gnome-keyring r1660 - in trunk: . egg egg/tests pkcs11/gck pkcs11/gck/tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Mar  5 04:02:25 2009
New Revision: 1660
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1660&view=rev

Log:
Check for asn1Parser tool in configure.

Patch by Alberto Ruiz. Fixes bug #566731

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/egg/Makefile.am
   trunk/egg/tests/Makefile.am
   trunk/pkcs11/gck/Makefile.am
   trunk/pkcs11/gck/tests/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar  5 04:02:25 2009
@@ -401,6 +401,11 @@
 DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"
 
+AC_PATH_PROG(ASN1PARSER, asn1Parser, no)
+if test "$ASN1PARSER" = "no" ; then
+	AC_MSG_ERROR(asn1Parser tool is not installed)
+fi
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.

Modified: trunk/egg/Makefile.am
==============================================================================
--- trunk/egg/Makefile.am	(original)
+++ trunk/egg/Makefile.am	Thu Mar  5 04:02:25 2009
@@ -31,10 +31,10 @@
 	$(BUILT_SOURCES)
 	
 asn1-def-pk.h: pk.asn
-	asn1Parser -o asn1-def-pk.h $(srcdir)/pk.asn 
+	$(ASN1PARSER) -o asn1-def-pk.h $(srcdir)/pk.asn 
 	
 asn1-def-pkix.h: pkix.asn
-	asn1Parser -o asn1-def-pkix.h $(srcdir)/pkix.asn 
+	$(ASN1PARSER) -o asn1-def-pkix.h $(srcdir)/pkix.asn 
 
 EXTRA_DIST = \
 	pkix.asn \

Modified: trunk/egg/tests/Makefile.am
==============================================================================
--- trunk/egg/tests/Makefile.am	(original)
+++ trunk/egg/tests/Makefile.am	Thu Mar  5 04:02:25 2009
@@ -3,7 +3,7 @@
 	asn1-def-test.h
 
 asn1-def-test.h: test.asn
-	asn1Parser -o asn1-def-test.h $(srcdir)/test.asn 
+	$(ASN1PARSER) -o asn1-def-test.h $(srcdir)/test.asn 
 	
 # Test files should be listed in order they need to run
 UNIT_AUTO = \

Modified: trunk/pkcs11/gck/Makefile.am
==============================================================================
--- trunk/pkcs11/gck/Makefile.am	(original)
+++ trunk/pkcs11/gck/Makefile.am	Thu Mar  5 04:02:25 2009
@@ -65,10 +65,10 @@
 	$(GLIB_GENMARSHAL) $< --body --prefix=gck_marshal >> $@
 
 asn1-def-pk.h: pk.asn
-	asn1Parser -o asn1-def-pk.h $<
+	$(ASN1PARSER) -o asn1-def-pk.h $<
 	
 asn1-def-pkix.h: pkix.asn
-	asn1Parser -o asn1-def-pkix.h $<
+	$(ASN1PARSER) -o asn1-def-pkix.h $<
 
 EXTRA_DIST = \
 	gck-marshal.list \

Modified: trunk/pkcs11/gck/tests/Makefile.am
==============================================================================
--- trunk/pkcs11/gck/tests/Makefile.am	(original)
+++ trunk/pkcs11/gck/tests/Makefile.am	Thu Mar  5 04:02:25 2009
@@ -3,7 +3,7 @@
 	asn1-def-test.h
 
 asn1-def-test.h: test.asn
-	asn1Parser -o asn1-def-test.h $(srcdir)/test.asn 
+	$(ASN1PARSER) -o asn1-def-test.h $(srcdir)/test.asn 
 	
 # Test files should be listed in order they need to run
 UNIT_AUTO = \