testsuite: remove gre kmods if the test loads them

[mirror_iproute2.git] / configure

diff --git a/configure b/configure
index d6832464f563ed10dc9af2fe89a7287834a3ec7c..5df6082bbd84e7d67455c36b3ea27aad79dcc71f 100755 (executable)
--- a/configure
+++ b/configure
@@ -17,18 +17,6 @@ check_prog()
     command -v $1 >/dev/null 2>&1 && (echo "$3:=y" >> $CONFIG; echo "yes") || (echo "no"; return 1)
 }
 
-check_docs()
-{
-    if check_prog latex " latex: " HAVE_LATEX; then
-        check_prog pdflatex " pdflatex: " HAVE_PDFLATEX || echo " WARNING: no PDF docs can be built from LaTeX files"
-        check_prog sgml2latex " sgml2latex: " HAVE_SGML2LATEX || echo " WARNING: no LaTeX files can be build from SGML files"
-    else
-        echo " WARNING: no docs can be built from LaTeX files"
-    fi
-
-    check_prog sgml2html " sgml2html: " HAVE_SGML2HTML || echo " WARNING: no HTML docs can be built from SGML"
-}
-
 check_toolchain()
 {
     : ${PKG_CONFIG:=pkg-config}
@@ -102,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;
@@ -141,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
@@ -342,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
@@ -422,11 +431,9 @@ check_berkeley_db
 echo -n "need for strlcpy: "
 check_strlcpy
 
-echo
-echo -n "docs:"
-check_docs
-echo
+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