[Pkg-wmaker-commits] [wmbiff] 18/77: attempt to fix Jordi's configure bug
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_4_0
in repository wmbiff.
commit f5912aaaf98debefa58bea35727f20fa91824f60
Author: bluehal <bluehal>
Date: Thu Apr 11 18:24:28 2002 +0000
attempt to fix Jordi's configure bug
---
configure.in | 11 +++++++----
wmbiff/.cvsignore | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.in b/configure.in
index f73f30a..180ff0d 100644
--- a/configure.in
+++ b/configure.in
@@ -23,17 +23,20 @@ if test -n "$GCC"; then
AC_MSG_RESULT(adding -Wall and friends to CFLAGS.)
fi
+dnl a no-op to force autoconf to seek out the preprocessor now.
+AC_CHECK_HEADERS(stdio.h)
+
dnl Pre-gnutls.
gnutls="ok"
-AC_CHECK_LIB(z, gzopen, , gnutls="nope") dnl GNUTLS seems to need libz; fail here if it's missing.
-AC_CHECK_LIB(gdbm, dbminit, , gnutls="nope") dnl GNUTLS seems to need libgdbm; fail here if it's missing.
+AC_CHECK_LIB(z, gzopen, [], [gnutls="nope"]) dnl GNUTLS seems to need libz; fail here if it's missing.
+AC_CHECK_LIB(gdbm, dbminit, [], [gnutls="nope"]) dnl GNUTLS seems to need libgdbm; fail here if it's missing.
dnl Parameter is minimum version
dnl TODO: fix so that GCRYPT is tested only if GNUTLS fails; the dependence
dnl between them makes this turn redundant
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(0.3.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." ])
@@ -62,7 +65,7 @@ AC_CHECK_LIB(X11, XrmParseCommand)
AC_CHECK_LIB(Xext, XextAddDisplay)
AC_CHECK_LIB(Xpm, XpmCreateImageFromXpmImage)
-AC_CHECK_HEADERS(X11/xpm.h, , AC_CHECK_HEADERS(xpm.h, , AC_MSG_ERROR([xpm.h is needed])))
+AC_CHECK_HEADERS(X11/xpm.h, [], AC_CHECK_HEADERS(xpm.h, [], AC_MSG_ERROR([xpm.h is needed])))
dnl Password prompting stuff.
AC_PATH_PROGS(DEFAULT_ASKPASS, ssh-askpass x11-ssh-askpass ssh-askpass-gnome, /usr/bin/ssh-askpass)
diff --git a/wmbiff/.cvsignore b/wmbiff/.cvsignore
index 5b0a33b..ddcca88 100644
--- a/wmbiff/.cvsignore
+++ b/wmbiff/.cvsignore
@@ -2,3 +2,4 @@
*.o
wmbiff
wmbiff-master.xpm
+Makefile.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list