projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
key-data.[ch] (key_copydata): New function copies filtered key data.
[u/mdw/catacomb]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
f8457bf
..
30c2816
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-29,14
+29,14
@@
dnl MA 02111-1307, USA.
dnl --- Boring boilerplate ---
AC_INIT(blkc.h)
dnl --- Boring boilerplate ---
AC_INIT(blkc.h)
-
mdw_INIT_LIB(catacomb, Catacomb, 2.1.0
)
+
AM_INIT_AUTOMAKE(catacomb, 2.1.1
)
AM_CONFIG_HEADER(config.h)
dnl --- Make sure I can compile and build libraries ---
AC_PROG_CC
AM_PROG_LIBTOOL
AM_CONFIG_HEADER(config.h)
dnl --- Make sure I can compile and build libraries ---
AC_PROG_CC
AM_PROG_LIBTOOL
-mdw_GCC_FLAGS
+AX_CFLAGS_WARN_ALL
AC_PROG_YACC
AC_PROG_YACC
@@
-47,16
+47,18
@@
AC_HEADER_STDC
dnl --- Check for various important system types ---
dnl --- Check for various important system types ---
-AC_
TYPE_PID_T
-AC_
TYPE_SIZE_T
+AC_
CHECK_TYPE(pid_t, int)
+AC_
CHECK_TYPE(size_t, unsigned)
AC_TYPE_UID_T
AC_CHECK_TYPE(time_t, long)
AC_TYPE_UID_T
AC_CHECK_TYPE(time_t, long)
-mdw_TYPE_SSIZE_T
+AC_CHECK_TYPE(ssize_t, int)
dnl --- The maths library, for Maurer's test ---
dnl --- The maths library, for Maurer's test ---
-mdw_CHECK_MANYLIBS(log, m,,, [#include <math.h>], [2])
-mdw_CHECK_MANYLIBS(sqrt, m,,, [#include <math.h>], [2])
+OLIBS=$LIBS
+AC_SEARCH_LIBS(log, m)
+AC_SEARCH_LIBS(sqrt, m)
+AC_SUBST([CATACOMB_LIBS], [$LIBS]) LIBS=$OLIBS
dnl --- Functions used for noise-gathering ---
dnl --- Functions used for noise-gathering ---
@@
-81,7
+83,9
@@
fi
dnl --- Support for the passphrase pixie ---
dnl --- Support for the passphrase pixie ---
-mdw_CHECK_MANYLIBS(socket, socket)
+OLIBS=$LIBS
+AC_SEARCH_LIBS(socket, socket)
+AC_SUBST([PIXIE_LIBS], [$LIBS]) LIBS=$OLIBS
AC_CHECK_FUNCS(mlock)
dnl --- Debugging things ---
AC_CHECK_FUNCS(mlock)
dnl --- Debugging things ---
@@
-102,8
+106,10
@@
AC_ARG_ENABLE([mpw],
dnl --- Done ---
dnl --- Done ---
-mdw_MLIB(2.0.0)
-AC_OUTPUT(Makefile tests/Makefile catacomb-config:lib-config.in qcc,
+PKG_CHECK_MODULES(mLib, mLib >= 2.0.4)
+CFLAGS="$CFLAGS $mLib_CFLAGS"
+LIBS="$LIBS $mLib_LIBS"
+AC_OUTPUT(Makefile tests/Makefile catacomb.pc qcc,
chmod 755 qcc)
dnl ----- That's all, folks -------------------------------------------------
chmod 755 qcc)
dnl ----- That's all, folks -------------------------------------------------