[Pkg-wmaker-commits] [wmbiff] 45/84: migrate to newer autoconf (2.5) to try to debug making-from-scratch problem and get rid of acconfig.h cruft

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_10
in repository wmbiff.

commit 457d5570049eba1469f9f19359adaeb2d8f65690
Author: bluehal <bluehal>
Date:   Wed Jun 26 18:56:22 2002 +0000

    migrate to newer autoconf (2.5) to try to debug making-from-scratch problem and get rid of acconfig.h cruft
---
 ChangeLog                    | 42 ++++++++++++++++++++++++++++++++++++++++--
 FromCVS.sh                   |  8 +++++++-
 Makefile.am                  |  2 +-
 autoconf/acconfig.h          |  3 ---
 configure.in => configure.ac |  7 +++++--
 5 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 804a947..bfb175c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,14 +6,52 @@ The latest changelog entry is in a different format, because it's inserted by
 CVS on commit.
 
   $Log: ChangeLog,v $
-  Revision 1.34  2002/06/24 07:18:09  bluehal
-  roughly finished 0.4.4
+  Revision 1.35  2002/06/26 18:56:22  bluehal
+  migrate to newer autoconf (2.5) to try to debug making-from-scratch problem and get rid of acconfig.h cruft
 
   Revision 1.1  2002/04/07 05:08:23  bluehal
   use automake / autoconf; after checkout run ./FromCVS.sh
 
 
 
+2002-06-25 Tuesday 23:52 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* Makefile.am: tiny automake 1.6 fix (doesn't appear to use
+	stamp-h.  who knew.)
+
+2002-06-25 Tuesday 23:33 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* autoconf/libgnutls.m4: trivial upstream bugfix
+
+2002-06-25 Tuesday 23:29 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* wmbiff/Makefile.am: never underestimate the complexity of
+	solutions involving automake
+
+2002-06-25 Tuesday 23:24 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* configure.in, wmbiff/Makefile.am: corrections to conditional
+	compilation of gnutls-common for automake 1.5 (and thereby the true
+	automake way)
+
+2002-06-25 Tuesday 23:15 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* configure.in, wmbiff/Makefile.am: only compile gnutls-common.[ch]
+	if gnutls is configured in (duh), and only check for gcrypt.h if
+	libgcrypt is installed and current
+
+2002-06-24 Monday 07:18 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* ChangeLog, FromCVS.sh, NEWS: roughly finished 0.4.4
+
+2002-06-24 Monday 07:16 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* wmbiff/tlsComm.c: restore certificate checking
+
+2002-06-24 Monday 07:15 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+	* wmbiff/: gnutls-common.c, gnutls-common.h: indent run
+
 2002-06-24 Monday 01:23 UTC -- Neil Spring <nspring at cs.washington.edu>
 
 	* wmbiff/Makefile.am, configure.in, wmbiff/Makefile.am: basic
diff --git a/FromCVS.sh b/FromCVS.sh
index 455eed4..26c3ea8 100755
--- a/FromCVS.sh
+++ b/FromCVS.sh
@@ -1,12 +1,18 @@
 #!/bin/sh
 
 # runs all the things necessary to rebuild files from CVS.
-autoheader -l autoconf && \
+# no longer needed autoheader -l autoconf && \
+# aclocal must be run before autoheader, so that 
+# autoheader knows to create config.h, because automake
+# complains if any macro other than its own specifies
+# the file
+
 if [ -e /usr/share/aclocal/libgnutls.m4 ]; then
    aclocal;
 else 
    aclocal -I autoconf;
 fi
+ autoheader && \
  automake -a && \
  autoconf && \
  ./configure && \
diff --git a/Makefile.am b/Makefile.am
index 603df37..52a5eea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = wmgeneral wmbiff autoconf
 EXTRA_DIST = README.licq TODO FAQ
 
-AUTOHEADER = @AUTOHEADER@ -l autoconf
+## no longer needed AUTOHEADER = @AUTOHEADER@ -l autoconf
 
 # make maintainer-clean is all about returning to CVS.
 # aclocal.m4 is generated by aclocal
diff --git a/autoconf/acconfig.h b/autoconf/acconfig.h
deleted file mode 100644
index 6a95a71..0000000
--- a/autoconf/acconfig.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#undef DEFAULT_SKIN_PATH
-#undef DEFAULT_ASKPASS
-#undef VERSION
diff --git a/configure.in b/configure.ac
similarity index 93%
rename from configure.in
rename to configure.ac
index 4a7a593..090d644 100644
--- a/configure.in
+++ b/configure.ac
@@ -7,11 +7,13 @@ dnl and configure:
 dnl  installation prefix
 dnl  version
 
-AC_INIT(configure.in)
+AC_INIT(wmbiff, 0.4.4, wmbiff-devel at lists.sourceforge.net)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_INIT_AUTOMAKE(wmbiff, 0.4.4)
 dnl AUTOHEADER="$AUTOHEADER -l \\\\\\\$\(srcdir)/autoconf"
 AM_CONFIG_HEADER(config.h)
+dnl make sure autoheader finds version, implicitly defined above.
+AH_TEMPLATE([VERSION], [wmbiff's release version])
 AC_SUBST(VERSION)
 
 AC_PROG_INSTALL
@@ -110,6 +112,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_SKIN_PATH,
                    "$SKINDIR:/usr/share/wmbiff/skins:/usr/local/share/wmbiff/skins:.", [Path to use when finding skins (modified pixmaps)] )
 
 dnl We're done.
-AC_OUTPUT(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 autoconf/Makefile)
+AC_CONFIG_FILES(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 autoconf/Makefile)
+AC_OUTPUT
 dnl remind not to write the file.
 chmod 0444 wmbiff/wmbiffrc.5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git