[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r1594 - in trunk: . auditor enforcer hsmbully libhsm signer softHSM xml

Jakob Schlyter jakob at kirei.se
Thu Aug 13 10:40:01 CEST 2009


Author: jakob
Date: 2009-08-13 10:40:01 +0200 (Thu, 13 Aug 2009)
New Revision: 1594

Modified:
   trunk/auditor/configure.ac
   trunk/configure.ac
   trunk/enforcer/configure.ac
   trunk/hsmbully/configure.ac
   trunk/libhsm/configure.ac
   trunk/signer/configure.ac
   trunk/softHSM/configure.ac
   trunk/xml/configure.ac
Log:
update autoconf and remove obsolete macros (thanks to autoupdate for the patch)


Modified: trunk/auditor/configure.ac
===================================================================
--- trunk/auditor/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/auditor/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.61)
-AC_INIT([auditor], [0.0.1], [alex.dalitz at nominet.org.uk])
+AC_INIT([auditor],[0.0.1],[alex.dalitz at nominet.org.uk])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -57,6 +57,9 @@
 opendnsseclibdir=$full_libdir/opendnssec
 AC_SUBST([opendnsseclibdir])
 
-AC_CONFIG_FILES([Makefile kasp_auditor])
+AC_CONFIG_FILES([
+	Makefile
+	kasp_auditor
+])
 
 AC_OUTPUT

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,7 +1,7 @@
 # $Id$
 
-AC_PREREQ(2.61)
-AC_INIT([opendnssec], [0.0.1], [])
+AC_PREREQ(2.63)
+AC_INIT([opendnssec],[0.0.1],[])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])

Modified: trunk/enforcer/configure.ac
===================================================================
--- trunk/enforcer/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/enforcer/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.61)
-AC_INIT([enforcer], [0.0.1], [jad at jadickinson.co.uk])
+AC_INIT([enforcer],[0.0.1],[jad at jadickinson.co.uk])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -15,7 +15,7 @@
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 ACX_PEDANTIC
 ACX_STRICT
@@ -111,15 +111,15 @@
 
 
 AC_CONFIG_FILES([
-Makefile
-ksm/Makefile
-ksm/include/Makefile
-ksm/include/ksm/Makefile
-common/Makefile
-communicated/Makefile
-keygend/Makefile
-utils/Makefile
-test/Makefile
+	Makefile
+	ksm/Makefile
+	ksm/include/Makefile
+	ksm/include/ksm/Makefile
+	common/Makefile
+	communicated/Makefile
+	keygend/Makefile
+	utils/Makefile
+	test/Makefile
 ])
 
 AC_OUTPUT

Modified: trunk/hsmbully/configure.ac
===================================================================
--- trunk/hsmbully/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/hsmbully/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -15,7 +15,7 @@
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 ACX_PEDANTIC
 ACX_STRICT
@@ -37,7 +37,7 @@
 ACX_DLOPEN
 
 AC_ARG_WITH(pkcs11-softhsm, 
-	AC_HELP_STRING([--with-pkcs11-softhsm=PATH],[specify path of SoftHSM library to use for regression testing (default PREFIX/lib/libsofthsm.so)]),
+	AS_HELP_STRING([--with-pkcs11-softhsm=PATH],[specify path of SoftHSM library to use for regression testing (default PREFIX/lib/libsofthsm.so)]),
 	[ pkcs11_softhsm_module="$withval" ],
 	[ pkcs11_softhsm_module="/usr/local/lib/libsofthsm.so" ]
 )
@@ -45,10 +45,10 @@
 AC_SUBST(pkcs11_softhsm_module)
 
 AC_CONFIG_FILES([
-Makefile
-src/Makefile
-checks/Makefile
-checks/softhsm.sh
+	Makefile
+	src/Makefile
+	checks/Makefile
+	checks/softhsm.sh
 ])
 
 AC_OUTPUT

Modified: trunk/libhsm/configure.ac
===================================================================
--- trunk/libhsm/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/libhsm/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.61)
-AC_INIT([libhsm], [0.0.1], [jelte at nlnetlabs.nl])
+AC_INIT([libhsm],[0.0.1],[jelte at nlnetlabs.nl])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -15,7 +15,7 @@
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 ACX_ARG_RPATH
 ACX_RUNTIME_PATH_ADD
