X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=61dd05fd0a60c4868991b2258a1d515065864776;hb=8ee3c601076be778d8b2429ded5077aa694c3405;hp=c4c611eacb3f4bfd32bdd5da0147329b2e322582;hpb=9bc87bff4bad26ed8b41872ec38003512777f22c;p=vlc

diff --git a/configure.in b/configure.in
index c4c611eacb..61dd05fd0a 100644
--- a/configure.in
+++ b/configure.in
@@ -4,9 +4,9 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.1.99i
+VLC_VERSION=0.2.70
 AC_SUBST(VLC_VERSION)
-VLC_CODENAME=Onatopp
+VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
 
 dnl Check for tools
@@ -28,51 +28,115 @@ AC_C_BIGENDIAN
 dnl Check for system libs needed
 AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol)
 AC_CHECK_FUNCS(setenv putenv)
-AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
-AC_CHECK_FUNC(nanosleep,,[AC_CHECK_LIB(rt,nanosleep,,[AC_CHECK_LIB(posix4,nanosleep)])])
+AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect,LIB=${LIB}" -lsocket")])
+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,LIB=${LIB}" -lnsl")])
+AC_CHECK_FUNC(nanosleep,,[AC_CHECK_LIB(rt,nanosleep,LIB=${LIB}" -lrt",[AC_CHECK_LIB(posix4,nanosleep,LIB=${LIB}" -lposix4")])])
 AC_CHECK_FUNCS(usleep)
-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
+AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton,LIB=${LIB}" -lresolv")])
+AC_CHECK_FUNCS(vasprintf)
+
+AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
+[ # FreeBSD has a gnugetopt library for this:
+  AC_CHECK_LIB([gnugetopt],[getopt_long],
+    [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB=${LIB}" -lgnugetopt"],
+    [GETOPT="extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o"])])
+AC_SUBST(GETOPT)
+
 AC_FUNC_MMAP
-AC_FUNC_VPRINTF
 AC_TYPE_SIGNAL
-AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_LIB(gnugetopt, optarg)
-AC_CHECK_LIB(be, _)
-AC_CHECK_LIB(game, _)
-AC_CHECK_LIB(root, _)
-AC_CHECK_LIB(m, powl)
-AC_CHECK_LIB(pthread, pthread_create)
-AC_CHECK_LIB(threads, thread_create)
-
-dnl check for getopt_long, substitute the distributed versions if not
-AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"])
-AC_SUBST(LIBOBJS)
-
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h)
+AC_CHECK_LIB(dl,dlopen,LIB=${LIB}" -ldl")
+AC_CHECK_LIB(m,powl,LIB=${LIB}" -lm")
+AC_CHECK_LIB(pthread,pthread_create,LIB=${LIB}" -lpthread")
+AC_CHECK_LIB(threads,thread_create,LIB=${LIB}" -lthreads")
+
+CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+AC_CHECK_HEADERS(stddef.h)
+AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_HEADERS(sys/sockio.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
 AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
+AC_CHECK_HEADERS(machine/param.h)
 
 dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 
+dnl Do a series of bizarre compilation tests
+save_CFLAGS=$CFLAGS
+
+dnl Check for ntohl, etc.
+CFLAGS="${CFLAGS} -Wall -Werror"
+AC_MSG_CHECKING([for ntohl in sys/param.h])
+AC_TRY_COMPILE([#include <sys/param.h>
+void foo() { int meuh; ntohl(meuh); }],,
+ AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if ntohl is in <sys/param.h>.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+dnl Check for -rdynamic flag
+CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
+AC_MSG_CHECKING([if \$CC accepts -rdynamic])
+AC_TRY_COMPILE([],,
+ LCFLAGS=${LCFLAGS}" -rdynamic"
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+dnl End of the bizarre compilation tests
+CFLAGS=$save_CFLAGS
+
+dnl Check for boolean_t
+AC_MSG_CHECKING([for boolean_t in sys/types.h])
+AC_TRY_COMPILE([#include <sys/types.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_MSG_CHECKING([for boolean_t in pthread.h])
+AC_TRY_COMPILE([#include <pthread.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
 dnl default plugins 
-PLUGINS=${PLUGINS}"yuv ";
+PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
+if test x$host_os = xbeos; then
+    ACCEL_PLUGINS="yuvmmx idctmmx motionmmx "
+else
+    ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext "
+fi
+
+dnl Checks for DVD ioctls
+AC_CHECK_HEADERS(sys/ioctl.h,
+  [PLUGINS=${PLUGINS}"dvd "
+   AC_CHECK_HEADERS(linux/cdrom.h)
+   AC_EGREP_HEADER(dvd,linux/cdrom.h,[AC_DEFINE(LINUX_DVD,1,DVD support for linux)])])
 
 ARCH=${host_cpu}
+AC_ARG_ENABLE(dummy,
+  [  --disable-dummy         dummy module (default enabled)])
+if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi
+AC_ARG_ENABLE(null,
+  [  --disable-null          Null module (default enabled)])
+if test x$enable_null != xno; then PLUGINS=${PLUGINS}"null "; fi
 AC_ARG_ENABLE(ppro,
 [  --disable-ppro          Disable PentiumPro optimizations (default enabled for x86)],
 [ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
 [ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
 AC_ARG_ENABLE(mmx,
-[  --disable-mmx           Disable MMX optimizations (default enabled for x86)])
-if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then if test x$enableval != xno; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ; fi
+[  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
+[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ],
+[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ])
+AC_ARG_ENABLE(altivec,
+[  --enable-altivec        Enable altivec optimizations (default disabled since it is broken)],
+[ if test x$enableval = xyes; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
+#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
+AC_ARG_ENABLE(css,
+[  --disable-css           Disable DVD CSS decryption (default enabled)],
+[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
+if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -86,53 +150,133 @@ AC_ARG_ENABLE(optimizations,
 
 SYS=${host_os}
 
-# special cases
+dnl special cases
 if test x$host_os = xbeos; then
-    PLUGINS=${PLUGINS}"dummy beos "
+    PLUGINS=${PLUGINS}"beos "
+    LIB=${LIB}" -lbe -lgame -lroot"
 
 dnl default case
 else
 
-AC_ARG_ENABLE(dummy,
-  [  --disable-dummy         dummy audio and video support (default enabled)])
-if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi
+GVLC=0
+
 AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
-if test x$enable_dsp != xno; then PLUGINS=${PLUGINS}"dsp "; fi
+if test x$enable_dsp != xno; then
+  if test -c /dev/dsp; then
+    PLUGINS=${PLUGINS}"dsp "
+  fi
+fi
 AC_ARG_ENABLE(esd,
   [  --enable-esd            Esound library support (default disabled)],
   [if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi])
+AC_ARG_ENABLE(darwin,
+  [  --enable-darwin         Darwin sound support (default disabled)],
+  [if test x$enable_darwin = xyes; then PLUGINS=${PLUGINS}"darwin "; fi])
+AC_ARG_ENABLE(macosx,
+  [  --enable-macosx         Mac OS X interface support (default enabled in Mac OS X)],
+  [if test x$enable_macosx = xyes; then PLUGINS=${PLUGINS}"macosx "; fi],
+  [AC_CHECK_HEADERS(Carbon/Carbon.h, PLUGINS=${PLUGINS}"macosx ")])
 AC_ARG_ENABLE(fb,
   [  --enable-fb             Linux framebuffer support (default disabled)],
-  [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi])
-AC_ARG_ENABLE(ggi,
-  [  --enable-ggi            GGI support (default disabled)],
-  [if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; fi])
-AC_ARG_ENABLE(sdl,
-  [  --enable-sdl            SDL support (default disabled)],
-  [if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi])
-AC_ARG_ENABLE(glide,
-  [  --enable-glide          Glide (3dfx) support (default disabled)],
-  [if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; fi])
+  [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
+AC_ARG_WITH(ggi,
+  [  --with-ggi[=name]       GGI support (default disabled)],
+  [ if test "x$withval" != "xno";
+    then
+      PLUGINS=${PLUGINS}"ggi ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GGI="-l"$withval
+      else
+        LIB_GGI="-lggi"
+      fi
+    fi ])
+AC_ARG_WITH(sdl,
+  [  --with-sdl[=name]       SDL support (default enabled)],
+  [ if test "x$withval" != "xno";
+    then
+      PLUGINS=${PLUGINS}"sdl ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_SDL="-L/usr/X11R6/lib -L"$withval"/lib -l"$withval
+        INCLUDE=${INCLUDE}" -I"$withval"/include"
+      else
+        AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
+        LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      fi
+    fi ])
+    if test "x$withval" = "x";
+    then
+      AC_CHECK_HEADERS(SDL/SDL.h,
+      [PLUGINS=${PLUGINS}"sdl "
+       LIB_SDL="-L/usr/X11R6/lib -lSDL"])
+    fi
+AC_ARG_WITH(glide,
+  [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
+  [ if test "x$withval" != "xno";
+    then
+      PLUGINS=${PLUGINS}"glide ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GLIDE="-l"$withval
+      else
+        LIB_GLIDE="-lglide2x"
+      fi
+    fi ])
+AC_ARG_ENABLE(ncurses,
+  [  --enable-ncurses        ncurses interface support (default disabled)],
+  [if test x$enable_ncurses = xyes; then PLUGINS=${PLUGINS}"ncurses "; fi])
+AC_ARG_ENABLE(qt,
+  [  --enable-qt             Qt interface support (default disabled)],
+  [if test x$enable_qt = xyes; then PLUGINS=${PLUGINS}"qt "; ALIASES=${ALIASES}"qvlc "; fi])
+AC_ARG_ENABLE(kde,
+  [  --enable-kde            KDE interface support (default disabled)],
+  [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
 AC_ARG_ENABLE(gnome,
-  [  --enable-gnome          Gnome support (default disabled)],
-  [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gvlc "; fi])
+  [  --enable-gnome          Gnome interface support (default disabled)],
+  [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi])
+AC_ARG_ENABLE(gtk,
+  [  --disable-gtk           Gtk+ support (default enabled)])
+if test x$enable_gtk != xno; then
+  if which gtk-config; then
+    PLUGINS=${PLUGINS}"gtk "
+    GVLC=1
+  fi
+fi
 AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
-if test x$enable_x11 != xno; then PLUGINS=${PLUGINS}"x11 "; fi
+if test x$enable_x11 != xno; then
+  AC_CHECK_HEADERS(X11/Xlib.h, [PLUGINS=${PLUGINS}"x11 "])
+fi
+AC_ARG_ENABLE(xvideo,
+  [  --enable-xvideo         XVideo interface support (default disabled)],
+  [if test x$enable_xvideo = xyes; then PLUGINS=${PLUGINS}"xvideo "; fi])
+
 AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
   [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
 
+if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
+
 fi
 
 AC_SUBST(SYS)
 AC_SUBST(ARCH)
 AC_SUBST(PLUGINS)
 AC_SUBST(ALIASES)
+AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
 AC_SUBST(STATS)
 AC_SUBST(OPTIMS)
+AC_SUBST(CSS)
+
+AC_SUBST(LCFLAGS)
+AC_SUBST(LIB)
+
+AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_GLIDE)
+AC_SUBST(LIB_GGI)
 
 AC_OUTPUT([Makefile include/config.h])
 
@@ -145,6 +289,7 @@ architecture          : ${ARCH}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
 optimizations         : ${OPTIMS}
+CSS decryption        : ${CSS}
 plugins               : ${PLUGINS}
 vlc aliases           : ${ALIASES}
 "