dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.30 2003/07/14 21:32:58 sigmunau Exp $
+dnl $Id: configure.ac,v 1.46 2003/07/29 17:42:58 gbazin Exp $
-AC_INIT(vlc,0.6.0)
+AC_INIT(vlc,0.6.1)
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)
AM_CONFIG_HEADER(config.h)
dnl
dnl matroska demux plugin
dnl
AC_ARG_ENABLE(mkv,
- [ --enable-mkv Matroska demux support (default disabled)])
-if test "${enable_mkv}" = "yes"
+ [ --enable-mkv Matroska demux support (default enabled)])
+if test "${enable_mkv}" != "no"
then
AC_LANG_PUSH(C++)
dnl matroska headers include ebml headers directly... pouah that stinks
then
AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support],
- [ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame])
+ [
+ dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
+ dnl linker would miserably barf on multiple definitions.
+ AX_ADD_LDFLAGS([stream_out_transcode],[])
AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
AC_ARG_WITH(ffmpeg-tree,
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
dnl MP4 module
dnl
AC_CHECK_HEADERS(zlib.h, [
- AX_ADD_LDFLAGS([mp4 skins basic_skins],[-lz])
+ AX_ADD_LDFLAGS([mp4 skins],[-lz])
] )
dnl skins module
dnl
AC_CHECK_HEADERS(libtar.h, [
- AX_ADD_LDFLAGS([skins basic_skins],[-ltar])
+ AX_ADD_LDFLAGS([skins],[-ltar])
] )
])
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
dnl png
dnl
AC_CHECK_HEADERS(png.h, [
- AX_ADD_LDFLAGS([logo],[-lpng])
+ AX_ADD_LDFLAGS([logo],[-lpng -lz])
AX_ADD_PLUGINS([logo])])
dnl
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
AC_ARG_ENABLE(skins,
[ --enable-skins Skins interface module (default enabled on Win32)])
if test "${enable_skins}" != "no"; then
- WXWINDOWS_PATH="${PATH}"
- AC_ARG_WITH(skins-wx-config-path,
- [ --with-skins-wx-config-path=PATH wx-config path for the skins plugin (default search in \$PATH)],
- [ if test "${with_skins_wx_config_path}" != "no"
- then
- WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
- fi ])
- # look for wx-config
- AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
- if test "${WX_CONFIG_SKINS}" != "no"
- then
- if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
- then
- AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.])
- fi
- AX_ADD_CPPFLAGS([skins],[`${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS])
- AX_ADD_LDFLAGS([skins],[`${WX_CONFIG_SKINS} --libs`])
- fi
-
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+
AX_ADD_PLUGINS([skins])
AX_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins])
AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
AX_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
- else
- if test "${enable_skins}" = "yes"; then
- IMLIB2_PATH="${PATH}"
- AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- if test "${IMLIB2_CONFIG_SKINS}" = "no"; then
- AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.])
- fi
-
- AX_ADD_PLUGINS([skins])
- AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
- AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
- AX_ADD_PLUGINS([skins])
- fi
- fi
-fi
-
-dnl
-dnl Basic skins module (i.e. without wxWindows dialogs)
-dnl
-AC_ARG_ENABLE(basic-skins,
- [ --enable-basic-skins Skins interface module without wxWindows dialogs (default disabled)])
-if test "${enable_basic_skins}" = "yes"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
-
- AX_ADD_CPPFLAGS([basic_skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins])
- AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([basic_skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
- else
+ else if test "${enable_skins}" = "yes"; then
IMLIB2_PATH="${PATH}"
AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
if test "${IMLIB2_CONFIG_SKINS}" = "no"; then
- AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.])
+ AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.])
fi
- AX_ADD_CPPFLAGS([basic_skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
- AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([basic_skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
- fi
-
- AX_ADD_PLUGINS([basic_skins])
+ AX_ADD_PLUGINS([skins])
+ AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
+ AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
+ AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
+ fi fi
fi
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 "${enable_mozilla}" = "yes"
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
- if test "${MOZILLA_CONFIG}" != "no"
+ if test "${MOZILLA_CONFIG}" = "no"
then
+ AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+ else
if test "${SYS}" != "mingw32"; then
LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
AC_CHECK_LIB(Xt,XtStrings,[
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"
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
-VLC_CONFIG="\$(top_builddir)/vlc-config"
+VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
AC_SUBST(VLC_CONFIG)
CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
ipkg/Makefile
lib/Makefile
modules/Makefile
+ mozilla/Makefile
m4/Makefile
po/Makefile.in
share/Makefile
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
projects / vlc / blobdiff