* Grmbl. Forgot to update the libdvdcss changelog.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index abec4d34488fdaaa5a9716586f5363d9f03e0a3b..2666421e5addd128c3c136b6fa2266ad51791e2b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_CANONICAL_HOST
 HAVE_VLC=0
 if test -r src/interface/main.c; then
   HAVE_VLC=1
-  VLC_VERSION=0.2.82
+  VLC_VERSION=0.2.83
   AC_SUBST(VLC_VERSION)
   VLC_CODENAME=Ourumov
   AC_SUBST(VLC_CODENAME)
@@ -78,8 +78,10 @@ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
 CFLAGS="${CFLAGS} -I/usr/local/include"
 
 dnl Check for pthreads - borrowed from XMMS
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+THREAD_LIB=error
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+fi
 if test "x${THREAD_LIB}" = xerror; then
   AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
 fi
@@ -87,10 +89,13 @@ if test "x${THREAD_LIB}" = xerror; then
   AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
 fi
 if test "x${THREAD_LIB}" = xerror; then
-  THREAD_LIBS=""
   AC_CHECK_FUNC(pthread_attr_init)
+  THREAD_LIB=""
 fi
 
+dnl Check for cthreads under GNU/Hurd for instance
+AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+
 dnl Check for misc headers
 AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
   AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
@@ -174,6 +179,11 @@ 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))
+AC_MSG_CHECKING([for boolean_t in cthreads.h])
+AC_TRY_COMPILE([#include <cthreads.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -192,18 +202,30 @@ dnl
 dnl  Accelerated modules
 dnl
 MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
+MMXEXT_MODULES="idctmmxext motionmmxext"
+THREEDNOW_MODULES="imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
 
 AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
   ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
-AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
+AC_MSG_CHECKING([if \$CC groks MMX EXT inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
   ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING([if \$CC groks 3D Now! inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks SSE inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
 dnl
 dnl  libdvdcss: check for DVD ioctls
 dnl
@@ -361,10 +383,20 @@ AC_ARG_ENABLE(trace,
 dnl
 dnl  Trace mode
 dnl
-PROFILING=0
-AC_ARG_ENABLE(profiling,
-[  --enable-profiling      Enable gprof profiling (default disabled)],
-[ if test x$enableval = xyes; then PROFILING=1; fi ])
+GPROF=0
+AC_ARG_ENABLE(gprof,
+[  --enable-gprof          Enable gprof profiling (default disabled)],
+[ if test x$enableval = xyes; then GPROF=1; fi ])
+
+CPROF=0
+AC_ARG_ENABLE(cprof,
+[  --enable-cprof          Enable cprof profiling (default disabled)],
+[ if test x$enableval = xyes;
+  then
+    LIB="${LIB} -lcprof"
+    CPROF=1
+  fi
+])
 
 dnl
 dnl  Enable/disable optimizations
@@ -854,7 +886,8 @@ AC_SUBST(DEBUG)
 AC_SUBST(STATS)
 AC_SUBST(ASM)
 AC_SUBST(TRACE)
-AC_SUBST(PROFILING)
+AC_SUBST(CPROF)
+AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
@@ -919,7 +952,7 @@ vlc version           : ${VLC_VERSION}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
 trace mode            : ${TRACE}
-profiling             : ${PROFILING}
+cprof/gprof support   : ${CPROF}/${GPROF}
 need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}
 plugin modules        :${PLUGINS}