# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1279718864 0
# Node ID 1151059c5eff0c74ddef4f8f2403332706735d2e
# Parent  b50f0107e505736ba8e1f3c39a5a0c633c01c31d
Work properly again with bundled libtom*. autoconf is a hassle.

diff -r b50f0107e505 -r 1151059c5eff Makefile.in
--- a/Makefile.in	Wed Jul 21 12:55:25 2010 +0000
+++ b/Makefile.in	Wed Jul 21 13:27:44 2010 +0000
@@ -76,7 +76,7 @@
 STRIP=@STRIP@
 INSTALL=@INSTALL@
 CPPFLAGS=@CPPFLAGS@
-CFLAGS=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
 LIBS+=@LIBS@
 LDFLAGS=@LDFLAGS@
 
diff -r b50f0107e505 -r 1151059c5eff configure.in
--- a/configure.in	Wed Jul 21 12:55:25 2010 +0000
+++ b/configure.in	Wed Jul 21 13:27:44 2010 +0000
@@ -366,18 +366,20 @@
 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