@@ -51,25 +51,25 @@
 AC_DEFINE_UNQUOTED([HSM_DEFAULT_CONFIG],["${full_sysconfdir}/opendnssec/conf.xml"],[Default configuration file.])
 
 AC_ARG_WITH(pkcs11-softhsm, 
-	AC_HELP_STRING([--with-pkcs11-softhsm=PATH],[specify path of SoftHSM library to use for regression testing (default PREFIX/lib/libsofthsm.so)]),
+	AS_HELP_STRING([--with-pkcs11-softhsm=PATH],[specify path of SoftHSM library to use for regression testing (default PREFIX/lib/libsofthsm.so)]),
 	[ pkcs11_softhsm_module="$withval" ],
 	[ pkcs11_softhsm_module="$prefix/lib/libsofthsm.so" ]
 )
 
 AC_ARG_WITH(pkcs11-sca6000, 
-	AC_HELP_STRING([--with-pkcs11-sca6000=PATH],[specify path of SCA6000 library to use for regression testing (default /usr/lib/libpkcs11.so)]),
+	AS_HELP_STRING([--with-pkcs11-sca6000=PATH],[specify path of SCA6000 library to use for regression testing (default /usr/lib/libpkcs11.so)]),
 	[ pkcs11_sca6000_module="$withval" ],
 	[ pkcs11_sca6000_module="/usr/lib/libpkcs11.so" ]
 )
 
 AC_ARG_WITH(pkcs11-etoken, 
-	AC_HELP_STRING([--with-pkcs11-etoken=PATH],[specify path of Aladdin eToken library to use for regression testing (default /usr/local/lib/libeTPkcs11.so)]),
+	AS_HELP_STRING([--with-pkcs11-etoken=PATH],[specify path of Aladdin eToken library to use for regression testing (default /usr/local/lib/libeTPkcs11.so)]),
 	[ pkcs11_etoken_module="$withval" ],
 	[ pkcs11_etoken_module="/usr/local/lib/libeTPkcs11.so" ]
 )
 
 AC_ARG_WITH(pkcs11-opensc, 
-	AC_HELP_STRING([--with-pkcs11-opensc=PATH],[specify path of Aladdin eToken library to use for regression testing (default /usr/lib/pkcs11/opensc-pkcs11.so)]),
+	AS_HELP_STRING([--with-pkcs11-opensc=PATH],[specify path of Aladdin eToken library to use for regression testing (default /usr/lib/pkcs11/opensc-pkcs11.so)]),
 	[ pkcs11_opensc_module="$withval" ],
 	[ pkcs11_opensc_module="/usr/lib/pkcs11/opensc-pkcs11.so" ]
 )
@@ -80,14 +80,14 @@
 AC_SUBST(pkcs11_opensc_module)
 
 AC_CONFIG_FILES([
-Makefile
-src/Makefile
-checks/Makefile
-checks/conf-softhsm.xml
-checks/conf-sca6000.xml
-checks/conf-etoken.xml
-checks/conf-multi.xml
-checks/conf-opensc.xml
+	Makefile
+	src/Makefile
+	checks/Makefile
+	checks/conf-softhsm.xml
+	checks/conf-sca6000.xml
+	checks/conf-etoken.xml
+	checks/conf-multi.xml
+	checks/conf-opensc.xml
 ])
 
 AC_OUTPUT

Modified: trunk/signer/configure.ac
===================================================================
--- trunk/signer/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/signer/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,6 +1,7 @@
 # $Id$
 
-AC_INIT([signer_engine], [0.0.1], [jelte at NLnetLabs.nl])
+AC_PREREQ(2.61)
+AC_INIT([signer_engine],[0.0.1],[jelte at NLnetLabs.nl])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -45,15 +46,15 @@
 AM_PATH_PYTHON
 AC_CONFIG_HEADERS([tools/config.h])
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_CONFIG_FILES([
-Makefile
-tools/Makefile
-signer_engine/Makefile
-signer_engine/signer_engine
-signer_engine/EngineConfig.py
-signer_engine/signer_engine_cli
+	Makefile
+	tools/Makefile
+	signer_engine/Makefile
+	signer_engine/signer_engine
+	signer_engine/EngineConfig.py
+	signer_engine/signer_engine_cli
 ])
 
 AC_OUTPUT

Modified: trunk/softHSM/configure.ac
===================================================================
--- trunk/softHSM/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/softHSM/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -33,10 +33,8 @@
 ##################
 
 # Init 
-AC_PREREQ(2.61)
-AC_INIT([libsofthsm],
-	[SOFTHSM_VERSION_MAJOR.SOFTHSM_VERSION_MINOR.SOFTHSM_VERSION_FIX[]PACKAGE_SUFFIX],
-	[rickard.bondesson at iis.se])
+AC_PREREQ(2.63)
+AC_INIT([libsofthsm],[SOFTHSM_VERSION_MAJOR.SOFTHSM_VERSION_MINOR.SOFTHSM_VERSION_FIX[]PACKAGE_SUFFIX],[rickard.bondesson at iis.se])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([src/Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
@@ -115,18 +113,20 @@
 )
 
 # Generate the libtool script and install script 
-AC_PROG_LIBTOOL 
+LT_INIT 
 AC_PROG_INSTALL
 
 softhsmdbdir=${localstatedir}/softhsm
 AC_SUBST([softhsmdbdir])
 
 # Generate the make files
-AC_OUTPUT(
+AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	src/lib/Makefile
 	src/bin/Makefile
 	checks/Makefile
 	softhsm.conf
-)
+])
+
+AC_OUTPUT

Modified: trunk/xml/configure.ac
===================================================================
--- trunk/xml/configure.ac	2009-08-13 08:36:21 UTC (rev 1593)
+++ trunk/xml/configure.ac	2009-08-13 08:40:01 UTC (rev 1594)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.61)
-AC_INIT([opendnssec-xml], [0.0.1], [jad at jadickinson.co.uk])
+AC_INIT([opendnssec-xml],[0.0.1],[jad at jadickinson.co.uk])
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])




More information about the Opendnssec-commits mailing list