* rc: Fixed a bug with seek command.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 83ffd745eb96719a9ce5d1c8738c37f068e98b2d..ea15e4cb1f867e43c69229844322fd7235ba231b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.34 2003/07/17 17:30:39 gbazin Exp $
+dnl $Id: configure.ac,v 1.44 2003/07/27 21:35:50 jpsaman Exp $
 
-AC_INIT(vlc,0.6.0)
+AC_INIT(vlc,0.6.1-test1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Trevelyan"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.6.0)
+AM_INIT_AUTOMAKE(vlc,0.6.1-test1)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -1695,10 +1695,14 @@ AC_ARG_ENABLE(quicktime,
 if test "${enable_quicktime}" != "no" &&
   (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
 then
+  if test "${SYS}" = "mingw32"; then
+    AX_ADD_BUILTINS([quicktime])
+  else
   AC_CHECK_HEADERS(QuickTime/QuickTime.h,
     [ AX_ADD_BUILTINS([quicktime])
       AX_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon])
-    ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
+    ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ])
+  fi
 fi
 
 dnl
@@ -1946,6 +1950,14 @@ You also need to check that you have a libogg posterior to the 1.0 release.])],
   ])
 fi
 
+dnl
+dnl   subsdec support
+dnl
+AX_ADD_LDFLAGS([subsdec],[${LIBICONV}])
+AX_ADD_CPPFLAGS([subsdec],[${INCICONV}])
+AX_ADD_PLUGINS([subsdec])
+
+
 dnl
 dnl  Video Filters
 dnl
@@ -1954,7 +1966,7 @@ dnl
 dnl   png
 dnl
 AC_CHECK_HEADERS(png.h, [
-    AX_ADD_LDFLAGS([logo],[-lpng])
+    AX_ADD_LDFLAGS([logo],[-lpng -lz])
     AX_ADD_PLUGINS([logo])])
 
 dnl
@@ -2132,6 +2144,8 @@ then
     AX_ADD_PLUGINS([freetype])
     AX_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
     AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
+    AC_CHECK_HEADERS(Carbon/Carbon.h,
+      [AX_ADD_LDFLAGS([freetype],[-framework Carbon])])
     CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
   elif test "${enable_freetype}" =  "yes"
   then
@@ -2512,6 +2526,25 @@ dnl     NEED_GTK2_MAIN=yes
 dnl   fi
 dnl fi
 
+dnl
+dnl  PDA Gtk+2 module
+dnl
+AC_ARG_ENABLE(pda,
+  [  --enable-pda           PDA interface needs Gtk2 suport (default disabled)])
+if test "x${enable_pda}" = "xyes"
+then
+  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+  AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
+  AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
+  AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
+  AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}])
+  AX_ADD_PLUGINS([pda])
+  if test "${SYS}" != "mingw32"; then
+    NEED_GTK2_MAIN=yes
+  fi
+fi
+
+
 dnl
 dnl  Familiar module uses Gtk+ library
 dnl
@@ -2887,6 +2920,19 @@ then
   fi
 fi
 
+dnl 
+dnl  Joystick plugin
+dnl
+AC_ARG_ENABLE(joystick,
+  [  --enable-joystick       joystick control (default disabled)])
+if test "${enable_joystick}" = "yes"
+then
+ AC_CHECK_HEADER( linux/joystick.h, 
+               [AX_ADD_PLUGINS([joystick])]
+               )
+fi
+
+
 dnl
 dnl corba (ORBit) plugin
 dnl
@@ -3037,16 +3083,16 @@ dnl
 if test "${NEED_GTK_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([gtk_main])
-    AX_ADD_CFLAGS([gtk familiar],[-DNEED_GTK_MAIN])
-    AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar}])
-    AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar}])
+    AX_ADD_CFLAGS([gtk familiar pda],[-DNEED_GTK_MAIN])
+    AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_pda}])
+    AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_pda}])
 fi
 
 if test "${NEED_GNOME_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([gnome_main])
-    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}])
-    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}])
+    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_pda} ${CFLAGS_gnome}])
+    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
 fi
 
 if test "${NEED_GTK2_MAIN}" != "no"
@@ -3227,6 +3273,7 @@ AC_OUTPUT([
   modules/codec/mpeg_video/idct/Makefile
   modules/codec/mpeg_video/motion/Makefile
   modules/codec/spudec/Makefile
+  modules/codec/subsdec/Makefile
   modules/control/Makefile
   modules/control/corba/Makefile
   modules/control/lirc/Makefile
@@ -3244,6 +3291,7 @@ AC_OUTPUT([
   modules/gui/Makefile
   modules/gui/beos/Makefile
   modules/gui/familiar/Makefile
+  modules/gui/pda/Makefile
   modules/gui/gtk/Makefile
   modules/gui/gtk2/Makefile
   modules/gui/kde/Makefile
@@ -3252,7 +3300,6 @@ AC_OUTPUT([
   modules/gui/qnx/Makefile
   modules/gui/qt/Makefile
   modules/gui/skins/Makefile
-  modules/gui/win32/Makefile
   modules/gui/wxwindows/Makefile
   modules/misc/Makefile
   modules/misc/dummy/Makefile