diff --git a/configure.ac b/configure.ac
index 2a9b84a9a5e13ed4daa19cdcfef5c4484c1de1fe..971081994858c8ce2819228459e975b97c0230e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
#endif
])
#endif
])
-AC_CHECK_HEADERS(netinet/ip_compat.h)
-
have_net_pfvar_h="no"
AC_CHECK_HEADERS(net/pfvar.h,
[have_net_pfvar_h="yes"],
have_net_pfvar_h="no"
AC_CHECK_HEADERS(net/pfvar.h,
[have_net_pfvar_h="yes"],
fi
AC_MSG_CHECKING([for libjvm.so])
fi
AC_MSG_CHECKING([for libjvm.so])
- TMPVAR=`find -L "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
+ TMPVAR=`find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
if test "x$TMPVAR" != "x"
then
AC_MSG_RESULT([found in $TMPVAR])
if test "x$TMPVAR" != "x"
then
AC_MSG_RESULT([found in $TMPVAR])
# --with-libmosquitto {{{
with_libmosquitto_cppflags=""
# --with-libmosquitto {{{
with_libmosquitto_cppflags=""
-with_libmosquitto_libs="-lmosquitto"
+with_libmosquitto_ldflags=""
AC_ARG_WITH(libmosquitto, [AS_HELP_STRING([--with-libmosquitto@<:@=PREFIX@:>@], [Path to libmosquitto.])],
[
if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
with_libmosquitto_cppflags="-I$withval/include"
AC_ARG_WITH(libmosquitto, [AS_HELP_STRING([--with-libmosquitto@<:@=PREFIX@:>@], [Path to libmosquitto.])],
[
if test "x$withval" != "xno" && test "x$withval" != "xyes"
then
with_libmosquitto_cppflags="-I$withval/include"
- with_libmosquitto_libs="-L$withval/lib -lmosquitto"
+ with_libmosquitto_ldflags="-L$withval/lib"
with_libmosquitto="yes"
else
with_libmosquitto="$withval"
with_libmosquitto="yes"
else
with_libmosquitto="$withval"
@@ -2686,7 +2684,7 @@ AC_ARG_WITH(libmosquitto, [AS_HELP_STRING([--with-libmosquitto@<:@=PREFIX@:>@],
if test "x$with_libmosquitto" = "xyes"
then
SAVE_CPPFLAGS="$CPPFLAGS"
if test "x$with_libmosquitto" = "xyes"
then
SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$with_libmosquitto_cppflags"
+ CPPFLAGS="$CPPFLAGS $with_libmosquitto_cppflags"
AC_CHECK_HEADERS(mosquitto.h, [with_libmosquitto="yes"], [with_libmosquitto="no (mosquitto.h not found)"])
AC_CHECK_HEADERS(mosquitto.h, [with_libmosquitto="yes"], [with_libmosquitto="no (mosquitto.h not found)"])
then
SAVE_LDFLAGS="$LDFLAGS"
SAVE_CPPFLAGS="$CPPFLAGS"
then
SAVE_LDFLAGS="$LDFLAGS"
SAVE_CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$with_libmosquitto_libs"
- CPPFLAGS="$with_libmosquitto_cppflags"
+ LDFLAGS="$LDFLAGS $with_libmosquitto_ldflags"
+ CPPFLAGS="$CPPFLAGS $with_libmosquitto_cppflags"
AC_CHECK_LIB(mosquitto, mosquitto_connect, [with_libmosquitto="yes"], [with_libmosquitto="no (libmosquitto not found)"])
AC_CHECK_LIB(mosquitto, mosquitto_connect, [with_libmosquitto="yes"], [with_libmosquitto="no (libmosquitto not found)"])
if test "x$with_libmosquitto" = "xyes"
then
BUILD_WITH_LIBMOSQUITTO_CPPFLAGS="$with_libmosquitto_cppflags"
if test "x$with_libmosquitto" = "xyes"
then
BUILD_WITH_LIBMOSQUITTO_CPPFLAGS="$with_libmosquitto_cppflags"
- BUILD_WITH_LIBMOSQUITTO_LIBS="$with_libmosquitto_libs"
+ BUILD_WITH_LIBMOSQUITTO_LDFLAGS="$with_libmosquitto_ldflags"
+ BUILD_WITH_LIBMOSQUITTO_LIBS="-lmosquitto"
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_CPPFLAGS)
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_CPPFLAGS)
+ AC_SUBST(BUILD_WITH_LIBMOSQUITTO_LDFLAGS)
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_LIBS)
fi
# }}}
AC_SUBST(BUILD_WITH_LIBMOSQUITTO_LIBS)
fi
# }}}