AM_PATH_LIBGNUTLS seems to be obsolete. Replace the check with pkg-config using PKG_CHECK_MODULES.
AM_CONFIG_HEADER also seems to be obsolete. Replace with AC_CONFIG_HEADER. Fix installing an extra script (security.debian.rb) Signed-off-by: Wade Berrier <[email protected]> --- wmbiff/configure.ac | 4 ++-- wmbiff/scripts/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wmbiff/configure.ac b/wmbiff/configure.ac index 7ad8329..b8960ce 100644 --- a/wmbiff/configure.ac +++ b/wmbiff/configure.ac @@ -9,7 +9,7 @@ dnl version AC_INIT(WMBiff, 0.4.27, [email protected], wmbiff) AC_CONFIG_AUX_DIR(autoconf) AM_INIT_AUTOMAKE(wmbiff, 0.4.27) dnl tarded syntax for automake <= 1.5 -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER([config.h]) dnl make sure autoheader finds version, implicitly defined above. AH_TEMPLATE([VERSION], [wmbiff's release version]) AC_SUBST(VERSION) @@ -77,7 +77,7 @@ AC_ARG_ENABLE(crypto, AC_HELP_STRING([ --disable-crypto ], [ disable gnutls/gcry GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS." if test "$gnutls" = "ok"; then - AM_PATH_LIBGNUTLS(1.0.4, [LIBS="$LIBS $LIBGNUTLS_LIBS" + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls > 1.0.4], [LIBS="$LIBS $LIBGNUTLS_LIBS" CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" GNUTLS_COMMON_O="gnutls-common.o" diff --git a/wmbiff/scripts/Makefile.am b/wmbiff/scripts/Makefile.am index 2cd7c0a..c63569d 100644 --- a/wmbiff/scripts/Makefile.am +++ b/wmbiff/scripts/Makefile.am @@ -1,2 +1,3 @@ -pkglib_SCRIPTS = security.debian.rb +wmbiff_pkglibdir = $(pkglibdir) +wmbiff_pkglib_SCRIPTS = security.debian.rb EXTRA_DIST = security.debian.rb -- 1.7.9.5 -- To unsubscribe, send mail to [email protected].
