dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :)
+AC_CHECK_TOOL(AR, ar, :)
+AC_CHECK_TOOL(LD, ld, :)
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
+ALL_LINGUAS="de en_GB fr it ja no ru nl pl se"
AM_GNU_GETTEXT_VERSION(0.10.40)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
fi
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
+XGETTEXT="${XGETTEXT} --keyword=_NS"
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd"
+ LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvd"
LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd"
;;
x*bsd*)
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32"
LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -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"
fi
;;
x*nto*)
LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket"
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
+ LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket"
+ LDFLAGS_sap="${LDFLAGS_sap} -lsocket"
+ LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[
AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
Define if <X11/extensions/dpms.h> defines DPMSInfo.)
])
+ ],,[
+ #include <X11/Xlib.h>
])
CPPFLAGS="${CPPFLAGS_save}"
fi
[CFLAGS="-Wall ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
-AC_CACHE_CHECK([if \$CC accepts -Wtraditional],
- [ac_cv_c_Wtraditional],
- [CFLAGS="-Wtraditional ${CFLAGS_save}"
- AC_TRY_COMPILE([],,ac_cv_c_Wtraditional=yes, ac_cv_c_Wtraditional=no)])
-
AC_CACHE_CHECK([if \$CC accepts -Wconversion],
[ac_cv_c_Wconversion],
[CFLAGS="-Wconversion ${CFLAGS_save}"
OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
-if test "x${ac_cv_c_Wtraditional}" != "xno"; then
- CFLAGS_save="-Wtraditional ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="-Wtraditional ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="-Wtraditional ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-fi
-
if test "x${ac_cv_c_Wunreachable_code}" != "xno"; then
- CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
+# CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
+# CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+# OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
dnl -Wunreachable-code means gcc-3.x, we can use -Wconversion and we can
dnl activate -Winline for C++, it won't choke on system headers.
- if test "x${ac_cv_c_Wconversion}" != "xno"; then
- CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
- fi
+# if test "x${ac_cv_c_Wconversion}" != "xno"; then
+# CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
+# CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+# OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
+# fi
if test "x${ac_cv_c_Winline}" != "xno"; then
CXXFLAGS_save="-Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
[${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
fi
+dnl Checks for __attribute__(format()) directive
+AC_CACHE_CHECK([__attribute__ ((format ())) support with function pointers],
+ [ac_cv_c_attribute_format],
+ [ac_cv_c_attribute_format=no
+ CFLAGS="${CFLAGS_save} -Werror"
+ AC_TRY_COMPILE([],
+ [static void (*pf_printf)(const char *, ...) __attribute__ ((format(printf,1,2)));(void)pf_printf;],
+ [ac_cv_c_attribute_format=yes])
+ CFLAGS="${CFLAGS_save}"])
+if test "x${ac_cv_c_attribute_format}" != "xno"; then
+ AC_DEFINE(HAVE_ATTRIBUTE_FORMAT, 1, Support for __attribute__((format())) with function pointers)
+fi
+
dnl
dnl Check the CPU
dnl
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} trivial_channel_mixer"
+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"
-PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap"
+PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap access_ftp"
dnl
dnl Accelerated modules
[ --enable-release activate extra optimizations (default disabled)])
AM_CONDITIONAL(RELEASE, test "x${enable_release}" = "xyes")
+dnl
+dnl Stream output
+dnl
+AC_ARG_ENABLE(sout,
+ [ --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} mux_ts mux_ps mux_dummy"
+ PLUGINS="${PLUGINS} packetizer_mpegaudio packetizer_mpegvideo packetizer_a52"
+ PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_copy"
+fi
+
+
dnl
dnl Input plugins
dnl
then
if test "x${with_dvdread_tree}" = x
then
- AC_CHECK_HEADERS(dvdread/dvdread.h,
+ AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ PLUGINS="${PLUGINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} -ldvdread" ],
+ LDFLAGS_dvdread="${LDFLAGS_dvdread} -ldvdread ${LDFLAGS_dvdcss}" ],
[ if test "x${enable_dvdread}" != "x"
then
AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml])
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
BUILTINS="${BUILTINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} ${real_dvdread_tree}/dvdread/.libs/libdvdread.a"
+ LDFLAGS_dvdread="${LDFLAGS_dvdread} ${real_dvdread_tree}/dvdread/.libs/libdvdread.a ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}"
else
dnl The given libdvdread wasn't built
fi
else
AC_MSG_CHECKING(for dvdread headers in ${with_dvdread})
- if test -f ${with_dvdread}/include/dvdread/dvdread.h
+ if test -f ${with_dvdread}/include/dvdread/dvd_reader.h
then
- dnl Use ${with_dvdread}/include/dvdread/dvdread.h
+ dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${with_dvdread}/lib -ldvdread"
+ LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdread="${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/dvdread.h])
+ AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h])
fi
fi
fi
then
AC_CHECK_HEADERS(dvdplay/dvdplay.h,
[ PLUGINS="${PLUGINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} -ldvdplay"
+ LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread}" ],
[ if test "x${enable_dvdplay}" != "x"
then
dnl Use a custom libdvdplay
AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a)
BUILTINS="${BUILTINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} ${real_dvdplay_tree}/src/.libs/libdvdplay.a"
+ LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${real_dvdplay_tree}/src/.libs/libdvdplay.a ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src"
else
dnl The given libdvdplay wasn't built
dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} ${LDFLAGS_dvd} ${LDFLAGS_dvdread} -L${with_dvdplay}/lib -ldvdplay"
+ LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${with_dvdplay}/include"
else
dnl No libdvdplay could be found, sorry
],[])
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
[ --with-ffmpeg=PATH path to ffmpeg installation],[],[])
if test "x${with_ffmpeg}" != "xno" -a "x${with_ffmpeg}" != "x"
then
- CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${with_ffmpeg}/include/libffmpeg"
+ CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${with_ffmpeg}/include/ffmpeg"
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${with_ffmpeg}/lib"
fi
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
SDL_HEADER="SDL/SDL.h"
fi
+ # check for cross-compiling
+ SDL_PREFIX=
+ AC_ARG_WITH(sdl-prefix,
+ [ --with-sdl-prefix=PATH path to libsdl (needed for cross-compiling),
+ e.g use as:
+ --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
+ if test "x${with_sdl_prefix}" != "xno" -a "x${with_sdl_prefix}" != "x"
+ then
+ SDL_PREFIX="--prefix=${with_sdl_prefix}"
+ fi
if test "x${SDL_CONFIG}" != "xno"
then
PLUGINS="${PLUGINS} vout_sdl aout_sdl"
- CFLAGS_vout_sdl="${CFLAGS_vout_sdl} `${SDL_CONFIG} --cflags`"
- LDFLAGS_vout_sdl="${LDFLAGS_vout_sdl} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
- CFLAGS_aout_sdl="${CFLAGS_aout_sdl} `${SDL_CONFIG} --cflags`"
- LDFLAGS_aout_sdl="${LDFLAGS_aout_sdl} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
+ CFLAGS_vout_sdl="${CFLAGS_vout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`"
+ LDFLAGS_vout_sdl="${LDFLAGS_vout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
+ CFLAGS_aout_sdl="${CFLAGS_aout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`"
+ LDFLAGS_aout_sdl="${LDFLAGS_aout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
<${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
+ [ AC_CHECK_HEADERS(SDL.h, AC_DEFINE(SDL_INCLUDE_FILE, <SDL.h>,
+ As a last resort we also test for SDL.h presence),
[ AC_MSG_ERROR([The development package for SDL is not installed.
Please install it and try again. Alternatively you can also configure with
--disable-sdl.])
- ])
+ ])])
CPPFLAGS="${CPPFLAGS_save}"
if expr 1.1.5 \> `${SDL_CONFIG} --version` >/dev/null
then
dnl
AC_ARG_ENABLE(qte,
[ --enable-qte QT Embedded support (default disabled)])
-if test "x${enable_qte}" != "xno"
+if test "x${enable_qte}" = "xyes"
then
AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "x${with_qte}" = "x"
+ [ --with-qte=PATH Qt Embedded headers and libraries])
+ if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
then
- LDFLAGS_test="-L${QTDIR}/lib"
- CPPFLAGS_test="-I${QTDIR}/include"
+ LDFLAGS_qte="${LDFLAGS_qte} -L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte"
+ CPPFLAGS_qte="${CPPFLAGS_qte} -I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
else
- LDFLAGS_test="-L${with_qte}/lib"
- CPPFLAGS_test="-I${with_qte}/include"
+ LDFLAGS_qte="${LDFLAGS_qte} -L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte"
+ CPPFLAGS_qte="${CPPFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
fi
-
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
- AC_CHECK_HEADERS(qt.h, [
- CPPFLAGS_qte="${CPPFLAGS_qte} ${CPPFLAGS_test} -DQT_QWS_IPAQ -DQWS"
- CXXFLAGS_qte="${CXXFLAGS_qte} -fno-exceptions -fno-rtti"
- LDFLAGS_qte="${LDFLAGS_qte} ${LDFLAGS_test} -lqte"
- if test "x${with_qte}" = "x"
- then
- PLUGINS="${PLUGINS} qte"
- else
- BUILTINS="${BUILTINS} qte"
- fi
- ])
+ PLUGINS="${PLUGINS} qte"
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+ AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
+ AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
+ ] )
CPPFLAGS="${CPPFLAGS_save}"
fi
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
if test "x${have_alsa}" = "xtrue"
then
- #PLUGINS="${PLUGINS} alsa"
+ PLUGINS="${PLUGINS} alsa"
LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"
fi
fi])
then
AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
fi
+ # check for cross-compiling
+ GTK_PREFIX=
+ AC_ARG_WITH(gtk-prefix,
+ [ --with-gtk-prefix=PATH path to libgtk (needed for cross-compiling),
+ e.g use as:
+ --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
+ if test "x${with_gtk_prefix}" != "xno" -a "x${with_gtk_prefix}" != "x"
+ then
+ GTK_PREFIX="--prefix=$with_gtk_prefix"
+ fi
if test "x${GTK_CONFIG}" != "xno"
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-familiar.])
fi
- CFLAGS_familiar="${CFLAGS_familiar} `${GTK_CONFIG} --cflags gtk gthread`"
- LDFLAGS_familiar="${LDFLAGS_familiar} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
+ CFLAGS_familiar="${CFLAGS_familiar} `${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`"
+ LDFLAGS_familiar="${LDFLAGS_familiar} `${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`"
# now look for the gtk.h header
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar}"
ac_cv_gtk_headers=yes
if test "x${ac_cv_gtk_headers}" = "xyes"
then
PLUGINS="${PLUGINS} familiar"
- NEED_GTK_MAIN=yes
fi
CPPFLAGS="${CPPFLAGS_save}"
- fi
+
+ # now look for gpe support
+ AC_ARG_WITH(gpe-prefix,
+ [ --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[])
+ if test "x$with_gpe_prefix" != "xno" -a "x$with_gpe_prefix" != "x"
+ then
+ CFLAGS_gpe="-I$with_gpe_prefix/include"
+ LDFLAGS_gpe="-lXi -lgdk_pixbuf -L$with_gpe_prefix/lib -lgpewidget"
+ # now look for gpe/init.h header file
+ CFLAGS_save=$CFLAGS
+ LDFLAGS_save=$LDFLAGS
+ CFLAGS="${CFLAGS_familiar} ${CFLAGS_gpe}"
+ LDFLAGS="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
+ CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar} ${CFLAGS_gpe}"
+ ac_cv_gpe_headers=yes
+ AC_CHECK_HEADERS(gpe/init.h, ,
+ [ ac_cv_gpe_headers=no
+ AC_MSG_ERROR([Cannot find development headers for libgpewidget...]) ])
+ CFLAGS=$CFLAGS_save
+ LDFLAGS=$LDFLAG_save
+ if test "x${ac_cv_gpe_headers}" = "xyes"
+ then
+ CFLAGS_familiar="${CFLAGS_familiar} ${CFLAGS_gpe}"
+ LDFLAGS_familiar="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
+ fi
+ else
+ NEED_GTK_MAIN=yes
+ fi # end gpe support
+ fi # end gtk+ support
fi
dnl
then
AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
fi
- CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cflags`"
+ CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cxxflags`"
LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`"
# now look for the wxprec.h header
CPPFLAGS="${save_CPPFLAGS} ${CXXFLAGS_wxwindows}"
[ --enable-opie Qt embedded interface support (default disabled)],
[if test "x${enable_opie}" = "xyes"; then
AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "x${with_qte}" = "x"
+ [ --with-qte=PATH Qt Embedded headers and libraries])
+ if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
then
- LDFLAGS_test="-L${QTDIR}/lib"
- CPPFLAGS_test="-I${QTDIR}/include"
+ LDFLAGS_qte="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte"
+ CPPFLAGS_qte="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
else
- LDFLAGS_test="-L${with_qte}/lib"
- CPPFLAGS_test="-I${with_qte}/include"
+ LDFLAGS_qte="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
+ CPPFLAGS_qte="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
fi
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+ AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
+ AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
+ ] )
+ CPPFLAGS="${CPPFLAGS_save}"
PLUGINS="${PLUGINS} opie"
- LDFLAGS_opie="${LDFLAGS_opie} ${LDFLAGS_test} -lqte"
- CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_test}"
- if test -x ${QTEDIR}/bin/moc
+ LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}"
+ CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}"
+ if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
then
- MOC=${QTEDIR}/bin/moc
+ MOC=${with_qte}/bin/moc
else
- MOC=moc
+ MOC=${QTDIR}/bin/moc
fi
fi])
then
PLUGINS="${PLUGINS} gtk_main"
CFLAGS_gtk="${CFLAGS_gtk} -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
projects / vlc / blobdiff