dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.1-test1)
+AC_INIT(vlc,0.5.3-test1)
CONFIGURE_LINE="$0 $*"
CODENAME="Natalya"
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(src/libvlc.c)
+AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM
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.5.1-test1)
+AM_INIT_AUTOMAKE(vlc,0.5.3-test1)
AM_CONFIG_HEADER(config.h)
dnl
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}"
- LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
+ LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -lmmsystem -mwindows"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
- LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
+ LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
+ LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi
;;
x*nto*)
dnl BONE or not BONE ?
AC_CHECK_LIB( bind, inet_ntoa,
[ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"],
+ LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
+ LDFLAGS_httpd="${LDFLAGS_httpd} -lbind"],
[])
;;
x*)
dnl Gettext stuff
dnl
ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
])
fi
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
-XGETTEXT="${XGETTEXT} --keyword=_NS"
+XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
)])
AC_CHECK_FUNCS(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl",[
- AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind")])
+ AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl" LDFLAGS_httpd="${LDFLAGS_httpd} -lnsl",[
+ AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind" LDFLAGS_httpd="${LDFLAGS_httpd} -lbind")])
])
-have_nanosleep=false
-AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
- AC_CHECK_LIB(rt,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
- [AC_CHECK_LIB(posix4,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])]
- )
-])
-if ${have_nanosleep}; then
- AC_DEFINE(HAVE_NANOSLEEP, 1,
- Define if nanosleep is available.)
-fi
-
dnl Check for socklen_t
AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
[AC_TRY_COMPILE(
Define if <sys/socket.h> defines socklen_t.)
fi
-dnl HP/UX port
-AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
-
AC_CHECK_FUNCS(inet_aton,,[
- AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv")
+ AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv" LDFLAGS_httpd="${LDFLAGS_httpd} -lresolv")
])
dnl Check for getopt
LDFLAGS_i420_rgb="${LDFLAGS_i420_rgb} -lm"
LDFLAGS_faad="${LDFLAGS_faad} -lm"
)
+AC_CHECK_LIB(m,sqrt,
+ LDFLAGS_headphone_channel_mixer="${LDFLAGS_headphone_channel_mixer} -lm"
+)
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
dnl Check for cthreads under GNU/Hurd for instance
AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+dnl
+dnl GNU portable threads
+dnl
+AC_ARG_ENABLE(pth,
+ [ --enable-pth GNU Pth support (default disabled)],
+ [ if test "x${enable_pth}" = "xyes"; then
+ AC_CHECK_LIB(pth,pth_init)
+ AC_MSG_CHECKING(for pth_init in pth.h)
+ AC_EGREP_HEADER(pth_init,pth.h,[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
+ Define if <pth.h> defines pth_init)
+ THREAD_LIB="-lpth"
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ fi
+])
+
+dnl
+dnl State Threads
+dnl
+AC_ARG_ENABLE(st,
+ [ --enable-st State Threads (default disabled)],
+ [ if test "x${enable_st}" = "xyes"; then
+ AC_CHECK_LIB(st,st_init)
+ AC_MSG_CHECKING(for st_init in st.h)
+ AC_EGREP_HEADER(st_init,st.h,[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ST_INIT_IN_ST_H, 1,
+ Define if <st.h> defines st_init)
+ THREAD_LIB="-lst"
+ ],[
+ AC_MSG_RESULT(yes)
+ ])
+ fi
+])
+
+if test "x${SYS}" != "xmingw32"; then
+ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
+ LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
+fi
+
+dnl Don't link with rt when using GNU-pth
+if test "x${THREAD_LIB}" != "x-lpth" && test "x${THREAD_LIB}" != "x-lst"; then
+ dnl HP/UX port
+ AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
+
+ have_nanosleep=false
+ AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
+ AC_CHECK_LIB(rt,nanosleep,
+ [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
+ [AC_CHECK_LIB(posix4,nanosleep,
+ [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])]
+ )
+ ])
+ if ${have_nanosleep}; then
+ AC_DEFINE(HAVE_NANOSLEEP, 1,
+ Define if nanosleep is available.)
+ fi
+fi
+
dnl Check for misc headers
AC_MSG_CHECKING(for pthread_cond_t in pthread.h)
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no
+NEED_GTK2_MAIN=no
+NEED_GNOME2_MAIN=no
dnl build the qte plugin ?
NEED_QTE_MAIN=no
dnl
dnl default modules
dnl
+BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion"
PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy"
-PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts"
-PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
-#PLUGINS="${PLUGINS} a52old imdct downmix imdct3dn downmix3dn imdctsse downmixsse"
-PLUGINS="${PLUGINS} lpcm a52"
+PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
+PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
-PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
+PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler bandlimited_resampler"
PLUGINS="${PLUGINS} trivial_channel_mixer headphone_channel_mixer"
PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer"
PLUGINS="${PLUGINS} aout_file"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
-PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys"
+PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
-PLUGINS="${PLUGINS} sap screensaver"
+PLUGINS="${PLUGINS} sap httpd"
+
+dnl
+dnl Some plugins aren't useful on some platforms
+dnl
+if test "x${SYS}" != "xmingw32"; then
+ PLUGINS="${PLUGINS} screensaver"
+fi
dnl
dnl Accelerated modules
if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xx86" -o "x${target_cpu}" = "xi386"
then
ARCH="${ARCH} mmx"
- PLUGINS="${PLUGINS} ${ACCEL_MODULES}"
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"
fi
dnl
[ --enable-sout Stream output modules (default enabled)])
if test "x${enable_sout}" != "xno"
then
- PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file"
+ PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file access_output_http"
PLUGINS="${PLUGINS} mux_ts mux_ps mux_avi mux_dummy"
PLUGINS="${PLUGINS} packetizer_mpegaudio packetizer_mpegvideo packetizer_a52"
PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_mpeg4audio"
PLUGINS="${PLUGINS} packetizer_copy"
PLUGINS="${PLUGINS} vout_encoder"
+
+ dnl Ogg/ogm
+ AC_CHECK_HEADERS(ogg/ogg.h, [
+ AC_CHECK_LIB( ogg, ogg_stream_packetin, [
+ PLUGINS="${PLUGINS} mux_ogg"
+ LDFLAGS_mux_ogg="${LDFLAGS_mux_ogg} -logg" ])
+ ],[])
fi
PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)])
fi
-dnl
-dnl AVI demux plugin
-dnl
-AC_ARG_ENABLE(avi,
- [ --enable-avi AVI demux module (default enabled)])
-if test "x${enable_avi}" != "xno"
-then
- PLUGINS="${PLUGINS} avi"
-fi
-
-dnl
-dnl ASF demux plugin
-dnl
-AC_ARG_ENABLE(asf,
- [ --enable-asf ASF demux module (default enabled)])
-if test "x${enable_asf}" != "xno"
-then
- PLUGINS="${PLUGINS} asf"
-fi
-
-dnl
-dnl AAC demux plugin
-dnl
-AC_ARG_ENABLE(aac,
- [ --enable-aac AAC demux module (default enabled)])
-if test "x${enable_aac}" != "xno"
-then
- PLUGINS="${PLUGINS} aac"
-fi
-
dnl
dnl ogg plugin
dnl
],[])
fi
-dnl
-dnl raw dv demux plugin
-dnl
-AC_ARG_ENABLE(rawdv,
- [ --enable-rawdv raw dv demux module (default enabled)])
-if test "x${enable_rawdv}" != "xno"
-then
- PLUGINS="${PLUGINS} rawdv"
-fi
-
dnl
dnl Codec plugins
dnl
dnl libid3tag support
dnl
AC_CHECK_HEADERS(id3tag.h, [
- LDFLAGS_id3tag="${LDFLAGS_id3tag} -lz -lid3tag"
- PLUGINS="${PLUGINS} id3tag"])
+ AC_CHECK_HEADERS(zlib.h, [
+ LDFLAGS_id3tag="${LDFLAGS_id3tag} -lid3tag -lz"
+ PLUGINS="${PLUGINS} id3tag"]) ])
dnl
dnl ffmpeg decoder plugin
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}"
AC_CHECK_HEADERS(xvid.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
- AC_CHECK_LIB(xvid, xvid_init, [
+ AC_CHECK_LIB(xvidcore, xvid_init, [
PLUGINS="${PLUGINS} xvid"
- LDFLAGS_xvid="${LDFLAGS_xvid} -lxvid" ],
+ LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
[ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
dnl
dnl MP4 module
dnl
-AC_ARG_ENABLE(mp4,
- [ --enable-mp4 MP4 demux module (default enabled)])
-if test "x${enable_mp4}" != "xno"
-then
+AC_CHECK_HEADERS(zlib.h, [
+ LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
+ LDFLAGS_skins="${LDFLAGS_skins} -lz"
+] )
+
+
+dnl
+dnl skins module
+dnl
+AC_CHECK_HEADERS(libtar.h, [
+ LDFLAGS_skins="${LDFLAGS_skins} -ltar"
+] )
+
- PLUGINS="${PLUGINS} mp4"
- AC_CHECK_HEADERS(zlib.h,
- [ LDFLAGS_mp4="${LDFLAGS_mp4} -lz" ] )
-fi
dnl
dnl a52 AC3 decoder plugin
fi
fi
-dnl
-dnl cinepak plugin
-dnl
-AC_ARG_ENABLE(cinepak,
- [ --enable-cinepak Cinepak decoder (default enabled)])
-if test "x${enable_cinepak}" != "xno"
-then
- PLUGINS="${PLUGINS} cinepak"
-fi
-
dnl
dnl DV plugin
dnl
],[])
fi
+dnl
+dnl Flac plugin
+dnl
+AC_ARG_ENABLE(flac,
+ [ --enable-flac flac decoder support (default disabled)])
+if test "x${enable_flac}" = "xyes"
+then
+ AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
+ PLUGINS="${PLUGINS} flac flacdec"
+ LDFLAGS_flacdec="${LDFLAGS_flacdec} -lFLAC"
+ ],[])
+fi
+
+dnl
+dnl Libmpeg2 plugin
+dnl
+AC_ARG_ENABLE(libmpeg2,
+ [ --enable-libmpeg2 libmpeg2 decoder support (default disabled)])
+if test "x${enable_libmpeg2}" = "xyes"
+then
+ AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
+ PLUGINS="${PLUGINS} libmpeg2"
+ LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"
+ ],[])
+fi
+
dnl
dnl Vorbis plugin
dnl
LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg"
],[])
fi
-
+
dnl
dnl Tremor plugin
dnl
PLUGINS="${PLUGINS} beos"
fi
+dnl
+dnl Skins module
+dnl
+AC_ARG_ENABLE(skins,
+ [ --enable-skins Win32 skins module (default enabled on Win32)])
+if test "x${enable_skins}" != "xno"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+ PLUGINS="${PLUGINS} skins"
+ CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -fno-exceptions -Imodules/gui/skins -Imodules/gui/skins/src -Imodules/gui/skins/win32 -Imodules/gui/skins/controls"
+ LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32"
+ fi
+fi
+
dnl
dnl Gtk+ module
dnl
fi
fi
+dnl
+dnl Gtk+2 module
+dnl
+AC_ARG_ENABLE(gtk2,
+ [ --enable-gtk2 Gtk2 support (default disabled)])
+if test "x${enable_gtk2}" = "xyes"
+then
+ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+ CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}"
+ LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}"
+ PLUGINS="${PLUGINS} gtk2"
+ if test "x${SYS}" != "xmingw32"; then
+ NEED_GTK2_MAIN=yes
+ fi
+fi
+
dnl
dnl Familiar module uses Gtk+ library
dnl
CPPFLAGS="${CPPFLAGS_save}"
fi])
+dnl
+dnl Gnome2 module
+dnl
+AC_ARG_ENABLE(gnome2,
+ [ --enable-gnome2 Gnome2 support (default disabled)])
+if test "x${enable_gnome2}" = "xyes"
+then
+ PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+ CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}"
+ LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}"
+ PLUGINS="${PLUGINS} gnome2"
+ if test "x${SYS}" != "xmingw32"; then
+ NEED_GNOME2_MAIN=yes
+ fi
+fi
+
dnl
dnl wxWindows module
dnl
[if test "x${enable_qt}" = "xyes"; then
PLUGINS="${PLUGINS} qt"
ALIASES="${ALIASES} qvlc"
- LDFLAGS_qt="${LDFLAGS_qt} -lqt -L${QTDIR}/lib"
- CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt -I${QTDIR}/include"
+ LDFLAGS_qt="${LDFLAGS_qt} -L${QTDIR}/lib"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}"
+ AC_CHECK_LIB(qt-mt,main,[
+ LDFLAGS_qt="${LDFLAGS_qt} -lqt-mt"
+ ],[
+ AC_CHECK_LIB(qt,main,[
+ LDFLAGS_qt="${LDFLAGS_qt} -lqt"
+ ])
+ ])
+ LDFLAGS="${LDFLAGS_save}"
+ CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
then
MOC=${QTDIR}/bin/moc
LDFLAGS_kde="${LDFLAGS_kde} -lkio"
])
LDFLAGS="${LDFLAGS_save}"
- CPPFLAGS_kde="${CPPFLAGS_kde} -I/usr/include/kde -I/usr/include/qt"
+ CPPFLAGS_kde="${CPPFLAGS_kde} -I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt"
CPPFLAGS_kde="${CPPFLAGS_kde} -I${KDEDIR}/include -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
then
if test "x${have_slp}" = "xtrue"
then
PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="${LDFLAGS_slp} -lslp"
+ LDFLAGS_slp="-lslp ${LDFLAGS_slp}"
fi
else
AC_MSG_CHECKING(for slp headers in ${with_slp})
dnl Use ${with_slp}/libslp/slp.h
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp"
+ LDFLAGS_slp="-L${with_slp} -lslp ${LDFLAGS_slp}"
CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
else
dnl No libslp could be found, sorry
AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
fi
-dnl
-dnl GNU portable threads
-dnl
-AC_ARG_ENABLE(pth,
- [ --enable-pth GNU Pth support (default disabled)],
- [ if test "x${enable_pth}" = "xyes"; then
- AC_CHECK_LIB(pth,pth_init)
- AC_MSG_CHECKING(for pth_init in pth.h)
- AC_EGREP_HEADER(pth_init,pth.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
- Define if <pth.h> defines pth_init)
- THREAD_LIB="-lpth"
- ],[
- AC_MSG_RESULT(no)
- ])
- fi
-])
-
-dnl
-dnl State Threads
-dnl
-AC_ARG_ENABLE(st,
- [ --enable-st State Threads (default disabled)],
- [ if test "x${enable_st}" = "xyes"; then
- AC_CHECK_LIB(st,st_init)
- AC_MSG_CHECKING(for st_init in st.h)
- AC_EGREP_HEADER(st_init,st.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(ST_INIT_IN_ST_H, 1,
- Define if <st.h> defines st_init)
- THREAD_LIB="-lst"
- ],[
- AC_MSG_RESULT(yes)
- ])
- fi
-])
-
-if test "x${SYS}" != "xmingw32"; then
- LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
- LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
-fi
-
dnl
dnl Mozilla plugin
dnl
then
PLUGINS="${PLUGINS} gtk_main"
CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN"
- CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN"
+ CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN"
CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}"
LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}"
fi
LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
fi
+if test "x${NEED_GTK2_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} gtk2_main"
+ CFLAGS_gtk2="${CFLAGS_gtk2} -DNEED_GTK2_MAIN"
+ CFLAGS_gtk2_main="${CFLAGS_gtk2_main} ${CFLAGS_gtk2}"
+ LDFLAGS_gtk2_main="${LDFLAGS_gtk2_main} ${LDFLAGS_gtk2}"
+fi
+
+if test "x${NEED_GNOME2_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} gnome2_main"
+ CFLAGS_gnome2_main="${CFLAGS_gnome2_main} ${CFLAGS_gtk2} ${CFLAGS_gnome2}"
+ LDFLAGS_gnome2_main="${LDFLAGS_gnome2_main} ${LDFLAGS_gtk2} ${LDFLAGS_gnome2}"
+fi
+
dnl
dnl qte_main plugin
dnl
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
-DATA_PATH="${ac_tool_prefix}/share/videolan"
+DATA_PATH="${ac_tool_prefix}/share/vlc"
AC_SUBST(DATA_PATH)
-PLUGIN_PATH="${ac_tool_prefix}/share/videolan"
+PLUGIN_PATH="${ac_tool_prefix}/lib/vlc"
AC_SUBST(PLUGIN_PATH)
dnl
AC_SUBST(XPIDL)
AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES)
+AC_SUBST(ALL_LINGUAS)
AC_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM)
AC_OUTPUT([
Makefile
+ autotools/Makefile
debian/Makefile
doc/Makefile
intl/Makefile