testsuite: remove gre kmods if the test loads them

[mirror_iproute2.git] / configure

diff --git a/configure b/configure
index f7c2d7a7d57c698570783ec14cae98a71332bfb8..5df6082bbd84e7d67455c36b3ea27aad79dcc71f 100755 (executable)
--- a/configure
+++ b/configure
@@ -90,13 +90,13 @@ EOF
 
 check_xt_old()
 {
-    # bail if previous XT checks has already succeded.
+    # bail if previous XT checks has already succeeded.
     if grep -q TC_CONFIG_XT $CONFIG
     then
        return
     fi
 
-    #check if we dont need our internal header ..
+    #check if we don't need our internal header ..
     cat >$TMPDIR/ipttest.c <<EOF
 #include <xtables.h>
 char *lib_dir;
@@ -129,7 +129,7 @@ EOF
 
 check_xt_old_internal_h()
 {
-    # bail if previous XT checks has already succeded.
+    # bail if previous XT checks has already succeeded.
     if grep -q TC_CONFIG_XT $CONFIG
     then
        return
@@ -330,12 +330,33 @@ EOF
     then
        echo "no"
     else
-       echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
-       echo "yes"
+       if ${PKG_CONFIG} libbsd --exists
+       then
+               echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
+               echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
+               echo "no"
+       else
+               echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+               echo "yes"
+       fi
     fi
     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
 }
 
+check_cap()
+{
+       if ${PKG_CONFIG} libcap --exists
+       then
+               echo "HAVE_CAP:=y" >>$CONFIG
+               echo "yes"
+
+               echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
+               echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
+       else
+               echo "no"
+       fi
+}
+
 quiet_config()
 {
        cat <<EOF
@@ -410,6 +431,9 @@ check_berkeley_db
 echo -n "need for strlcpy: "
 check_strlcpy
 
+echo -n "libcap support: "
+check_cap
+
 echo >> $CONFIG
 echo "%.o: %.c" >> $CONFIG
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
+echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG