dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.25 2003/07/06 23:14:50 massiot Exp $
+dnl $Id: configure.ac,v 1.32 2003/07/17 12:06:10 sam Exp $
AC_INIT(vlc,0.6.0)
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof lseek)
])
])
-dnl Check for getopt
+dnl Check for getopt (always use builtin one on win32)
+if test "${SYS}" = "mingw32"; then
+need_getopt=:
+else
need_getopt=false
AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
AX_ADD_LDFLAGS([vlc],[-lgnugetopt])],
[need_getopt=:])])
+fi
AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
if test "${SYS}" != "mingw32"; then
if test "${enable_sout}" != "no"
then
AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
- AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_dummy])
+ AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_dummy])
AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo packetizer_a52])
AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
AX_ADD_PLUGINS([packetizer_copy])
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
AX_ADD_BUILTINS([theora])
- AX_ADD_LDFLAGS([theora],[-ltheora -logg]) ],[
+ if test "${SYS}" = "darwin"; then
+ theora_libs="-ltheora"
+ else
+ theora_libs="-ltheora -logg"
+ fi
+ AX_ADD_LDFLAGS([theora],[${theora_libs}]) ],[
AC_MSG_ERROR([libtheora doesn't appear to be installed on you system.
You also need to check that you have a libogg posterior to the 1.0 release.])],
[-logg])
if test "${FREETYPE_CONFIG}" != "no"
then
- AX_ADD_PLUGINS([osdtext])
- AX_ADD_CFLAGS([osdtext],[`${FREETYPE_CONFIG} --cflags`])
- AX_ADD_LDFLAGS([osdtext],[`${FREETYPE_CONFIG} --libs`])
+ AX_ADD_PLUGINS([freetype])
+ AX_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "${enable_freetype}" = "yes"
then
fi
dnl
-dnl Gtk+2 module
+dnl Gtk+2 module ! Disabled for know as it is unuseable and confuses users
dnl
-AC_ARG_ENABLE(gtk2,
- [ --enable-gtk2 Gtk2 support (default disabled)])
-if test "${enable_gtk2}" = "yes"
-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_PLUGINS([gtk2])
- if test "${SYS}" != "mingw32"; then
- NEED_GTK2_MAIN=yes
- fi
-fi
+dnl AC_ARG_ENABLE(gtk2,
+dnl [ --enable-gtk2 Gtk2 support (default disabled)])
+dnl if test "${enable_gtk2}" = "yes"
+dnl then
+dnl PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+dnl AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
+dnl AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
+dnl AX_ADD_PLUGINS([gtk2])
+dnl if test "${SYS}" != "mingw32"; then
+dnl NEED_GTK2_MAIN=yes
+dnl fi
+dnl fi
dnl
dnl Familiar module uses Gtk+ library
fi])
dnl
-dnl Gnome2 module
+dnl Gnome2 module ! Disabled for know as it is unuseable and confuses users
dnl
-AC_ARG_ENABLE(gnome2,
- [ --enable-gnome2 Gnome2 support (default disabled)])
-if test "${enable_gnome2}" = "yes"
-then
- PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
- AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}])
- AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}])
- AX_ADD_PLUGINS([gnome2])
- if test "${SYS}" != "mingw32"; then
- NEED_GNOME2_MAIN=yes
- fi
-fi
+dnl AC_ARG_ENABLE(gnome2,
+dnl [ --enable-gnome2 Gnome2 support (default disabled)])
+dnl if test "${enable_gnome2}" = "yes"
+dnl then
+dnl PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+dnl AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}])
+dnl AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}])
+dnl AX_ADD_PLUGINS([gnome2])
+dnl if test "${SYS}" != "mingw32"; then
+dnl NEED_GNOME2_MAIN=yes
+dnl fi
+dnl fi
dnl
dnl wxWindows module
fi
fi
+dnl
+dnl corba (ORBit) plugin
+dnl
+AC_ARG_ENABLE(corba,
+ [ --enable-corba corba interface support (default disabled)])
+if test "${enable_corba}" = "yes"; then
+ ORBIT_PATH="${PATH}"
+ AC_ARG_WITH(orbit-config-path,
+ [ --with-orbit-config-path=PATH orbit-config path (default search in \$PATH)])
+ if test "${with_orbit_config_path}" != "no"; then
+ ORBIT_PATH="${with_orbit_config_path}:${PATH}"
+ fi
+ # look for orbit2-config
+ AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no, ${ORBIT_PATH})
+ if test "${ORBIT_CONFIG}" != "no"; then
+ AX_ADD_CFLAGS(corba,[`${ORBIT_CONFIG} --cflags server`])
+ AX_ADD_LDFLAGS(corba,[`${ORBIT_CONFIG} --libs server | sed 's,-rdynamic,,'`])
+ # now look for the orbit.h header
+ CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_corba}"
+ ac_cv_corba_headers=yes
+ AC_CHECK_HEADERS(orbit/orbit.h, , [
+ ac_cv_corba_headers=no
+ AC_MSG_ERROR([Could not find corba development headers])
+ ])
+ if test "${ac_cv_corba_headers}" = "yes"; then
+ AX_ADD_PLUGINS(corba)
+ fi
+ CPPFLAGS="${CPPFLAGS_save}"
+ fi
+fi
+
AC_ARG_WITH(,[Misc options:])
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,[
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
-VLC_CONFIG="\$(top_builddir)/vlc-config"
+VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" \$(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/motion/Makefile
modules/codec/spudec/Makefile
modules/control/Makefile
+ modules/control/corba/Makefile
modules/control/lirc/Makefile
modules/control/rc/Makefile
modules/demux/Makefile