Work properly again with bundled libtom*. autoconf is a hassle.

--HG--
extra : convert_revision : 4077fc3332bd7c965aadbb05b02eba6d00fa9621

Makefile.in

@@ -76,7 +76,7 @@ [email protected]@
 STRIP=@[email protected]
 INSTALL=@[email protected]
 CPPFLAGS=@[email protected]
-CFLAGS=-I. -I$(srcdir) $(CPPFLAGS) @[email protected]
+CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @[email protected]
 LIBS+=@[email protected]
 LDFLAGS=@[email protected]
 

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