Fix linker paths and libs order

This commit is contained in:
dmiller 2026-08-05 19:59:42 +00:00
parent d5645bf76d
commit 945cbf3506
3 changed files with 13 additions and 13 deletions

View file

@ -48,7 +48,7 @@ CPPFLAGS = @CPPFLAGS@ $(DEFS)
CFLAGS = @CFLAGS@ $(DBGFLAGS) $(CCOPT)
STATIC =
LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC)
LIBS = @LIBNSOCK_LIBS@ @LIBNBASE_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(LIBSSH2_LIBS) $(OPENSSL_LIBS) $(ZLIB_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBLINEAR_LIBS@ @LIBS@
LIBS = $(top_srcdir)/libnetutil/libnetutil.a @LIBNSOCK_LIBS@ @LIBNBASE_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(LIBSSH2_LIBS) $(OPENSSL_LIBS) $(ZLIB_LIBS) @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBLINEAR_LIBS@ @LIBS@
OPENSSL_LIBS = @OPENSSL_LIBS@
LIBSSH2_LIBS = @LIBSSH2_LIBS@
ZLIB_LIBS = @ZLIB_LIBS@

12
configure vendored
View file

@ -7266,7 +7266,7 @@ if test $have_libpcap != yes; then
else
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
LIBPCAP_LIBS='\$(top_srcdir)/$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="build-pcap"
PCAP_CLEAN="clean-pcap"
PCAP_DIST_CLEAN="distclean-pcap"
@ -7477,7 +7477,7 @@ if test $have_pcre != yes ; then
subdirs="$subdirs libpcre"
CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR/src $CPPFLAGS"
LIBPCRE_LIBS="$LIBPCREDIR/.libs/libpcre2-8.a"
LIBPCRE_LIBS="\$(top_srcdir)/$LIBPCREDIR/.libs/libpcre2-8.a"
PCRE_BUILD="build-pcre"
PCRE_CLEAN="clean-pcre"
PCRE_DIST_CLEAN="distclean-pcre"
@ -7648,7 +7648,7 @@ fi
# headers/libs on your own if you want compression support for SSH.
#ac_configure_args="$ac_configure_args '--with-libz-prefix=../../$ZLIBDIR'"
CPPFLAGS="-I\$(top_srcdir)/$ZLIBDIR $CPPFLAGS"
ZLIB_LIBS="$ZLIBDIR/libz.a"
ZLIB_LIBS="\$(top_srcdir)/$ZLIBDIR/libz.a"
ZLIB_BUILD="build-zlib"
ZLIB_CLEAN="clean-zlib"
ZLIB_DIST_CLEAN="distclean-zlib"
@ -7824,7 +7824,7 @@ fi
subdirs="$subdirs libssh2"
CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS"
LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a"
LIBSSH2_LIBS="\$(top_srcdir)/$LIBSSH2DIR/lib/libssh2.a"
LIBSSH2_BUILD="build-libssh2"
LIBSSH2_CLEAN="clean-libssh2"
LIBSSH2_DIST_CLEAN="distclean-libssh2"
@ -8865,7 +8865,7 @@ NBASEDIR="nbase"
fi
LDFLAGS="$LDFLAGS -L$NBASEDIR"
LDFLAGS="$LDFLAGS -L\$(top_srcdir)/$NBASEDIR"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR"
LIBNBASE_LIBS="-lnbase"
@ -8896,7 +8896,7 @@ then :
fi
LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/"
LDFLAGS="$LDFLAGS -L\$(top_srcdir)/$NSOCKDIR/src/"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include"
LIBNSOCK_LIBS="-lnsock"

View file

@ -489,7 +489,7 @@ if test $have_libpcap != yes; then
else
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
fi
LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
LIBPCAP_LIBS='\$(top_srcdir)/$(LIBPCAPDIR)/libpcap.a'
PCAP_BUILD="build-pcap"
PCAP_CLEAN="clean-pcap"
PCAP_DIST_CLEAN="distclean-pcap"
@ -561,7 +561,7 @@ fi
if test $have_pcre != yes ; then
AC_CONFIG_SUBDIRS( libpcre )
CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR/src $CPPFLAGS"
LIBPCRE_LIBS="$LIBPCREDIR/.libs/libpcre2-8.a"
LIBPCRE_LIBS="\$(top_srcdir)/$LIBPCREDIR/.libs/libpcre2-8.a"
PCRE_BUILD="build-pcre"
PCRE_CLEAN="clean-pcre"
PCRE_DIST_CLEAN="distclean-pcre"
@ -640,7 +640,7 @@ if test $with_libz != no; then
# headers/libs on your own if you want compression support for SSH.
#ac_configure_args="$ac_configure_args '--with-libz-prefix=../../$ZLIBDIR'"
CPPFLAGS="-I\$(top_srcdir)/$ZLIBDIR $CPPFLAGS"
ZLIB_LIBS="$ZLIBDIR/libz.a"
ZLIB_LIBS="\$(top_srcdir)/$ZLIBDIR/libz.a"
ZLIB_BUILD="build-zlib"
ZLIB_CLEAN="clean-zlib"
ZLIB_DIST_CLEAN="distclean-zlib"
@ -722,7 +722,7 @@ if test $use_libssh2 = yes -a $use_openssl = yes; then
have_libssh2=yes
AC_CONFIG_SUBDIRS(libssh2)
CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS"
LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a"
LIBSSH2_LIBS="\$(top_srcdir)/$LIBSSH2DIR/lib/libssh2.a"
LIBSSH2_BUILD="build-libssh2"
LIBSSH2_CLEAN="clean-libssh2"
LIBSSH2_DIST_CLEAN="distclean-libssh2"
@ -1050,7 +1050,7 @@ NBASE_BUILD="build-nbase"
NBASEDIR="nbase"
)
LDFLAGS="$LDFLAGS -L$NBASEDIR"
LDFLAGS="$LDFLAGS -L\$(top_srcdir)/$NBASEDIR"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NBASEDIR"
LIBNBASE_LIBS="-lnbase"
@ -1076,7 +1076,7 @@ AC_HELP_STRING([--with-libnsock=DIR], [Compile and link to libnsock in DIR]),
esac]
)
LDFLAGS="$LDFLAGS -L$NSOCKDIR/src/"
LDFLAGS="$LDFLAGS -L\$(top_srcdir)/$NSOCKDIR/src/"
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$NSOCKDIR/include"
LIBNSOCK_LIBS="-lnsock"