X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fd1fecc13290b13860a5baab5b66ed92ab76087a;hb=0e7418b88ca4b5c257b3789eafda3939f6966539;hp=2169d643fe99207146578a3460581a6420cbaf5a;hpb=8b0498ef6a22bcaab561f15cdd08d48bb5d2b97f;p=vlc diff --git a/configure.ac b/configure.ac index 2169d643fe..fd1fecc132 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Autoconf settings for vlc dnl $Id$ -AC_INIT(vlc,0.7.2-test2) +AC_INIT(vlc,0.7.3-svn) CONFIGURE_LINE="$0 $*" CODENAME="Bond" @@ -13,7 +13,7 @@ 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.7.2-test2) +AM_INIT_AUTOMAKE(vlc,0.7.3-svn) AM_CONFIG_HEADER(config.h) dnl @@ -148,7 +148,7 @@ case "${target_os}" in 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([vcdx cddax],[-lwinmm]) - AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet],[-lws2_32]) + AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet netsync],[-lws2_32]) fi ;; *nto*) @@ -294,6 +294,7 @@ dnl Check for usual libc functions AC_CHECK_FUNCS(strdup strndup atof lseek) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) +AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) dnl Check for setlocal and langinfo AC_CHECK_FUNCS(setlocale) @@ -709,11 +710,19 @@ if test "${ac_cv_c_pipe}" != "no"; then fi dnl Check for various optimization flags +AC_CACHE_CHECK([if \$CC accepts -Os], + [ac_cv_c_os], + [CFLAGS="${CFLAGS_save} -Os" + AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) +if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then + CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os" +fi + AC_CACHE_CHECK([if \$CC accepts -O3], [ac_cv_c_o3], [CFLAGS="${CFLAGS_save} -O3" AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test "${ac_cv_c_o3}" != "no"; then +if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" fi @@ -721,17 +730,17 @@ AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [CFLAGS="${CFLAGS_save} -O2" AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) -if test "${ac_cv_c_o2}" != "no"; then +if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" fi CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2" -else +else AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [CFLAGS="${CFLAGS_save} -O" AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test "${ac_cv_c_o}" != "no"; then + if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi @@ -883,8 +892,8 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys]) -AX_ADD_PLUGINS([mpgv mpga m4v h264 mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff]) +AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync]) +AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg]) AX_ADD_PLUGINS([cvdsub svcdsub 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]) @@ -893,9 +902,9 @@ AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer]) AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer]) AX_ADD_PLUGINS([aout_file]) AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga]) -AX_ADD_PLUGINS([id3 m3u playlist export sgimb]) +AX_ADD_PLUGINS([m3u playlist export sgimb]) AX_ADD_PLUGINS([rawvideo]) -AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au]) +AX_ADD_PLUGINS([wav araw 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 http]) @@ -1111,7 +1120,7 @@ AC_ARG_ENABLE(sout, 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_mp4 mux_asf mux_dummy]) + AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy]) AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) AX_ADD_PLUGINS([packetizer_copy]) @@ -1204,201 +1213,201 @@ fi -dnl -dnl DVD module: optionally check for installed libdvdcss -dnl -AC_ARG_ENABLE(dvd, -[ --enable-dvd DVD input module (default enabled)]) -if test "${enable_dvd}" != "no" -then - AC_ARG_WITH(dvdcss, - [ --with-dvdcss=PATH libdvdcss headers and libraries]) - AC_ARG_WITH(dvdcss-tree, - [ --with-dvdcss-tree=PATH libdvdcss tree for static linking]) - case "${with_dvdcss}" in - ""|yes) - if test -z "${with_dvdcss_tree}" - then - AC_CHECK_HEADERS(dvdcss/dvdcss.h, - [ AX_ADD_PLUGINS([dvd]) - AX_ADD_LDFLAGS([dvd dvdcss],[-ldvdcss])], - [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) - AC_MSG_ERROR([cannot find libdvdcss headers]) ]) - else - AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree}) - real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" - if test -z "${real_dvdcss_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_dvdcss_tree}]) - fi - if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a" - then - dnl Use a custom libdvdcss - AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) - AX_ADD_BUILTINS([dvd]) - AX_ADD_LDFLAGS([dvd dvdcss],[-L${real_dvdcss_tree}/src/.libs -ldvdcss]) - AX_ADD_CPPFLAGS([dvd],[-I${real_dvdcss_tree}/src]) - else - dnl The given libdvdcss wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}]) - fi - fi - ;; - no) - dnl Compile without dvdcss (dlopen version, works only under Linux) - AX_ADD_PLUGINS([dvd]) - AX_ADD_CPPFLAGS([dvd],[-DGOD_DAMN_DMCA]) - AX_ADD_LDFLAGS([dvd],[-ldl]) - ;; - *) - AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) - if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h - then - dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h - AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([dvd]) - AX_ADD_LDFLAGS([dvd dvdcss],[-L${with_dvdcss}/lib -ldvdcss]) - AX_ADD_CPPFLAGS([dvd],[-I${with_dvdcss}/include]) - else - dnl No libdvdcss could be found, sorry - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h]) - fi - ;; - esac -fi - -dnl -dnl dvdread module: check for libdvdread -dnl -AC_ARG_ENABLE(dvdread, -[ --enable-dvdread dvdread input module (default disabled)]) -if test "${enable_dvdread}" != "no" -then - AC_ARG_WITH(dvdread, - [ --with-dvdread=PATH libdvdread headers and libraries]) - AC_ARG_WITH(dvdread-tree, - [ --with-dvdread-tree=PATH libdvdread tree for static linking]) - if test -z "${with_dvdread}" - then - if test -z "${with_dvdread_tree}" - then - AC_CHECK_HEADERS(dvdread/dvd_reader.h, - [ AX_ADD_PLUGINS([dvdread]) - AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) - ],[ - if test -n "${enable_dvdread}" - then - AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml]) - AC_MSG_ERROR([cannot find libdvdread headers]) - fi - ]) - else - AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) - real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" - if test -z "${real_dvdread_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_dvdread_tree}]) - fi - if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" - then - dnl Use a custom libdvdread - AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) - AX_ADD_BUILTINS([dvdread]) - AX_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) - AX_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) - else - dnl The given libdvdread wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) - fi - fi - else - AC_MSG_CHECKING(for dvdread headers in ${with_dvdread}) - if test -f ${with_dvdread}/include/dvdread/dvd_reader.h - then - dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h - AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([dvdread]) - AX_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) - AX_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) - else - dnl No libdvdread could be found, sorry - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h]) - fi - fi -fi - -dnl -dnl dvdplay module: check for libdvdplay -dnl -AC_ARG_ENABLE(dvdplay, -[ --enable-dvdplay dvdplay input module (default enabled)]) -if test "${enable_dvdplay}" != "no" -then - AC_ARG_WITH(dvdplay, - [ --with-dvdplay=PATH libdvdplay headers and libraries]) - AC_ARG_WITH(dvdplay-tree, - [ --with-dvdplay-tree=PATH libdvdplay tree for static linking]) - if test -z "${with_dvdplay}" - then - if test -z "${with_dvdplay_tree}" - then - AC_CHECK_HEADERS(dvdplay/dvdplay.h,[ - AX_ADD_PLUGINS([dvdplay]) - AX_ADD_LDFLAGS([dvdplay],[-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) - AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}]) - ],[ - if test -n "${enable_dvdplay}" - then - AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.]) - AC_MSG_ERROR([cannot find libdvdplay headers]) - fi - ]) - else - AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree}) - real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`" - if test -z "${real_dvdplay_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_dvdplay_tree}]) - fi - if test -f "${real_dvdplay_tree}/src/.libs/libdvdplay.a" - then - dnl Use a custom libdvdplay - AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a) - AX_ADD_BUILTINS([dvdplay]) - AX_ADD_LDFLAGS([dvdplay],[-L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) - AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src]) - else - dnl The given libdvdplay wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_dvdplay_tree}/src/.libs/libdvdplay.a, make sure you compiled libdvdplay in ${with_dvdplay_tree}]) - fi - fi - else - AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay}) - if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h" - then - dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h - AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([dvdplay]) - AX_ADD_LDFLAGS([dvdplay],[-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) - AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${with_dvdplay}/include]) - else - dnl No libdvdplay could be found, sorry - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${with_dvdplay}/include/dvdplay/dvdplay.h]) - fi - fi -fi +dnl dnl +dnl dnl DVD module: optionally check for installed libdvdcss +dnl dnl +dnl AC_ARG_ENABLE(dvd, +dnl [ --enable-dvd DVD input module (default enabled)]) +dnl if test "${enable_dvd}" != "no" +dnl then +dnl AC_ARG_WITH(dvdcss, +dnl [ --with-dvdcss=PATH libdvdcss headers and libraries]) +dnl AC_ARG_WITH(dvdcss-tree, +dnl [ --with-dvdcss-tree=PATH libdvdcss tree for static linking]) +dnl case "${with_dvdcss}" in +dnl ""|yes) +dnl if test -z "${with_dvdcss_tree}" +dnl then +dnl AC_CHECK_HEADERS(dvdcss/dvdcss.h, +dnl [ AX_ADD_PLUGINS([dvd]) +dnl AX_ADD_LDFLAGS([dvd dvdcss],[-ldvdcss])], +dnl [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) +dnl AC_MSG_ERROR([cannot find libdvdcss headers]) ]) +dnl else +dnl AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree}) +dnl real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" +dnl if test -z "${real_dvdcss_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_dvdcss_tree}]) +dnl fi +dnl if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a" +dnl then +dnl dnl Use a custom libdvdcss +dnl AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) +dnl AX_ADD_BUILTINS([dvd]) +dnl AX_ADD_LDFLAGS([dvd dvdcss],[-L${real_dvdcss_tree}/src/.libs -ldvdcss]) +dnl AX_ADD_CPPFLAGS([dvd],[-I${real_dvdcss_tree}/src]) +dnl else +dnl dnl The given libdvdcss wasn't built +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}]) +dnl fi +dnl fi +dnl ;; +dnl no) +dnl dnl Compile without dvdcss (dlopen version, works only under Linux) +dnl AX_ADD_PLUGINS([dvd]) +dnl AX_ADD_CPPFLAGS([dvd],[-DGOD_DAMN_DMCA]) +dnl AX_ADD_LDFLAGS([dvd],[-ldl]) +dnl ;; +dnl *) +dnl AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) +dnl if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h +dnl then +dnl dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h +dnl AC_MSG_RESULT(yes) +dnl AX_ADD_PLUGINS([dvd]) +dnl AX_ADD_LDFLAGS([dvd dvdcss],[-L${with_dvdcss}/lib -ldvdcss]) +dnl AX_ADD_CPPFLAGS([dvd],[-I${with_dvdcss}/include]) +dnl else +dnl dnl No libdvdcss could be found, sorry +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h]) +dnl fi +dnl ;; +dnl esac +dnl fi +dnl +dnl dnl +dnl dnl dvdread module: check for libdvdread +dnl dnl +dnl AC_ARG_ENABLE(dvdread, +dnl [ --enable-dvdread dvdread input module (default disabled)]) +dnl if test "${enable_dvdread}" != "no" +dnl then +dnl AC_ARG_WITH(dvdread, +dnl [ --with-dvdread=PATH libdvdread headers and libraries]) +dnl AC_ARG_WITH(dvdread-tree, +dnl [ --with-dvdread-tree=PATH libdvdread tree for static linking]) +dnl if test -z "${with_dvdread}" +dnl then +dnl if test -z "${with_dvdread_tree}" +dnl then +dnl AC_CHECK_HEADERS(dvdread/dvd_reader.h, +dnl [ AX_ADD_PLUGINS([dvdread]) +dnl AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) +dnl ],[ +dnl if test -n "${enable_dvdread}" +dnl then +dnl AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml]) +dnl AC_MSG_ERROR([cannot find libdvdread headers]) +dnl fi +dnl ]) +dnl else +dnl AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) +dnl real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" +dnl if test -z "${real_dvdread_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_dvdread_tree}]) +dnl fi +dnl if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" +dnl then +dnl dnl Use a custom libdvdread +dnl AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) +dnl AX_ADD_BUILTINS([dvdread]) +dnl AX_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) +dnl AX_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) +dnl else +dnl dnl The given libdvdread wasn't built +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) +dnl fi +dnl fi +dnl else +dnl AC_MSG_CHECKING(for dvdread headers in ${with_dvdread}) +dnl if test -f ${with_dvdread}/include/dvdread/dvd_reader.h +dnl then +dnl dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h +dnl AC_MSG_RESULT(yes) +dnl AX_ADD_PLUGINS([dvdread]) +dnl AX_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) +dnl AX_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) +dnl else +dnl dnl No libdvdread could be found, sorry +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h]) +dnl fi +dnl fi +dnl fi +dnl +dnl dnl +dnl dnl dvdplay module: check for libdvdplay +dnl dnl +dnl AC_ARG_ENABLE(dvdplay, +dnl [ --enable-dvdplay dvdplay input module (default enabled)]) +dnl if test "${enable_dvdplay}" != "no" +dnl then +dnl AC_ARG_WITH(dvdplay, +dnl [ --with-dvdplay=PATH libdvdplay headers and libraries]) +dnl AC_ARG_WITH(dvdplay-tree, +dnl [ --with-dvdplay-tree=PATH libdvdplay tree for static linking]) +dnl if test -z "${with_dvdplay}" +dnl then +dnl if test -z "${with_dvdplay_tree}" +dnl then +dnl AC_CHECK_HEADERS(dvdplay/dvdplay.h,[ +dnl AX_ADD_PLUGINS([dvdplay]) +dnl AX_ADD_LDFLAGS([dvdplay],[-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) +dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}]) +dnl ],[ +dnl if test -n "${enable_dvdplay}" +dnl then +dnl AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.]) +dnl AC_MSG_ERROR([cannot find libdvdplay headers]) +dnl fi +dnl ]) +dnl else +dnl AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree}) +dnl real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`" +dnl if test -z "${real_dvdplay_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_dvdplay_tree}]) +dnl fi +dnl if test -f "${real_dvdplay_tree}/src/.libs/libdvdplay.a" +dnl then +dnl dnl Use a custom libdvdplay +dnl AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a) +dnl AX_ADD_BUILTINS([dvdplay]) +dnl AX_ADD_LDFLAGS([dvdplay],[-L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) +dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src]) +dnl else +dnl dnl The given libdvdplay wasn't built +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${real_dvdplay_tree}/src/.libs/libdvdplay.a, make sure you compiled libdvdplay in ${with_dvdplay_tree}]) +dnl fi +dnl fi +dnl else +dnl AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay}) +dnl if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h" +dnl then +dnl dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h +dnl AC_MSG_RESULT(yes) +dnl AX_ADD_PLUGINS([dvdplay]) +dnl AX_ADD_LDFLAGS([dvdplay],[-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) +dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${with_dvdplay}/include]) +dnl else +dnl dnl No libdvdplay could be found, sorry +dnl AC_MSG_RESULT(no) +dnl AC_MSG_ERROR([cannot find ${with_dvdplay}/include/dvdplay/dvdplay.h]) +dnl fi +dnl fi +dnl fi dnl dnl libdvdnav plugin @@ -1455,8 +1464,8 @@ then if test -z "${with_dvbpsi_tree}" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-ldvbpsi]) ], + [ AX_ADD_PLUGINS([mux_ts ts]) + AX_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -1480,9 +1489,9 @@ then then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-I${real_dvbpsi_tree}/src]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) + AX_ADD_BUILTINS([mux_ts ts]) + AX_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src]) + AX_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -1505,9 +1514,9 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ - AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi ts2]) - AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${CPPFLAGS_test}]) - AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi ts2],[${LDFLAGS_test} -ldvbpsi]) + AX_ADD_PLUGINS([mux_ts ts]) + AX_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}]) + AX_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi]) ],[ if test -n "${enable_dvbpsi}" @@ -1551,59 +1560,59 @@ then 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)]) - -AC_ARG_ENABLE(cdda, - [ --enable-cdda CDDA plugin support (default enabled)]) - -AC_ARG_ENABLE(cddax, - [ --enable-cddax CDDAX plugin support (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_libcddb != 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 - - if test "${enable_vcdx}" != "no" - then - PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21, - [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 +dnl dnl VCDX and CDDAX modules +dnl dnl +dnl AC_ARG_ENABLE(libcdio, +dnl [ --enable-libcdio CDDA support via libcdio (default enabled)]) +dnl +dnl AC_ARG_ENABLE(libcddb, +dnl [ --enable-libcddb CDDB support for CDDAX (default enabled)]) +dnl +dnl AC_ARG_ENABLE(vcdx, +dnl [ --enable-vcdx VCD support with Navigation (default enabled)]) +dnl +dnl AC_ARG_ENABLE(cdda, +dnl [ --enable-cdda CDDA plugin support (default enabled)]) +dnl +dnl AC_ARG_ENABLE(cddax, +dnl [ --enable-cddax CDDAX plugin support (default enabled)]) +dnl +dnl if test "${enable_cddax}" != "no" +dnl then +dnl PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65, +dnl [enable_cddax="no" +dnl AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio]) +dnl AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS]) +dnl AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) +dnl AX_ADD_PLUGINS([cddax])], +dnl [AC_MSG_WARN(libcdio library not found) +dnl HAVE_CDDAX=no]) +dnl +dnl if test x$enable_libcddb != no; then +dnl PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [ +dnl HAVE_LIBCDDB=yes +dnl AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed]) +dnl AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS]) +dnl AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) +dnl ], +dnl [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) +dnl HAVE_LIBCDDB=no]) +dnl fi +dnl +dnl if test "${enable_vcdx}" != "no" +dnl then +dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20, +dnl [enable_vcd="no" +dnl AC_DEFINE(HAVE_VCDX, [], +dnl [Define for the VCD plugin using libcdio/libvcdinfo]) +dnl AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) +dnl AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) +dnl AX_ADD_PLUGINS([vcdx])], +dnl [AC_MSG_WARN(vcdinfo library not found) +dnl HAVE_VCDX=no]) +dnl fi +dnl fi dnl dnl VCD module @@ -1828,12 +1837,12 @@ then fi dnl -dnl libid3tag support +dnl libid3tag support (FIXME!!! doesn't work with new input) dnl -AC_CHECK_HEADERS(id3tag.h, [ - AC_CHECK_HEADERS(zlib.h, [ - AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) - AX_ADD_PLUGINS([id3tag])]) ]) +dnl AC_CHECK_HEADERS(id3tag.h, [ +dnl AC_CHECK_HEADERS(zlib.h, [ +dnl AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) +dnl AX_ADD_PLUGINS([id3tag])]) ]) dnl dnl ffmpeg decoder/demuxer plugin @@ -2306,8 +2315,19 @@ AC_ARG_ENABLE(speex, if test "${enable_speex}" != "no" then AC_CHECK_HEADERS(speex.h, [ - AX_ADD_PLUGINS([speex]) - AX_ADD_LDFLAGS([speex],[-lspeex]) ],[]) + AC_MSG_CHECKING(for libspeex version > 1.1.0) + AC_EGREP_CPP(yes, + [#include + #ifdef SPEEX_SET_SUBMODE_ENCODING + yes + #endif], + [ AC_MSG_RESULT([yes]) + AX_ADD_PLUGINS([speex]) + AX_ADD_LDFLAGS([speex],[-lspeex]) ], + [ AC_MSG_RESULT([no]) + AC_MSG_WARN([Your libspeex is too old, please get the development + version.]) ] ) + ],[]) fi dnl @@ -2389,7 +2409,7 @@ AC_CHECK_HEADERS(png.h, [ AX_ADD_LDFLAGS([logo],[-lpng -lz]) AX_ADD_PLUGINS([logo]) AX_ADD_LDFLAGS([svcdsub],[-lpng -lz]) - AX_ADD_LDFLAGS([cvdsub],[-lpng -lz]) + AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm]) AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])]) dnl @@ -2616,6 +2636,22 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice fi fi +dnl +dnl SVG module +dnl +AC_ARG_ENABLE(svg, + [ --enable-svg SVG support (default disabled)]) +if test "${enable_svg}" == "yes" +then + PKG_CHECK_MODULES(SVG, + librsvg-2.0 >= 2.5.0, + [ + AX_ADD_LDFLAGS([svg],[$SVG_LIBS]) + AX_ADD_CFLAGS([svg],[$SVG_CFLAGS]) + AX_ADD_PLUGINS([svg]) ], + [AC_MSG_WARN(SVG library not found)]) +fi + dnl dnl Qt Embedded module dnl (disabled by default) @@ -2666,6 +2702,31 @@ dnl LDFLAGS="${LDFLAGS_save}" dnl AX_ADD_CXXFLAGS([qt_video],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) dnl fi +dnl +dnl Roku HD1000 Video output module +dnl +AC_ARG_ENABLE(hd1000v, + [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)]) +if test "${enable_hd1000v}" != "no" && + (test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes") +then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([cascade/graphics/CascadeScreen.h cascade/graphics/CascadeBitmap.h], + [ + can_build_roku="yes" + ], + [ + can_build_roku="no" + AC_MSG_WARN([Not building Roku HD1000 compatible video output]) + ]) + if test "$can_build_roku" = "yes" + then + AX_ADD_PLUGINS([hd1000v]) + AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) + fi + AC_LANG_POP([C++]) +fi + dnl dnl Windows DirectX module dnl @@ -3051,59 +3112,59 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} fi -dnl -dnl Gtk+ module -dnl -AC_ARG_ENABLE(gtk, - [ --enable-gtk Gtk+ support (default enabled)]) -if test "${enable_gtk}" != "no" -then - GTK_PATH="${PATH}" - AC_ARG_WITH(gtk-config-path, - [ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)], - [ if test "${with_gtk_config_path}" != "no" - then - GTK_PATH="${with_gtk_config_path}:${PATH}" - fi ]) - # look for gtk-config - AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH}) - GTK_CONFIG=${GTK12_CONFIG} - if test "${GTK_CONFIG}" = "no" - then - AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH}) - fi - if test "${GTK_CONFIG}" != "no" - then - if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null - then - AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) - fi - if test "${SYS}" != "mingw32"; then - AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) - AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) - else - AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) - AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) - fi - # now look for the gtk.h header - CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}" - ac_cv_gtk_headers=yes - AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ - ac_cv_gtk_headers=no - echo "Cannot find gtk development headers." - ]) - if test "${ac_cv_gtk_headers}" = "yes" - then - AX_ADD_PLUGINS([gtk]) - if test "${SYS}" != "mingw32"; then - NEED_GTK_MAIN=yes - fi - ALIASES="${ALIASES} gvlc" - fi - CPPFLAGS="${CPPFLAGS_save}" - fi -fi - +dnl dnl +dnl dnl Gtk+ module +dnl dnl +dnl AC_ARG_ENABLE(gtk, +dnl [ --enable-gtk Gtk+ support (default enabled)]) +dnl if test "${enable_gtk}" != "no" +dnl then +dnl GTK_PATH="${PATH}" +dnl AC_ARG_WITH(gtk-config-path, +dnl [ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)], +dnl [ if test "${with_gtk_config_path}" != "no" +dnl then +dnl GTK_PATH="${with_gtk_config_path}:${PATH}" +dnl fi ]) +dnl # look for gtk-config +dnl AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH}) +dnl GTK_CONFIG=${GTK12_CONFIG} +dnl if test "${GTK_CONFIG}" = "no" +dnl then +dnl AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH}) +dnl fi +dnl if test "${GTK_CONFIG}" != "no" +dnl then +dnl if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null +dnl then +dnl AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) +dnl fi +dnl if test "${SYS}" != "mingw32"; then +dnl AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) +dnl AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) +dnl else +dnl AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) +dnl AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) +dnl fi +dnl # now look for the gtk.h header +dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}" +dnl ac_cv_gtk_headers=yes +dnl AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ +dnl ac_cv_gtk_headers=no +dnl echo "Cannot find gtk development headers." +dnl ]) +dnl if test "${ac_cv_gtk_headers}" = "yes" +dnl then +dnl AX_ADD_PLUGINS([gtk]) +dnl if test "${SYS}" != "mingw32"; then +dnl NEED_GTK_MAIN=yes +dnl fi +dnl ALIASES="${ALIASES} gvlc" +dnl fi +dnl CPPFLAGS="${CPPFLAGS_save}" +dnl fi +dnl fi +dnl dnl dnl Gtk+2 module ! Disabled for now as it is unusable and confuses users dnl @@ -3124,7 +3185,7 @@ dnl dnl PDA Gtk+2 module dnl AC_ARG_ENABLE(pda, - [ --enable-pda PDA interface needs Gtk2 support (default disabled)]) + [ --enable-pda PDA interface needs Gtk2 support (default disabled)]) if test "x${enable_pda}" = "xyes" then PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) @@ -3138,39 +3199,39 @@ then fi fi -dnl -dnl Gnome module -dnl -AC_ARG_ENABLE(gnome, - [ --enable-gnome Gnome interface support (default disabled)], - [if test "${enable_gnome}" = "yes"; then - # look for gnome-config - AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) - if test -x ${GNOME_CONFIG} - then - AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) - AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) - fi - # now look for the gnome.h header - CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}" - AC_CHECK_HEADERS(gnome.h, [ - AX_ADD_PLUGINS([gnome]) - NEED_GTK_MAIN=yes - NEED_GNOME_MAIN=yes - ALIASES="${ALIASES} gnome-vlc" - dnl We need this because of some moronic gnomesupport.h flavours - AC_MSG_CHECKING(for strndup in gnome.h) - AC_EGREP_HEADER(strndup,gnome.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(STRNDUP_IN_GNOME_H, 1, - Define if defines strndup.)],[ - AC_MSG_RESULT(no)]) - ],[ - AC_MSG_ERROR([Can't find gnome headers. Please install the gnome -developement tools or remove the --enable-gnome option]) - ]) - CPPFLAGS="${CPPFLAGS_save}" - fi]) +dnl dnl +dnl dnl Gnome module +dnl dnl +dnl AC_ARG_ENABLE(gnome, +dnl [ --enable-gnome Gnome interface support (default disabled)], +dnl [if test "${enable_gnome}" = "yes"; then +dnl # look for gnome-config +dnl AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) +dnl if test -x ${GNOME_CONFIG} +dnl then +dnl AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) +dnl AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) +dnl fi +dnl # now look for the gnome.h header +dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}" +dnl AC_CHECK_HEADERS(gnome.h, [ +dnl AX_ADD_PLUGINS([gnome]) +dnl NEED_GTK_MAIN=yes +dnl NEED_GNOME_MAIN=yes +dnl ALIASES="${ALIASES} gnome-vlc" +dnl dnl We need this because of some moronic gnomesupport.h flavours +dnl AC_MSG_CHECKING(for strndup in gnome.h) +dnl AC_EGREP_HEADER(strndup,gnome.h,[ +dnl AC_MSG_RESULT(yes) +dnl AC_DEFINE(STRNDUP_IN_GNOME_H, 1, +dnl Define if defines strndup.)],[ +dnl AC_MSG_RESULT(no)]) +dnl ],[ +dnl AC_MSG_ERROR([Can't find gnome headers. Please install the gnome +dnl developement tools or remove the --enable-gnome option]) +dnl ]) +dnl CPPFLAGS="${CPPFLAGS_save}" +dnl fi]) dnl dnl Gnome2 module ! Disabled for know as it is unuseable and confuses users @@ -3230,65 +3291,65 @@ then fi fi -dnl -dnl Qt module -dnl -AC_ARG_ENABLE(qt, - [ --enable-qt Qt interface support (default disabled)], - [if test "${enable_qt}" = "yes"; then - AX_ADD_PLUGINS([qt]) - ALIASES="${ALIASES} qvlc" - AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" - AC_CHECK_LIB(qt-mt,main,[ - AX_ADD_LDFLAGS([qt],[-lqt-mt]) - ],[ - AC_CHECK_LIB(qt,main,[ - AX_ADD_LDFLAGS([qt],[-lqt]) - ]) - ]) - LDFLAGS="${LDFLAGS_save}" - AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) - if test -x ${QTDIR}/bin/moc - then - MOC=${QTDIR}/bin/moc - else - MOC=moc - fi - fi]) - -dnl -dnl KDE module -dnl -AC_ARG_ENABLE(kde, - [ --enable-kde KDE interface support (default disabled)], - [if test "${enable_kde}" = "yes"; then - AX_ADD_PLUGINS([kde]) - ALIASES="${ALIASES} kvlc" - AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) - dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" - AC_CHECK_LIB(kfile,main,[ - AX_ADD_LDFLAGS([kde],[-lkfile]) - ]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" - AC_CHECK_LIB(kdeui,main,[ - AX_ADD_LDFLAGS([kde],[-lkdeui]) - ]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" - AC_CHECK_LIB(kio,main,[ - AX_ADD_LDFLAGS([kde],[-lkio]) - ]) - LDFLAGS="${LDFLAGS_save}" - AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) - AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include]) - if test -x ${QTDIR}/bin/moc - then - MOC=${QTDIR}/bin/moc - else - MOC=moc - fi - fi]) +dnl dnl +dnl dnl Qt module +dnl dnl +dnl AC_ARG_ENABLE(qt, +dnl [ --enable-qt Qt interface support (default disabled)], +dnl [if test "${enable_qt}" = "yes"; then +dnl AX_ADD_PLUGINS([qt]) +dnl ALIASES="${ALIASES} qvlc" +dnl AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) +dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" +dnl AC_CHECK_LIB(qt-mt,main,[ +dnl AX_ADD_LDFLAGS([qt],[-lqt-mt]) +dnl ],[ +dnl AC_CHECK_LIB(qt,main,[ +dnl AX_ADD_LDFLAGS([qt],[-lqt]) +dnl ]) +dnl ]) +dnl LDFLAGS="${LDFLAGS_save}" +dnl AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) +dnl if test -x ${QTDIR}/bin/moc +dnl then +dnl MOC=${QTDIR}/bin/moc +dnl else +dnl MOC=moc +dnl fi +dnl fi]) +dnl +dnl dnl +dnl dnl KDE module +dnl dnl +dnl AC_ARG_ENABLE(kde, +dnl [ --enable-kde KDE interface support (default disabled)], +dnl [if test "${enable_kde}" = "yes"; then +dnl AX_ADD_PLUGINS([kde]) +dnl ALIASES="${ALIASES} kvlc" +dnl AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) +dnl dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3) +dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" +dnl AC_CHECK_LIB(kfile,main,[ +dnl AX_ADD_LDFLAGS([kde],[-lkfile]) +dnl ]) +dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" +dnl AC_CHECK_LIB(kdeui,main,[ +dnl AX_ADD_LDFLAGS([kde],[-lkdeui]) +dnl ]) +dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" +dnl AC_CHECK_LIB(kio,main,[ +dnl AX_ADD_LDFLAGS([kde],[-lkio]) +dnl ]) +dnl LDFLAGS="${LDFLAGS_save}" +dnl AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) +dnl AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include]) +dnl if test -x ${QTDIR}/bin/moc +dnl then +dnl MOC=${QTDIR}/bin/moc +dnl else +dnl MOC=moc +dnl fi +dnl fi]) dnl dnl Opie QT embedded module @@ -3408,27 +3469,42 @@ then dnl test for --with-goom-tree dnl if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then - AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) + AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree}) real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`" if test -z "${real_goom_tree}"; then dnl The given directory can't be found AC_MSG_RESULT(no) AC_MSG_ERROR([cannot cd to ${with_goom_tree}]) fi - if test -f "${real_goom_tree}/libgoom.a"; then - AC_MSG_RESULT(${real_goom_tree}/libgoom.a) + if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then + AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) AX_ADD_BUILTINS([goom]) - AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) - AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}]) + AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) + AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) else - dnl The given libgoom wasn't built + dnl The given libgoom2 wasn't built, try to look for the old goom AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}]) + AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) + if test -f "${real_goom_tree}/libgoom.a"; then + AC_MSG_RESULT(${real_goom_tree}/libgoom.a) + AX_ADD_BUILTINS([goom]) + AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) + AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) + else + dnl The given libgoom wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}]) + fi fi else - dnl The --with-goom-tree isn't specified wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([You have to specify a tree with --with-goom-tree]) + AC_CHECK_HEADERS(goom/goom.h, [ + AC_CHECK_LIB(goom2, goom_init, [ + AX_ADD_PLUGINS([goom]) + AX_ADD_LDFLAGS([goom],[-lgoom2]) + ],[ + AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) + ]) + ]) fi fi @@ -3436,8 +3512,8 @@ dnl dnl SLP access plugin dnl AC_ARG_ENABLE(slp, - [ --enable-slp SLP service discovery support (default enabled)]) -if test "${enable_slp}" != "no" + [ --enable-slp SLP service discovery support (default disabled)]) +if test "${enable_slp}" = "yes" then AC_ARG_WITH(slp, [ --with-slp=PATH libslp headers and libraries]) @@ -3496,37 +3572,29 @@ then ) fi - dnl dnl corba (ORBit) plugin dnl +dnl Default: do not enable corba +enablecorba=false 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 + GLIB_VERSION=2.3.2 + PKG_CHECK_MODULES(CORBA, + ORBit-2.0 >= 2.8.0 \ + glib-2.0 >= $GLIB_VERSION \ + gobject-2.0 >= $GLIB_VERSION \ + gthread-2.0 >= $GLIB_VERSION, + [ + enablecorba=true + AX_ADD_LDFLAGS([corba],[$CORBA_LIBS]) + AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS]) + AX_ADD_PLUGINS([corba snapshot]) ], + [ enablecorba=false + AC_MSG_WARN(corba library not found) ]) +fi +AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue) AC_ARG_WITH(,[Misc options:]) @@ -3875,7 +3943,6 @@ AC_CONFIG_FILES([ modules/gui/gtk2/Makefile modules/gui/kde/Makefile modules/gui/macosx/Makefile - modules/gui/ncurses/Makefile modules/gui/qnx/Makefile modules/gui/qt/Makefile modules/gui/skins/Makefile