* Small fix for checking for pack.cfg

svn: 642

autotools/configure.ac

@@ -20,8 +20,6 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
-DO_PACK_CFG
-
 #checkpoint
 AC_CACHE_SAVE 
 
@@ -199,6 +197,7 @@ AC_CACHE_SAVE
 # ---------- end of (what used to be) robey's Tcl thingies
 
 EGG_SUBST_VERSION
+DO_PACK_CFG
 EGG_SUBST_MOD_UPDIR
 EGG_CATCH_MAKEFILE_REBUILD
 DO_DEPS

autotools/includes/acinclude.m4

@@ -1077,7 +1077,7 @@ AC_DEFUN(EGG_SUBST_VERSION, [dnl
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print [$]5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 NUMVER=`grep "int" $srcdir/src/main.c | $AWK '/egg_numver =/ {print [$]5}' |  sed -e 's/\;//g'`
 if ! test -f $srcdir/pack/pack.cfg; then
- cat << 'EOF' >&2
+ cat << EOF >&2
 configure: error:
 
   Your pack cfg is missing, please copy it to $srcdir/pack/pack.cfg

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.6 .
+# From configure.ac Revision: 1.7 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -3022,17 +3022,6 @@ _ACEOF
 fi
 
 
-
-for define in `sed -n -e 's/^+ \([^ ]*\) .*/\1/ p' pack/pack.cfg`; do
- u_define="S_$define"
- cat >>confdefs.h <<_ACEOF
-#define $u_define 1
-_ACEOF
-
-done
-
-
-
 #checkpoint
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12324,7 +12313,7 @@ rm -f confcache
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 NUMVER=`grep "int" $srcdir/src/main.c | $AWK '/egg_numver =/ {print $5}' |  sed -e 's/\;//g'`
 if ! test -f $srcdir/pack/pack.cfg; then
- cat << 'EOF' >&2
+ cat << EOF >&2
 configure: error:
 
   Your pack cfg is missing, please copy it to $srcdir/pack/pack.cfg
@@ -12339,6 +12328,16 @@ cat >>confdefs.h <<_ACEOF
 #define EGG_VERSION $version_num
 _ACEOF
 
+
+for define in `sed -n -e 's/^+ \([^ ]*\) .*/\1/ p' pack/pack.cfg`; do
+ u_define="S_$define"
+ cat >>confdefs.h <<_ACEOF
+#define $u_define 1
+_ACEOF
+
+done
+
+
 case "$srcdir" in
   [\\/]* | ?:[\\/]*)
     MOD_UPDIR=""