2002-01-22 Marcus Brinkmann <marcus@g10code.de>

* configure.ac (HAVE_JNLIB_LOGGING): Define always for assuan.
This commit is contained in:
Marcus Brinkmann 2002-01-22 16:34:52 +00:00
parent b863cea7d7
commit 4da57b04cb
2 changed files with 14 additions and 6 deletions

View File

@ -1,3 +1,7 @@
2002-01-22 Marcus Brinkmann <marcus@g10code.de>
* configure.ac (HAVE_JNLIB_LOGGING): Define always for assuan.
2001-12-19 Werner Koch <wk@gnupg.org> 2001-12-19 Werner Koch <wk@gnupg.org>
* configure.ac (VERSION,PACKAGE): Defined and subst. Used for * configure.ac (VERSION,PACKAGE): Defined and subst. Used for

View File

@ -102,8 +102,8 @@ GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
# We should not use them in this software; dnl We should not use them in this software;
# However jnlib/types.h needs them - so we take the easy way. dnl However jnlib/types.h needs them - so we take the easy way.
AC_CHECK_SIZEOF(unsigned short) AC_CHECK_SIZEOF(unsigned short)
AC_CHECK_SIZEOF(unsigned int) AC_CHECK_SIZEOF(unsigned int)
AC_CHECK_SIZEOF(unsigned long) AC_CHECK_SIZEOF(unsigned long)
@ -122,6 +122,10 @@ dnl
dnl These are needed by libjnlib dnl These are needed by libjnlib
AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp) AC_CHECK_FUNCS(memicmp stpcpy strlwr strtoul memmove stricmp)
dnl We use jnlib, so tell other modules about it
AC_DEFINE(HAVE_JNLIB_LOGGING, 1,
[Defined if jnlib style logging fucntions are available.])
dnl dnl
dnl Checks for system services dnl Checks for system services
dnl dnl
@ -185,10 +189,6 @@ fi
AM_CONDITIONAL(RUN_GPGSM_TESTS, AM_CONDITIONAL(RUN_GPGSM_TESTS,
[test "$cross_compiling" != "yes" && test -n "$GPGSM" && test -r "$GPGSM"]) [test "$cross_compiling" != "yes" && test -n "$GPGSM" && test -r "$GPGSM"])
dnl
dnl Create config files
dnl
dnl FIXME: Only build if supported. dnl FIXME: Only build if supported.
AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no") AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
@ -211,6 +211,10 @@ GPGME_CFLAGS=""
AC_SUBST(GPGME_LIBS) AC_SUBST(GPGME_LIBS)
AC_SUBST(GPGME_CFLAGS) AC_SUBST(GPGME_CFLAGS)
dnl
dnl Create config files
dnl
AC_CONFIG_FILES(Makefile assuan/Makefile jnlib/Makefile gpgme/Makefile AC_CONFIG_FILES(Makefile assuan/Makefile jnlib/Makefile gpgme/Makefile
tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
doc/Makefile doc/Makefile