Permalink
Browse files

Use config.status to generate pcap-config.

Rather than use a custom sed script to replace things in pcap-config,
use the already existing config.status script.  This keeps people from
having to update the Makefile.in every time they want to add a new var
to the file.

Also, clean up the pcap-config.in script a bit to set local vars at the
top of the file and then refer to those rather than replacing all things
through out.  This makes it easier to tweak on the fly as there is only
line to change rather than trying and figure out all the locations.

Reviewed-By: Guy Harris <guy@alum.mit.edu>
  • Loading branch information...
1 parent a092baf commit 16f6b49c87c030be6c4ffc5890a93309f810c849 @vapier vapier committed with guyharris Dec 1, 2010
Showing with 20 additions and 17 deletions.
  1. +1 −5 Makefile.in
  2. +19 −12 pcap-config.in
View
@@ -490,11 +490,7 @@ bpf_filter.o: bpf_filter.c
#
pcap-config: $(srcdir)/pcap-config.in
@rm -f $@ $@.tmp
- sed -e 's|@includedir[@]|$(includedir)|g' \
- -e 's|@libdir[@]|$(libdir)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \
- $(srcdir)/pcap-config.in >$@.tmp
+ ./config.status --file=$@.tmp:$<
mv $@.tmp $@
chmod a+x $@
View
@@ -4,6 +4,13 @@
# Script to give the appropriate compiler flags and linker flags
# to use when building code that uses libpcap.
#
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+includedir="@includedir@"
+libdir="@libdir@"
+V_RPATH_OPT="@V_RPATH_OPT@"
+LIBS="@LIBS@"
+
static=0
show_cflags=0
show_libs=0
@@ -29,14 +36,14 @@ do
esac
shift
done
-if [ "@V_RPATH_OPT@" != "" ]
+if [ "$V_RPATH_OPT" != "" ]
then
#
# If libdir isn't /usr/lib, add it to the run-time linker path.
#
- if [ "@libdir@" != "/usr/lib" ]
+ if [ "$libdir" != "/usr/lib" ]
then
- RPATH=@V_RPATH_OPT@@libdir@
+ RPATH=$V_RPATH_OPT$libdir
fi
fi
if [ "$static" = 1 ]
@@ -47,19 +54,19 @@ then
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I@includedir@ -L@libdir@ -lpcap @LIBS@"
+ echo "-I$includedir -L$libdir -lpcap $LIBS"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I@includedir@ -L@libdir@ @LIBS@"
+ echo "-I$includedir -L$libdir $LIBS"
elif [ "$show_cflags" = 1 ]
then
- echo "-I@includedir@"
+ echo "-I$includedir"
elif [ "$show_libs" = 1 ]
then
- echo "-L@libdir@ -lpcap @LIBS@"
+ echo "-L$libdir -lpcap $LIBS"
elif [ "$show_additional_libs" = 1 ]
then
- echo "@LIBS@"
+ echo "$LIBS"
fi
else
#
@@ -68,15 +75,15 @@ else
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I@includedir@ -L@libdir@ $RPATH -lpcap"
+ echo "-I$includedir -L$libdir $RPATH -lpcap"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I@includedir@"
+ echo "-I$includedir"
elif [ "$show_cflags" = 1 ]
then
- echo "-I@includedir@"
+ echo "-I$includedir"
elif [ "$show_libs" = 1 ]
then
- echo "-L@libdir@ $RPATH -lpcap"
+ echo "-L$libdir $RPATH -lpcap"
fi
fi

0 comments on commit 16f6b49

Please sign in to comment.