~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
struct/buf.c: Muffle an annoying Clang warning about a pointless assertion.
[mLib]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
9ff83ba
..
ab8d2a8
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-50,13
+50,17
@@
AC_DEFINE_UNQUOTED([SRCDIR], ["$(cd $srcdir && pwd)"],
dnl--------------------------------------------------------------------------
dnl C programming environment.
dnl--------------------------------------------------------------------------
dnl C programming environment.
+MLIB_LIBS=
+
dnl Headers.
AC_CHECK_HEADERS([float.h])
AC_CHECK_HEADERS([stdint.h])
dnl Libraries.
dnl Headers.
AC_CHECK_HEADERS([float.h])
AC_CHECK_HEADERS([stdint.h])
dnl Libraries.
+mdw_ORIG_LIBS=$LIBS LIBS=$MLIB_LIBS
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
+MLIB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
dnl Functions.
AC_CHECK_FUNCS([snprintf])
dnl Functions.
AC_CHECK_FUNCS([snprintf])
@@
-78,6
+82,9
@@
AC_CHECK_MEMBERS([struct msgdr.msg_control],,, [
dnl Find out whether we're cross-compiling.
AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
dnl Find out whether we're cross-compiling.
AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
+dnl Set the master library list.
+AC_SUBST([MLIB_LIBS])
+
dnl--------------------------------------------------------------------------
dnl Name resolution.
dnl--------------------------------------------------------------------------
dnl Name resolution.
@@
-87,10
+94,12
@@
AC_ARG_WITH([adns],
[want_adns=$withval],
[want_adns=auto])
[want_adns=$withval],
[want_adns=auto])
+mdw_ORIG_LIBS=$LIBS LIBS=$MLIB_LIBS
case $want_adns in
no) ;;
*) AC_SEARCH_LIBS([adns_init], [adns], [have_adns=yes], [have_adns=no]) ;;
esac
case $want_adns in
no) ;;
*) AC_SEARCH_LIBS([adns_init], [adns], [have_adns=yes], [have_adns=no]) ;;
esac
+MLIB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
case $want_adns,$have_adns in
yes,no)
AC_MSG_ERROR([ADNS library not found but explicitly requested])
case $want_adns,$have_adns in
yes,no)
AC_MSG_ERROR([ADNS library not found but explicitly requested])