- up to 5.6.1.1

[packages/net-snmp.git] / net-snmp-config-noflags.patch

diff --git a/net-snmp-config-noflags.patch b/net-snmp-config-noflags.patch
index 118f22ed2c8fc6f7fa792a8d29e82a8d224e09b7..3c015bb878fec76c97baf103304ba0d073debfc2 100644 (file)
--- a/net-snmp-config-noflags.patch
+++ b/net-snmp-config-noflags.patch
@@ -1,42 +1,33 @@
---- net-snmp-5.0.8/net-snmp-config.in.orig     2003-03-12 19:40:33.000000000 +0100
-+++ net-snmp-5.0.8/net-snmp-config.in  2003-05-17 13:10:21.000000000 +0200
-@@ -27,24 +27,24 @@
-       echo @MODULE_LIST@
+--- net-snmp-5.6/net-snmp-config.in.orig       2010-05-30 22:19:04.000000000 +0200
++++ net-snmp-5.6/net-snmp-config.in    2010-10-24 10:12:12.899734339 +0200
+@@ -46,7 +46,7 @@
+ includedir=@includedir@
+ libdir=@libdir@
+ datarootdir=@datarootdir@
+-NSC_LDFLAGS="@LDFLAGS@"
++NSC_LDFLAGS=""
+ NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
+ NSC_INCLUDEDIR=${includedir}
+ NSC_LIBDIR=-L${libdir}
+@@ -124,10 +124,10 @@
        ;;
+     #################################################### compile
      --base-cflags)
--      echo @CFLAGS@ @CPPFLAGS@ -I@includedir@
-+      echo @CPPFLAGS@ -I@includedir@
+-      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
++      echo @CPPFLAGS@ -I${NSC_INCLUDEDIR}
        ;;
-     --cflags)
--      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I@includedir@
-+      echo @DEVFLAGS@ @CPPFLAGS@ -I. -I@includedir@
+     --cflags|--cf*)
+-      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
++      echo @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
        ;;
-     --agent-libs)
-       # use this one == --netsnmp-agent-libs + --external-libs
--      echo @LDFLAGS@ -L@libdir@ $NSC_BASE_AGENT_LIBS @AGENTLIBS@ @WRAPLIBS@
-+      echo -L@libdir@ $NSC_BASE_AGENT_LIBS @AGENTLIBS@ @WRAPLIBS@
-       ;;
-     --libs)
-       # use this one == --netsnmp-libs + --external-libs
--      echo @LDFLAGS@ -L@libdir@ -lnetsnmp @LIBS@
-+      echo -L@libdir@ -lnetsnmp @LIBS@
-       ;;
-     --external-libs)
--      echo @LDFLAGS@ @LIBS@
-+      echo @LIBS@
-       ;;
-     --external-agent-libs)
--      echo @LDFLAGS@ @AGENTLIBS@ @WRAPLIBS@
-+      echo @AGENTLIBS@ @WRAPLIBS@
-       ;;
-     --netsnmp-libs)
-       echo -L@libdir@ -lnetsnmp
-@@ -265,7 +265,7 @@
+     --srcdir)
+       echo $NSC_SRCDIR
+@@ -585,7 +585,7 @@
+         echo "Ack.  Can't create $tmpfile."
        exit 1
        fi
-       prefix=@prefix@
--      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles @LDFLAGS@ -L@exec_prefix@/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp @AGENTLIBS@ $ldflags"
-+      cmd="@CC@ $cflags @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles -L@exec_prefix@/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp @AGENTLIBS@ $ldflags"
+-      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
++      cmd="@CC@ $cflags @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
        echo "running: $cmd"
        `$cmd`
        if test "x$norm" != "x1" ; then