diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2010-07-21 13:27:44 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2010-07-21 13:27:44 +0000 |
| commit | 27fddd2c355b32c5bc304a026f3ceae86433c34c (patch) | |
| tree | 068bef033b8b1d33fec7ceb6ba59efbef353b4a3 | |
| parent | fced1113d3dfbe6ee8ce8784ab75ae074a47e03b (diff) | |
Work properly again with bundled libtom*. autoconf is a hassle.
--HG--
extra : convert_revision : 4077fc3332bd7c965aadbb05b02eba6d00fa9621
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 4eaeddf..d72828b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,7 +76,7 @@ RANLIB=@RANLIB@ STRIP=@STRIP@ INSTALL=@INSTALL@ CPPFLAGS=@CPPFLAGS@ -CFLAGS=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ LIBS+=@LIBS@ LDFLAGS=@LDFLAGS@ diff --git a/configure.in b/configure.in index 9229902..6272a15 100644 --- a/configure.in +++ b/configure.in @@ -366,18 +366,20 @@ AC_CHECK_FUNCS(logout updwtmp logwtmp) AC_ARG_ENABLE(bundled-libtom, [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], [ - AC_MSG_NOTICE(use bundled) - AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom) BUNDLED_LIBTOM=1 + AC_MSG_NOTICE(Forcing bundled libtom*) ], [ - AC_MSG_NOTICE(not bundled) BUNDLED_LIBTOM=0 AC_CHECK_LIB(tomcrypt, register_cipher, , BUNDLED_LIBTOM=1) AC_CHECK_LIB(tommath, mp_exptmod, , BUNDLED_LIBTOM=1) ] ) +if test $BUNDLED_LIBTOM = 1 ; then + AC_DEFINE(BUNDLED_LIBTOM,,Use bundled libtom) +fi + AC_SUBST(BUNDLED_LIBTOM) dnl Added from OpenSSH 3.6.1p2's configure.ac |