X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=b0f0641db86d1131509670281d73466f936c4f37;hb=a7592866a083dec4ef8e1d22b26a40a37e1bba30;hp=2ff1cf0ee71f754a550ace1025103faff1505c71;hpb=2e0eab4ca7a626b63263ec6d978c19ea0c3df22e;p=vlc

diff --git a/configure.in b/configure.in
index 2ff1cf0ee7..b0f0641db8 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM
 HAVE_VLC=0
 if test -r src/interface/main.c; then
   HAVE_VLC=1
-  VLC_VERSION=0.2.91
+  VLC_VERSION="0.2.92-dev"
   AC_SUBST(VLC_VERSION)
   VLC_CODENAME=Ourumov
   AC_SUBST(VLC_CODENAME)
@@ -16,7 +16,7 @@ fi
 HAVE_LIBDVDCSS=0
 if test -r extras/libdvdcss/libdvdcss.c; then
   HAVE_LIBDVDCSS=1
-  LIBDVDCSS_VERSION=1.0.0
+  LIBDVDCSS_VERSION="1.0.1-dev"
   AC_SUBST(LIBDVDCSS_VERSION)
   if test -r extras/libdvdcss/csskeys.h; then
     AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys)
@@ -33,6 +33,15 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
+dnl Gettext stuff
+ALL_LINGUAS="de fr ru"
+PACKAGE="vlc"
+VERSION="$VLC_VERSION"
+
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AM_GNU_GETTEXT
+
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
@@ -135,6 +144,7 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
+AC_CHECK_LIB(m,cos,LIB_IMDCT="${LIB_IMDCT} -lm")
 AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
 
 dnl Check for pthreads - borrowed from XMMS
@@ -295,13 +305,14 @@ ARCH=${target_cpu}
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} es ps ts memcpy yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
-PLUGINS="${PLUGINS} ac3_spdif spu_dec"
+#BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy yuv2rgb8 idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+PLUGINS="${PLUGINS} ac3_spdif spudec"
 
 dnl
 dnl  Accelerated modules
 dnl
-MMX_MODULES="memcpymmx yuvmmx idctmmx motionmmx"
+MMX_MODULES="memcpymmx idctmmx motionmmx"
 MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
 THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
 SSE_MODULES="imdctsse downmixsse"
@@ -348,12 +359,15 @@ AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
          [save_CFLAGS=$CFLAGS
           CFLAGS="$CFLAGS -Wa,-m7400"
           AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
-            [ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400"],
+            [ac_cv_altivec_inline="-Wa,-m7400"],
             ac_cv_altivec_inline=no)
           CFLAGS=$save_CFLAGS
          ])])
 if test x"$ac_cv_altivec_inline" != x"no"; then
   AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
+  if test x"$ac_cv_altivec_inline" != x"yes"; then
+    CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_altivec_inline"
+  fi
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
 
@@ -404,6 +418,11 @@ case ${target_os} in
   *mingw32*)
     SYS=mingw32
     ;;
+  *nto*)
+    SYS=nto
+    LIB_X11="${LIB_X11} -lsocket"
+    LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
+    ;;
   *)
     SYS=${target_os}
     ;;
@@ -414,7 +433,7 @@ dnl Windoze specific section
 dnl
 if test $SYS = mingw32; then
 AC_CHECK_TOOL(WINDRES, windres, :)
-LIB_TS="-lws2_32"
+LIB_MPEG_TS="-lws2_32"
 LIB_RC="-lws2_32"
 fi
 
@@ -510,6 +529,22 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   fi
 ])
 
+
+dnl
+dnl  Check the operating system
+dnl
+case ${target_os} in
+  bsdi*)
+    SYS=bsdi
+    ;;
+  darwin*)
+    SYS=darwin
+    ;;
+  *)
+    SYS=${target_os}
+    ;;
+esac
+
 dnl
 dnl  Special arch tuning
 dnl
@@ -746,28 +781,29 @@ dnl
 dnl  rc plugin
 dnl
 AC_ARG_ENABLE(rc,
-  [  --disable-rc            rc module (default enabled)])
+  [  --disable-rc            Remote Control module (default enabled)])
+
 if test x$enable_rc != xno
 then
   BUILTINS="${BUILTINS} rc"
 fi
 
 dnl
-dnl  libmad plugin
+dnl  mad plugin
 dnl
-AC_ARG_WITH(libmad,
-  [  --with-libmad[=PATH]    libmad module (default disabled)],
+AC_ARG_WITH(mad,
+  [  --with-mad[=PATH]       libmad module (default disabled)],
   [ if test "x$with_val" != "xno"; then
       if test -n $with_val; then
-	    CFLAGS_MAD_ADEC="-I$with_val/include"
-        LIB_MAD_ADEC="-L$with_val/lib -lmad"
+	    CFLAGS_MAD="-I$with_val/include"
+        LIB_MAD="-L$with_val/lib -lmad"
       else
-        LIB_MAD_ADEC="-lmad"
+        LIB_MAD="-lmad"
       fi
       save_CFLAGS=$CFLAGS
       save_LDFLAGS=$LDFLAGS
-      CFLAGS="$CFLAGS $CFLAGS_MAD_ADEC"
-      LDFLAGS="$LDFLAGS $LIB_MAD_ADEC"
+      CFLAGS="$CFLAGS $CFLAGS_MAD"
+      LDFLAGS="$LDFLAGS $LIB_MAD"
       AC_CHECK_HEADERS(mad.h, ,
       [ echo "Cannot find development headers for libmad..."
         exit 1
@@ -778,7 +814,7 @@ AC_ARG_WITH(libmad,
       ])
       CFLAGS=$save_CFLAGS
       LDFLAGS=$save_LDFLAGS
-      BUILTINS="${BUILTINS} mad_adec"
+      PLUGINS="${PLUGINS} mad"
     fi ])
 
 dnl special case for BeOS
@@ -1124,7 +1160,7 @@ if test x$enable_x11 != xno &&
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS -I$x_includes"
   AC_CHECK_HEADERS(X11/Xlib.h, [
-    PLUGINS="${PLUGINS} x11"
+    #PLUGINS="${PLUGINS} x11"
     LIB_X11="-L$x_libraries -lX11 -lXext"
     CFLAGS_X11="-I$x_includes"
   ]
@@ -1207,6 +1243,8 @@ AC_SUBST(RELEASE)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(PLCFLAGS)
@@ -1231,13 +1269,13 @@ AC_SUBST(LIB_GTK)
 AC_SUBST(LIB_KDE)
 AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_MACOSX)
-AC_SUBST(LIB_MAD_ADEC)
+AC_SUBST(LIB_MAD)
+AC_SUBST(LIB_MPEG_TS)
 AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
-AC_SUBST(LIB_TS)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
@@ -1250,7 +1288,7 @@ AC_SUBST(CFLAGS_LIBDVDCSS)
 AC_SUBST(CFLAGS_ARTS)
 AC_SUBST(CFLAGS_ESD)
 AC_SUBST(CFLAGS_GTK)
-AC_SUBST(CFLAGS_MAD_ADEC)
+AC_SUBST(CFLAGS_MAD)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
 
@@ -1259,7 +1297,8 @@ AC_SUBST(OBJ_LIBDVDCSS)
 
 AC_SUBST(NEED_LIBDVDCSS)
 
-AC_OUTPUT([Makefile.opts include/config.h])
+AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
+#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in])
 
 echo "
 global configuration