X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=e2d4f8ce5bf4842db9a73f01d90fbb552219b82d;hb=e76c030a9675b6bd3d1825e3bc6ab95716a917f7;hp=bd8ca1dd08541d1427e1f61a8f8c11ea437fd42d;hpb=b10e5d81780306200ecadaf86605cef5ad8c9a04;p=collectd.git

diff --git a/configure.in b/configure.in
index bd8ca1dd..e2d4f8ce 100644
--- a/configure.in
+++ b/configure.in
@@ -1763,78 +1763,6 @@ AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$collect_libpcap],
 AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
 # }}}
 
-# --with-libpcre {{{
-with_pcre_config="pcre-config"
-with_pcre_cflags=""
-with_pcre_libs=""
-AC_ARG_WITH(libpcre, [AS_HELP_STRING([--with-libpcre@<:@=PREFIX@:>@],
-	[Path to libpcre.])],
-	[
-		if test "x$withval" = "xno"
-		then
-			with_libpcre="no"
-		else if test "x$withval" = "xyes"
-		then
-			with_libpcre="yes"
-		else
-			if test -f "$withval" && test -x "$withval"
-			then
-				with_pcre_config="$withval"
-			else if test -x "$withval/bin/pcre-config"
-			then
-				with_pcre_config="$withval/bin/pcre-config"
-			fi; fi
-			with_libpcre="yes"
-		fi; fi
-	],
-	[
-		with_libpcre="yes"
-	])
-
-if test "x$with_libpcre" = "xyes"
-then
-	with_pcre_cflags=`$with_pcre_config --cflags 2>/dev/null`
-	pcre_config_status=$?
-
-	if test $pcre_config_status -ne 0
-	then
-		with_libpcre="no ($with_pcre_config failed)"
-	else
-		SAVE_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $with_pcre_cflags"
-
-		AC_CHECK_HEADERS(pcre.h, [], [with_libpcre="no (pcre.h not found)"], [])
-
-		CPPFLAGS="$SAVE_CPPFLAGS"
-	fi
-fi
-
-if test "x$with_libpcre" = "xyes"
-then
-	with_pcre_libs=`$with_pcre_config --libs 2>/dev/null`
-	pcre_config_status=$?
-
-	if test $pcre_config_status -ne 0
-	then
-		with_libpcre="no ($with_pcre_config failed)"
-	else
-		AC_CHECK_LIB(pcre, pcre_compile,
-			[with_libpcre="yes"],
-			[with_libpcre="no (symbol 'pcre_compile' not found)"],
-			[$with_pcre_libs])
-	fi
-fi
-
-if test "x$with_libpcre" = "xyes"
-then
-	BUILD_WITH_LIBPCRE_CFLAGS="$with_pcre_cflags"
-	BUILD_WITH_LIBPCRE_LIBS="$with_pcre_libs"
-	AC_SUBST(BUILD_WITH_LIBPCRE_CFLAGS)
-	AC_SUBST(BUILD_WITH_LIBPCRE_LIBS)
-fi
-AM_CONDITIONAL(BUILD_WITH_LIBPCRE, test "x$with_libpcre" = "xyes")
-# }}}
-
 # --with-libperl {{{
 perl_interpreter="perl"
 AC_ARG_WITH(libperl, [AS_HELP_STRING([--with-libperl@<:@=PREFIX@:>@], [Path to libperl.])],
@@ -2124,6 +2052,7 @@ if test "x$with_libpthread" = "xyes"
 then
 	AC_CHECK_LIB(pthread, pthread_create, [with_libpthread="yes"], [with_libpthread="no (libpthread not found)"], [])
 fi
+
 if test "x$with_libpthread" = "xyes"
 then
 	AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
@@ -2284,41 +2213,43 @@ with_libstatgrab_cflags=""
 with_libstatgrab_ldflags=""
 AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
 [
-	if test "x$withval" != "xno" \
-		&& test "x$withval" != "xyes"
-	then
-		with_libstatgrab_cflags="-I$withval/include"
-		with_libstatgrab_ldflags="-L$withval/lib"
-		with_libstatgrab="yes"
-	else
-		with_libstatgrab="$withval"
-	fi
-],
+ if test "x$withval" != "xno" \
+   && test "x$withval" != "xyes"
+ then
+   with_libstatgrab_cflags="-I$withval/include"
+   with_libstatgrab_ldflags="-L$withval/lib -lstatgrab"
+   with_libstatgrab="yes"
+   with_libstatgrab_pkg_config="no"
+ else
+   with_libstatgrab="$withval"
+   with_libstatgrab_pkg_config="yes"
+ fi
+ ],
 [
-	if test "x$ac_system" = "xunknown"
-	then
-		with_libstatgrab="yes"
-	else
-		with_libstatgrab="no"
-	fi
+ with_libstatgrab="yes"
+ with_libstatgrab_pkg_config="yes"
 ])
-with_libstatgrab_pkg_config="yes"
+
 if test "x$with_libstatgrab" = "xyes" \
