62 lines
1.4 KiB
Diff
62 lines
1.4 KiB
Diff
diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
|
|
--- libpcap/pcap-config.in.multilib 2009-07-03 06:01:12.000000000 +0200
|
|
+++ libpcap/pcap-config.in 2009-07-09 15:55:48.000000000 +0200
|
|
@@ -29,16 +29,6 @@ do
|
|
esac
|
|
shift
|
|
done
|
|
-if [ "@V_RPATH_OPT@" != "" ]
|
|
-then
|
|
- #
|
|
- # If libdir isn't /usr/lib, add it to the run-time linker path.
|
|
- #
|
|
- if [ "@libdir@" != "/usr/lib" ]
|
|
- then
|
|
- RPATH=@V_RPATH_OPT@@libdir@
|
|
- fi
|
|
-fi
|
|
if [ "$static" = 1 ]
|
|
then
|
|
#
|
|
@@ -47,16 +37,16 @@ then
|
|
#
|
|
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
|
then
|
|
- echo "-I@includedir@ -L@libdir@ -lpcap @LIBS@"
|
|
+ echo "-lpcap @LIBS@"
|
|
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
|
then
|
|
- echo "-I@includedir@ -L@libdir@ @LIBS@"
|
|
+ echo "@LIBS@"
|
|
elif [ "$show_cflags" = 1 ]
|
|
then
|
|
- echo "-I@includedir@"
|
|
+ echo ""
|
|
elif [ "$show_libs" = 1 ]
|
|
then
|
|
- echo "-L@libdir@ -lpcap @LIBS@"
|
|
+ echo "-lpcap @LIBS@"
|
|
elif [ "$show_additional_libs" = 1 ]
|
|
then
|
|
echo "@LIBS@"
|
|
@@ -68,15 +58,15 @@ else
|
|
#
|
|
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
|
then
|
|
- echo "-I@includedir@ -L@libdir@ $RPATH -lpcap"
|
|
+ echo "-lpcap"
|
|
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
|
then
|
|
- echo "-I@includedir@"
|
|
+ echo ""
|
|
elif [ "$show_cflags" = 1 ]
|
|
then
|
|
- echo "-I@includedir@"
|
|
+ echo ""
|
|
elif [ "$show_libs" = 1 ]
|
|
then
|
|
- echo "-L@libdir@ $RPATH -lpcap"
|
|
+ echo "-lpcap"
|
|
fi
|
|
fi
|