configure.in | 16 ++++++++-------- src/Makefile.in | 7 ++++--- src/libnids.3 | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 86f32b8..6f895f7 100644 --- a/configure.in +++ b/configure.in @@ -76,8 +76,8 @@ AC_ARG_WITH(libpcap, ;; esac ], [ if test -f ${prefix}/include/pcap.h; then - PCAP_CFLAGS="-I${prefix}/include" - PCAPLIB="-L${exec_prefix}/lib -lpcap" + PCAP_CFLAGS="" + PCAPLIB="-lpcap" elif test -f /usr/include/pcap/pcap.h; then PCAP_CFLAGS="-I/usr/include/pcap" PCAPLIB="-lpcap" @@ -142,11 +142,11 @@ AC_ARG_WITH(libnet, ;; *) AC_MSG_RESULT($withval) - if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then + if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.so -a -f $withval/libnet-config ; then owd=`pwd` if cd $withval; then withval=`pwd`; cd $owd; fi - LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`" - LNETLIB="-L$withval/lib -lnet" + LNET_CFLAGS="`$withval/libnet-config --defines`" + LNETLIB="-lnet" elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then owd=`pwd` if cd $withval; then withval=`pwd`; cd $owd; fi @@ -161,9 +161,9 @@ AC_ARG_WITH(libnet, [ if test "x"$LIBNET_VER = "x"-1 ; then AC_MSG_RESULT(skipping libnet) else - if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then - LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`" - LNETLIB="-L${exec_prefix}/lib -lnet" + if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.so ; then + LNET_CFLAGS="`${exec_prefix}/bin/libnet-config --defines 2>/dev/null`" + LNETLIB="-lnet" else LNET_CFLAGS="`libnet-config --defines 2>/dev/null`" LNETLIB="-lnet" diff --git a/src/Makefile.in b/src/Makefile.in index 2204c79..71d41b6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -67,14 +67,15 @@ $(LIBSTATIC): $(OBJS) $(LIBSHARED): $(OBJS_SHARED) $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) -_install install: $(LIBSTATIC) +_installcommon: ../mkinstalldirs $(install_prefix)$(libdir) ../mkinstalldirs $(install_prefix)$(includedir) ../mkinstalldirs $(install_prefix)$(mandir)/man3 - $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir) $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3 -_installshared installshared: install $(LIBSHARED) +_install install: _installcommon $(LIBSTATIC) + $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) +_installshared installshared: _installcommon $(LIBSHARED) $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir) ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so diff --git a/src/libnids.3 b/src/libnids.3 index 8d2f35b..3400a47 100644 --- a/src/libnids.3 +++ b/src/libnids.3 @@ -55,7 +55,7 @@ int int \fBnids_getfd\fR(void); -int +void \fBnids_register_chksum_ctl\fR(struct nids_chksum_ctl *, int); void