dnl Autoconf settings for vlc
+dnl $Id: configure.ac,v 1.35 2003/07/18 23:41:09 hartman Exp $
AC_INIT(vlc,0.6.0)
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
AX_ADD_LDFLAGS([vlc ffmpeg],[-all_load])
+ AX_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress])
LIBEXT=".dylib"
;;
*mingw32* | *cygwin*)
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)
- INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
+ INCLUDES="${INCLUDES} -I\$(top_builddir)/intl"
else
AC_CHECK_FUNCS(textdomain,,[
AC_CHECK_LIB(intl,textdomain,
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof lseek)
])
])
-dnl Check for getopt
+dnl Check for getopt (always use builtin one on win32)
+if test "${SYS}" = "mingw32"; then
+need_getopt=:
+else
need_getopt=false
AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
AX_ADD_LDFLAGS([vlc],[-lgnugetopt])],
[need_getopt=:])])
+fi
AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
if test "${SYS}" != "mingw32"; then
AC_DEFINE(HAVE_ATTRIBUTE_FORMAT, 1, Support for __attribute__((format())) with function pointers)
fi
+dnl Check for __attribute__(())
+AC_CACHE_CHECK([for __attribute__((packed))],
+ [ac_cv_c_attribute_packed],
+ [ac_cv_c_attribute_packed=no
+ AC_TRY_COMPILE(, [struct __attribute__((__packed__)) foo { int a; } b;],
+ [ac_cv_c_attribute_packed=yes])])
+if test "${ac_cv_c_attribute_packed}" != "no"; then
+ AC_DEFINE(HAVE_ATTRIBUTE_PACKED, 1, Support for __attribute__((packed)) for structs)
+fi
+
dnl
dnl Check the CPU
dnl
#AX_ADD_BUILTINS([mpeg_video_old idct idctclassic motion])
AX_ADD_PLUGINS([dummy rc logger gestures memcpy])
AX_ADD_PLUGINS([es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv])
-AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak])
+AX_ADD_PLUGINS([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])
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
(default i686 on IA-32 and 750 on PPC)])
-if test "${with_tuning}" != ""; then
+if test -n "${with_tuning}"; then
if test "${target_cpu}" = "powerpc"; then
CFLAGS_TUNING="-mtune=${with_tuning}"
else
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_dummy])
+ AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_dummy])
AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo packetizer_a52])
AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
AX_ADD_PLUGINS([packetizer_copy])
[ --with-dvdcss-tree=PATH libdvdcss tree for static linking])
case "${with_dvdcss}" in
""|yes)
- if test "${with_dvdcss_tree}" = ""
+ if test -z "${with_dvdcss_tree}"
then
AC_CHECK_HEADERS(dvdcss/dvdcss.h,
[ AX_ADD_PLUGINS([dvd])
else
AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree})
real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`"
- if test "${real_dvdcss_tree}" = ""
+ if test -z "${real_dvdcss_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
[ --with-dvdread=PATH libdvdread headers and libraries])
AC_ARG_WITH(dvdread-tree,
[ --with-dvdread-tree=PATH libdvdread tree for static linking])
- if test "${with_dvdread}" = ""
+ if test -z "${with_dvdread}"
then
- if test "${with_dvdread_tree}" = ""
+ 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 "${enable_dvdread}" != ""
+ 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])
else
AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
- if test "${real_dvdread_tree}" = ""
+ if test -z "${real_dvdread_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
[ --with-dvdplay=PATH libdvdplay headers and libraries])
AC_ARG_WITH(dvdplay-tree,
[ --with-dvdplay-tree=PATH libdvdplay tree for static linking])
- if test "${with_dvdplay}" = ""
+ if test -z "${with_dvdplay}"
then
- if test "${with_dvdplay_tree}" = ""
+ 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 "${enable_dvdplay}" != ""
+ if test -n "${enable_dvdplay}"
then
AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.])
AC_MSG_ERROR([cannot find libdvdplay headers])
else
AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree})
real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`"
- if test "${real_dvdplay_tree}" = ""
+ if test -z "${real_dvdplay_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
[ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
case "${with_dvbpsi}" in
""|yes)
- if test "${with_dvbpsi_tree}" = ""
+ if test -z "${with_dvbpsi_tree}"
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi])
else
AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`"
- if test "${real_dvbpsi_tree}" = ""
+ if test -z "${real_dvbpsi_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
;;
*)
AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi})
- if test "${with_dvbpsi}" = ""
+ if test -z "${with_dvbpsi}"
then
LDFLAGS_test=""
CPPFLAGS_test=""
AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[${LDFLAGS_test} -ldvbpsi])
],[
- if test "${enable_dvbpsi}" != ""
+ if test -n "${enable_dvbpsi}"
then
AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
fi
[ --enable-v4l Video4Linux input support (default disabled)])
if test "${enable_v4l}" = "yes"
then
+ AC_ARG_WITH(v4l,
+ [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[])
+ if test "${with_v4l}" != "no" -a -n "${with_v4l}"
+ then
+ AX_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
+ fi
+
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}"
AC_CHECK_HEADERS(linux/videodev.h, [
AX_ADD_PLUGINS([v4l])
- ],[])
+ ],[])
+ CPPFLAGS="${CPPFLAGS_save}"
fi
dnl
then
AC_ARG_WITH(mad,
[ --with-mad=PATH path to libmad],[],[])
- if test "${with_mad}" != "no" -a "${with_mad}" != ""
+ if test "${with_mad}" != "no" -a -n "${with_mad}"
then
AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
AX_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib])
AC_ARG_WITH(mad-tree,
[ --with-mad-tree=PATH mad tree for static linking],[],[])
- if test "${with_mad_tree}" != "no" -a "${with_mad_tree}" != ""
+ if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}"
then
real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
- if test "${real_mad_tree}" = ""
+ if test -z "${real_mad_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
[ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "${enable_ffmpeg}" != "no"
then
+ AC_ARG_WITH(ffmpeg-mp3lame,
+ [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support],
+ [ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame])
+ AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
+
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
dnl
dnl test for !(--with-ffmpeg-tree)
dnl
- if test "${with_ffmpeg_tree}" == "no" -o "${with_ffmpeg_tree}" == "";then
+ if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}";then
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h postproc/postprocess.h)
dnl
dnl test for --with-ffmpeg-tree
dnl
- if test "${with_ffmpeg_tree}" != "no" -a "${with_ffmpeg_tree}" != "";then
+ if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}";then
AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree})
real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
- if test "${real_ffmpeg_tree}" = ""; then
+ if test -z "${real_ffmpeg_tree}"; then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}])
AX_ADD_CPPFLAGS([encoder_ffmpeg],[${CPPFLAGS_ffmpeg}])
dnl XXX: we don't link with -lavcodec blah blah blah
dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}])
+
+ ac_have_vorbis_headers=yes
+ AC_CHECK_HEADERS(vorbis/vorbisenc.h vorbis/codec.h,,
+ ac_have_vorbis_headers=no)
+ if test "$ac_have_vorbis_headers" = "yes"; then
+ AX_ADD_LDFLAGS([stream_out_transcode],[-lvorbisenc -lvorbis -logg])
+ fi
fi
dnl
then
AC_ARG_WITH(faad-tree,
[ --with-faad-tree=PATH faad tree for static linking])
- if test "${with_faad_tree}" != ""
+ if test -n "${with_faad_tree}"
then
AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`"
- if test "${real_faad_tree}" = ""
+ if test -z "${real_faad_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
AC_ARG_WITH(xvid,
[ --with-xvid=PATH path to xvid installation],[],[])
- if test "${with_xvid}" != "no" -a "${with_xvid}" != ""
+ 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])
AC_ARG_WITH(xvid-tree,
[ --with-xvid-tree=PATH xvid tree for static linking])
- if test "${with_xvid_tree}" != ""
+ 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 "${real_xvid_tree}" = ""
+ if test -z "${real_xvid_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
dnl MP4 module
dnl
AC_CHECK_HEADERS(zlib.h, [
- AX_ADD_LDFLAGS([mp4 skins basic_skins],[-lz])
+ AX_ADD_LDFLAGS([mp4 skins],[-lz])
] )
dnl skins module
dnl
AC_CHECK_HEADERS(libtar.h, [
- AX_ADD_LDFLAGS([skins basic_skins],[-ltar])
+ AX_ADD_LDFLAGS([skins],[-ltar])
] )
[ --with-a52=PATH a52 headers and libraries])
AC_ARG_WITH(a52-tree,
[ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
- if test "${with_a52_tree}" != "no" -a "${with_a52_tree}" != ""
+ if test "${with_a52_tree}" != "no" -a -n "${with_a52_tree}"
then
real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
- if test "${real_a52_tree}" = ""
+ if test -z "${real_a52_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([the specified tree doesn't have a52.h])
fi
else
- if test "${with_a52}" = ""
+ if test -z "${with_a52}"
then
LDFLAGS_test=""
CPPFLAGS_test=""
then
AC_ARG_WITH(libmpeg2-tree,
[ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
- if test "${with_libmpeg2_tree}" != ""
+ if test -n "${with_libmpeg2_tree}"
then
AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree})
real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`"
- if test "${real_libmpeg2_tree}" = ""
+ if test -z "${real_libmpeg2_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
AC_ARG_WITH(tarkin-tree,
[ --with-tarkin-tree=PATH tarkin tree for static linking])
- if test "${with_tarkin_tree}" != ""
+ if test -n "${with_tarkin_tree}"
then
AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
AX_ADD_BUILTINS([theora])
- AX_ADD_LDFLAGS([theora],[-ltheora -logg]) ],[
+ if test "${SYS}" = "darwin"; then
+ theora_libs="-ltheora"
+ else
+ theora_libs="-ltheora -logg"
+ fi
+ AX_ADD_LDFLAGS([theora],[${theora_libs}]) ],[
AC_MSG_ERROR([libtheora doesn't appear to be installed on you system.
You also need to check that you have a libogg posterior to the 1.0 release.])],
[-logg])
])
fi
+dnl
+dnl spudec support
+dnl
+AC_CHECK_HEADERS(iconv.h, [
+ AX_ADD_LDFLAGS([spudec],[-liconv])
+ AX_ADD_PLUGINS([spudec])])
+
+
+dnl
+dnl Video Filters
+dnl
+
+dnl
+dnl png
+dnl
+AC_CHECK_HEADERS(png.h, [
+ AX_ADD_LDFLAGS([logo],[-lpng])
+ AX_ADD_PLUGINS([logo])])
+
dnl
dnl Video plugins
dnl
[ --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 "${with_sdl_prefix}" != "no" -a "${with_sdl_prefix}" != ""
+ if test "${with_sdl_prefix}" != "no" -a -n "${with_sdl_prefix}"
then
SDL_PREFIX="--prefix=${with_sdl_prefix}"
fi
if test "${FREETYPE_CONFIG}" != "no"
then
- AX_ADD_PLUGINS([osdtext])
- AX_ADD_CFLAGS([osdtext],[`${FREETYPE_CONFIG} --cflags`])
- AX_ADD_LDFLAGS([osdtext],[`${FREETYPE_CONFIG} --libs`])
+ AX_ADD_PLUGINS([freetype])
+ AX_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
+ AC_CHECK_HEADERS(Carbon/Carbon.h,
+ [AX_ADD_LDFLAGS([freetype],[-framework Carbon])])
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "${enable_freetype}" = "yes"
then
then
AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a "${with_qte}" != ""
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
then
AC_ARG_WITH(directx,
[ --with-directx=PATH Win32 DirectX headers])
- if test "${with_directx}" = ""
+ if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
[ AX_ADD_PLUGINS([vout_directx aout_directx])
AX_ADD_LDFLAGS([ggi],[-lggi])
AC_ARG_WITH(ggi,
[ --with-ggi=PATH path to libggi],
- [ if test "${with_ggi}" != "no" -a "${with_ggi}" != ""
+ [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
then
AX_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
AX_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib])
AX_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
AC_ARG_WITH(glide,
[ --with-glide=PATH path to libglide],
- [ if test "${with_glide}" != "no" -a "${with_glide}" != ""
+ [ if test "${with_glide}" != "no" -a -n "${with_glide}"
then
AX_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
AX_ADD_LDFLAGS([glide],[-L${with_glide}/lib])
AC_ARG_ENABLE(skins,
[ --enable-skins Skins interface module (default enabled on Win32)])
if test "${enable_skins}" != "no"; then
- WXWINDOWS_PATH="${PATH}"
- AC_ARG_WITH(skins-wx-config-path,
- [ --with-skins-wx-config-path=PATH wx-config path for the skins plugin (default search in \$PATH)],
- [ if test "${with_skins_wx_config_path}" != "no"
- then
- WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
- fi ])
- # look for wx-config
- AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
- if test "${WX_CONFIG_SKINS}" != "no"
- then
- if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
- 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-skins.])
- fi
- AX_ADD_CPPFLAGS([skins],[`${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS])
- AX_ADD_LDFLAGS([skins],[`${WX_CONFIG_SKINS} --libs`])
- fi
-
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+
AX_ADD_PLUGINS([skins])
AX_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins])
AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
AX_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
- else
- if test "${enable_skins}" = "yes"; then
- IMLIB2_PATH="${PATH}"
- AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- if test "${IMLIB2_CONFIG_SKINS}" = "no"; then
- AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.])
- fi
- AX_ADD_PLUGINS([skins])
- AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
- AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
- AX_ADD_PLUGINS([skins])
- fi
- fi
-fi
-
-dnl
-dnl Basic skins module (i.e. without wxWindows dialogs)
-dnl
-AC_ARG_ENABLE(basic-skins,
- [ --enable-basic-skins Skins interface module without wxWindows dialogs (default disabled)])
-if test "${enable_basic_skins}" = "yes"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
-
- AX_ADD_CPPFLAGS([basic_skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins])
- AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([basic_skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
-
- else
+ else if test "${enable_skins}" = "yes"; then
IMLIB2_PATH="${PATH}"
AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
if test "${IMLIB2_CONFIG_SKINS}" = "no"; then
- AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.])
+ AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.])
fi
- AX_ADD_CPPFLAGS([basic_skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
- AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti])
- AX_ADD_LDFLAGS([basic_skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
- fi
-
- AX_ADD_PLUGINS([basic_skins])
+ AX_ADD_PLUGINS([skins])
+ AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
+ AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
+ AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
+ fi fi
fi
dnl
fi
dnl
-dnl Gtk+2 module
+dnl Gtk+2 module ! Disabled for know as it is unuseable and confuses users
dnl
-AC_ARG_ENABLE(gtk2,
- [ --enable-gtk2 Gtk2 support (default disabled)])
-if test "${enable_gtk2}" = "yes"
-then
- PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
- AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
- AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
- AX_ADD_PLUGINS([gtk2])
- if test "${SYS}" != "mingw32"; then
- NEED_GTK2_MAIN=yes
- fi
-fi
+dnl AC_ARG_ENABLE(gtk2,
+dnl [ --enable-gtk2 Gtk2 support (default disabled)])
+dnl if test "${enable_gtk2}" = "yes"
+dnl then
+dnl PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+dnl AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
+dnl AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
+dnl AX_ADD_PLUGINS([gtk2])
+dnl if test "${SYS}" != "mingw32"; then
+dnl NEED_GTK2_MAIN=yes
+dnl fi
+dnl fi
dnl
dnl Familiar module uses Gtk+ library
[ --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 "${with_gtk_prefix}" != "no" -a "${with_gtk_prefix}" != ""
+ if test "${with_gtk_prefix}" != "no" -a -n "${with_gtk_prefix}"
then
GTK_PREFIX="--prefix=${with_gtk_prefix}"
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 "${with_gpe_prefix}" != "no" -a "${with_gpe_prefix}" != ""
+ if test "${with_gpe_prefix}" != "no" -a -n "${with_gpe_prefix}"
then
AX_ADD_CFLAGS([gpe],[-I${with_gpe_prefix}/include])
AX_ADD_LDFLAGS([gpe],[-lXi -lgdk_pixbuf -L${with_gpe_prefix}/lib -lgpewidget])
fi])
dnl
-dnl Gnome2 module
+dnl Gnome2 module ! Disabled for know as it is unuseable and confuses users
dnl
-AC_ARG_ENABLE(gnome2,
- [ --enable-gnome2 Gnome2 support (default disabled)])
-if test "${enable_gnome2}" = "yes"
-then
- PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
- AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}])
- AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}])
- AX_ADD_PLUGINS([gnome2])
- if test "${SYS}" != "mingw32"; then
- NEED_GNOME2_MAIN=yes
- fi
-fi
+dnl AC_ARG_ENABLE(gnome2,
+dnl [ --enable-gnome2 Gnome2 support (default disabled)])
+dnl if test "${enable_gnome2}" = "yes"
+dnl then
+dnl PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+dnl AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}])
+dnl AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}])
+dnl AX_ADD_PLUGINS([gnome2])
+dnl if test "${SYS}" != "mingw32"; then
+dnl NEED_GNOME2_MAIN=yes
+dnl fi
+dnl fi
dnl
dnl wxWindows module
[if test "${enable_opie}" = "yes"; then
AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a "${with_qte}" != ""
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
NEED_QTE_MAIN=yes
AX_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}])
AX_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}])
- if test "${with_qte}" != "no" -a "${with_qte}" != ""
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
MOC=${with_qte}/bin/moc
else
then
AC_ARG_WITH(slp,
[ --with-slp=PATH libslp headers and libraries])
- if test "${with_slp}" = ""
+ if test -z "${with_slp}"
then
AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
if test "${have_slp}" = "true"
fi
fi
+dnl
+dnl corba (ORBit) plugin
+dnl
+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
+
AC_ARG_WITH(,[Misc options:])
dnl
if test "${enable_mozilla}" = "yes"
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
- if test "${MOZILLA_CONFIG}" != "no"
+ if test "${MOZILLA_CONFIG}" = "no"
then
+ AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+ else
if test "${SYS}" != "mingw32"; then
LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
AC_CHECK_LIB(Xt,XtStrings,[
AX_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
dnl Not necessarily in ${PATH}
- if test "${XPIDL}" = "" -o ! -x "${XPIDL}"
+ if test -z "${XPIDL}" -o ! -x "${XPIDL}"
then
XPIDL="/usr/lib/mozilla/xpidl"
fi
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
-VLC_CONFIG="\$(top_builddir)/vlc-config"
+VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
AC_SUBST(VLC_CONFIG)
CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
ipkg/Makefile
lib/Makefile
modules/Makefile
+ mozilla/Makefile
m4/Makefile
po/Makefile.in
share/Makefile
modules/codec/mpeg_video/motion/Makefile
modules/codec/spudec/Makefile
modules/control/Makefile
+ modules/control/corba/Makefile
modules/control/lirc/Makefile
modules/control/rc/Makefile
modules/demux/Makefile
projects / vlc / blobdiff