Attachment #188791 for bug #266554





GKR_LIBTASN1_VERSION=0.3.4

PKG_CHECK_MODULES(LIBTASN1,libtasn1 >= 1.0)
AC_SUBST([LIBTASN1_LIBS])
AC_SUBST([LIBTASN1_CFLAGS])
*** LibtASN1 ${GKR_LIBTASN1_VERSION} was not found. 
]]))
libtasn=yes
AC_DEFINE_UNQUOTED(GKR_LIBGCRYPT_VERSION, "$GKR_LIBTASN1_VERSION", [Version of libtasn1 we expect])

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.

Return to bug 266554

Lines 392-408 Link Here

(-)configure.in.orig (-7 / +8 lines)
392		392
393	GKR_LIBTASN1_VERSION=0.3.4	393	GKR_LIBTASN1_VERSION=0.3.4
394		394
395	AM_PATH_LIBTASN1($GKR_LIBTASN1_VERSION,,	395	PKG_CHECK_MODULES(LIBTASN1,libtasn1 >= 1.0)
396	AC_MSG_ERROR([[	396	AC_SUBST([LIBTASN1_LIBS])
397	***	397	AC_SUBST([LIBTASN1_CFLAGS])
398	*** LibtASN1 ${GKR_LIBTASN1_VERSION} was not found.
399	]]))
400	libtasn=yes
401	AC_DEFINE_UNQUOTED(GKR_LIBGCRYPT_VERSION, "$GKR_LIBTASN1_VERSION", [Version of libtasn1 we expect])
402		398
403	DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"	399	DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"
404	DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"	400	DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"
405		401
		402	AC_PATH_PROG(ASN1PARSER, asn1Parser, no)
		403	if test "$ASN1PARSER" = "no" ; then
		404	AC_MSG_ERROR(asn1Parser tool is not installed)
		405	fi
		406
406	dnl ==========================================================================	407	dnl ==========================================================================
407		408
408	dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.	409	dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.