snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmbiff: slight automake/autoconf refresh

Browse source 
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 <wberrier@gmail.com>
This commit is contained in:
Wade Berrier 2012-06-12 21:51:53 -06:00 committed by Carlos R. Mafra
parent 792a5d290a
commit d93ab227a0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wmbiff/configure.ac
View file

@ -9,7 +9,7 @@ dnl version
AC_INIT(WMBiff, 0.4.27, wmbiff-devel@lists.sourceforge.net, wmbiff) AC_INIT(WMBiff, 0.4.27, wmbiff-devel@lists.sourceforge.net, wmbiff)
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AM_INIT_AUTOMAKE(wmbiff, 0.4.27) dnl tarded syntax for automake <= 1.5 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. dnl make sure autoheader finds version, implicitly defined above.
AH_TEMPLATE([VERSION], [wmbiff's release version]) AH_TEMPLATE([VERSION], [wmbiff's release version])
AC_SUBST(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." GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
if test "$gnutls" = "ok"; then 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" CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
GNUTLS_COMMON_O="gnutls-common.o" GNUTLS_COMMON_O="gnutls-common.o"

3
wmbiff/scripts/Makefile.am
View file

@ -1,2 +1,3 @@
pkglib_SCRIPTS = security.debian.rb wmbiff_pkglibdir = $(pkglibdir)
wmbiff_pkglib_SCRIPTS = security.debian.rb
EXTRA_DIST = security.debian.rb EXTRA_DIST = security.debian.rb