if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS(linux/version.h)
+AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
AC_HEADER_TIME
dnl
AC_ARG_ENABLE(cyberlink,
[ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)])
-if test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no"); then
+AS_IF([test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no")], [
AC_ARG_WITH(cyberlink-tree,
[ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
dnl
dnl test for --with-cyberlink-tree
dnl
- if test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""; then
+ AS_IF([test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""], [
AC_LANG_PUSH(C++)
real_cyberlink_tree="`cd ${with_cyberlink_tree} 2>/dev/null && pwd`"
- if test -z "${real_cyberlink_tree}"
- then
+ AS_IF([test -z "${real_cyberlink_tree}"], [
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_cyberlink_tree}])
- fi
- CXXFLAGS_save="${CXXFLAGS}"
- CXXFLAGS_cyberlink="-I${real_cyberlink_tree}/include"
- CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_cyberlink}"
+ ])
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS_cyberlink="-I${real_cyberlink_tree}/include"
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}"
AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h],
- [ VLC_ADD_CXXFLAGS([upnp], [${CXXFLAGS_cyberlink}])
+ [ VLC_ADD_CPPFLAGS([upnp], [${CPPFLAGS_cyberlink}])
VLC_ADD_PLUGINS([upnp])
],[
AC_MSG_ERROR([cannot find CyberLink for C++ headers])
])
AC_MSG_CHECKING(for libclink.a in ${with_cyberlink_tree})
- if test -f "${real_cyberlink_tree}/lib/unix/libclink.a"
- then
+ AS_IF([test -f "${real_cyberlink_tree}/lib/unix/libclink.a"], [
AC_MSG_RESULT(${real_cyberlink_tree}/lib/unix/libclink.a)
VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lexpat])
- else
+ ], [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}])
- fi
- CXXFLAGS="${CXXFLAGS_save}"
+ AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}])
+ ])
+ CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP([C++])
- fi
-fi
+ ])
+])
dnl
dnl Interface plugins
fi
fi
-dnl
-dnl SLP access plugin
-dnl
-AC_ARG_ENABLE(slp,
- [ --enable-slp SLP service discovery support (default disabled)])
-if test "${enable_slp}" = "yes"
-then
- AC_ARG_WITH(slp,
- [ --with-slp=PATH libslp headers and libraries])
- if test -z "${with_slp}"
- then
- AC_CHECK_HEADERS(slp.h, have_slp="true", have_slp="false")
- if test "${have_slp}" = "true"
- then
- VLC_ADD_PLUGINS([slp])
- VLC_ADD_LDFLAGS([slp],[-lslp])
- VLC_ADD_LDFLAGS([stream_out_standard],[-lslp])
- fi
- else
- AC_MSG_CHECKING(for slp headers in ${with_slp})
- if test -f ${with_slp}/slp.h
- then
- dnl Use ${with_slp}/libslp/slp.h
- AC_MSG_RESULT(yes)
- VLC_ADD_PLUGINS([slp])
- VLC_ADD_LDFLAGS([slp],[-L${with_slp} -lslp])
- VLC_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp])
- VLC_ADD_CPPFLAGS([slp],[-I${with_slp}])
- AC_DEFINE(HAVE_SLP_H)
- else
- dnl No libslp could be found, sorry
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${with_slp}/slp.h])
- fi
- fi
-fi
-
dnl
dnl DAAP access plugin and services discovery
dnl
if test "${enable_bonjour}" != "no"
then
PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3,
- [AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library])
+ [PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6,
+ [AC_DEFINE(HAVE_AVAHI_06, [], [Define if you have avahi-client 0.6 or greater])],)
+ AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library])
VLC_ADD_LDFLAGS([bonjour access_output_http],[$BONJOUR_LIBS])
VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS])
VLC_ADD_PLUGINS([bonjour]) ],
dnl Shortcut to nice compile message
rm -f compile
echo '#! /bin/sh' >compile
-echo "PATH=$PATH LANG=C make \$\* 2>&1| ${srcdir}/extras/make.pl" >>compile
+echo "PATH=$PATH LANG=C make \$* 2>&1| ${srcdir}/extras/make.pl" >>compile
chmod a+x compile
printf "