Module Name: src
Committed By: christos
Date: Sun Dec 5 03:01:40 UTC 2010
Modified Files:
src/external/bsd/libpcap/dist: pcap-config.in
Log Message:
don't print -L/usr/lib and -I/usr/include for no reason.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libpcap/dist/pcap-config.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/dist/pcap-config.in
diff -u src/external/bsd/libpcap/dist/pcap-config.in:1.1.1.1 src/external/bsd/libpcap/dist/pcap-config.in:1.2
--- src/external/bsd/libpcap/dist/pcap-config.in:1.1.1.1 Sat Dec 4 20:20:34 2010
+++ src/external/bsd/libpcap/dist/pcap-config.in Sat Dec 4 22:01:39 2010
@@ -39,6 +39,19 @@
rpa...@v_rpath_opt@@libdir@
fi
fi
+if [ "@includedir@" != "/usr/include" ]
+then
+ i="-...@includedir@"
+fi
+if [ "@libdir@" != "/usr/lib" ]
+then
+ l="-...@libdir@"
+fi
+if [ -n "@LIBS@" ]
+then
+ L="@LIBS@"
+fi
+
if [ "$static" = 1 ]
then
#
@@ -47,19 +60,19 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-...@includedir@ -...@libdir@ -lpcap @LIBS@"
+ echo "$i $l -lpcap $L"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-...@includedir@ -...@libdir@ @LIBS@"
+ echo "$i $l $L"
elif [ "$show_cflags" = 1 ]
then
- echo "-...@includedir@"
+ echo "$i"
elif [ "$show_libs" = 1 ]
then
- echo "-...@libdir@ -lpcap @LIBS@"
+ echo "$l -lpcap $L"
elif [ "$show_additional_libs" = 1 ]
then
- echo "@LIBS@"
+ echo "$L"
fi
else
#
@@ -68,15 +81,15 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-...@includedir@ -...@libdir@ $RPATH -lpcap"
+ echo "$l $RPATH -lpcap"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-...@includedir@"
+ echo "$i"
elif [ "$show_cflags" = 1 ]
then
- echo "-...@includedir@"
+ echo "$i"
elif [ "$show_libs" = 1 ]
then
- echo "-...@libdir@ $RPATH -lpcap"
+ echo "$l $RPATH -lpcap"
fi
fi
