CVS shishi

[shishi-commit]

Update of /home/jas/self/public-cvs/shishi
In directory latte:/home/jas/self/src/shishi

Modified Files:
        configure.ac 
Log Message:
Fix libtasn1 test.


--- /home/jas/self/public-cvs/shishi/configure.ac       2006/03/11 16:19:54     
1.177
+++ /home/jas/self/public-cvs/shishi/configure.ac       2006/03/13 14:16:33     
1.178
@@ -134,37 +134,23 @@
 # Check for libtasn1
 AC_ARG_WITH(system-asn1,
        AC_HELP_STRING([--with-system-asn1], [Use the system's libtasn1]),
-       system_asn1=$withval, system_asn1=auto)
-if test "$system_asn1" = "auto"; then
-       save_LIBS=$LIBS
-       LIBS="$LIBS -ltasn1"
-       AC_CACHE_CHECK([for libtasn1 >= 0.3.2], ac_cv_libtasn1, [
-               AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <libtasn1.h>
-int main ()
-{
-  return asn1_check_version ("0.3.2") == NULL;
-}
-]])],[ac_cv_libtasn1=yes],[ac_cv_libtasn1=no],[ac_cv_libtasn1=no])
-       ])
-       LIBS=$save_LIBS
-       if test "$ac_cv_libtasn1" = "yes"; then
-               system_asn1=yes
-               LIBTASN1_LIBS="-ltasn1"
-       else
-               system_asn1=no
-               AC_MSG_WARN([Libtasn1 >= 0.3.2 not found. Using included one.])
-       fi
+       system_asn1=$withval, system_asn1=yes)
+if test "$system_asn1" != "no"; then
+  AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>],
+    [asn1_find_node (0, 0);])
+fi
+if test "$ac_cv_libtasn1" = "yes"; then
+  system_asn1=yes
+else
+  system_asn1=no
+  LTLIBTASN1="\$(top_builddir)/asn1/libminitasn1.la"
+  LIBTASN1_CFLAGS="-I\$(top_srcdir)/asn1"
+  AC_SUBST(LIBTASN1_CFLAGS)
+  AC_MSG_WARN([Libtasn1 >= 0.3.1 not found. Using included one.])
 fi
 AC_MSG_CHECKING([whether to use the system's libtasn1])
 AC_MSG_RESULT($system_asn1)
-if test "$system_asn1" = "no"; then
-       LIBTASN1_LIBS="\$(top_builddir)/asn1/libminitasn1.la"
-       LIBTASN1_CFLAGS="-I\$(top_srcdir)/asn1"
-fi
 AM_CONDITIONAL(ASN1, test "$system_asn1" = "no")
-AC_SUBST(LIBTASN1_LIBS)
-AC_SUBST(LIBTASN1_CFLAGS)
 
 # Check for gnutls.
 AC_ARG_ENABLE(starttls,