~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.4.2.
[mLib]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
5973f45
..
ab8d2a8
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-31,7
+31,7
@@
mdw_AUTO_VERSION
AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib])
AC_CONFIG_SRCDIR([mLib.pc.in])
AC_CONFIG_AUX_DIR([config])
AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib])
AC_CONFIG_SRCDIR([mLib.pc.in])
AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign
subdir-objects
])
mdw_SILENT_RULES
AC_PROG_CC
mdw_SILENT_RULES
AC_PROG_CC
@@
-50,19
+50,28
@@
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 Types.
dnl Functions.
AC_CHECK_FUNCS([snprintf])
dnl Types.
-AC_CHECK_TYPE([socklen_t], [int])
+AC_CHECK_TYPE([socklen_t], [],
+ [AC_DEFINE([socklen_t], [int],
+ [Define to `int' if <sys/socket.h> does not define])],
+ [AC_INCLUDES_DEFAULT
+#include <sys/socket.h>
+])
dnl Which version of struct msghdr do we have?
AC_CHECK_MEMBERS([struct msgdr.msg_control],,, [
dnl Which version of struct msghdr do we have?
AC_CHECK_MEMBERS([struct msgdr.msg_control],,, [
@@
-73,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.
@@
-82,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])