shishi Makefile.am configure.ac

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/10/14 19:26:17

Modified files:
        .              : Makefile.am configure.ac 

Log message:
        Use CONDITIONALs instead of @...@ subsitution for SUBDIRS.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/Makefile.am.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/configure.ac.diff?tr1=1.97&tr2=1.98&r1=text&r2=text

Patches:
Index: shishi/Makefile.am
diff -u shishi/Makefile.am:1.45 shishi/Makefile.am:1.46
--- shishi/Makefile.am:1.45     Sun Sep 14 13:34:41 2003
+++ shishi/Makefile.am  Tue Oct 14 19:26:17 2003
@@ -21,11 +21,16 @@
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-gtk-doc --without-system-asn1 --without-libgcrypt
 
-MOST_SUBDIRS = m4 po gl lib src tests doc
+SUBDIRS = m4 po gl
 
-DIST_SUBDIRS = crypto asn1 $(MOST_SUBDIRS) examples extra
+if ASN1
+SUBDIRS += asn1
+endif
+if NETTLE
+SUBDIRS += crypto
+endif
 
-SUBDIRS = @CRYPTO@ @ASN1@ $(MOST_SUBDIRS)
+SUBDIRS += lib src tests doc examples extra
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
Index: shishi/configure.ac
diff -u shishi/configure.ac:1.97 shishi/configure.ac:1.98
--- shishi/configure.ac:1.97    Fri Oct 10 15:26:58 2003
+++ shishi/configure.ac Tue Oct 14 19:26:17 2003
@@ -251,11 +251,10 @@
 AC_MSG_CHECKING([whether to use the system's libtasn1])
 AC_MSG_RESULT($system_asn1)
 if test "$system_asn1" = "no"; then
-       ASN1=asn1
        LIBTASN1_LIBS="\$(top_builddir)/asn1/libminitasn1.la"
        LIBTASN1_CFLAGS="-I\$(top_srcdir)/asn1"
 fi
-AC_SUBST(ASN1)
+AM_CONDITIONAL(ASN1, test "$system_asn1" = "no")
 AC_SUBST(LIBTASN1_LIBS)
 AC_SUBST(LIBTASN1_CFLAGS)
 
@@ -274,13 +273,11 @@
 if test "$libgcrypt" != "no" ; then
        AC_DEFINE(USE_GCRYPT, 1, [Define to 1 if you want to use libgcrypt.])
 else
-       CRYPTO=crypto
        CRYPTO_CFLAGS="-I\$(top_srcdir)/crypto"
        CRYPTO_LIBS="\$(top_builddir)/crypto/libnettle.la"
 fi
 AM_CONDITIONAL(LIBGCRYPT, test "$libgcrypt" != "no")
 AM_CONDITIONAL(NETTLE, test "$libgcrypt" = "no")
-AC_SUBST(CRYPTO)
 AC_SUBST(CRYPTO_CFLAGS)
 AC_SUBST(CRYPTO_LIBS)