X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=22910aa651d0581e200b98aa1e414035045f3068;hb=0a5310ddaae74d0ac98ff30b28d55871fadc8fcb;hp=79dd6f8abaee472b4afc70e9041199341f5e3d66;hpb=e9a9482ab6d6ce752fff934625be962d0f88251b;p=collectd.git

diff --git a/configure.in b/configure.in
index 79dd6f8a..22910aa6 100644
--- a/configure.in
+++ b/configure.in
@@ -104,9 +104,13 @@ AC_ARG_ENABLE(standards,
 if test "x$enable_standards" = "xyes"
 then
 	AC_DEFINE(_ISOC99_SOURCE,        1, [Define to enforce ISO C99 compliance.])
-	AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Define to enforce POSIX.1-2001 compliance.])
-	AC_DEFINE(_XOPEN_SOURCE,       600, [Define to enforce X/Open 6 (XSI) compliance.])
+	AC_DEFINE(_POSIX_C_SOURCE, 200809L, [Define to enforce POSIX.1-2008 compliance.])
+	AC_DEFINE(_XOPEN_SOURCE,       700, [Define to enforce X/Open 7 (XSI) compliance.])
 	AC_DEFINE(_REENTRANT,            1, [Define to enable reentrancy interfaces.])
+	if test "x$GCC" = "xyes"
+	then
+		CFLAGS="$CFLAGS -std=c99"
+	fi
 fi
 AM_CONDITIONAL(BUILD_FEATURE_STANDARDS, test "x$enable_standards" = "xyes")
 
@@ -1016,7 +1020,7 @@ fi
 AC_MSG_CHECKING([if have htonll defined])
 
     have_htonll="no"
-    AC_RUN_IFELSE([
+    AC_LINK_IFELSE([
        AC_LANG_PROGRAM([
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -3688,57 +3692,94 @@ AM_CONDITIONAL(BUILD_WITH_LIBYAJL, test "x$with_libyajl" = "xyes")
 
 # --with-libvarnish {{{
 with_libvarnish_cppflags=""
-with_libvarnish_ldflags=""
-with_libvarnish_cflags="-lvarnish -lvarnishcompat -lvarnishapi"
+with_libvarnish_cflags=""
+with_libvarnish_libs=""
 AC_ARG_WITH(libvarnish, [AS_HELP_STRING([--with-libvarnish@<:@=PREFIX@:>@], [Path to libvarnish.])],
 [
-	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+	if test "x$withval" = "xno"
 	then
-		with_libvarnish_cppflags="-I$withval/include"
-		with_libvarnish_ldflags="-L$withval/lib"
+		with_libvarnish="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_libvarnish="use_pkgconfig"
+	else if test -d "$with_libvarnish/lib"
+	then
+		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
+		with_libvarnish_cflags="-I$withval/include"
+		with_libvarnish_libs="-L$withval/lib -lvarnish -lvarnishcompat -lvarnishapi"
 		with_libvarnish="yes"
-	else
-		with_libvarnish="$withval"
-	fi
+	fi; fi; fi
 ],
-[
+[with_libvarnish="use_pkgconfig"])
+
+# configure using pkg-config
+if test "x$with_libvarnish" = "xuse_pkgconfig"
+then
+	if test "x$PKG_CONFIG" = "x"
+	then
+		with_libvarnish="no (Don't have pkg-config)"
+	fi
+fi
+if test "x$with_libvarnish" = "xuse_pkgconfig"
+then
+	AC_MSG_NOTICE([Checking for varnishapi using $PKG_CONFIG])
+	$PKG_CONFIG --exists 'varnishapi' 2>/dev/null
+	if test $? -ne 0
+	then
+		with_libvarnish="no (pkg-config doesn't know library)"
+	fi
+fi
+if test "x$with_libvarnish" = "xuse_pkgconfig"
+then
+	with_libvarnish_cflags="`$PKG_CONFIG --cflags 'varnishapi'`"
+	if test $? -ne 0
+	then
+		with_libvarnish="no ($PKG_CONFIG failed)"
+	fi
+	with_libvarnish_libs="`$PKG_CONFIG --libs 'varnishapi'`"
+	if test $? -ne 0
+	then
+		with_libvarnish="no ($PKG_CONFIG failed)"
+	fi
+fi
+if test "x$with_libvarnish" = "xuse_pkgconfig"
+then
 	with_libvarnish="yes"
-])
+fi
+
+# with_libvarnish_cflags and with_libvarnish_libs are set up now, let's do
+# the actual checks.
 if test "x$with_libvarnish" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libvarnish_cppflags"
-
-	AC_CHECK_HEADERS(varnish/varnishapi.h, [with_libvarnish="yes"], [with_libvarnish="no (varnish/varnishapi.h not found)"])
+	CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags"
+	AC_CHECK_HEADERS(varnish/varnishapi.h, [], [with_libvarnish="no (varnish/varnishapi.h not found)"])
 
 	CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 if test "x$with_libvarnish" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	SAVE_LDFLAGS="$LDFLAGS"
-	SAVE_CFLAGS="$CFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libvarnish_cppflags"
-	LDFLAGS="$LDFLAGS $with_libvarnish_ldflags"
-	CFLAGS="$CFLAGS $with_libvarnish_cflags"
+	#SAVE_LDFLAGS="$LDFLAGS"
+
+	CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags"
+	#LDFLAGS="$LDFLAGS $with_libvarnish_libs"
 
-	AC_CHECK_LIB(varnishapi, VSL_OpenStats, [with_libvarnish="yes"], [with_libvarnish="no (Symbol 'VSL_OpenStats' not found)"])
+	AC_CHECK_LIB(varnishapi, VSL_OpenStats,
+		     [with_libvarnish="yes"],
+		     [with_libvarnish="no (symbol VSL_OpenStats not found)"],
+		     [$with_libvarnish_libs])
 
 	CPPFLAGS="$SAVE_CPPFLAGS"
-	LDFLAGS="$SAVE_LDFLAGS"
-	CFLAGS="$SAVE_CFLAGS"
+	#LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_libvarnish" = "xyes"
 then
-	BUILD_WITH_LIBVARNISH_CPPFLAGS="$with_libvarnish_cppflags"
-	BUILD_WITH_LIBVARNISH_LDFLAGS="$with_libvarnish_ldflags"
-	BUILD_WITH_LIBVARNISH_LIBS="-lvarnishcompat -lvarnish -lvarnishapi"
-	AC_SUBST(BUILD_WITH_LIBVARNISH_CPPFLAGS)
-	AC_SUBST(BUILD_WITH_LIBVARNISH_LDFLAGS)
+	BUILD_WITH_LIBVARNISH_CFLAGS="$with_libvarnish_cflags"
+	BUILD_WITH_LIBVARNISH_LIBS="$with_libvarnish_libs"
+	AC_SUBST(BUILD_WITH_LIBVARNISH_CFLAGS)
 	AC_SUBST(BUILD_WITH_LIBVARNISH_LIBS)
-	AC_DEFINE(HAVE_LIBVARNISH, 1, [Define if libvarnish is present and usable.])
 fi
-AM_CONDITIONAL(BUILD_WITH_LIBVARNISH, test "x$with_libvarnish" = "xyes")
 # }}}
 
 # pkg-config --exists 'libxml-2.0'; pkg-config --exists libvirt {{{