* Beginning of the built-in modules support.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index ce6f16e5ea9266f04068999dfe67ee0f50c66e68..666cb589ddad9a0e13c91da5e861fc218fe55500 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ 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"])])
+    [GETOPT=1])])
 AC_SUBST(GETOPT)
 
 AC_FUNC_MMAP
@@ -101,7 +101,8 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
 dnl default plugins 
-PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
+#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
+BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
 if test x$host_os = xbeos; then
     ACCEL_PLUGINS="yuvmmx idctmmx motionmmx "
 else
@@ -110,28 +111,39 @@ fi
 
 dnl Checks for DVD ioctls
 AC_CHECK_HEADERS(sys/ioctl.h,
-  [PLUGINS=${PLUGINS}"dvd "
+  [#PLUGINS=${PLUGINS}"dvd "
+   BUILTINS=${BUILTINS}"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
+if test x$enable_dummy != xno; then
+  #PLUGINS=${PLUGINS}"dummy ";
+  BUILTINS=${BUILTINS}"dummy "; fi
 AC_ARG_ENABLE(null,
   [  --disable-null          Null module (default enabled)])
-if test x$enable_null != xno; then PLUGINS=${PLUGINS}"null "; fi
+if test x$enable_null != xno; then
+  #PLUGINS=${PLUGINS}"null ";
+  BUILTINS=${BUILTINS}"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$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 ])
+[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx";
+  #PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
+  BUILTINS=${BUILTINS}}${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};
+  BUILTINS=${BUILTINS}${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 x$enableval = xyes; then ARCH=${ARCH}" altivec";
+  #PLUGINS=${PLUGINS}"idctaltivec ";
+  BUILTINS=${BUILTINS}"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)],
@@ -259,6 +271,7 @@ fi
 AC_SUBST(SYS)
 AC_SUBST(ARCH)
 AC_SUBST(PLUGINS)
+AC_SUBST(BUILTINS)
 AC_SUBST(ALIASES)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
@@ -273,7 +286,7 @@ AC_SUBST(LIB_SDL)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GGI)
 
-AC_OUTPUT([Makefile include/config.h])
+AC_OUTPUT([Makefile.opts Makefile.modules include/config.h])
 
 echo "
 vlc configuration
@@ -285,7 +298,10 @@ debug mode            : ${DEBUG}
 statistics            : ${STATS}
 optimizations         : ${OPTIMS}
 CSS decryption        : ${CSS}
-plugins               : ${PLUGINS}
+need builtin getopt   : ${GETOPT}
+plugin modules        : ${PLUGINS}
+built-in modules      : ${BUILTINS}
 vlc aliases           : ${ALIASES}
-"
+
+You may now tune Makefile.opts at your convenience."