mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-28 21:06:16 +00:00
Code Issues Releases Wiki Activity

Add libwrap at the end of the configure run

Browse Source 
If libwrap becomes added earlier, other tests may fail because of not all
external variables required by libwrap are available when linking: for
example allow_severity and deny_severity.

This patch adds generic support for the LDFLAGS_END and LIBS_END variables
(CFLAGS_END has been implemented already).

Problem spotted on OpenBSD.

(cherry picked from commit 0f85c4c6a7)

Conflicts:
	configure.ng
This commit is contained in:
Alexander Barton 2014-01-17 16:10:34 +01:00
parent ecb55704b7
commit 9f090d7554
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ng
View File

@ -463,7 +463,9 @@ AC_ARG_WITH(tcp-wrappers,
LDFLAGS="-L$withval/lib $LDFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS"
fi fi
AC_MSG_CHECKING(for hosts_access) AC_MSG_CHECKING(for hosts_access)
saved_LIBS="$LIBS"
LIBS="-lwrap $LIBS" LIBS="-lwrap $LIBS"
LIBS_END="-lwrap $LIBS_END"
AC_TRY_LINK([ AC_TRY_LINK([
#include <tcpd.h> #include <tcpd.h>
int allow_severity = 0; int allow_severity = 0;
@ -478,6 +480,7 @@ int deny_severity = 0;
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR([Can't enable TCP wrappers!]) AC_MSG_ERROR([Can't enable TCP wrappers!])
]) ])
LIBS="$saved_LIBS"
fi fi
] ]
) )
@ -633,9 +636,12 @@ AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" )
AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" ) AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" )
AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" ) AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" )
# Add additional CFLAGS, eventually specified on the command line, but after # Add additional CFLAGS, LDFLAGS and LIBS which were specified on the command
# running this configure script. Useful for "-Werror" for example. # line or by some tests from above, but after running this script. Useful for
# adding "-Werror", for example:
test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END"
test -n "$LDFLAGS_END" && LDFLAGS="$LDFLAGS $LDFLAGS_END"
test -n "$LIBS_END" && LIBS="$LIBS $LIBS_END"
# -- Generate files -- # -- Generate files --