[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r4176 - in trunk: OpenDNSSEC/m4 OpenDNSSEC/plugins/eppclient/m4 hsmbully/m4 softHSM/m4 utils/m4

Rickard Bellgrim rickard.bellgrim at iis.se
Wed Nov 10 03:51:32 CET 2010


Author: rb
Date: 2010-11-10 03:51:32 +0100 (Wed, 10 Nov 2010)
New Revision: 4176

Modified:
   trunk/OpenDNSSEC/m4/acx_sqlite3.m4
   trunk/OpenDNSSEC/plugins/eppclient/m4/acx_libsqlite3.m4
   trunk/hsmbully/m4/acx_cunit.m4
   trunk/softHSM/m4/acx_libsqlite3.m4
   trunk/utils/m4/acx_libsqlite3.m4
   trunk/utils/m4/acx_sqlite3.m4
Log:
Edit the text message (and hsmbully was updated from utils/m4)


Modified: trunk/OpenDNSSEC/m4/acx_sqlite3.m4
===================================================================
--- trunk/OpenDNSSEC/m4/acx_sqlite3.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/OpenDNSSEC/m4/acx_sqlite3.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -32,7 +32,7 @@
 	LIBS="$LIBS $SQLITE3_LIBS"
 
 	AC_CHECK_HEADERS(sqlite3.h,,[AC_MSG_ERROR([Can't find SQLite3 headers])])
-	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.4.2 or greater])])
+	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.3.9 or greater])])
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS

Modified: trunk/OpenDNSSEC/plugins/eppclient/m4/acx_libsqlite3.m4
===================================================================
--- trunk/OpenDNSSEC/plugins/eppclient/m4/acx_libsqlite3.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/OpenDNSSEC/plugins/eppclient/m4/acx_libsqlite3.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -25,7 +25,7 @@
 	LIBS="$LIBS $SQLITE3_LIBS"
 
 	AC_CHECK_HEADERS(sqlite3.h,,[AC_MSG_ERROR([Can't find SQLite3 headers])])
-	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.4.2 or greater])])
+	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.3.9 or greater])])
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS

Modified: trunk/hsmbully/m4/acx_cunit.m4
===================================================================
--- trunk/hsmbully/m4/acx_cunit.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/hsmbully/m4/acx_cunit.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -1,4 +1,4 @@
-# $Id: acx_cunit.m4 1647 2009-08-17 12:07:30Z jakob $
+# $Id$
 
 AC_DEFUN([ACX_CUNIT],[
 	AC_ARG_WITH(cunit,
@@ -9,6 +9,8 @@
 			CUNIT_PATH="/usr/local"
 		])
 
+	AS_IF([test "x$with_cunit" != xno],[
+
 	AC_MSG_CHECKING(what are the cunit includes)
 	CUNIT_INCLUDES="-I$CUNIT_PATH/include"
 	AC_MSG_RESULT($CUNIT_INCLUDES)
@@ -32,6 +34,12 @@
 	CPPFLAGS=$tmp_INCLUDES
 	LIBS=$tmp_LIBS
 
+	],[
+		AC_MSG_NOTICE([cunit disabled])
+		CUNIT_INCLUDES=
+		CUNIT_LIBS=
+	])
+
 	AC_SUBST(CUNIT_INCLUDES)
 	AC_SUBST(CUNIT_LIBS)
 ])


Property changes on: trunk/hsmbully/m4/acx_cunit.m4
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/softHSM/m4/acx_libsqlite3.m4
===================================================================
--- trunk/softHSM/m4/acx_libsqlite3.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/softHSM/m4/acx_libsqlite3.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -25,7 +25,7 @@
 	LIBS="$LIBS $SQLITE3_LIBS"
 
 	AC_CHECK_HEADERS(sqlite3.h,,[AC_MSG_ERROR([Can't find SQLite3 headers])])
-	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.4.2 or greater])])
+	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.3.9 or greater])])
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS

Modified: trunk/utils/m4/acx_libsqlite3.m4
===================================================================
--- trunk/utils/m4/acx_libsqlite3.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/utils/m4/acx_libsqlite3.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -25,7 +25,7 @@
 	LIBS="$LIBS $SQLITE3_LIBS"
 
 	AC_CHECK_HEADERS(sqlite3.h,,[AC_MSG_ERROR([Can't find SQLite3 headers])])
-	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.4.2 or greater])])
+	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.3.9 or greater])])
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS

Modified: trunk/utils/m4/acx_sqlite3.m4
===================================================================
--- trunk/utils/m4/acx_sqlite3.m4	2010-11-10 02:11:13 UTC (rev 4175)
+++ trunk/utils/m4/acx_sqlite3.m4	2010-11-10 02:51:32 UTC (rev 4176)
@@ -32,7 +32,7 @@
 	LIBS="$LIBS $SQLITE3_LIBS"
 
 	AC_CHECK_HEADERS(sqlite3.h,,[AC_MSG_ERROR([Can't find SQLite3 headers])])
-	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.4.2 or greater])])
+	AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2, [], [AC_MSG_ERROR([Missing SQLite3 library v3.3.9 or greater])])
 
 	CPPFLAGS=$tmp_CPPFLAGS
 	LIBS=$tmp_LIBS




More information about the Opendnssec-commits mailing list