libnids-1.18-libnet_config.diff 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. --- configure.in 2003-10-15 01:40:00.000000000 +0200
  2. +++ configure.in.oden 2004-06-25 19:35:24.225317360 +0200
  3. @@ -127,11 +127,12 @@
  4. ;;
  5. *)
  6. AC_MSG_RESULT($withval)
  7. - if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
  8. + if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.so -a -f /usr/bin/libnet-config ; then
  9. owd=`pwd`
  10. if cd $withval; then withval=`pwd`; cd $owd; fi
  11. - LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
  12. - LNETLIB="-L$withval/lib -lnet"
  13. + LNET_CFLAGS="`/usr/bin/libnet-config --cflags` `/usr/bin/libnet-config --defines`"
  14. + LNETLIB="`/usr/bin/libnet-config --libs`"
  15. + LDFLAGS="$LDFLAGS `/usr/bin/libnet-config --libs`"
  16. elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
  17. owd=`pwd`
  18. if cd $withval; then withval=`pwd`; cd $owd; fi
  19. @@ -146,12 +147,14 @@
  20. [ if test "x"$LIBNET_VER = "x"-1 ; then
  21. AC_MSG_RESULT(skipping libnet)
  22. else
  23. - if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then
  24. - LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`"
  25. - LNETLIB="-L${exec_prefix}/lib -lnet"
  26. + if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.so ; then
  27. + LNET_CFLAGS="`/usr/bin/libnet-config --cflags` `/usr/bin/libnet-config --defines 2>/dev/null`"
  28. + LNETLIB="`/usr/bin/libnet-config --libs`"
  29. + LDFLAGS="$LDFLAGS `/usr/bin/libnet-config --libs`"
  30. else
  31. - LNET_CFLAGS="`libnet-config --defines 2>/dev/null`"
  32. - LNETLIB="-lnet"
  33. + LNET_CFLAGS="`/usr/bin/libnet-config --cflags` `/usr/bin/libnet-config --defines 2>/dev/null`"
  34. + LNETLIB="`/usr/bin/libnet-config --libs`"
  35. + LDFLAGS="$LDFLAGS `/usr/bin/libnet-config --libs`"
  36. fi
  37. fi ]
  38. )