dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.106 2003/11/07 21:30:52 massiot Exp $
+dnl $Id: configure.ac,v 1.136 2003/12/27 10:36:42 gbazin Exp $
-AC_INIT(vlc,0.6.3-cvs)
+AC_INIT(vlc,0.7.0-test3)
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.3-cvs)
+AM_INIT_AUTOMAKE(vlc,0.7.0-test3)
AM_CONFIG_HEADER(config.h)
dnl
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
+dnl Sam, if you think I didn't see that... --Meuuh
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_C_CONST
AC_C_INLINE
+dnl
+dnl Check for the contrib directory
+dnl
+topdir="`pwd`"
+if test -d ${topdir}/extras/contrib/lib; then
+ export PATH=${topdir}/extras/contrib/bin:$PATH
+ export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
+ CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
+ CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
+ CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
+ CFLAGS_save="${CFLAGS_save} -I${topdir}/extras/contrib/include"
+ CXXFLAGS="${CXXFLAGS} -I${topdir}/extras/contrib/include"
+ CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include"
+ OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
+ if test -d ${topdir}/extras/contrib/vlc-lib; then
+ LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/vlc-lib"
+ LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/vlc-lib"
+ 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
dnl Set default values
dnl
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
- AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
fi
;;
*nto*)
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])
- dnl Check for BONE presence
- AC_CHECK_LIB(socket, connect,
- AX_ADD_LDFLAGS([vlc ipv4 access_http access_mms access_udp access_ftp sap http access_output_udp],
- [-lbind]))
-
dnl Ugly check for Zeta
if test -f /boot/beos/system/lib/libzeta.so; then
AX_ADD_LDFLAGS([beos],[-lzeta])
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="de en_GB es fr it ja nl no pl pt_BR ru sv"
+ALL_LINGUAS="de en_GB es fr hu it ja nl no pl pt_BR ru sv"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
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(send,,[
AC_CHECK_LIB(socket,send,[
- AX_ADD_LDFLAGS([access_http access_mms access_udp access_ftp sap http access_output_udp],[-lsocket])
+ AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap httpd access_output_udp stream_out_standard],[-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 httpd],[-lbind])
+ AX_ADD_LDFLAGS([ipv4 access_mms httpd],[-lbind])
])
])
])
dnl default modules
dnl
AX_ADD_PLUGINS([dummy rc logger gestures memcpy hotkeys])
-AX_ADD_PLUGINS([es mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
-AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak dvbsub])
+AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
+AX_ADD_PLUGINS([spudec dvbsub 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])
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([access_file access_udp access_http ipv4 access_mms])
+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])
dnl
AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
AX_ADD_PLUGINS([stream_out_duplicate stream_out_display stream_out_gather])
- AX_ADD_PLUGINS([stream_out_transrate])
+# AX_ADD_PLUGINS([stream_out_transrate])
dnl Ogg and vorbis are handled in their respective section
fi
AC_ARG_WITH(,[Input plugins:])
+dnl
+dnl live.com input
+dnl
+AC_ARG_ENABLE(livedotcom,
+[ --enable-livedotcom live.com input plugin (default disabled)])
+if test "${enable_livedotcom}" = "yes"
+then
+ AC_ARG_WITH(livedotcom-tree,
+ [ --with-livedotcom-tree=PATH live.com tree for static linking (required)])
+
+ dnl
+ dnl test for --with-livedotcom-tree
+ dnl
+ if test "${with_livedotcom_tree}" != "no" -a -n "${with_livedotcom_tree}";then
+ AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree})
+ real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`"
+ if test -z "${real_livedotcom_tree}"; then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_livedotcom_tree}])
+ fi
+ if test -f "${real_livedotcom_tree}/liveMedia/libliveMedia.a"; then
+ AC_MSG_RESULT(${real_livedotcom_tree}/liveMedia/libliveMedia.a)
+
+ AX_ADD_BUILTINS([livedotcom])
+
+ if test "${SYS}" = "mingw32"; then
+ # add ws2_32 for closesocket, select, recv
+ AX_ADD_LDFLAGS([livedotcom],[-lws2_32])
+ fi
+
+ AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia])
+ AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
+ AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock])
+ AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment])
+
+ AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include])
+ AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include])
+ AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include])
+ AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ])
+ else
+ dnl The given live.com wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_livedotcom_tree}/liveMedia/libliveMedia.a, make sure you compiled live.com in ${with_livedotcom_tree}])
+ fi
+ else
+ dnl The --with-livedotcom-tree isn't specified wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([You have to specify a tree with --with-livedotcom-tree])
+ fi
+fi
+
+
+
dnl
dnl DVD module: optionally check for installed libdvdcss
dnl
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.63,
- [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.18-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])
then
AC_CHECK_HEADERS(ogg/ogg.h, [
AC_CHECK_LIB( ogg, oggpack_read, [
- AC_CHECK_LIB( ogg, oggpackB_read, [
- AX_ADD_CPPFLAGS([ogg],[-DHAVE_OGGPACKB])])
AX_ADD_PLUGINS([ogg mux_ogg])
AX_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
],[])
fi
-dnl
-dnl xvid decoder plugin
-dnl
-AC_ARG_ENABLE(xvid,
-[ --enable-xvid xvid codec (default disabled)])
-if test "${enable_xvid}" = "yes"
-then
- AC_ARG_WITH(xvid,
- [ --with-xvid=PATH path to xvid installation],[],[])
- if test "${with_xvid}" != "no" -a -n "${with_xvid}"
- then
- AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
- AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
- fi
-
- AC_ARG_WITH(xvid-tree,
- [ --with-xvid-tree=PATH xvid tree for static linking])
- if test -n "${with_xvid_tree}"
- then
- AC_MSG_CHECKING(for libxvidcore.a in ${with_xvid_tree})
- real_xvid_tree="`cd ${with_xvid_tree} 2>/dev/null && pwd`"
- if test -z "${real_xvid_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_xvid_tree}])
- fi
- if test -f "${real_xvid_tree}/build/generic/libxvidcore.a"
- then
- dnl Use a custom xvid
- AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
- AX_ADD_BUILTINS([xvid])
- AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
- AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
- else
- dnl The given libxvidcore wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_xvid_tree}/build/generic/libxvidcore.a, make sure you compiled libxvidcore in ${with_xvid_tree}])
- fi
- else
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xvid}"
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}"
- AC_CHECK_HEADERS(xvid.h, ,
- [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
- AC_CHECK_LIB(xvidcore, xvid_init, [
- AX_ADD_PLUGINS([xvid])
- AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
- [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
- LDFLAGS="${LDFLAGS_save}"
- CPPFLAGS="${CPPFLAGS_save}"
- fi
-fi
+dnl dnl
+dnl dnl xvid decoder plugin
+dnl dnl
+dnl AC_ARG_ENABLE(xvid,
+dnl [ --enable-xvid xvid codec (default disabled)])
+dnl if test "${enable_xvid}" = "yes"
+dnl then
+dnl AC_ARG_WITH(xvid,
+dnl [ --with-xvid=PATH path to xvid installation],[],[])
+dnl if test "${with_xvid}" != "no" -a -n "${with_xvid}"
+dnl then
+dnl AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
+dnl AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
+dnl fi
+dnl
+dnl AC_ARG_WITH(xvid-tree,
+dnl [ --with-xvid-tree=PATH xvid tree for static linking])
+dnl if test -n "${with_xvid_tree}"
+dnl then
+dnl AC_MSG_CHECKING(for libxvidcore.a in ${with_xvid_tree})
+dnl real_xvid_tree="`cd ${with_xvid_tree} 2>/dev/null && pwd`"
+dnl if test -z "${real_xvid_tree}"
+dnl then
+dnl dnl The given directory can't be found
+dnl AC_MSG_RESULT(no)
+dnl AC_MSG_ERROR([cannot cd to ${with_xvid_tree}])
+dnl fi
+dnl if test -f "${real_xvid_tree}/build/generic/libxvidcore.a"
+dnl then
+dnl dnl Use a custom xvid
+dnl AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
+dnl AX_ADD_BUILTINS([xvid])
+dnl AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
+dnl AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
+dnl else
+dnl dnl The given libxvidcore wasn't built
+dnl AC_MSG_RESULT(no)
+dnl AC_MSG_ERROR([cannot find ${real_xvid_tree}/build/generic/libxvidcore.a, make sure you compiled libxvidcore in ${with_xvid_tree}])
+dnl fi
+dnl else
+dnl CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xvid}"
+dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}"
+dnl AC_CHECK_HEADERS(xvid.h, ,
+dnl [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
+dnl AC_CHECK_LIB(xvidcore, xvid_init, [
+dnl AX_ADD_PLUGINS([xvid])
+dnl AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
+dnl [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
+dnl LDFLAGS="${LDFLAGS_save}"
+dnl CPPFLAGS="${CPPFLAGS_save}"
+dnl fi
+dnl fi
dnl
dnl QuickTime plugin
dnl MP4 module
dnl
AC_CHECK_HEADERS(zlib.h, [
- AX_ADD_LDFLAGS([mp4 skins],[-lz])
+ AX_ADD_LDFLAGS([mp4 skins sap],[-lz])
] )
fi
fi
-dnl
-dnl DV plugin
-dnl
-AC_ARG_ENABLE(dv,
- [ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)])
-if test "${enable_dv}" = "yes"
-then
- AC_CHECK_HEADERS(libdv/dv.h, [
- AX_ADD_PLUGINS([dv])
- AX_ADD_LDFLAGS([dv],[-ldv])
- ],[])
-fi
+dnl dnl
+dnl dnl DV plugin
+dnl dnl
+dnl AC_ARG_ENABLE(dv,
+dnl [ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)])
+dnl if test "${enable_dv}" = "yes"
+dnl then
+dnl AC_CHECK_HEADERS(libdv/dv.h, [
+dnl AX_ADD_PLUGINS([dv])
+dnl AX_ADD_LDFLAGS([dv],[-ldv])
+dnl ],[])
+dnl fi
dnl
dnl Flac plugin
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."])
] )
fi
fi
+dnl
+dnl libcaca plugin
+dnl
+AC_ARG_ENABLE(caca,
+ [ --enable-caca libcaca output (default disabled)])
+if test "${enable_caca}" = "yes"
+then
+ AC_PATH_PROG(CACA_CONFIG, caca-config, no)
+ if test "${CACA_CONFIG}" != "no"
+ then
+ AX_ADD_PLUGINS([caca])
+ AX_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([caca],[`${CACA_CONFIG} --plugin-libs`])
+ fi
+fi
+
dnl
dnl win32 GDI plugin
dnl
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"
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
-VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"
+VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
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/access/pvr/Makefile
modules/access/satellite/Makefile
modules/access/v4l/Makefile
+ modules/access/cdda/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/access_output/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