- revert the commenting of touch doc/quagga.info, wont work because

  defines.texi is autogenerated every configure time so it will always
  be newer than quagga.info, and hence require quagga.info to be built. drat.

diff --git a/ChangeLog b/ChangeLog
index 280b03d8600285d0fea28ce9b2d4b88e1f80b371..635ea5b46b601e511e8e9676c9e3ddc64b8fa516 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,3 @@
-2005-05-13 Paul Jakma <paul.jakma@sun.com>
-
-       * configure.ac: Comment out the touch doc/quagga.info hack. I'm
-         hoping it's not needed anymore, cause it breaks out of tree builds
-         which i've become fond of.. Plus I think we sorted out most of
-         the original problems (updated texinfo.tex, moved the version
-         info to an autogenerated by automake version.texi). Dist users
-         most definitely wont be affected.
-
 2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su>
 
        * configure.ac: Check for OSes which support passing ifindex in

diff --git a/configure.ac b/configure.ac
index 370b004e26c7027951fce053c0912b6cdd7ac37f..9da0e0fe6d52352acd9dc99b4d6f673bc9f3391e 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.107 2005/05/13 07:09:50 paul Exp $
+## $Id: configure.ac,v 1.108 2005/05/13 20:11:53 paul Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.1, [http://bugzilla.quagga.net])
@@ -1339,7 +1339,7 @@ AC_CONFIG_FILES([solaris/Makefile])
 AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
 ## Hack, but working solution to avoid rebuilding of quagga.info.
 ## It's already in CVS until texinfo 4.7 is more common.
-dnl AC_CONFIG_COMMANDS([info-time],[touch doc/quagga.info])dnl
+AC_CONFIG_COMMANDS([info-time],[touch doc/quagga.info])
 AC_OUTPUT
 
 echo "