-  && test "x$PKG_CONFIG" != "x"
+  && test "x$with_libstatgrab_pkg_config" = "xyes"
 then
-  AC_MSG_CHECKING([pkg-config for libstatgrab])
-  temp_result="found"
-  $PKG_CONFIG --exists libstatgrab 2>/dev/null
-  if test "$?" != "0"
+  if test "x$PKG_CONFIG" != "x"
   then
+    AC_MSG_CHECKING([pkg-config for libstatgrab])
+    temp_result="found"
+    $PKG_CONFIG --exists libstatgrab 2>/dev/null
+    if test "$?" != "0"
+    then
+      with_libstatgrab_pkg_config="no"
+      with_libstatgrab="no ($PKG_CONFIG doesn't know libstatgrab)"
+      temp_result="not found"
+    fi
+    AC_MSG_RESULT([$temp_result])
+  else
+    AC_MSG_NOTICE([pkg-config not available, trying to guess flags for the statgrab library.])
     with_libstatgrab_pkg_config="no"
-    temp_result="not found"
+    with_libstatgrab_ldflags="$with_libstatgrab_ldflags -lstatgrab"
   fi
-  AC_MSG_RESULT([$temp_result])
-else
-  AC_MSG_NOTICE([pkg-config not available, trying to guess flags for the statgrab library.])
-  with_libstatgrab_pkg_config="no"
-  with_libstatgrab_ldflags="$with_libstatgrab_ldflags -lstatgrab"
 fi
 
 if test "x$with_libstatgrab" = "xyes" \
@@ -2392,103 +2323,94 @@ then
 fi
 # }}}
 
-# --with-libxmms {{{
-with_xmms_config="xmms-config"
-with_xmms_cflags=""
-with_xmms_libs=""
-AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])],
+# --with-libupsclient {{{
+with_libupsclient_config=""
+with_libupsclient_cflags=""
+with_libupsclient_libs=""
+AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
 [
-	if test "x$withval" != "xno" \
-		&& test "x$withval" != "xyes"
+	if test "x$withval" = "xno"
 	then
-		if test -f "$withval" && test -x "$withval";
+		with_libupsclient="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_libupsclient="use_pkgconfig"
+	else
+		if test -x "$withval"
 		then
-			with_xmms_config="$withval"
-		else if test -x "$withval/bin/xmms-config"
+			with_libupsclient_config="$withval"
+			with_libupsclient="use_libupsclient_config"
+		else if test -x "$withval/bin/libupsclient-config"
 		then
-			with_xmms_config="$withval/bin/xmms-config"
+			with_libupsclient_config="$withval/bin/net-snmp-config"
+			with_libupsclient="use_libupsclient_config"
+		else
+			AC_MSG_NOTICE([Not checking for libupsclient: Manually configured])
+			with_libupsclient_cflags="-I$withval/include"
+			with_libupsclient_libs="-L$withval/lib -lupsclient"
+			with_libupsclient="yes"
 		fi; fi
-		with_libxmms="yes"
-	else if test "x$withval" = "xno"
-	then
-		with_libxmms="no"
-	else
-		with_libxmms="yes"
 	fi; fi
 ],
-[
-	with_libxmms="yes"
-])
-if test "x$with_libxmms" = "xyes"
-then
-	with_xmms_cflags=`$with_xmms_config --cflags 2>/dev/null`
-	xmms_config_status=$?
+[with_libupsclient="use_pkgconfig"])
 
-	if test $xmms_config_status -ne 0
+# configure using libupsclient-config
+if test "x$with_libupsclient" = "xuse_libupsclient_config"
+then
+	AC_MSG_NOTICE([Checking for libupsclient using $with_libupsclient_config])
+	with_libupsclient_cflags="`$with_libupsclient_config --cflags`"
+	if test $? -ne 0
 	then
-		with_libxmms="no"
+		with_libupsclient="no ($with_libupsclient_config failed)"
 	fi
-fi
-if test "x$with_libxmms" = "xyes"
-then
-	with_xmms_libs=`$with_xmms_config --libs 2>/dev/null`
-	xmms_config_status=$?
-
-	if test $xmms_config_status -ne 0
+	with_libupsclient_libs="`$with_libupsclient_config --libs`"
+	if test $? -ne 0
 	then
-		with_libxmms="no"
+		with_libupsclient="no ($with_libupsclient_config failed)"
 	fi
 fi
-if test "x$with_libxmms" = "xyes"
+if test "x$with_libupsclient" = "xuse_libupsclient_config"
 then
-	AC_CHECK_LIB(xmms, xmms_remote_get_info,
-	[
-		BUILD_WITH_LIBXMMS_CFLAGS="$with_xmms_cflags"
-		BUILD_WITH_LIBXMMS_LIBS="$with_xmms_libs"
-		AC_SUBST(BUILD_WITH_LIBXMMS_CFLAGS)
-		AC_SUBST(BUILD_WITH_LIBXMMS_LIBS)
-	],
-	[
-		with_libxmms="no"
-	],
-	[$with_xmms_libs])
+	with_libupsclient="yes"
 fi
