dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.124 2003/11/30 14:28:07 fenrir Exp $
+dnl $Id: configure.ac,v 1.135 2003/12/15 21:07:55 jpsaman Exp $
-AC_INIT(vlc,0.7.0-test1)
+AC_INIT(vlc,0.7.0-test2)
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.7.0-test1)
+AM_INIT_AUTOMAKE(vlc,0.7.0-test2)
AM_CONFIG_HEADER(config.h)
dnl
fi
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
+ with_livedotcom_tree=${topdir}/extras/contrib/src/live
+ with_goom_tree=${topdir}/extras/contrib/src/goom
fi
dnl
SYS=beos
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
+ AX_ADD_CXXFLAGS([beos],[])
AX_ADD_LDFLAGS([vlc beos],[-lbe])
AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
- AX_ADD_LDFLAGS([vlc ipv4],-lsocket)
+ AX_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket)
])
])
AC_CHECK_FUNCS(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,[
- AX_ADD_LDFLAGS([ipv4 httpd vlc],[-lnsl])
+ AX_ADD_LDFLAGS([cddax ipv4 httpd vlc],[-lnsl])
],[
AC_CHECK_LIB(bind,gethostbyname,[
AX_ADD_LDFLAGS([ipv4 access_mms httpd],[-lbind])
AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
AX_ADD_PLUGINS([id3 m3u])
AX_ADD_PLUGINS([rawvideo])
-AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys au])
+AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au])
AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
AX_ADD_PLUGINS([access_ftp access_directory sap httpd http])
AX_ADD_PLUGINS([pvr])
fi
+dnl
+dnl VCDX and CDDAX modules
+dnl
+AC_ARG_ENABLE(libcdio,
+ [ --enable-libcdio CDDA support via libcdio (default enabled)])
+
+AC_ARG_ENABLE(libcddb,
+ [ --enable-libcddb CDDB support for CDDAX (default enabled)])
+
+AC_ARG_ENABLE(vcdx,
+ [ --enable-vcdx VCD support with Navigation (default enabled)])
+
+if test "${enable_cddax}" != "no"
+then
+ PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
+ [enable_cddax="no"
+ AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
+ AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+ AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+ AX_ADD_PLUGINS([cddax])],
+ [AC_MSG_WARN(libcdio library not found)
+ HAVE_CDDAX=no])
+
+ if test x$enable_cddb != no; then
+ PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
+ HAVE_LIBCDDB=yes
+ AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+ AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
+ AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
+ ],
+ [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
+ HAVE_LIBCDDB=no])
+ fi
+
+ PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
+ [enable_cddax="no"
+ AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+ AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+ AX_ADD_PLUGINS([cddax])],
+ [AC_MSG_WARN(libcdio library not found)])
+
+ if test "${enable_vcdx}" != "no"
+ then
+ PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20-cdio,
+ [enable_vcd="no"
+ AC_DEFINE(HAVE_VCDX, [],
+ [Define for the VCD plugin using libcdio/libvcdinfo])
+ AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
+ AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+ AX_ADD_PLUGINS([vcdx])],
+ [AC_MSG_WARN(vcdinfo library not found)
+ HAVE_VCDX=no])
+ fi
+fi
+
dnl
dnl VCD module
dnl
fi
fi
-dnl
-dnl VCDX and CDX modules
-dnl
-AC_ARG_ENABLE(vcdx,
- [ --enable-vcdx VCD support with Navigation for Linux and Win32 (default enabled)])
-
-if test "${enable_vcdx}" != "no"
-then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
- [enable_cdda="no"
- AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
- AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
- AX_ADD_PLUGINS([cddax])],
- [AC_MSG_WARN(libcdio library not found)])
-
- PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20-cdio,
- [enable_vcd="no"
- AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
- AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
- AX_ADD_PLUGINS([vcdx])],
- [AC_MSG_WARN(vcdinfo library not found)])
-fi
-
dnl
dnl Satellite input module
dnl
[ --enable-satellite satellite card support (default disabled)],
[ if test "${enable_satellite}" = "yes"
then
+ AC_DEFINE(HAVE_SATELLITE, [],
+ [Define for the VCD plugin using libcdio/libvcdinfo])
AX_ADD_PLUGINS([satellite])
fi])
fi
AX_ADD_PLUGINS([qte])
NEED_QTE_MAIN=yes
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+ CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
] )
AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`])
AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`])
fi
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+ CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
] )
if test "${NEED_GNOME_MAIN}" != "no"
then
AX_ADD_PLUGINS([gnome_main])
- AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_pda} ${CFLAGS_gnome}])
- AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
+ AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}])
+ AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}])
fi
if test "${NEED_GTK2_MAIN}" != "no"
dnl Create vlc-config.in
AX_OUTPUT_VLC_CONFIG_IN
-AC_OUTPUT([
- vlc-config
-
+AC_CONFIG_FILES([
Makefile
autotools/Makefile
debian/Makefile
po/Makefile.in
share/Makefile
src/Makefile
+])
+AC_CONFIG_FILES([
modules/access/Makefile
modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/visualization/scope/Makefile
modules/visualization/xosd/Makefile
modules/visualization/visual/Makefile
-],[
- chmod 0755 vlc-config
])
-dnl Generate makefiles found by bootstrap
+AC_CONFIG_FILES([vlc-config], [chmod 0755 vlc-config])
+
+dnl Generate makefiles
+AC_OUTPUT
printf "
vlc configuration
projects / vlc / blobdiff