dnl Autoconf settings for vlc
+dnl $Id: configure.ac,v 1.23 2003/07/03 19:25:51 garf Exp $
-AC_INIT(vlc,0.6.0-test3)
+AC_INIT(vlc,0.6.0)
CONFIGURE_LINE="$0 $*"
CODENAME="Trevelyan"
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.6.0-test3)
+AM_INIT_AUTOMAKE(vlc,0.6.0)
AM_CONFIG_HEADER(config.h)
dnl
dnl Save *FLAGS
dnl
-CPPFLAGS_save="${CPPFLAGS}"
-CFLAGS_save="${CFLAGS}"
-CXXFLAGS_save="${CXXFLAGS}"
-OBJCFLAGS_save="${OBJCFLAGS}"
-LDFLAGS_save="${LDFLAGS}"
+AX_SAVE_FLAGS
dnl
dnl Check for tools
dnl
dnl Check the operating system
dnl
-case "x${target_os}" in
- x)
+case "${target_os}" in
+ "")
SYS=unknown
;;
- xlinux*)
+ linux*)
SYS=linux
;;
- xbsdi*)
+ bsdi*)
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"
- LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd"
+ AX_ADD_LDFLAGS([dvd dvdcss vcd cdda],[-ldvd])
;;
- x*bsd*)
+ *bsd*)
SYS="${target_os}"
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
;;
- xdarwin*)
+ darwin*)
SYS=darwin
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
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}"
- LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
- LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
+ AX_ADD_LDFLAGS([vlc ffmpeg],[-all_load])
+ AX_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress])
LIBEXT=".dylib"
;;
- x*mingw32* | x*cygwin*)
+ *mingw32* | *cygwin*)
AC_CHECK_TOOL(WINDRES, windres, :)
LIBEXT=".dll"
- case "x${target_os}" in
- x*mingw32*)
+ case "${target_os}" in
+ *mingw32*)
SYS=mingw32
;;
- x*cygwin*)
+ *cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
AC_EGREP_CPP(yes,
;;
esac
- if test "x$SYS" = "xmingw32"; then
+ if test "${SYS}" = "mingw32"; then
# 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 -lwinmm -mwindows"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
- LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
- LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
- LDFLAGS_access_mms="${LDFLAGS_access_mms} -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_sap="${LDFLAGS_sap} -lws2_32"
- LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
- LDFLAGS_http="${LDFLAGS_http} -lws2_32"
- LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
+ CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
+ AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd],[-lws2_32])
fi
;;
- x*nto*)
+ *nto*)
SYS=nto
- LDFLAGS_x11="${LDFLAGS_x11} -lsocket"
- LDFLAGS_xvideo="${LDFLAGS_xvideo} -lsocket"
+ AX_ADD_LDFLAGS([x11 xvideo],[-lsocket])
;;
- xsolaris*)
+ solaris*)
SYS=solaris
;;
- xhpux*)
+ hpux*)
SYS=hpux
LIBEXT=".sl"
;;
- xbeos)
+ beos)
SYS=beos
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
- LDFLAGS_vlc="${LDFLAGS_vlc} -lbe"
- LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -ltranslation -ltracker -lgame -lstdc++.r4"
+ AX_ADD_LDFLAGS([vlc beos],[-lbe])
+ AX_ADD_CXXFLAGS([beos],[])
+ AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
dnl Check if we have BONE (old net_server doesn't have libsocket.so)
- AC_CHECK_LIB( socket, connect,
- LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket -lbind"
- LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket -lbind"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind"
- LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind" )
+ AC_CHECK_LIB(socket, connect,
+ AX_ADD_LDFLAGS([vlc access_mms ipv4 httpd],[-lsocket -lbind]))
;;
- x*)
+ *)
SYS="${target_os}"
;;
esac
-AM_CONDITIONAL(HAVE_BEOS, test "x${SYS}" = "xbeos")
-AM_CONDITIONAL(HAVE_DARWIN, test "x${SYS}" = "xdarwin")
-AM_CONDITIONAL(HAVE_WIN32, test "x${SYS}" = "xmingw32")
+AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
+AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
+AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
dnl
dnl Gettext stuff
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,
- LDFLAGS_vlc="${LDFLAGS_vlc} ${LIBINTL}",,
+ AX_ADD_LDFLAGS([vlc],[${LIBINTL}]),,
${LIBINTL}
)
])
AC_MSG_RESULT(${LIBEXT})
dnl Check for the need to include the mingwex lib for mingw32
-if test x$SYS = xmingw32
+if test "${SYS}" = "mingw32"
then
AC_CHECK_LIB(mingwex,opendir,
- AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}",
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lmingwex"
- LDFLAGS_gtk="${LDFLAGS_gtk} -lmingwex"])
+ AC_CHECK_LIB(mingw32,opendir,AX_ADD_LDFLAGS([vlc],[]),
+ [AX_ADD_LDFLAGS([vlc gtk],[-lmingwex])])
)
fi
dnl Check for fnative-struct or mms-bitfields support for mingw32
-if test x$SYS = xmingw32
+if test "${SYS}" = "mingw32"
then
AC_CACHE_CHECK([if \$CC accepts -mms-bitfields],
[ac_cv_c_mms_bitfields],
[CFLAGS="${CFLAGS_save} -mms-bitfields"
AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)])
- if test x"$ac_cv_c_mms_bitfields" != x"no"; then
+ if test "${ac_cv_c_mms_bitfields}" != "no"; then
CFLAGS_save="${CFLAGS_save} -mms-bitfields";
CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields";
else
[ac_cv_c_fnative_struct],
[CFLAGS="${CFLAGS_save} -fnative-struct"
AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
- if test x"$ac_cv_c_fnative_struct" != x"no"; then
+ if test "${ac_cv_c_fnative_struct}" != "no"; then
CFLAGS_save="${CFLAGS_save} -fnative-struct";
CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct";
fi
fi
dnl Check for fvtable-thunks support for mingw32
-if test x$SYS = xmingw32
+if test "${SYS}" = "mingw32"
then
AC_LANG_PUSH(C++)
AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
[CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes,
ac_cv_cxx_fvtable_thunks=no)])
- if test x"$ac_cv_cxx_fvtable_thunks" = x"yes"; then
+ if test "${ac_cv_cxx_fvtable_thunks}" = "yes"; then
CXXFLAGS_mingw32_special="-fvtable-thunks"
fi
- CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"
- CXXFLAGS="${CXXFLAGS_save}"
+ CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"; CXXFLAGS="${CXXFLAGS_save}"
AC_LANG_POP(C++)
fi
dnl Flags for plugin compilation
-case "x${SYS}" in
- xmingw32|xcygwin)
- CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
- CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
- OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
- CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}"
- CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
- OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
+case "${SYS}" in
+ mingw32|cygwin)
+ AX_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
+ AX_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}])
+ AX_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}])
;;
- x*)
- CFLAGS_pics="${CFLAGS_pics} -fPIC"
- CXXFLAGS_pics="${CXXFLAGS_pics} -fPIC"
- OBJCFLAGS_pics="${OBJCFLAGS_pics} -fPIC"
- CFLAGS_plugins="${CFLAGS_plugins} -fPIC"
- CXXFLAGS_plugins="${CXXFLAGS_plugins} -fPIC"
- OBJCFLAGS_plugins="${OBJCFLAGS_plugins} -fPIC"
- LDFLAGS_plugins="${LDFLAGS_plugins} -fPIC"
+ *)
+ AX_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC])
+ AX_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC])
+ AX_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC])
+ AX_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC])
;;
esac
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)
+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)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof lseek)
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
AC_CHECK_FUNCS(connect,,[
- AC_CHECK_LIB(socket,connect,
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket"
- LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket"
-)])
+ AC_CHECK_LIB(socket,connect,[
+ AX_ADD_LDFLAGS([vlc ipv4],-lsocket)
+ ])
+])
AC_CHECK_FUNCS(send,,[
- AC_CHECK_LIB(socket,send,
- LDFLAGS_access_http="${LDFLAGS_access_http} -lsocket"
- LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket"
- LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
- LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket"
- LDFLAGS_sap="${LDFLAGS_sap} -lsocket"
- LDFLAGS_http="${LDFLAGS_http} -lsocket"
- LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket"
-)])
+ AC_CHECK_LIB(socket,send,[
+ AX_ADD_LDFLAGS([access_http access_mms access_udp access_ftp sap http access_output_udp],[-lsocket])
+ ])
+])
AC_CHECK_FUNCS(gethostbyname,,[
- 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")])
+ AC_CHECK_LIB(nsl,gethostbyname,[
+ AX_ADD_LDFLAGS([ipv4 httpd vlc],[-lnsl])
+ ],[
+ AC_CHECK_LIB(bind,gethostbyname,[
+ AX_ADD_LDFLAGS([ipv4 httpd],[-lbind])
+ ])
+ ])
])
dnl Check for socklen_t
[socklen_t len = 42; return len;],
ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no)])
-if test x$ac_cv_type_socklen_t != xno; then
+if test "${ac_cv_type_socklen_t}" != "no"; then
AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if <sys/socket.h> defines socklen_t.])
fi
[va_list ap1, ap2; va_copy(ap1,ap2);],
[ac_cv_c_va_copy="yes"],
[ac_cv_c_va_copy="no"]))
-if test "$ac_cv_c_va_copy" = "yes"; then
+if test "${ac_cv_c_va_copy}" = "yes"; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if <stdarg.h> defines va_copy.])
fi
AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
[va_list ap1, ap2; __va_copy(ap1,ap2);],
[ac_cv_c___va_copy="yes"],
[ac_cv_c___va_copy="no"]))
-if test "$ac_cv_c___va_copy" = "yes"; then
+if test "${ac_cv_c___va_copy}" = "yes"; then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if <stdarg.h> defines __va_copy.])
fi
AC_CHECK_FUNCS(inet_aton,,[
- AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv" LDFLAGS_httpd="${LDFLAGS_httpd} -lresolv")
+ AC_CHECK_LIB(resolv,inet_aton,[
+ AX_ADD_LDFLAGS([ipv4 httpd],[-lresolv])
+ ])
])
dnl Check for getopt
AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
AC_CHECK_LIB([gnugetopt],[getopt_long],
- [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LDFLAGS_vlc="${LDFLAGS_vlc} -lgnugetopt"],
+ [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support)
+ AX_ADD_LDFLAGS([vlc],[-lgnugetopt])],
[need_getopt=:])])
AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
-if test "x$SYS" != "xmingw32"; then
+if test "${SYS}" != "mingw32"; then
AC_TYPE_SIGNAL
-AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl")
-AC_CHECK_LIB(m,cos,
- LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
- LDFLAGS_adjust="${LDFLAGS_adjust} -lm"
- LDFLAGS_distort="${LDFLAGS_distort} -lm"
- LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -lm")
-AC_CHECK_LIB(m,pow,
- LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lm"
- LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -lm"
- LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
- LDFLAGS_imdct3dn="${LDFLAGS_imdct3dn} -lm"
- LDFLAGS_imdctsse="${LDFLAGS_imdctsse} -lm"
- 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"
-)
-fi # end "x$SYS" != "xmingw32"
-
-if test "x$SYS" != "xmingw32"; then
+AC_CHECK_LIB(dl,dlopen,[
+ AX_ADD_LDFLAGS([vlc],[-ldl])
+])
+AC_CHECK_LIB(m,cos,[
+ AX_ADD_LDFLAGS([imdct adjust distort a52tofloat32],[-lm])
+])
+AC_CHECK_LIB(m,pow,[
+ AX_ADD_LDFLAGS([ffmpeg stream_out_transcode imdct imdct3dn imdctsse i420_rgb faad],[-lm])
+])
+AC_CHECK_LIB(m,sqrt,[
+ AX_ADD_LDFLAGS([headphone_channel_mixer],[-lm])
+])
+fi # end "${SYS}" != "mingw32"
+
+if test "${SYS}" != "mingw32"; then
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
-if test "x${THREAD_LIB}" = "xerror"; then
+if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
-if test "x${THREAD_LIB}" = "xerror"; then
+if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
fi
-if test "x${THREAD_LIB}" = "xerror"; then
+if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
fi
-if test "x${THREAD_LIB}" = "xerror"; then
+if test "${THREAD_LIB}" = "error"; then
AC_CHECK_FUNCS(pthread_mutex_lock)
THREAD_LIB=""
fi
dnl
AC_ARG_ENABLE(pth,
[ --enable-pth GNU Pth support (default disabled)],
- [ if test "x${enable_pth}" = "xyes"; then
+ [ if test "${enable_pth}" = "yes"; then
AC_CHECK_LIB(pth,pth_init)
AC_MSG_CHECKING(for pth_init in pth.h)
AC_EGREP_HEADER(pth_init,pth.h,[
dnl
AC_ARG_ENABLE(st,
[ --enable-st State Threads (default disabled)],
- [ if test "x${enable_st}" = "xyes"; then
+ [ if test "${enable_st}" = "yes"; then
AC_CHECK_LIB(st,st_init)
AC_MSG_CHECKING(for st_init in st.h)
AC_EGREP_HEADER(st_init,st.h,[
fi
])
-LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
-LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
+AX_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}])
dnl Don't link with rt when using GNU-pth
-if test "x${THREAD_LIB}" != "x-lpth" && test "x${THREAD_LIB}" != "x-lst"; then
+if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
dnl HP/UX port
- AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
+ AC_CHECK_LIB(rt,sem_init, [AX_ADD_LDFLAGS([vlc],[-lrt])])
have_nanosleep=false
AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
AC_CHECK_LIB(rt,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
+ [AX_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:],
[AC_CHECK_LIB(posix4,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])]
+ [AX_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])]
)
])
if ${have_nanosleep}; then
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_once.)],[
AC_MSG_RESULT(no)])
-fi # end "x$SYS" != "xmingw32"
+fi # end "${SYS}" != "mingw32"
AC_MSG_CHECKING(for strncasecmp in strings.h)
AC_EGREP_HEADER(strncasecmp,strings.h,[
AC_MSG_RESULT(no)])
dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
-if test "x$SYS" != "xmingw32"; then
+if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS(linux/version.h)
-fi # end "x$SYS" != "xmingw32"
+fi # end "${SYS}" != "mingw32"
AC_HEADER_TIME
AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
dnl Mac OS X and other OSes don't have declaration for nanosleep
-if test "x$SYS" != "xmingw32"; then
+if test "${SYS}" != "mingw32"; then
AC_MSG_CHECKING(for nanosleep in time.h)
AC_EGREP_HEADER(nanosleep,time.h,[
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
])
-fi # end "x$SYS" != "xmingw32"
+fi # end "${SYS}" != "mingw32"
dnl Make sure we have timespecs
AC_MSG_CHECKING(for timespec in sys/time.h)
])
dnl Check for threads library
-if test "x$SYS" != "xmingw32"; then
+if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
-fi # end "x$SYS" != "xmingw32"
+fi # end "${SYS}" != "mingw32"
dnl Default X headers and libraries
-if test "x${x_includes}" = "xNONE"; then
+if test "${x_includes}" = "NONE"; then
x_includes="/usr/X11R6/include"
fi
-if test "x${x_libraries}" = "xNONE"; then
+if test "${x_libraries}" = "NONE"; then
x_libraries="/usr/X11R6/lib"
fi
AC_TRY_COMPILE([#include <sys/param.h>],
[void foo() { int meuh; ntohl(meuh); }],
ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)])
-if test "x${ac_cv_c_ntohl_sys_param_h}" != "xno"; then
+if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then
AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
fi
[ac_cv_c_inline_limit],
[CFLAGS="${CFLAGS_save} -finline-limit-30000"
AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)])
-if test "x${ac_cv_c_inline_limit}" != "xno"; then
+if test "${ac_cv_c_inline_limit}" != "no"; then
CFLAGS_save="${CFLAGS_save} -finline-limit-30000"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -finline-limit-30000"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}"
# [ac_cv_c_W${flag}],
# [CFLAGS="-W${flag} ${CFLAGS_save}"
# AC_TRY_COMPILE([],,ac_cv_c_W${flag}=yes, ac_cv_c_W${flag}=no)])
-# if test "x${ac_cv_c_W${flag}}" != "xno"; then
+# if test "${ac_cv_c_W${flag}}" != "no"; then
# CFLAGS_save="-W${flag} ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
[CFLAGS="-Wsign-compare ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
-AC_CACHE_CHECK([if \$CC accepts -Wdisabled-optimization],
- [ac_cv_c_Wdisabled_optimization],
- [CFLAGS="-Wdisabled-optimization ${CFLAGS_save}"
- AC_TRY_COMPILE([],,ac_cv_c_Wdisabled_optimization=yes, ac_cv_c_Wdisabled_optimization=no)])
-
-AC_CACHE_CHECK([if \$CC accepts -Winline],
- [ac_cv_c_Winline],
- [CFLAGS="-Winline ${CFLAGS_save}"
- AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)])
-
-if test "x${ac_cv_c_Wall}" != "xno"; then
+if test "${ac_cv_c_Wall}" != "no"; then
CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall ${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}"
-
- 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_Winline}" != "xno"; then
- CXXFLAGS_save="-Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
- fi
-
-fi
-
-if test "x${ac_cv_c_Wsign_compare}" != "xno"; then
+if test "${ac_cv_c_Wsign_compare}" != "no"; then
CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
-if test "x${ac_cv_c_Wdisabled_optimization}" != "xno"; then
- CFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- CXXFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
- OBJCFLAGS_save="-Wdisabled-optimization ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-fi
-
-if test "x${ac_cv_c_Winline}" != "xno"; then
- CFLAGS_save="-Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
- OBJCFLAGS_save="-Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
-fi
-
dnl Check for -pipe
AC_CACHE_CHECK([if \$CC accepts -pipe],
[ac_cv_c_pipe],
[CFLAGS="${CFLAGS_save} -pipe"
AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)])
-if test "x${ac_cv_c_pipe}" != "xno"; then
+if test "${ac_cv_c_pipe}" != "no"; then
CFLAGS_save="${CFLAGS_save} -pipe"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -pipe"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -pipe"; OBJCFLAGS="${OBJCFLAGS_save}"
[ac_cv_c_o3],
[CFLAGS="${CFLAGS_save} -O3"
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "x${ac_cv_c_o3}" != "xno"; then
+if test "${ac_cv_c_o3}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
fi
[ac_cv_c_o2],
[CFLAGS="${CFLAGS_save} -O2"
AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
-if test "x${ac_cv_c_o2}" != "xno"; then
- if test "x${ac_cv_c_o3}" = "xno"; then
+if test "${ac_cv_c_o2}" != "no"; then
+ if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
[ac_cv_c_o],
[CFLAGS="${CFLAGS_save} -O"
AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
- if test "x${ac_cv_c_o}" != "xno"; then
- if test "x${ac_cv_c_o3}" = "xno"; then
+ if test "${ac_cv_c_o}" != "no"; then
+ if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
[ac_cv_c_fast_math],
[CFLAGS="${CFLAGS_save} -ffast-math"
AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)])
-if test "x${ac_cv_c_fast_math}" != "xno"; then
+if test "${ac_cv_c_fast_math}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math"
fi
dnl Check for -funroll-loops
dnl Disabled on BeOS because BeOS' gcc is buggy and may crash with it
-if test "x${SYS}" != "xbeos"
+if test "${SYS}" != "beos"
then
AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
[ac_cv_c_unroll_loops],
[CFLAGS="${CFLAGS_save} -funroll-loops"
AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
- if test "x${ac_cv_c_unroll_loops}" != "xno"; then
+ if test "${ac_cv_c_unroll_loops}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops"
fi
fi
[ac_cv_c_omit_frame_pointer],
[CFLAGS="${CFLAGS_save} -fomit-frame-pointer"
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
-if test "x${ac_cv_c_omit_frame_pointer}" != "xno"; then
+if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
# this plugin does not compile without -fomit-frame-pointer, damn gcc!
- CFLAGS_i420_yuy2_mmx="${CFLAGS_i420_yuy2_mmx} -fomit-frame-pointer"
+ AX_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer])
fi
dnl Check for -mdynamic-no-pic
[ac_cv_c_dynamic_no_pic],
[CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
-if test "x${ac_cv_c_dynamic_no_pic}" != "xno"; then
- CFLAGS_builtins="${CFLAGS_builtins} -mdynamic-no-pic"
- CFLAGS_libvlc="${CFLAGS_libvlc} -mdynamic-no-pic"
+if test "${ac_cv_c_dynamic_no_pic}" != "no"; then
+ AX_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
+ AX_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
fi
dnl Check for Darwin plugin linking flags
[ac_cv_ld_darwin],
[CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic"
AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
-if test "x${ac_cv_ld_darwin}" != "xno"; then
- LDFLAGS_plugins="${LDFLAGS_plugins} -bundle -undefined error -lcc_dynamic"
+if test "${ac_cv_ld_darwin}" != "no"; then
+ AX_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic])
fi
dnl Check for standard plugin linking flags
dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
-if test "x${SYS}" = "xbeos"; then
- LDFLAGS_plugins="${LDFLAGS_plugins} -nostart"
+if test "${SYS}" = "beos"; then
+ AX_ADD_LDFLAGS([plugin mozilla],[-nostart])
else
- AC_CACHE_CHECK([if \$CC accepts -shared],
- [ac_cv_ld_plugins],
- [CFLAGS="${CFLAGS_save} -shared"
- AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
- if test "x${ac_cv_ld_plugins}" != "xno"; then
- LDFLAGS_plugins="${LDFLAGS_plugins} -shared"
- fi
+ AC_CACHE_CHECK([if \$CC accepts -shared],
+ [ac_cv_ld_plugins],
+ [CFLAGS="${CFLAGS_save} -shared"
+ AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+ if test "${ac_cv_ld_plugins}" != "no"; then
+ AX_ADD_LDFLAGS([plugin mozilla],[-shared])
+ fi
fi
dnl Check for variadic macros
[a("foo");a("%s","bar");a("%s%s","baz","quux");],
ac_cv_cpp_variadic_macros=yes,
ac_cv_cpp_variadic_macros=no)])
-if test "x${ac_cv_cpp_variadic_macros}" != "xno"; then
+if test "${ac_cv_cpp_variadic_macros}" != "no"; then
AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros)
fi
[ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"])
done
CFLAGS="${CFLAGS_save}"])
-if test "x${ac_cv_c_attribute_aligned}" != "x0"; then
+if test "${ac_cv_c_attribute_aligned}" != "0"; then
AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
[${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
fi
[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
+if test "${ac_cv_c_attribute_format}" != "no"; 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
-case "x${target_cpu}" in
- x)
+case "${target_cpu}" in
+ "")
ARCH=unknown
;;
*)
case "${ARCH}" in
hppa64)
- CFLAGS_mpeg_video_old="${CFLAGS_mpeg_video_old} -ffunction-sections"
+ AX_ADD_CFLAGS([mpeg_video_old],[-ffunction-sections])
;;
esac
[ --enable-gprof gprof profiling (default disabled)])
AC_ARG_ENABLE(cprof,
[ --enable-cprof cprof profiling (default disabled)])
-AM_CONDITIONAL(GPROF, test "${enable_gprof}" = "yes")
-AM_CONDITIONAL(CPROF, test "${enable_gprof}" = "yes")
+test "${enable_gprof}" != "yes" && enable_gprof="no"
+test "${enable_cprof}" != "yes" && enable_cprof="no"
dnl
dnl default modules
dnl
-#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion"
-PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
-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 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} rawvideo"
-PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
-PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms"
-PLUGINS="${PLUGINS} access_ftp access_directory sap httpd http"
+#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([deinterlace invert adjust wall transform distort clone crop motionblur])
+AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
+AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
+AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
+AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
+AX_ADD_PLUGINS([aout_file])
+#AX_ADD_PLUGINS([scope])
+AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
+AX_ADD_PLUGINS([id3 m3u])
+AX_ADD_PLUGINS([rawvideo])
+AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys au])
+AX_ADD_PLUGINS([access_file access_udp access_http ipv4 access_mms])
+AX_ADD_PLUGINS([access_ftp access_directory sap httpd http])
dnl
dnl Switch to enable a version of VLC where most modules will be builtin
dnl
AC_ARG_ENABLE(mostly-builtin,
[ --enable-mostly-builtin most modules will be built-in (default disabled)])
-if test "x${enable_mostly_builtin}" = "xyes"; then
- BUILTINS="${BUILTINS} ${PLUGINS}"
+if test "${enable_mostly_builtin}" = "yes"; then
+ AX_ADD_BUILTINS([${PLUGINS}])
PLUGINS=""
fi
dnl
dnl Some plugins aren't useful on some platforms
dnl
-if test "x${SYS}" != "xmingw32"; then
- PLUGINS="${PLUGINS} screensaver"
+if test "${SYS}" != "mingw32"; then
+ AX_ADD_PLUGINS([screensaver])
fi
dnl
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
-if test "x${ac_cv_mmx_inline}" != "xno"; then
+if test "${ac_cv_mmx_inline}" != "no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
fi
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
-if test "x${ac_cv_mmxext_inline}" != "xno"; then
+if test "${ac_cv_mmxext_inline}" != "no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
fi
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
-if test "x${ac_cv_3dnow_inline}" != "xno"; then
+if test "${ac_cv_3dnow_inline}" != "no"; then
AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
fi
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
-if test "x${ac_cv_sse_inline}" != "xno" -a "x${SYS}" != "xmingw32"; then
+if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32"; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi
-if test "x${SYS}" != "xmingw32"; then
+if test "${SYS}" != "mingw32"; then
AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly],
[ac_cv_altivec_inline],
[CFLAGS="${CFLAGS_save}"
[ac_cv_altivec_inline="-Wa,-m7400"],
ac_cv_altivec_inline=no)
])])
-if test "x${ac_cv_altivec_inline}" != "xno"; then
+if test "${ac_cv_altivec_inline}" != "no"; then
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.)
- if test "x${ac_cv_altivec_inline}" != "xyes"; then
- CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_altivec_inline}"
- CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_altivec_inline}"
- CFLAGS_memcpyaltivec="${CFLAGS_memcpyaltivec} ${ac_cv_altivec_inline}"
- CFLAGS_vlc="${CFLAGS_vlc} ${ac_cv_altivec_inline}"
+ if test "${ac_cv_altivec_inline}" != "yes"; then
+ AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}])
+ AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}])
+ AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
+ AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}])
fi
ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi
[ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
])
CFLAGS="${CFLAGS_save}"])
-if test "x${ac_cv_c_altivec}" != "xno"; then
+if test "${ac_cv_c_altivec}" != "no"; then
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
- CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_c_altivec}"
- CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_c_altivec}"
- CFLAGS_memcpyaltivec="${CFLAGS_memcpyaltivec} ${ac_cv_c_altivec}"
- CFLAGS_vlc="${CFLAGS_vlc} ${ac_cv_c_altivec}"
+ AX_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[${ac_cv_c_altivec}])
ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi
AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
LDFLAGS="${LDFLAGS_save}"
])
-if test "x${ac_cv_ld_altivec}" != "xno"; then
- LDFLAGS_idctaltivec="${LDFLAGS_idctaltivec} -framework vecLib"
- LDFLAGS_motionaltivec="${LDFLAGS_motionaltivec} -framework vecLib"
- LDFLAGS_memcpyaltivec="${LDFLAGS_memcpyaltivec} -framework vecLib"
- LDFLAGS_vlc="${LDFLAGS_vlc} -framework vecLib"
+if test "${ac_cv_ld_altivec}" != "no"; then
+ AX_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib])
fi
-fi # end "x$SYS" != "xmingw32"
+fi # end "${SYS}" != "mingw32"
AC_ARG_WITH(,[])
AC_ARG_WITH(,[Optimization options:])
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
(default i686 on IA-32 and 750 on PPC)])
-if test "x${with_tuning}" != "x"; then
- if test "x${target_cpu}" = "xpowerpc"; then
+if test -n "${with_tuning}"; then
+ if test "${target_cpu}" = "powerpc"; then
CFLAGS_TUNING="-mtune=${with_tuning}"
else
CFLAGS_TUNING="-mcpu=${with_tuning}"
fi
else
- if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xi486" -o "x${target_cpu}" = "xi386"; then CFLAGS_TUNING="-mcpu=pentiumpro"
+ if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then CFLAGS_TUNING="-mcpu=pentiumpro"
else
- if test "x${target_cpu}" = "xpowerpc"; then CFLAGS_TUNING="-mtune=750"; fi
+ if test "${target_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=750"; fi
fi
fi
dnl
dnl x86 accelerations
dnl
-if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xx86" -o "x${target_cpu}" = "xi386"
+if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "x86" -o "${target_cpu}" = "i386"
then
ARCH="${ARCH} mmx"
- BUILTINS="${BUILTINS} ${ACCEL_MODULES}"
+ AX_ADD_BUILTINS([${ACCEL_MODULES}])
fi
dnl
dnl
AC_ARG_ENABLE(optimizations,
[ --disable-optimizations disable compiler optimizations (default enabled)])
-AM_CONDITIONAL(OPTIM, test "x${enable_optimizations}" != "xno")
+test "${enable_optimizations}" != "no" && enable_optimizations="yes"
dnl
dnl AltiVec acceleration
dnl
AC_ARG_ENABLE(altivec,
[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)],
-[ if test "x${enable_altivec}" = "xyes"; then ARCH="${ARCH} altivec";
- BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
-[ if test "x${target_cpu}" = "xpowerpc"; then ARCH="${ARCH} altivec";
- BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
+[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec";
+ AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ],
+[ if test "${target_cpu}" = "powerpc"; then ARCH="${ARCH} altivec";
+ AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ])
dnl
dnl Debugging mode
dnl
AC_ARG_ENABLE(debug,
[ --enable-debug debug mode (default disabled)])
-AM_CONDITIONAL(DEBUG, test "x${enable_debug}" = "xyes")
+test "${enable_debug}" != "yes" && enable_debug="no"
dnl
dnl Enable release-specific flags
dnl
AC_ARG_ENABLE(release,
[ --enable-release activate extra optimizations (default disabled)])
-AM_CONDITIONAL(RELEASE, test "x${enable_release}" = "xyes")
+test "${enable_release}" != "yes" && enable_release="no"
dnl
dnl Stream output
dnl
AC_ARG_ENABLE(sout,
[ --enable-sout Stream output modules (default enabled)])
-if test "x${enable_sout}" != "xno"
+if test "${enable_sout}" != "no"
then
- 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"
+ 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([packetizer_mpegaudio packetizer_mpegvideo packetizer_a52])
+ AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
+ AX_ADD_PLUGINS([packetizer_copy])
- PLUGINS="${PLUGINS} stream_out_dummy stream_out_standard stream_out_es"
- PLUGINS="${PLUGINS} stream_out_duplicate stream_out_display"
+ AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es])
+ AX_ADD_PLUGINS([stream_out_duplicate stream_out_display])
- 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" ])
- ],[])
+ dnl Ogg and vorbis are handled in their respective section
fi
dnl
AC_ARG_ENABLE(dvd,
[ --enable-dvd DVD input module (default enabled)])
-if test "x${enable_dvd}" != "xno"
+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 "x${with_dvdcss}" in
- x|xyes)
- if test "x${with_dvdcss_tree}" = x
+ case "${with_dvdcss}" in
+ ""|yes)
+ if test -z "${with_dvdcss_tree}"
then
AC_CHECK_HEADERS(dvdcss/dvdcss.h,
- [ PLUGINS="${PLUGINS} dvd"
- LDFLAGS_dvd="${LDFLAGS_dvd} -ldvdcss"
- LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvdcss" ],
+ [ 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=<path/where/libdvdcss/was/installed> for dynamic linking (recommended under Unix) or --with-dvdcss-tree=<path/where/libdvdcss/was/built> 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 "x${real_dvdcss_tree}" = "x"
+ if test -z "${real_dvdcss_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom libdvdcss
AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
- BUILTINS="${BUILTINS} dvd"
- LDFLAGS_dvd="${LDFLAGS_dvd} -L${real_dvdcss_tree}/src/.libs -ldvdcss"
- LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -L${real_dvdcss_tree}/src/.libs -ldvdcss"
- CPPFLAGS_dvd="${CPPFLAGS_dvd} -I${real_dvdcss_tree}/src"
+ 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)
fi
fi
;;
- xno)
+ no)
dnl Compile without dvdcss (dlopen version, works only under Linux)
- PLUGINS="${PLUGINS} dvd"
- CPPFLAGS_dvd="${CPPFLAGS_dvd} -DGOD_DAMN_DMCA"
- LDFLAGS_dvd="${LDFLAGS_dvd} -ldl"
+ 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})
then
dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} dvd"
- LDFLAGS_dvd="${LDFLAGS_dvd} -L${with_dvdcss}/lib -ldvdcss"
- LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -L${with_dvdcss}/lib -ldvdcss"
- CPPFLAGS_dvd="${CPPFLAGS_dvd} -I${with_dvdcss}/include"
+ 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)
dnl
AC_ARG_ENABLE(dvdread,
[ --enable-dvdread dvdread input module (default disabled)])
-if test "x${enable_dvdread}" != "xno"
+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 "x${with_dvdread}" = x
+ if test -z "${with_dvdread}"
then
- if test "x${with_dvdread_tree}" = x
+ if test -z "${with_dvdread_tree}"
then
AC_CHECK_HEADERS(dvdread/dvd_reader.h,
- [ PLUGINS="${PLUGINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} -ldvdread ${LDFLAGS_dvdcss}" ],
- [ if test "x${enable_dvdread}" != "x"
+ [ 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 ])
+ 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 "x${real_dvdread_tree}" = "x"
+ if test -z "${real_dvdread_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
- BUILTINS="${BUILTINS} dvdread"
- LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}"
- CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}"
+ 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)
then
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_dvdcss}"
- CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${with_dvdread}/include"
+ 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)
dnl
AC_ARG_ENABLE(dvdplay,
[ --enable-dvdplay dvdplay input module (default enabled)])
-if test "x${enable_dvdplay}" != "xno"
+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 "x${with_dvdplay}" = x
+ if test -z "${with_dvdplay}"
then
- if test "x${with_dvdplay_tree}" = x
+ if test -z "${with_dvdplay_tree}"
then
- AC_CHECK_HEADERS(dvdplay/dvdplay.h,
- [ PLUGINS="${PLUGINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
- CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread}" ],
- [ if test "x${enable_dvdplay}" != "x"
+ 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 ])
+ 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 "x${real_dvdplay_tree}" = "x"
+ if test -z "${real_dvdplay_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom libdvdplay
AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a)
- BUILTINS="${BUILTINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
- CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src"
+ 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)
fi
else
AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay})
- if test -f ${with_dvdplay}/include/dvdplay/dvdplay.h
+ if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h"
then
dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} dvdplay"
- LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}"
- CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${with_dvdplay}/include"
+ 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)
dnl
AC_ARG_ENABLE(dvbpsi,
[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)])
-if test "x${enable_dvbpsi}" != "xno"
+if test "${enable_dvbpsi}" != "no"
then
AC_ARG_WITH(dvbpsi,
[ --with-dvbpsi=PATH libdvbpsi headers and libraries])
AC_ARG_WITH(dvbpsi,
[ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
- case "x${with_dvbpsi}" in
- x|xyes)
- if test "x${with_dvbpsi_tree}" = "x"
+ case "${with_dvbpsi}" in
+ ""|yes)
+ if test -z "${with_dvbpsi_tree}"
then
AC_CHECK_HEADERS(dvbpsi/dr.h,
- [ PLUGINS="${PLUGINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi"
- PLUGINS="${PLUGINS} mux_ts_dvbpsi"
- LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ],
+ [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi])
+ AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-ldvbpsi]) ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H )
# include <stdint.h>
else
AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`"
- if test "x${real_dvbpsi_tree}" = "x"
+ if test -z "${real_dvbpsi_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- BUILTINS="${BUILTINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi"
- CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} -I${real_dvbpsi_tree}/src"
-
- BUILTINS="${BUILTINS} mux_ts_dvbpsi"
- LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi"
- CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} -I${real_dvbpsi_tree}/src"
-
+ AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi])
+ AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-I${real_dvbpsi_tree}/src])
+ AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi])
else
dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no)
fi
fi
;;
- xno)
+ no)
dnl Compile without dvbpsi
;;
*)
AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi})
- if test "x${with_dvbpsi}" = "x"
+ if test -z "${with_dvbpsi}"
then
LDFLAGS_test=""
CPPFLAGS_test=""
CPPFLAGS_test="-I${with_dvbpsi}/include"
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
- AC_CHECK_HEADER([dvbpsi/dr.h],[
- PLUGINS="${PLUGINS} ts_dvbpsi"
- LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi"
- CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} ${CPPFLAGS_test}"
- PLUGINS="${PLUGINS} mux_ts_dvbpsi"
- LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi"
- CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} ${CPPFLAGS_test}"
+ AC_CHECK_HEADERS([dvbpsi/dr.h],[
+ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi])
+ AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi],[${CPPFLAGS_test}])
+ AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[${LDFLAGS_test} -ldvbpsi])
- ],[
- if test "x${enable_dvbpsi}" != "x"
+ ],[
+ 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
dnl
AC_ARG_ENABLE(v4l,
[ --enable-v4l Video4Linux input support (default disabled)])
-if test "x${enable_v4l}" = "xyes"
+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, [
- PLUGINS="${PLUGINS} v4l"
- ],[])
+ AX_ADD_PLUGINS([v4l])
+ ],[])
+ CPPFLAGS="${CPPFLAGS_save}"
fi
dnl
dnl
AC_ARG_ENABLE(pvr,
[ --enable-pvr PVR cards access module (default disabled)])
-if test "x${enable_pvr}" = "xyes"
+if test "${enable_pvr}" = "yes"
then
- PLUGINS="${PLUGINS} pvr"
+ AX_ADD_PLUGINS([pvr])
fi
dnl
AC_ARG_ENABLE(vcd,
[ --enable-vcd VCD support for Linux, FreeBSD, MacOS X and Win32 (default enabled)])
-if test "x${enable_vcd}" != "xno"
+if test "${enable_vcd}" != "no"
then
AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} vcd cdda"
+ AX_ADD_PLUGINS([vcd cdda])
],[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for scsireq in sys/scsiio.h)
AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} vcd cdda"
+ AX_ADD_PLUGINS([vcd cdda])
AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
],[
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h)
AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} vcd cdda"
+ AX_ADD_PLUGINS([vcd cdda])
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
],[
AC_MSG_RESULT(no)
])
- if test "x${SYS}" = "xbsdi" -o "x${SYS}" = "xmingw32"
+ if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32"
then
- PLUGINS="${PLUGINS} vcd cdda"
+ AX_ADD_PLUGINS([vcd cdda])
fi
- if test "x${SYS}" = "xdarwin"
+ if test "${SYS}" = "darwin"
then
- PLUGINS="${PLUGINS} vcd cdda"
- LDFLAGS_vcd="${LDFLAGS_vcd} -framework IOKit -framework CoreFoundation"
- LDFLAGS_cdda="${LDFLAGS_cdda} -framework IOKit -framework CoreFoundation"
+ AX_ADD_PLUGINS([vcd cdda])
+ AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation])
fi
fi
dnl
AC_ARG_ENABLE(satellite,
[ --enable-satellite satellite card support (default disabled)],
- [ if test "x${enable_satellite}" = "xyes"
+ [ if test "${enable_satellite}" = "yes"
then
- PLUGINS="${PLUGINS} satellite"
+ AX_ADD_PLUGINS([satellite])
fi])
dnl
dnl ipv6 plugin - not for QNX yet
dnl
-if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32"
+if test "${SYS}" != "nto" && test "${SYS}" != "mingw32"
then
have_ipv6=false
AC_CHECK_FUNCS(inet_pton,[have_ipv6=:],[
AC_CHECK_LIB(resolv,inet_pton,
[have_ipv6=:
- LDFLAGS_ipv6="${LDFLAGS_ipv6} -lresolv"])
+ AX_ADD_LDFLAGS([ipv6],[-lresolv])])
])
AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h)
AC_EGREP_HEADER(sockaddr_in6,netinet/in.h,
- [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=false])
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) have_ipv6=false])
if ${have_ipv6}; then
- PLUGINS="${PLUGINS} ipv6"
+ AX_ADD_PLUGINS([ipv6])
fi
fi
-if test "x${SYS}" = "xmingw32"
+if test "${SYS}" = "mingw32"
then
AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h)
AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)])
+ AX_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)])
fi
dnl
-dnl ogg plugin
+dnl ogg demux plugin
dnl
AC_ARG_ENABLE(ogg,
[ --enable-ogg Ogg demux support (default enabled)])
-if test "x${enable_ogg}" != "xno"
+if test "${enable_ogg}" != "no"
then
AC_CHECK_HEADERS(ogg/ogg.h, [
AC_CHECK_LIB( ogg, oggpack_read, [
- PLUGINS="${PLUGINS} ogg"
- LDFLAGS_ogg="${LDFLAGS_ogg} -logg"
AC_CHECK_LIB( ogg, oggpackB_read, [
- CPPFLAGS_ogg="${CPPFLAGS_ogg} -DHAVE_OGGPACKB"])])
+ AX_ADD_CPPFLAGS([ogg],[-DHAVE_OGGPACKB])])
+ AX_ADD_PLUGINS([ogg mux_ogg])
+ AX_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
],[])
fi
+dnl
+dnl matroska demux plugin
+dnl
+AC_ARG_ENABLE(mkv,
+ [ --enable-mkv Matroska demux support (default disabled)])
+if test "${enable_mkv}" = "yes"
+then
+AC_LANG_PUSH(C++)
+ dnl matroska headers include ebml headers directly... pouah that stinks
+ CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
+ AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+ AX_ADD_PLUGINS([mkv])
+ AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
+ AC_CHECK_LIB(ebml_pic,main,[
+ # We have ebml_pic, that's good, we can build an mkv.so plugin !
+ AX_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
+ ],[
+ AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+ ])
+ ],[
+ AC_MSG_ERROR([libebml or libmatroska include files not found])
+ ])
+ CPPFLAGS="${CPPFLAGS_save}"
+AC_LANG_POP(C++)
+fi
+
dnl
dnl Codec plugins
dnl
dnl
AC_ARG_ENABLE(mad,
[ --enable-mad libmad module (default enabled)])
-if test "x${enable_mad}" != "xno"
+if test "${enable_mad}" != "no"
then
AC_ARG_WITH(mad,
[ --with-mad=PATH path to libmad],[],[])
- if test "x${with_mad}" != "xno" -a "x${with_mad}" != "x"
+ if test "${with_mad}" != "no" -a -n "${with_mad}"
then
- CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${with_mad}/include"
- LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${with_mad}/lib"
+ AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
+ AX_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib])
fi
AC_ARG_WITH(mad-tree,
[ --with-mad-tree=PATH mad tree for static linking],[],[])
- if test "x${with_mad_tree}" != "xno" -a "x${with_mad_tree}" != "x"
+ 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 "x${real_mad_tree}" = "x"
+ if test -z "${real_mad_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
if test -f ${real_mad_tree}/libmad/mad.h
then
AC_MSG_RESULT(yes)
- CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${real_mad_tree}/libmad"
- LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${real_mad_tree}/libmad/.libs"
+ AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}/libmad])
+ AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/libmad/.libs])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}"
AC_CHECK_LIB(mad, mad_bit_init, [
- BUILTINS="${BUILTINS} mpgatofixed32"
- LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad"
+ AX_ADD_BUILTINS([mpgatofixed32])
+ AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])
],[ AC_MSG_ERROR([the specified tree hasn't been compiled ])
],[])
LDFLAGS="${LDFLAGS_save}"
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
- PLUGINS="${PLUGINS} mpgatofixed32"
- LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad" ],
+ AX_ADD_PLUGINS([mpgatofixed32])
+ AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])],
[ AC_MSG_ERROR([Cannot find libmad library...]) ])
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS="${LDFLAGS_save}"
dnl
AC_CHECK_HEADERS(id3tag.h, [
AC_CHECK_HEADERS(zlib.h, [
- LDFLAGS_id3tag="${LDFLAGS_id3tag} -lid3tag -lz"
- PLUGINS="${PLUGINS} id3tag"]) ])
+ AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
+ AX_ADD_PLUGINS([id3tag])]) ])
dnl
dnl ffmpeg decoder plugin
dnl
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)])
-if test "x${enable_ffmpeg}" != "xno"
+if test "${enable_ffmpeg}" != "no"
then
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
dnl
dnl test for !(--with-ffmpeg-tree)
dnl
- if test "x${with_ffmpeg_tree}" == "xno" -o "x${with_ffmpeg_tree}" == "x";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)
AC_CHECK_LIB(avcodec, avcodec_init, [
- BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
- LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lavcodec"
+ AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
+ AX_ADD_LDFLAGS([ffmpeg],[-lavcodec])
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
- LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode}" ],
+ AX_ADD_LDFLAGS([stream_out_transcode],[]) ],
[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
dnl
dnl test for --with-ffmpeg-tree
dnl
- if test "x${with_ffmpeg_tree}" != "xno" -a "x${with_ffmpeg_tree}" != "x";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 "x${real_ffmpeg_tree}" = x; 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}])
if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
- BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
- LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
- CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
+ AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
+ AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec])
+ AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec])
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
- LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${real_ffmpeg_tree}/libavcodec"
- CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${real_ffmpeg_tree}/libavcodec"
+ AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
+ AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec])
else
dnl The given libavcodec wasn't built
AC_MSG_RESULT(no)
fi
dnl Duplicate the ffmpeg CPPFLAGS and LDFLAGS for the encoder
- CPPFLAGS_encoder_ffmpeg="${CPPFLAGS_ffmpeg}"
+ AX_ADD_CPPFLAGS([encoder_ffmpeg],[${CPPFLAGS_ffmpeg}])
dnl XXX: we don't link with -lavcodec blah blah blah
- #LDFLAGS_encoder_ffmpeg="${LDFLAGS_ffmpeg}"
+ dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}])
+
+ AC_CHECK_HEADERS(vorbis/vorbisenc.h vorbis/codec.h,
+ AX_ADD_LDFLAGS([stream_out_transcode],[-lvorbisenc -lvorbis -logg]) )
fi
dnl
dnl
AC_ARG_ENABLE(faad,
[ --enable-faad faad codec (default disabled)])
-if test "x${enable_faad}" = "xyes"
+if test "${enable_faad}" = "yes"
then
AC_ARG_WITH(faad-tree,
[ --with-faad-tree=PATH faad tree for static linking])
- if test "x${with_faad_tree}" != "x"
+ 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 "x${real_faad_tree}" = x
+ if test -z "${real_faad_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom faad
AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
- BUILTINS="${BUILTINS} faad"
- LDFLAGS_faad="${LDFLAGS_faad} -L${real_faad_tree}/libfaad/.libs -lfaad"
- CPPFLAGS_faad="${CPPFLAGS_faad} -I${real_faad_tree}/include"
+ AX_ADD_BUILTINS([faad])
+ AX_ADD_LDFLAGS([faad],[-L${real_faad_tree}/libfaad/.libs -lfaad])
+ AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_faad}"
AC_TRY_COMPILE([#include <faad.h>],
AC_CHECK_HEADERS(faad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
AC_CHECK_LIB(faad, faacDecOpen, [
- PLUGINS="${PLUGINS} faad"
- LDFLAGS_faad="${LDFLAGS_faad} -lfaad"
+ AX_ADD_PLUGINS([faad])
+ AX_ADD_LDFLAGS([faad],[-lfaad])
AC_TRY_COMPILE([#include <faad.h>],
[faacDecHandle a; faacDecFrameInfo *b; unsigned char *c;
unsigned long d; faacDecDecode(a,b,c,d);],
dnl
AC_ARG_ENABLE(xvid,
[ --enable-xvid xvid codec (default disabled)])
-if test "x${enable_xvid}" = "xyes"
+if test "${enable_xvid}" = "yes"
then
AC_ARG_WITH(xvid,
[ --with-xvid=PATH path to xvid installation],[],[])
- if test "x${with_xvid}" != "xno" -a "x${with_xvid}" != "x"
+ if test "${with_xvid}" != "no" -a -n "${with_xvid}"
then
- CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${with_xvid}/include"
- LDFLAGS_xvid="${LDFLAGS_xvid} -L${with_xvid}/lib"
+ AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
+ AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
fi
- LDFLAGS_xvid="${LDFLAGS_xvid}"
AC_ARG_WITH(xvid-tree,
[ --with-xvid-tree=PATH xvid tree for static linking])
- if test "x${with_xvid_tree}" != "x"
+ 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 "x${real_xvid_tree}" = x
+ if test -z "${real_xvid_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom xvid
AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
- BUILTINS="${BUILTINS} xvid"
- LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore"
- CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src"
+ AX_ADD_BUILTINS([xvid])
+ AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
+ AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
else
dnl The given libxvidcore wasn't built
AC_MSG_RESULT(no)
AC_CHECK_HEADERS(xvid.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
AC_CHECK_LIB(xvidcore, xvid_init, [
- PLUGINS="${PLUGINS} xvid"
- LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
+ AX_ADD_PLUGINS([xvid])
+ AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
[ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
fi
dnl Duplicate the xvid CPPFLAGS and LDFLAGS for the encoder
- LDFLAGS_encoder_xvid=${LDFLAGS_xvid}
- CPPFLAGS_encoder_xvid=${CPPFLAGS_xvid}
+ AX_ADD_LDFLAGS([encoder_xvid],[${LDFLAGS_xvid}])
+ AX_ADD_CPPFLAGS([encoder_xvid],[${CPPFLAGS_xvid}])
fi
dnl
dnl
AC_ARG_ENABLE(quicktime,
[ --enable-quicktime QuickTime module (default enabled on MacOS X)])
-if test "x${enable_quicktime}" != "xno" &&
- (test "x${SYS}" = "xdarwin" || test "x${enable_quicktime}" = "xyes")
+if test "${enable_quicktime}" != "no" &&
+ (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
then
AC_CHECK_HEADERS(QuickTime/QuickTime.h,
- [ BUILTINS="${BUILTINS} quicktime"
- LDFLAGS_quicktime="${LDFLAGS_quicktime} -framework QuickTime -framework Carbon"
+ [ AX_ADD_BUILTINS([quicktime])
+ AX_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
dnl MP4 module
dnl
AC_CHECK_HEADERS(zlib.h, [
- LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
- LDFLAGS_skins="${LDFLAGS_skins} -lz"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lz"
+ AX_ADD_LDFLAGS([mp4 skins basic_skins],[-lz])
] )
dnl skins module
dnl
AC_CHECK_HEADERS(libtar.h, [
- LDFLAGS_skins="${LDFLAGS_skins} -ltar"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -ltar"
+ AX_ADD_LDFLAGS([skins basic_skins],[-ltar])
] )
dnl
AC_ARG_ENABLE(a52,
[ --enable-a52 A/52 support with liba52 (default enabled)])
-if test "x${enable_a52}" != "xno"
+if test "${enable_a52}" != "no"
then
AC_ARG_WITH(a52,
[ --with-a52=PATH a52 headers and libraries])
AC_ARG_WITH(a52-tree,
[ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
- if test "x${with_a52_tree}" != "xno" -a "x${with_a52_tree}" != "x"
+ 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 "x${real_a52_tree}" = "x"
+ if test -z "${real_a52_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
if test -f ${real_a52_tree}/include/a52.h
then
AC_MSG_RESULT(yes)
- CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} -I${real_a52_tree}"
- LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -L${real_a52_tree}/liba52/.libs"
+ AX_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}])
+ AX_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}"
AC_CHECK_LIB(a52, a52_free, [
- BUILTINS="${BUILTINS} a52tofloat32"
- LDFLAGS_a52tofloat32="-la52 ${LDFLAGS_a52tofloat32}"
- CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} -DUSE_A52DEC_TREE"
+ AX_ADD_BUILTINS([a52tofloat32])
+ AX_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
+ AX_ADD_LDFLAGS([a52tofloat32],[-la52])
],[
if test -f ${real_a52_tree}/liba52/.libs/liba52.a
then
AC_MSG_ERROR([the specified tree doesn't have a52.h])
fi
else
- if test "x${with_a52}" = "x"
+ if test -z "${with_a52}"
then
LDFLAGS_test=""
CPPFLAGS_test=""
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
- PLUGINS="${PLUGINS} a52tofloat32"
- LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}"
- CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}"
+ AX_ADD_PLUGINS([a52tofloat32])
+ AX_ADD_LDFLAGS([a52tofloat32],[${LDFLAGS_test} -la52])
+ AX_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}])
],[
AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
])
dnl
AC_ARG_ENABLE(dv,
[ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)])
-if test "x${enable_dv}" = "xyes"
+if test "${enable_dv}" = "yes"
then
AC_CHECK_HEADERS(libdv/dv.h, [
- PLUGINS="${PLUGINS} dv"
- LDFLAGS_dv="${LDFLAGS_dv} -ldv"
+ AX_ADD_PLUGINS([dv])
+ AX_ADD_LDFLAGS([dv],[-ldv])
],[])
fi
dnl
AC_ARG_ENABLE(flac,
[ --enable-flac flac decoder support (default disabled)])
-if test "x${enable_flac}" = "xyes"
+if test "${enable_flac}" = "yes"
then
AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
- PLUGINS="${PLUGINS} flac flacdec"
- LDFLAGS_flacdec="${LDFLAGS_flacdec} -lFLAC"
+ AX_ADD_PLUGINS([flac flacdec])
+ AX_ADD_LDFLAGS([flacdec],[-lFLAC])
],[])
fi
dnl
AC_ARG_ENABLE(libmpeg2,
[ --enable-libmpeg2 libmpeg2 decoder support (default enabled)])
-if test "x${enable_libmpeg2}" != "xno"
+if test "${enable_libmpeg2}" != "no"
then
AC_ARG_WITH(libmpeg2-tree,
[ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
- if test "x${with_libmpeg2_tree}" != "x"
+ 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 "x${real_libmpeg2_tree}" = x
+ if test -z "${real_libmpeg2_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
then
dnl Use a custom libmpeg2
AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
- PLUGINS="${PLUGINS} libmpeg2"
- LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2"
- CFLAGS_libmpeg2="${CFLAGS_libmpeg2} -I${real_libmpeg2_tree}/include"
+ AX_ADD_PLUGINS([libmpeg2])
+ AX_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2])
+ AX_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include])
eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
else
dnl The given libmpeg2 wasn't built
#endif
#endif],
[AC_MSG_RESULT([yes])
- PLUGINS="${PLUGINS} libmpeg2"
- LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"],
+ AX_ADD_PLUGINS([libmpeg2])
+ AX_ADD_LDFLAGS([libmpeg2],[-lmpeg2])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
dnl
AC_ARG_ENABLE(vorbis,
[ --enable-vorbis Vorbis decoder support (default enabled)])
-if test "x${enable_vorbis}" != "xno"
+if test "${enable_vorbis}" != "no"
then
AC_CHECK_HEADERS(vorbis/codec.h, [
- PLUGINS="${PLUGINS} vorbis"
- LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg"
- ],[])
+ AX_ADD_PLUGINS([vorbis])
+ AX_ADD_LDFLAGS([vorbis],[-lvorbis -logg])
+ if test "${enable_sout}" != "no"; then
+ AX_ADD_PLUGINS([packetizer_vorbis])
+ AX_ADD_LDFLAGS([packetizer_vorbis],[-lvorbis -logg])
+ fi ],[])
fi
dnl
dnl
AC_ARG_ENABLE(tremor,
[ --enable-tremor Tremor decoder support (default disabled)])
-if test "x${enable_tremor}" = "xyes"
+if test "${enable_tremor}" = "yes"
then
AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
- PLUGINS="${PLUGINS} tremor"
- LDFLAGS_tremor="${LDFLAGS_tremor} -lvorbisidec -logg"
+ AX_ADD_PLUGINS([tremor])
+ AX_ADD_LDFLAGS([tremor],[-lvorbisidec -logg])
],[])
fi
dnl
AC_ARG_ENABLE(tarkin,
[ --enable-tarkin experimental tarkin codec (default disabled)])
-if test "x${enable_tarkin}" = "xyes"
+if test "${enable_tarkin}" = "yes"
then
AC_ARG_WITH(tarkin-tree,
[ --with-tarkin-tree=PATH tarkin tree for static linking])
- if test "x${with_tarkin_tree}" != "x"
+ 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`"
if test -f "${real_tarkin_tree}/tarkin.o"
then
- BUILTINS="${BUILTINS} tarkin"
- CPPFLAGS_tarkin="${CPPFLAGS_tarkin} -I${real_tarkin_tree}"
- LDFLAGS_tarkin="${LDFLAGS_tarkin} ${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg"
+ AX_ADD_BUILTINS([tarkin])
+ AX_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
+ AX_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
AC_MSG_RESULT(yes)
else
dnl The given tarkin tree wasn't built
dnl
AC_ARG_ENABLE(theora,
[ --enable-theora experimental theora codec (default disabled)])
-if test "x${enable_theora}" = "xyes"
+if test "${enable_theora}" = "yes"
then
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
- BUILTINS="${BUILTINS} theora"
- LDFLAGS_theora="${LDFLAGS_theora} -ltheora -logg" ],[
+ AX_ADD_BUILTINS([theora])
+ AX_ADD_LDFLAGS([theora],[-ltheora -logg]) ],[
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 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
AC_ARG_WITH(,[Video plugins:])
dnl Check for DPMS
-if test "x${SYS}" != "xmingw32"
+if test "${SYS}" != "mingw32"
then
CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
AC_CHECK_HEADERS(X11/extensions/dpms.h, [
dnl
AC_ARG_ENABLE(x11,
[ --enable-x11 X11 support (default enabled)])
-if test "x${enable_x11}" != "xno" &&
- (test "x${SYS}" != "xmingw32" || test "x${enable_x11}" = "xyes"); then
+if test "${enable_x11}" != "no" &&
+ (test "${SYS}" != "mingw32" || test "${enable_x11}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
AC_CHECK_HEADERS(X11/Xlib.h, [
- PLUGINS="${PLUGINS} x11"
- LDFLAGS_x11="${LDFLAGS_x11} -L${x_libraries} -lX11 -lXext"
- CPPFLAGS_x11="${CPPFLAGS_x11} -I${x_includes}"
+ AX_ADD_PLUGINS([x11])
+ AX_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext])
+ AX_ADD_CPPFLAGS([x11],[-I${x_includes}])
AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [
CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension, [
AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
- LDFLAGS_x11="${LDFLAGS_x11} -lXinerama")
+ AX_ADD_LDFLAGS([x11],[-lXinerama])
+ ])
CFLAGS="${CFLAGS_save}"
])
])
dnl
AC_ARG_ENABLE(xvideo,
[ --enable-xvideo XVideo support (default enabled)])
-if test "x${enable_xvideo}" != "xno" &&
- (test "x${SYS}" != "xmingw32" || test "x${enable_xvideo}" = "xyes"); then
+if test "${enable_xvideo}" != "no" &&
+ (test "${SYS}" != "mingw32" || test "${enable_xvideo}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
AC_CHECK_LIB(Xv_pic,XvPutImage,
# We have Xv_pic, that's good, we can build an xvideo.so plugin !
- PLUGINS="${PLUGINS} xvideo"
- LDFLAGS_xvideo="${LDFLAGS_xvideo} -L${x_libraries} -lX11 -lXext -lXv_pic"
- CPPFLAGS_xvideo="${CPPFLAGS_xvideo} -I${x_includes}",
- AC_CHECK_LIB(Xv,XvPutImage,
+ AX_ADD_PLUGINS([xvideo])
+ AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
+ AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]),
+ AC_CHECK_LIB(Xv,XvPutImage,[
# We don't have Xv_pic, but we have Xv, let's make xvideo.a as builtin
- PLUGINS="${PLUGINS} xvideo"
- LDFLAGS_xvideo="${LDFLAGS_xvideo} -L${x_libraries} -lX11 -lXext -lXv"
- CPPFLAGS_xvideo="${CPPFLAGS_xvideo} -I${x_includes}",
+ AX_ADD_PLUGINS([xvideo])
+ AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
+ AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
+ ],[
# Otherwise... well, do nothing.
:
- )
+ ])
)
- AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [
- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+ AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
- LDFLAGS_xvideo="${LDFLAGS_xvideo} -lXinerama")
+ AX_ADD_LDFLAGS([xvideo],[-lXinerama])
+ ])
])
CFLAGS="${CFLAGS_save}"
]
dnl
AC_ARG_ENABLE(sdl,
[ --enable-sdl SDL support (default enabled)])
-if test "x${enable_sdl}" != "xno"
+if test "${enable_sdl}" != "no"
then
SDL_PATH="${PATH}"
AC_ARG_WITH(sdl-config-path,
[ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
- [ if test "x${with_sdl_config_path}" != "xno"
+ [ if test "${with_sdl_config_path}" != "no"
then
SDL_PATH="${with_sdl_config_path}:${PATH}"
fi ])
AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, ${SDL_PATH})
SDL_CONFIG="${SDL12_CONFIG}"
SDL_HEADER="SDL12/SDL.h"
- if test "x${SDL_CONFIG}" = "xno"
+ if test "${SDL_CONFIG}" = "no"
then
AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, ${SDL_PATH})
SDL_CONFIG=${SDL11_CONFIG}
SDL_HEADER="SDL11/SDL.h"
fi
- if test "x${SDL_CONFIG}" = "xno"
+ if test "${SDL_CONFIG}" = "no"
then
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
SDL_HEADER="SDL/SDL.h"
[ --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"
+ if test "${with_sdl_prefix}" != "no" -a -n "${with_sdl_prefix}"
then
SDL_PREFIX="--prefix=${with_sdl_prefix}"
fi
- if test "x${SDL_CONFIG}" != "xno"
+ if test "${SDL_CONFIG}" != "no"
then
- PLUGINS="${PLUGINS} vout_sdl aout_sdl"
- 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,,'`"
+ AX_ADD_PLUGINS([vout_sdl aout_sdl])
+ AX_ADD_CFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`])
+ AX_ADD_LDFLAGS([vout_sdl 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),
Please install it and try again. Alternatively you can also configure with
--disable-sdl.])
fi
- elif test "x${enable_sdl}" = "xyes"
+ elif test "${enable_sdl}" = "yes"
then
AC_MSG_ERROR([I couldn't find the SDL package. You can download libSDL
from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
dnl
AC_ARG_ENABLE(freetype,
[ --enable-freetype freetype support (default enabled)])
-if test "x${enable_freetype}" != "xno"
+if test "${enable_freetype}" != "no"
then
FREETYPE_PATH="${PATH}"
AC_ARG_WITH(freetype-config-path,
[ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)],
- [ if test "x${with_freetype_config_path}" != "xno"
+ [ if test "${with_freetype_config_path}" != "no"
then
FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
fi ])
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
- if test "x${FREETYPE_CONFIG}" != "xno"
+ if test "${FREETYPE_CONFIG}" != "no"
then
- PLUGINS="${PLUGINS} osdtext"
- CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`"
- LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`"
+ AX_ADD_PLUGINS([osdtext])
+ AX_ADD_CFLAGS([osdtext],[`${FREETYPE_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([osdtext],[`${FREETYPE_CONFIG} --libs`])
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
- elif test "x${enable_freetype}" = "xyes"
+ elif test "${enable_freetype}" = "yes"
then
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
dnl
AC_ARG_ENABLE(qte,
[ --enable-qte QT Embedded support (default disabled)])
-if test "x${enable_qte}" = "xyes"
+if test "${enable_qte}" = "yes"
then
AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries])
- if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
- 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"
+ 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])
else
- 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"
+ AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
+ AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
fi
- PLUGINS="${PLUGINS} qte"
+ AX_ADD_PLUGINS([qte])
NEED_QTE_MAIN=yes
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
dnl
AC_ARG_ENABLE(directx,
[ --enable-directx Win32 DirectX support (default enabled on Win32)])
-if test "x${enable_directx}" != "xno"
+if test "${enable_directx}" != "no"
then
- if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then
AC_ARG_WITH(directx,
[ --with-directx=PATH Win32 DirectX headers])
- if test "x${with_directx}" = "x"
+ if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
- [ PLUGINS="${PLUGINS} vout_directx aout_directx"
- LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32" ])
+ [ AX_ADD_PLUGINS([vout_directx aout_directx])
+ AX_ADD_LDFLAGS([vout_directx],[-lgdi32]) ])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
then
- PLUGINS="${PLUGINS} vout_directx aout_directx"
- LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32"
- CPPFLAGS_vout_directx="${CPPFLAGS_vout_directx} -I${with_directx}"
- CPPFLAGS_aout_directx="${CPPFLAGS_aout_directx} -I${with_directx}"
+ AX_ADD_PLUGINS([vout_directx aout_directx])
+ AX_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
+ AX_ADD_LDFLAGS([vout_directx],[-lgdi32])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
dnl
AC_ARG_ENABLE(fb,
[ --enable-fb Linux framebuffer support (default enabled on Linux)])
- if test "x${enable_fb}" != "xno"
+ if test "${enable_fb}" != "no"
then
AC_CHECK_HEADERS(linux/fb.h, [
- PLUGINS="${PLUGINS} fb"
+ AX_ADD_PLUGINS([fb])
])
fi
dnl
AC_ARG_ENABLE(mga,
[ --enable-mga Linux kernel Matrox support (default disabled)],
- [ if test "x${enable_mga}" = "xyes"
+ [ if test "${enable_mga}" = "yes"
then
- PLUGINS="${PLUGINS} mga xmga"
+ AX_ADD_PLUGINS([mga xmga])
fi ])
dnl
dnl
AC_ARG_ENABLE(svgalib,
[ --enable-svgalib SVGAlib support (default disabled)])
-if test "x${enable_svgalib}" = "xyes"
+if test "${enable_svgalib}" = "yes"
then
- PLUGINS="${PLUGINS} svgalib"
- LDFLAGS_svgalib="${LDFLAGS_svgalib} -lvgagl -lvga"
+ AX_ADD_PLUGINS([svgalib])
+ AX_ADD_LDFLAGS([svgalib],[-lvgagl -lvga])
fi
dnl
dnl
AC_ARG_ENABLE(ggi,
[ --enable-ggi GGI support (default disabled)])
-if test "x${enable_ggi}" = "xyes"
+if test "${enable_ggi}" = "yes"
then
- PLUGINS="${PLUGINS} ggi"
- LDFLAGS_ggi="${LDFLAGS_ggi} -lggi"
+ AX_ADD_PLUGINS([ggi])
+ AX_ADD_LDFLAGS([ggi],[-lggi])
AC_ARG_WITH(ggi,
[ --with-ggi=PATH path to libggi],
- [ if test "x${with_ggi}" != "xno" -a "x${with_ggi}" != "x"
+ [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
then
- CPPFLAGS_ggi="${CPPFLAGS_ggi} -I${with_ggi}/include"
- LDFLAGS_ggi="${LDFLAGS_ggi} -L${with_ggi}/lib"
+ AX_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
+ AX_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib])
fi ])
fi
dnl
AC_ARG_ENABLE(glide,
[ --enable-glide Glide (3dfx) support (default disabled)])
-if test "x${enable_glide}" = "xyes"
+if test "${enable_glide}" = "yes"
then
- PLUGINS="${PLUGINS} glide"
- LDFLAGS_glide="${LDFLAGS_glide} -lglide2x -lm"
- CPPFLAGS_glide="${CPPFLAGS_glide} -I/usr/include/glide"
+ AX_ADD_PLUGINS([glide])
+ AX_ADD_LDFLAGS([glide],[-lglide2x -lm])
+ AX_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
AC_ARG_WITH(glide,
[ --with-glide=PATH path to libglide],
- [ if test "x${with_glide}" != "xno" -a "x${with_glide}" != "x"
+ [ if test "${with_glide}" != "no" -a -n "${with_glide}"
then
- CPPFLAGS_glide="${CPPFLAGS_glide} -I${with_glide}/include"
- LDFLAGS_glide="${LDFLAGS_glide} -L${with_glide}/lib"
+ AX_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
+ AX_ADD_LDFLAGS([glide],[-L${with_glide}/lib])
fi ])
fi
dnl
AC_ARG_ENABLE(aa,
[ --enable-aa aalib output (default disabled)])
-if test "x${enable_aa}" = "xyes"
+if test "${enable_aa}" = "yes"
then
AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false")
- if test "x${have_aa}" = "xtrue"
+ if test "${have_aa}" = "true"
then
- PLUGINS="${PLUGINS} aa"
- LDFLAGS_aa="${LDFLAGS_aa} -laa"
+ AX_ADD_PLUGINS([aa])
+ AX_ADD_LDFLAGS([aa],[-laa])
fi
fi
dnl
AC_ARG_ENABLE(wingdi,
[ --enable-wingdi Win32 GDI module (default enabled on Win32)])
-if test "x${enable_wingdi}" != "xno"; then
- if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
- PLUGINS="${PLUGINS} wingdi"
- LDFLAGS_wingdi="${LDFLAGS_wingdi} -lgdi32"
+if test "${enable_wingdi}" != "no"; then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+ AX_ADD_PLUGINS([wingdi])
+ AX_ADD_LDFLAGS([wingdi],[-lgdi32])
fi
fi
AC_ARG_ENABLE(oss,
[ --enable-oss Linux OSS /dev/dsp support (enabled on Linux)])
-if test "x${enable_oss}" != "xno" &&
- (test "x${SYS}" != "xmingw32" || test "x${enable_oss}" = "xyes")
+if test "${enable_oss}" != "no" &&
+ (test "${SYS}" != "mingw32" || test "${enable_oss}" = "yes")
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
- PLUGINS="${PLUGINS} oss"
- AC_CHECK_LIB(ossaudio,main,LDFLAGS_oss="${LDFLAGS_oss} -lossaudio")
+ AX_ADD_PLUGINS([oss])
+ AC_CHECK_LIB(ossaudio,main,AX_ADD_LDFLAGS([oss],[-lossaudio]))
])
fi
dnl
AC_ARG_ENABLE(esd,
[ --enable-esd Esound library support (default disabled)],
- [if test "x${enable_esd}" = "xyes"
+ [if test "${enable_esd}" = "yes"
then
AC_PATH_PROG(ESD_CONFIG, esd-config, no)
- if test "x${ESD_CONFIG}" != "xno"
+ if test "${ESD_CONFIG}" != "no"
then
- PLUGINS="${PLUGINS} esd"
- CFLAGS_esd="${CFLAGS_esd} `${ESD_CONFIG} --cflags`"
- LDFLAGS_esd="${LDFLAGS_esd} `${ESD_CONFIG} --libs`"
+ AX_ADD_PLUGINS([esd])
+ AX_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`])
fi
fi])
dnl
AC_ARG_ENABLE(arts,
[ --enable-arts aRts sound server (default disabled)],
- [if test "x${enable_arts}" = "xyes"
+ [if test "${enable_arts}" = "yes"
then
AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
- if test "x${ARTS_CONFIG}" != "xno"
+ if test "${ARTS_CONFIG}" != "no"
then
- PLUGINS="${PLUGINS} arts"
- CFLAGS_arts="${CFLAGS_arts} `${ARTS_CONFIG} --cflags`"
- LDFLAGS_arts="${LDFLAGS_arts} `${ARTS_CONFIG} --libs `"
+ AX_ADD_PLUGINS([arts])
+ AX_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`])
+ AX_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `])
fi
fi])
dnl
AC_ARG_ENABLE(alsa,
[ --enable-alsa ALSA sound support for Linux (default disabled)],
- [if test "x${enable_alsa}" = "xyes"
+ [if test "${enable_alsa}" = "yes"
then
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"
+ if test "${have_alsa}" = "true"
then
AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>],
[void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }],
AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
- PLUGINS="${PLUGINS} alsa"
- LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"
+ AX_ADD_PLUGINS([alsa])
+ AX_ADD_LDFLAGS([alsa],[-lasound -lm -ldl])
else
AC_MSG_ERROR([Could not find ALSA development headers])
fi
dnl
AC_ARG_ENABLE(waveout,
[ --enable-waveout Win32 waveOut module (default enabled on Win32)])
-if test "x${enable_waveout}" != "xno"; then
- if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
- PLUGINS="${PLUGINS} waveout"
- LDFLAGS_waveout="-lwinmm"
+if test "${enable_waveout}" != "no"; then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
+ AX_ADD_PLUGINS([waveout])
+ AX_ADD_LDFLAGS([waveout],[-lwinmm])
fi
fi
dnl
AC_ARG_ENABLE(coreaudio,
[ --enable-coreaudio CoreAudio module (default enabled on MacOS X)])
-if test "x${enable_coreaudio}" != "xno" &&
- (test "x${SYS}" = "xdarwin" || test "x${enable_coreaudio}" = "xyes")
+if test "${enable_coreaudio}" != "no" &&
+ (test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes")
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
- [ BUILTINS="${BUILTINS} coreaudio"
- LDFLAGS_coreaudio="${LDFLAGS_coreaudio} -framework CoreAudio"
+ [ AX_ADD_BUILTINS([coreaudio])
+ AX_ADD_LDFLAGS([coreaudio],[-framework CoreAudio])
AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h)
AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} coreaudio_resampler"
- LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
+ AX_ADD_PLUGINS([coreaudio_resampler])
+ AX_ADD_LDFLAGS([coreaudio_resampler],[-framework AudioToolbox])
],[ AC_MSG_RESULT(no) ])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi
AC_ARG_WITH(,[Interface plugins:])
dnl special case for BeOS
-if test "x${SYS}" = "xbeos"
+if test "${SYS}" = "beos"
then
- PLUGINS="${PLUGINS} beos"
+ AX_ADD_PLUGINS([beos])
fi
dnl
dnl
AC_ARG_ENABLE(skins,
[ --enable-skins Skins interface module (default enabled on Win32)])
-if test "x${enable_skins}" != "xno"; then
+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 "x${with_skins_wx_config_path}" != "xno"
+ [ 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 "x${WX_CONFIG_SKINS}" != "xno"
+ 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
- CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS"
- LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`"
+ AX_ADD_CPPFLAGS([skins],[`${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS])
+ AX_ADD_LDFLAGS([skins],[`${WX_CONFIG_SKINS} --libs`])
fi
- if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
- PLUGINS="${PLUGINS} skins"
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
- LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
+ 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 "x${enable_skins}" = "xyes"; then
+ if test "${enable_skins}" = "yes"; then
IMLIB2_PATH="${PATH}"
AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- if test "x${IMLIB2_CONFIG_SKINS}" = "xno"; then
+ 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
- PLUGINS="${PLUGINS} skins"
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
- LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
- PLUGINS="${PLUGINS} 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`])
+ AX_ADD_PLUGINS([skins])
fi
fi
fi
dnl
AC_ARG_ENABLE(basic-skins,
[ --enable-basic-skins Skins interface module without wxWindows dialogs (default disabled)])
-if test "x${enable_basic_skins}" = "xyes"; then
- if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+if test "${enable_basic_skins}" = "yes"; then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
- CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
+ 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
IMLIB2_PATH="${PATH}"
AC_PATH_PROG(IMLIB2_CONFIG_SKINS, imlib2-config, no, ${IMLIB2_PATH})
- if test "x${IMLIB2_CONFIG_SKINS}" = "xno"; then
+ 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.])
fi
- CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS"
- LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`"
+ 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
- PLUGINS="${PLUGINS} basic_skins"
- CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -DBASIC_SKINS"
+ AX_ADD_PLUGINS([basic_skins])
fi
dnl
dnl
AC_ARG_ENABLE(gtk,
[ --enable-gtk Gtk+ support (default enabled)])
-if test "x${enable_gtk}" != "xno"
+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 "x${with_gtk_config_path}" != "xno"
+ [ 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 "x${GTK_CONFIG}" = "xno"
+ if test "${GTK_CONFIG}" = "no"
then
AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
fi
- if test "x${GTK_CONFIG}" != "xno"
+ 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 "x${SYS}" != "xmingw32"; then
- CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk gthread`"
- LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`"
+ 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
- CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk`"
- LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
+ 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=no
echo "Cannot find gtk development headers."
])
- if test "x${ac_cv_gtk_headers}" = "xyes"
+ if test "${ac_cv_gtk_headers}" = "yes"
then
- PLUGINS="${PLUGINS} gtk"
- if test "x${SYS}" != "xmingw32"; then
+ AX_ADD_PLUGINS([gtk])
+ if test "${SYS}" != "mingw32"; then
NEED_GTK_MAIN=yes
fi
ALIASES="${ALIASES} gvlc"
dnl
AC_ARG_ENABLE(gtk2,
[ --enable-gtk2 Gtk2 support (default disabled)])
-if test "x${enable_gtk2}" = "xyes"
+if test "${enable_gtk2}" = "yes"
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
+ 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(familiar,
[ --enable-familiar Familiar Gtk+ support (default disabled)])
-if test "x${enable_familiar}" = "xyes"
+if test "${enable_familiar}" = "yes"
then
GTK_PATH="${PATH}"
AC_ARG_WITH(gtk-config-path,
[ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
- [ if test "x${with_gtk_config_path}" != "xno"
+ [ 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 "x${GTK_CONFIG}" = "xno"
+ if test "${GTK_CONFIG}" = "no"
then
AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
fi
[ --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"
+ if test "${with_gtk_prefix}" != "no" -a -n "${with_gtk_prefix}"
then
- GTK_PREFIX="--prefix=$with_gtk_prefix"
+ GTK_PREFIX="--prefix=${with_gtk_prefix}"
fi
- if test "x${GTK_CONFIG}" != "xno"
+ 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-familiar.])
fi
- 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,,'`"
+ AX_ADD_CFLAGS([familiar],[`${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`])
+ AX_ADD_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
ac_cv_gtk_headers=no
echo "Cannot find gtk development headers."
])
- if test "x${ac_cv_gtk_headers}" = "xyes"
+ if test "${ac_cv_gtk_headers}" = "yes"
then
- PLUGINS="${PLUGINS} familiar"
+ AX_ADD_PLUGINS([familiar])
fi
CPPFLAGS="${CPPFLAGS_save}"
# 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"
+ if test "${with_gpe_prefix}" != "no" -a -n "${with_gpe_prefix}"
then
- CFLAGS_gpe="-I$with_gpe_prefix/include"
- LDFLAGS_gpe="-lXi -lgdk_pixbuf -L$with_gpe_prefix/lib -lgpewidget"
+ AX_ADD_CFLAGS([gpe],[-I${with_gpe_prefix}/include])
+ AX_ADD_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_save="${CFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
CFLAGS="${CFLAGS_familiar} ${CFLAGS_gpe}"
LDFLAGS="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar} ${CFLAGS_gpe}"
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"
+ CFLAGS="${CFLAGS_save}"
+ LDFLAGS="${LDFLAG_save}"
+ if test "${ac_cv_gpe_headers}" = "yes"
then
- CFLAGS_familiar="${CFLAGS_familiar} ${CFLAGS_gpe}"
- LDFLAGS_familiar="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
+ AX_ADD_CFLAGS([familiar],[${CFLAGS_gpe}])
+ AX_ADD_LDFLAGS([familiar],[${LDFLAGS_gpe}])
fi
else
NEED_GTK_MAIN=yes
dnl
AC_ARG_ENABLE(gnome,
[ --enable-gnome Gnome interface support (default disabled)],
- [if test "x${enable_gnome}" = "xyes"; then
+ [if test "${enable_gnome}" = "yes"; then
# look for gnome-config
AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
if test -x ${GNOME_CONFIG}
then
- CFLAGS_gnome="${CFLAGS_gnome} `${GNOME_CONFIG} --cflags gtk gnomeui`"
- LDFLAGS_gnome="${LDFLAGS_gnome} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
+ 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, [
- PLUGINS="${PLUGINS} gnome"
+ AX_ADD_PLUGINS([gnome])
NEED_GTK_MAIN=yes
NEED_GNOME_MAIN=yes
ALIASES="${ALIASES} gnome-vlc"
dnl
AC_ARG_ENABLE(gnome2,
[ --enable-gnome2 Gnome2 support (default disabled)])
-if test "x${enable_gnome2}" = "xyes"
+if test "${enable_gnome2}" = "yes"
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
+ 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(wxwindows,
[ --enable-wxwindows wxWindows support (default enabled)])
-if test "x${enable_wxwindows}" != "xno"
+if test "${enable_wxwindows}" != "no"
then
WXWINDOWS_PATH="${PATH}"
AC_ARG_WITH(wx-config-path,
[ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
- [ if test "x${with_wx_config_path}" != "xno"
+ [ if test "${with_wx_config_path}" != "no"
then
WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
fi ])
# look for wx-config
AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
- if test "x${WX_CONFIG}" != "xno"
+ if test "${WX_CONFIG}" != "no"
then
if expr 2.3.0 \> `${WX_CONFIG} --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-wxwindows.])
fi
- CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cxxflags`"
- LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`"
+ AX_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`])
+ AX_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`])
# now look for the wxprec.h header
CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwindows}"
ac_cv_wx_headers=yes
ac_cv_wx_headers=no
echo "Cannot find wxWindows development headers."
])
- if test "x${ac_cv_wx_headers}" = "xyes"
+ if test "${ac_cv_wx_headers}" = "yes"
then
- PLUGINS="${PLUGINS} wxwindows"
+ AX_ADD_PLUGINS([wxwindows])
ALIASES="${ALIASES} wxvlc"
fi
CPPFLAGS="${CPPFLAGS_save}"
dnl
AC_ARG_ENABLE(qt,
[ --enable-qt Qt interface support (default disabled)],
- [if test "x${enable_qt}" = "xyes"; then
- PLUGINS="${PLUGINS} qt"
+ [if test "${enable_qt}" = "yes"; then
+ AX_ADD_PLUGINS([qt])
ALIASES="${ALIASES} qvlc"
- LDFLAGS_qt="${LDFLAGS_qt} -L${QTDIR}/lib"
+ AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}"
AC_CHECK_LIB(qt-mt,main,[
- LDFLAGS_qt="${LDFLAGS_qt} -lqt-mt"
+ AX_ADD_LDFLAGS([qt],[-lqt-mt])
],[
AC_CHECK_LIB(qt,main,[
- LDFLAGS_qt="${LDFLAGS_qt} -lqt"
+ AX_ADD_LDFLAGS([qt],[-lqt])
])
])
LDFLAGS="${LDFLAGS_save}"
- CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include"
+ 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
dnl
AC_ARG_ENABLE(kde,
[ --enable-kde KDE interface support (default disabled)],
- [if test "x${enable_kde}" = "xyes"; then
- PLUGINS="${PLUGINS} kde"
+ [if test "${enable_kde}" = "yes"; then
+ AX_ADD_PLUGINS([kde])
ALIASES="${ALIASES} kvlc"
- LDFLAGS_kde="${LDFLAGS_kde} -L${KDEDIR}/lib"
+ 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,[
- LDFLAGS_kde="${LDFLAGS_kde} -lkfile"
+ AX_ADD_LDFLAGS([kde],[-lkfile])
])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
AC_CHECK_LIB(kdeui,main,[
- LDFLAGS_kde="${LDFLAGS_kde} -lkdeui"
+ AX_ADD_LDFLAGS([kde],[-lkdeui])
])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
AC_CHECK_LIB(kio,main,[
- LDFLAGS_kde="${LDFLAGS_kde} -lkio"
+ AX_ADD_LDFLAGS([kde],[-lkio])
])
LDFLAGS="${LDFLAGS_save}"
- 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"
+ 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
dnl
AC_ARG_ENABLE(opie,
[ --enable-opie Qt embedded interface support (default disabled)],
- [if test "x${enable_opie}" = "xyes"; then
+ [if test "${enable_opie}" = "yes"; then
AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries])
- if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
- 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"
+ 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])
else
- 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,'`"
+ AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`])
+ AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`])
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
] )
CPPFLAGS="${CPPFLAGS_save}"
- PLUGINS="${PLUGINS} opie"
+ AX_ADD_PLUGINS([opie])
NEED_QTE_MAIN=yes
- LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}"
- CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}"
- if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
+ AX_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}])
+ AX_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}])
+ if test "${with_qte}" != "no" -a -n "${with_qte}"
then
MOC=${with_qte}/bin/moc
else
dnl
AC_ARG_ENABLE(macosx,
[ --enable-macosx MacOS X support (default enabled on MacOS X)],
- [if test "x${enable_macosx}" = "xyes"
+ [if test "${enable_macosx}" = "yes"
then
- BUILTINS="${BUILTINS} macosx"
- LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ AX_ADD_BUILTINS([macosx])
+ AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC])
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
- BUILTINS="${BUILTINS} macosx"
- LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ AX_ADD_BUILTINS([macosx])
+ AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC])
)])
dnl
dnl
AC_ARG_ENABLE(qnx,
[ --enable-qnx QNX RTOS support (default enabled on QNX RTOS)])
- if test "x${enable_qnx}" != "xno"
+ if test "${enable_qnx}" != "no"
then
AC_CHECK_HEADERS(Ph.h, [
- PLUGINS="${PLUGINS} qnx"
- LDFLAGS_qnx="${LDFLAGS_qnx} -lasound -lph"
+ AX_ADD_PLUGINS([qnx])
+ AX_ADD_LDFLAGS([qnx],[-lasound -lph])
])
fi
dnl
AC_ARG_ENABLE(ncurses,
[ --enable-ncurses ncurses interface support (default disabled)],
- [if test "x${enable_ncurses}" = "xyes"; then
- PLUGINS="${PLUGINS} ncurses"
- LDFLAGS_ncurses="${LDFLAGS_ncurses} -lncurses"
+ [if test "${enable_ncurses}" = "yes"; then
+ AX_ADD_PLUGINS([ncurses])
+ AX_ADD_LDFLAGS([ncurses],[-lncurses])
fi])
dnl
dnl
AC_ARG_ENABLE(xosd,
[ --enable-xosd xosd interface support (default disabled)])
-if test "x${enable_xosd}" = "xyes"
+if test "${enable_xosd}" = "yes"
then
AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false")
AC_CHECK_LIB(xosd,xosd_set_offset,
AC_TRY_COMPILE([#include <xosd.h>],
[void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if <xosd.h> is pre-1.0.0))))
- if test "x${have_xosd}" = "xtrue"
+ if test "${have_xosd}" = "true"
then
- PLUGINS="${PLUGINS} xosd"
- LDFLAGS_xosd="${LDFLAGS_xosd} -lxosd"
+ AX_ADD_PLUGINS([xosd])
+ AX_ADD_LDFLAGS([xosd],[-lxosd])
fi
fi
dnl
AC_ARG_ENABLE(slp,
[ --enable-slp SLP service discovery support (default enabled)])
-if test "x${enable_slp}" != "xno"
+if test "${enable_slp}" != "no"
then
AC_ARG_WITH(slp,
[ --with-slp=PATH libslp headers and libraries])
- if test "x${with_slp}" = x
+ if test -z "${with_slp}"
then
AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
- if test "x${have_slp}" = "xtrue"
+ if test "${have_slp}" = "true"
then
- PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="-lslp ${LDFLAGS_slp}"
+ AX_ADD_PLUGINS([slp])
+ AX_ADD_LDFLAGS([slp],[-lslp])
fi
else
AC_MSG_CHECKING(for slp headers in ${with_slp})
then
dnl Use ${with_slp}/libslp/slp.h
AC_MSG_RESULT(yes)
- PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="-L${with_slp} -lslp ${LDFLAGS_slp}"
- CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
+ AX_ADD_PLUGINS([slp])
+ AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp])
+ AX_ADD_CPPFLAGS([slp],[-I${with_slp}])
else
dnl No libslp could be found, sorry
AC_MSG_RESULT(no)
dnl
AC_ARG_ENABLE(lirc,
[ --enable-lirc lirc support (default disabled)])
-if test "x${enable_lirc}" = "xyes"
+if test "${enable_lirc}" = "yes"
then
AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false")
- if test "x${have_lirc}" = "xtrue"
+ if test "${have_lirc}" = "true"
then
- PLUGINS="${PLUGINS} lirc"
- LDFLAGS_lirc="${LDFLAGS_lirc} -llirc_client"
+ AX_ADD_PLUGINS([lirc])
+ AX_ADD_LDFLAGS([lirc],[-llirc_client])
fi
fi
dnl
AC_ARG_WITH(words,
[ --with-words=endianness set endianness (big or little)])
- case "x${with_words}" in
- xbig)
+ case "${with_words}" in
+ big)
ac_cv_c_bigendian=yes
;;
- xlittle)
+ little)
ac_cv_c_bigendian=no
;;
*)
fi
fi
])
- if test "x${ac_cv_c_bigendian}" = "xunknown"
+ if test "${ac_cv_c_bigendian}" = "unknown"
then
AC_MSG_ERROR([Could not guess endianness, please use --with-words])
fi
mozilla=false
AC_ARG_ENABLE(mozilla,
[ --enable-mozilla build a vlc-based Mozilla plugin (default disabled)])
-if test "x${enable_mozilla}" = "xyes"
+if test "${enable_mozilla}" = "yes"
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
- if test "x${MOZILLA_CONFIG}" != "xno"
+ if test "${MOZILLA_CONFIG}" != "no"
then
- if test "x${SYS}" != "xmingw32"; then
+ if test "${SYS}" != "mingw32"; then
LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
AC_CHECK_LIB(Xt,XtStrings,[
- LDFLAGS_mozilla="${LDFLAGS_mozilla} -L${x_libraries} -lXt"
+ AX_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt])
])
LDFLAGS="${LDFLAGS_save}"
fi
mozilla=:
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
- [CPPFLAGS_mozilla="${CPPFLAGS_mozilla} `${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"]
- #[CPPFLAGS_mozilla="${CPPFLAGS_mozilla} `${MOZILLA_CONFIG} --cflags plugin xpcom java --defines | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"]
- LDFLAGS_mozilla="${LDFLAGS_mozilla} `${MOZILLA_CONFIG} --libs plugin xpcom`"
+ 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 "x${XPIDL}" = "x" -o ! -x "${XPIDL}"
+ if test -z "${XPIDL}" -o ! -x "${XPIDL}"
then
XPIDL="/usr/lib/mozilla/xpidl"
fi
dnl
AC_ARG_ENABLE(testsuite,
[ --enable-testsuite build test modules (default disabled)])
-if test "x${enable_testsuite}" = "xyes"
+if test "${enable_testsuite}" = "yes"
then
TESTS="test1 test2 test3 test4"
dnl we define those so that bootstrap sets the right linker
- CXXFLAGS_test2="${CXXFLAGS_test2}"
- OBJCFLAGS_test3="${OBJCFLAGS_test3}"
+ AX_ADD_CXXFLAGS([test2],[])
+ AX_ADD_OBJCFLAGS([test3],[])
dnl this one is needed until automake knows what to do
- LDFLAGS_test3="${LDFLAGS_test3} -lobjc"
+ AX_ADD_LDFLAGS([test3],[-lobjc])
- PLUGINS="${PLUGINS} ${TESTS}"
- #BUILTINS="${BUILTINS} ${TESTS}"
+ AX_ADD_PLUGINS([${TESTS}])
+ #AX_ADD_BUILTINS([${TESTS}])
fi
dnl
dnl gtk_main plugin
dnl
-if test "x${NEED_GTK_MAIN}" != "xno"
+if test "${NEED_GTK_MAIN}" != "no"
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}"
+ AX_ADD_PLUGINS([gtk_main])
+ AX_ADD_CFLAGS([gtk familiar],[-DNEED_GTK_MAIN])
+ AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar}])
+ AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar}])
fi
-if test "x${NEED_GNOME_MAIN}" != "xno"
+if test "${NEED_GNOME_MAIN}" != "no"
then
- PLUGINS="${PLUGINS} gnome_main"
- CFLAGS_gnome_main="${CFLAGS_gnome_main} ${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}"
- LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
+ AX_ADD_PLUGINS([gnome_main])
+ AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}])
+ AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}])
fi
-if test "x${NEED_GTK2_MAIN}" != "xno"
+if test "${NEED_GTK2_MAIN}" != "no"
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}"
+ AX_ADD_PLUGINS([gtk2_main])
+ AX_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN])
+ AX_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2}])
+ AX_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2}])
fi
-if test "x${NEED_GNOME2_MAIN}" != "xno"
+if test "${NEED_GNOME2_MAIN}" != "no"
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}"
+ AX_ADD_PLUGINS([gnome2_main])
+ AX_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}])
+ AX_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}])
fi
dnl
dnl qte_main plugin
dnl
-if test "x${NEED_QTE_MAIN}" != "xno"
+if test "${NEED_QTE_MAIN}" != "no"
then
- PLUGINS="${PLUGINS} qte_main"
- CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN"
- CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
- CFLAGS_vout_sdl="${CFLAGS_vout_sdl} -DNEED_QTE_MAIN"
- CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}"
- LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}"
+ AX_ADD_PLUGINS([qte_main])
+ AX_ADD_CPPFLAGS([qte opie vout_sdl],[-DNEED_QTE_MAIN])
+ AX_ADD_CXXFLAGS([qte_main],[${CPPFLAGS_qte} ${CXXFLAGS_qte}])
+ AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte}])
fi
dnl Support for plugins - this must be AT THE END
AC_ARG_ENABLE(plugins,
[ --disable-plugins make all plugins built-in (default plugins enabled)],
- [if test "x${enable_plugins}" = "xno"
+ [if test "${enable_plugins}" = "no"
then
plugin_support=false
fi])
dnl Automagically disable plugins if there is no system support for
dnl dynamically loadable files (.so, .dll, .dylib).
dnl don't forget vlc-win32 still can load .dll as plugins
-if test "x${ac_cv_header_dlfcn_h}" = "xno" -a "x${ac_cv_header_image_h}" = "xno" -a "x${SYS}" != "xmingw32"
+if test "${ac_cv_header_dlfcn_h}" = "no" -a "${ac_cv_header_image_h}" = "no" -a "${SYS}" != "mingw32"
then
echo "*** Your system doesn't have plugin support. All plugins will be built"
echo "statically."
then
for plugin in `echo ${PLUGINS}`
do
- eval "${plugin}_plugin=yes"
+ eval "${plugin}_p=yes"
done
else
- BUILTINS="${BUILTINS} ${PLUGINS}"
- PLUGINS=
+ AX_ADD_BUILTINS([${PLUGINS}])
+ PLUGINS=""
fi
AM_CONDITIONAL(HAVE_PLUGINS, ${plugin_support})
builtin_support=:
for builtin in `echo ${BUILTINS}`
do
- eval "${builtin}_builtin=yes"
+ eval "${builtin}_b=yes"
done
fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
+dnl Import conditional variables generated by bootstrap
+AX_VLC_CONDITIONALS
+
dnl
dnl Stuff used by the program
dnl
AC_SUBST(PLUGIN_PATH)
dnl
-dnl Restore *FLAGS
+dnl Handle substvars that use $(top_srcdir)
dnl
-CPPFLAGS="${CPPFLAGS_save}"
-CFLAGS="${CFLAGS_save}"
-CXXFLAGS="${CXXFLAGS_save}"
-OBJCFLAGS="${OBJCFLAGS_save}"
-LDFLAGS="${LDFLAGS_save}"
+VLC_CONFIG="\$(top_builddir)/vlc-config"
+AC_SUBST(VLC_CONFIG)
+CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
dnl
-dnl Fool automake (see Makefile.am)
-dnl
-AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)"
-AC_SUBST(AUTOMAKE_SUCKS)
-
-dnl
-dnl Import substitution variables generated by bootstrap
+dnl Restore *FLAGS
dnl
-VLC_VARIABLES
+AX_RESTORE_FLAGS
dnl
dnl Create the vlc-config script
dnl
-LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtins}"
+LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtin}"
for i in `echo "${BUILTINS}" | sed -e 's@[^ ]*/@@g'` ; do LDFLAGS_libvlc="${LDFLAGS_libvlc} ${libdir}/vlc/${i}.a `eval echo '$'{LDFLAGS_${i}}`" ; done
dnl
dnl
AC_SUBST(SYS)
AC_SUBST(ARCH)
-AC_SUBST(PLUGINS)
-AC_SUBST(BUILTINS)
AC_SUBST(ALIASES)
AC_SUBST(ASM)
AC_SUBST(MOC)
AC_SUBST(INCLUDES)
AC_SUBST(ALL_LINGUAS)
-AC_SUBST(CFLAGS_TUNING)
-AC_SUBST(CFLAGS_OPTIM)
-AC_SUBST(CFLAGS_OPTIM_NODEBUG)
-AC_SUBST(CFLAGS_NOOPTIM)
-AC_SUBST(LDFLAGS)
-
-AC_SUBST(CFLAGS_vlc)
-AC_SUBST(CFLAGS_pics)
-AC_SUBST(CXXFLAGS_pics)
-AC_SUBST(CFLAGS_plugins)
-AC_SUBST(CXXFLAGS_plugins)
-AC_SUBST(CFLAGS_builtins)
-AC_SUBST(CPPFLAGS_mozilla)
-
-AC_SUBST(LDFLAGS_vlc)
-AC_SUBST(LDFLAGS_libvlc)
-AC_SUBST(LDFLAGS_plugins)
-AC_SUBST(LDFLAGS_builtins)
-AC_SUBST(LDFLAGS_mozilla)
+dnl Import substitutions generated by bootstrap
+AX_VLC_SUBSTS
+
+dnl Create vlc-config.in
+AX_OUTPUT_VLC_CONFIG_IN
AC_OUTPUT([
+ vlc-config
+
Makefile
autotools/Makefile
debian/Makefile
intl/Makefile
ipkg/Makefile
lib/Makefile
- m4/Makefile
modules/Makefile
+ m4/Makefile
po/Makefile.in
share/Makefile
src/Makefile
- vlc-config
+
+ modules/access/Makefile
+ modules/access/dvd/Makefile
+ modules/access/dvdplay/Makefile
+ modules/access/dvdread/Makefile
+ modules/access/mms/Makefile
+ modules/access/pvr/Makefile
+ modules/access/satellite/Makefile
+ modules/access/v4l/Makefile
+ modules/access/vcd/Makefile
+ modules/access_output/Makefile
+ modules/audio_filter/Makefile
+ modules/audio_filter/channel_mixer/Makefile
+ modules/audio_filter/converter/Makefile
+ modules/audio_filter/resampler/Makefile
+ modules/audio_mixer/Makefile
+ modules/audio_output/Makefile
+ modules/codec/Makefile
+ modules/codec/a52old/Makefile
+ modules/codec/a52old/downmix/Makefile
+ modules/codec/a52old/imdct/Makefile
+ modules/codec/cinepak/Makefile
+ modules/codec/faad/Makefile
+ modules/codec/ffmpeg/Makefile
+ modules/codec/ffmpeg/postprocessing/Makefile
+ modules/codec/mpeg_audio/Makefile
+ modules/codec/mpeg_video/Makefile
+ modules/codec/mpeg_video/idct/Makefile
+ modules/codec/mpeg_video/motion/Makefile
+ modules/codec/spudec/Makefile
+ modules/control/Makefile
+ modules/control/lirc/Makefile
+ modules/control/rc/Makefile
+ modules/demux/Makefile
+ modules/demux/aac/Makefile
+ modules/demux/asf/Makefile
+ modules/demux/avi/Makefile
+ modules/demux/mp4/Makefile
+ modules/demux/mpeg/Makefile
+ modules/demux/util/Makefile
+ modules/demux/wav/Makefile
+ modules/encoder/Makefile
+ modules/encoder/ffmpeg/Makefile
+ modules/gui/Makefile
+ modules/gui/beos/Makefile
+ modules/gui/familiar/Makefile
+ modules/gui/gtk/Makefile
+ 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
+ modules/gui/win32/Makefile
+ modules/gui/wxwindows/Makefile
+ modules/misc/Makefile
+ modules/misc/dummy/Makefile
+ modules/misc/logger/Makefile
+ modules/misc/memcpy/Makefile
+ modules/misc/network/Makefile
+ modules/misc/testsuite/Makefile
+ modules/mux/Makefile
+ modules/mux/mpeg/Makefile
+ modules/packetizer/Makefile
+ modules/stream_out/Makefile
+ modules/video_chroma/Makefile
+ modules/video_filter/Makefile
+ modules/video_filter/deinterlace/Makefile
+ modules/video_output/Makefile
+ modules/video_output/directx/Makefile
+ modules/video_output/mga/Makefile
+ modules/video_output/qte/Makefile
+ modules/video_output/x11/Makefile
+ modules/visualization/Makefile
+ modules/visualization/scope/Makefile
+ modules/visualization/xosd/Makefile
],[
- chmod a+x vlc-config
+ chmod 0755 vlc-config
])
+dnl Generate makefiles found by bootstrap
+
printf "
vlc configuration
--------------------
system : ${SYS}
architecture : ${ARCH}
build flavour : "
-test "x${DEBUG_TRUE}" = "x" && printf "debug "
-test "x${CPROF_TRUE}" = "x" && printf "cprof "
-test "x${GPROF_TRUE}" = "x" && printf "gprof "
-test "x${OPTIM_TRUE}" = "x" && printf "optim "
-test "x${RELEASE_TRUE}" = "x" && printf "release " || printf "devel "
+test "${enable_debug}" = "yes" && printf "debug "
+test "${enable_cprof}" = "yes" && printf "cprof "
+test "${enable_gprof}" = "yes" && printf "gprof "
+test "${enable_optimizations}" = "yes" && printf "optim "
+test "${enable_release}" = "yes" && printf "release " || printf "devel "
echo "
vlc aliases :${ALIASES}
+You can tune the compiler flags in vlc-config.
To build vlc and its plugins, type \`make'.
"
projects / vlc / blobdiff