dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.35 2003/07/18 23:41:09 hartman 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"
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
#AX_ADD_BUILTINS([mpeg_video_old idct idctclassic motion])
AX_ADD_PLUGINS([dummy rc logger gestures memcpy])
AX_ADD_PLUGINS([es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv])
-AX_ADD_PLUGINS([mpeg_audio lpcm a52 dts cinepak])
+AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
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
fi
dnl
-dnl spudec support
+dnl subsdec support
dnl
-AC_CHECK_HEADERS(iconv.h, [
- AX_ADD_LDFLAGS([spudec],[-liconv])
- AX_ADD_PLUGINS([spudec])])
+AX_ADD_LDFLAGS([subsdec],[${LIBICONV}])
+AX_ADD_CPPFLAGS([subsdec],[${INCICONV}])
+AX_ADD_PLUGINS([subsdec])
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
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
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
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"
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
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
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