~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trace/trace.3: Fix misformatting.
[mLib]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
e71e10f
..
9ff83ba
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-5,7
+5,7
@@
dnl
dnl (c) 2008 Straylight/Edgeware
dnl
dnl (c) 2008 Straylight/Edgeware
dnl
-dnl
----- Licensing notice
--------------------------------------------------
+dnl
----- Licensing notice -
--------------------------------------------------
dnl
dnl This file is part of the mLib utilities library.
dnl
dnl
dnl This file is part of the mLib utilities library.
dnl
@@
-31,7
+31,8
@@
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
AM_PROG_CC_C_O
AC_PROG_CC
AM_PROG_CC_C_O
@@
-39,6
+40,8
@@
AM_PROG_LIBTOOL
AX_CFLAGS_WARN_ALL
mdw_LIBTOOL_VERSION_INFO
AX_CFLAGS_WARN_ALL
mdw_LIBTOOL_VERSION_INFO
+AC_CHECK_PROGS([AUTOM4TE], [autom4te])
+
mdw_MANEXT
AC_DEFINE_UNQUOTED([SRCDIR], ["$(cd $srcdir && pwd)"],
mdw_MANEXT
AC_DEFINE_UNQUOTED([SRCDIR], ["$(cd $srcdir && pwd)"],
@@
-49,17
+52,32
@@
dnl C programming environment.
dnl Headers.
AC_CHECK_HEADERS([float.h])
dnl Headers.
AC_CHECK_HEADERS([float.h])
+AC_CHECK_HEADERS([stdint.h])
dnl Libraries.
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
dnl Libraries.
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
+dnl Functions.
+AC_CHECK_FUNCS([snprintf])
+
+dnl Types.
+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],,, [
#include <sys/types.h>
#include <sys/socket.h>
])
dnl Which version of struct msghdr do we have?
AC_CHECK_MEMBERS([struct msgdr.msg_control],,, [
#include <sys/types.h>
#include <sys/socket.h>
])
+dnl Find out whether we're cross-compiling.
+AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
+
dnl--------------------------------------------------------------------------
dnl Name resolution.
dnl--------------------------------------------------------------------------
dnl Name resolution.
@@
-94,13
+112,30
@@
esac
AM_CONDITIONAL([WITH_ADNS], [test "$use_adns" = yes])
dnl--------------------------------------------------------------------------
AM_CONDITIONAL([WITH_ADNS], [test "$use_adns" = yes])
dnl--------------------------------------------------------------------------
+dnl Python (used for testing).
+
+AM_PATH_PYTHON([2.4],, [:])
+
+dnl--------------------------------------------------------------------------
dnl Output.
AC_CONFIG_HEADER([config/config.h])
dnl Output.
AC_CONFIG_HEADER([config/config.h])
+AC_CONFIG_TESTDIR([t])
AC_CONFIG_FILES(
[Makefile]
AC_CONFIG_FILES(
[Makefile]
- [man/Makefile])
+ [buf/Makefile]
+ [codec/Makefile]
+ [hash/Makefile]
+ [mem/Makefile]
+ [sel/Makefile]
+ [struct/Makefile]
+ [sys/Makefile]
+ [test/Makefile]
+ [trace/Makefile]
+ [ui/Makefile]
+ [utils/Makefile]
+ [t/Makefile t/atlocal])
AC_OUTPUT
AC_OUTPUT
-dnl
----- That's all, folks -------------------------------------------------
+dnl
-
----- That's all, folks -------------------------------------------------