-with_libxmms_numeric=0
-if test "x$with_libxmms" = "xyes"
+
+# configure using pkg-config
+if test "x$with_libupsclient" = "xuse_pkgconfig"
 then
-	with_libxmms_numeric=1
+	if test "x$PKG_CONFIG" = "x"
+	then
+		with_libupsclient="no (Don't have pkg-config)"
+	fi
 fi
-AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with_libxmms_numeric], [Define to 1 if you have the 'xmms' library (-lxmms).])
-AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes")
-# }}}
-
-# pkg-config --exists 'libupsclient' {{{
-with_libupsclient="no (pkg-config isn't available)"
-with_libupsclient_cflags=""
-with_libupsclient_libs=""
-if test "x$PKG_CONFIG" != "x"
+if test "x$with_libupsclient" = "xuse_pkgconfig"
 then
-	pkg-config --exists 'libupsclient' 2>/dev/null
-	if test "$?" = "0"
+	AC_MSG_NOTICE([Checking for libupsclient using $PKG_CONFIG])
+	$PKG_CONFIG --exists 'libupsclient' 2>/dev/null
+	if test $? -ne 0
 	then
-		with_libupsclient="yes"
-	else
 		with_libupsclient="no (pkg-config doesn't know library)"
 	fi
 fi
-if test "x$with_libupsclient" = "xyes"
+if test "x$with_libupsclient" = "xuse_pkgconfig"
 then
-	with_libupsclient_cflags="`pkg-config --cflags 'libupsclient'`"
+	with_libupsclient_cflags="`$PKG_CONFIG --cflags 'libupsclient'`"
 	if test $? -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($PKG_CONFIG failed)"
 	fi
-	with_libupsclient_libs="`pkg-config --libs 'libupsclient'`"
+	with_libupsclient_libs="`$PKG_CONFIG --libs 'libupsclient'`"
 	if test $? -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($PKG_CONFIG failed)"
 	fi
 fi
+if test "x$with_libupsclient" = "xuse_pkgconfig"
+then
+	with_libupsclient="yes"
+fi
+
+# with_libupsclient_cflags and with_libupsclient_libs are set up now, let's do
+# the actual checks.
 if test "x$with_libupsclient" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
@@ -2534,6 +2456,76 @@ then
 fi
 # }}}
 
+# --with-libxmms {{{
+with_xmms_config="xmms-config"
+with_xmms_cflags=""
+with_xmms_libs=""
+AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])],
+[
+	if test "x$withval" != "xno" \
+		&& test "x$withval" != "xyes"
+	then
+		if test -f "$withval" && test -x "$withval";
+		then
+			with_xmms_config="$withval"
+		else if test -x "$withval/bin/xmms-config"
+		then
+			with_xmms_config="$withval/bin/xmms-config"
+		fi; fi
+		with_libxmms="yes"
+	else if test "x$withval" = "xno"
+	then
+		with_libxmms="no"
+	else
+		with_libxmms="yes"
+	fi; fi
+],
+[
+	with_libxmms="yes"
+])
+if test "x$with_libxmms" = "xyes"
+then
+	with_xmms_cflags=`$with_xmms_config --cflags 2>/dev/null`
+	xmms_config_status=$?
+
+	if test $xmms_config_status -ne 0
+	then
+		with_libxmms="no"
+	fi
+fi
+if test "x$with_libxmms" = "xyes"
+then
+	with_xmms_libs=`$with_xmms_config --libs 2>/dev/null`
+	xmms_config_status=$?
+
+	if test $xmms_config_status -ne 0
+	then
+		with_libxmms="no"
+	fi
+fi
+if test "x$with_libxmms" = "xyes"
+then
+	AC_CHECK_LIB(xmms, xmms_remote_get_info,
+	[
+		BUILD_WITH_LIBXMMS_CFLAGS="$with_xmms_cflags"
+		BUILD_WITH_LIBXMMS_LIBS="$with_xmms_libs"
+		AC_SUBST(BUILD_WITH_LIBXMMS_CFLAGS)
+		AC_SUBST(BUILD_WITH_LIBXMMS_LIBS)
+	],
+	[
+		with_libxmms="no"
+	],
+	[$with_xmms_libs])
+fi
+with_libxmms_numeric=0
+if test "x$with_libxmms" = "xyes"
+then
+	with_libxmms_numeric=1
+fi
+AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with_libxmms_numeric], [Define to 1 if you have the 'xmms' library (-lxmms).])
+AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes")
+# }}}
+
 # pkg-config --exists 'libxml-2.0'; pkg-config --exists libvirt {{{
 with_libxml2="no (pkg-config isn't available)"
 with_libxml2_cflags=""
@@ -3225,7 +3217,6 @@ Configuration:
     libopenipmi . . . . . $with_libopenipmipthread
     liboping  . . . . . . $with_liboping
     libpcap . . . . . . . $with_libpcap
-    libpcre . . . . . . . $with_libpcre
     libperl . . . . . . . $with_libperl
     libpq . . . . . . . . $with_libpq
     libpthread  . . . . . $with_libpthread