summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36d3cd8)
raw | patch | inline | side by side (parent: 36d3cd8)
author | Sebastian Harl <sh@tokkee.org> | |
Thu, 16 Jun 2011 09:11:40 +0000 (11:11 +0200) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Thu, 16 Jun 2011 09:11:40 +0000 (11:11 +0200) |
E.g., autoconf still tried to generated src/owniptc/Makefile in AC_OUTPUT(),
which obviously fails if owniptc is no longer there.
which obviously fails if owniptc is no longer there.
configure.in | patch | blob | history |
diff --git a/configure.in b/configure.in
index 8043d9a5c651679f8436a0f2354677d2f87f0e55..f24046643cb819c0cc4bfcd9acaddf0acbd3f0a2 100644 (file)
--- a/configure.in
+++ b/configure.in
then
AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
[
-#if OWN_LIBIPTC
-# include "$srcdir/src/owniptc/libiptc.h"
-# include "$srcdir/src/owniptc/libip6tc.h"
-#else
-# include <libiptc/libiptc.h>
-# include <libiptc/libip6tc.h>
-#endif
+#include <libiptc/libiptc.h>
+#include <libiptc/libip6tc.h>
])
fi
# Check for the iptc_init symbol in the library.
AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
-AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
if test "x$with_librrd" = "xyes" \
&& test "x$librrd_threadsafe" != "xyes"