[cvslog] (2008-07-02 07:31:37 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Wed Jul 2 01:31:37 CST 2008


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2008-07-02 07:31:37 UTC
Commited by: Tothwolf <tothwolf at techmonkeys.org>

Modified files:
     aclocal.m4 configure configure.ac doc/UPDATES1.6

Log message:

Fixed EGG_PROG_HEAD_1 autoconf macro cache checking. You can't use AC_MSG_RESULT() within AC_CACHE_VAL().

Moved --enable-strip configure check from EGG_PROG_STRIP to it's own macro: EGG_ENABLE_STRIP()

---------------------- diff included ----------------------
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.106 eggdrop1.6/aclocal.m4:1.107
--- eggdrop1.6/aclocal.m4:1.106	Wed Jun 18 04:42:50 2008
+++ eggdrop1.6/aclocal.m4	Wed Jul  2 02:31:26 2008
@@ -16,7 +16,7 @@
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
-dnl $Id: aclocal.m4,v 1.106 2008-06-18 09:42:50 tothwolf Exp $
+dnl $Id: aclocal.m4,v 1.107 2008-07-02 07:31:26 tothwolf Exp $
 dnl
 
 
@@ -280,14 +280,16 @@
         ac_cv_prog_HEAD_1="$HEAD_1"
       else
         if test "`cat conftest.head | $ac_prog`" = "a"; then
-          AC_MSG_RESULT([yes])
           ac_cv_prog_HEAD_1="$ac_prog"
-        else
-          AC_MSG_RESULT([no])
         fi
       fi
     ])
-    test -n "$ac_cv_prog_HEAD_1" && break
+    if test -n "$ac_cv_prog_HEAD_1"; then
+      AC_MSG_RESULT([yes])
+      break
+    else
+      AC_MSG_RESULT([no])
+    fi
   done
 
   if test "x$ac_cv_prog_HEAD_1" = "x"; then
@@ -311,26 +313,8 @@
 dnl
 AC_DEFUN([EGG_PROG_STRIP],
 [
-  AC_ARG_ENABLE([strip],
-                [  --enable-strip          enable stripping of executables ],
-                [enable_strip="$enableval"],
-                [enable_strip="no"])
-  if test "$enable_strip" = "yes"; then
-    AC_CHECK_PROG(STRIP, strip, strip)
-    if test "x$STRIP" = "x"; then
-      STRIP=touch
-    else
-      AC_DEFINE(ENABLE_STRIP, 1, [Define if stripping is enabled.])
-      cat << 'EOF' >&2
-configure: WARNING:
-
-  Stripping the executable, while saving some disk space, will make bug
-  reports nearly worthless. If Eggdrop crashes and you wish to report
-  a bug, you will need to recompile with stripping disabled.
-
-EOF
-    fi
-  else
+  AC_CHECK_PROG(STRIP, strip, strip)
+  if test "x$STRIP" = "x"; then
     STRIP=touch
   fi
 ])
@@ -372,6 +356,31 @@
 ])
 
 
+dnl EGG_ENABLE_STRIP()
+dnl
+AC_DEFUN([EGG_ENABLE_STRIP],
+[
+  AC_ARG_ENABLE([strip],
+                [  --enable-strip          enable stripping of executables ],
+                [enable_strip="$enableval"],
+                [enable_strip="no"])
+  if test "$enable_strip" = "yes"; then
+    AC_DEFINE(ENABLE_STRIP, 1, [Define if stripping is enabled.])
+    cat << 'EOF' >&2
+
+configure: WARNING:
+
+  Stripping the executable, while saving some disk space, will make bug
+  reports nearly worthless. If Eggdrop crashes and you wish to report
+  a bug, you will need to recompile with stripping disabled.
+
+EOF
+  else
+    STRIP="touch"
+  fi
+])
+
+
 dnl
 dnl Checks for operating system and module support.
 dnl
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.154 eggdrop1.6/configure:1.155
--- eggdrop1.6/configure:1.154	Wed Jun 18 04:42:50 2008
+++ eggdrop1.6/configure	Wed Jul  2 02:31:27 2008
@@ -4029,18 +4029,20 @@
         ac_cv_prog_HEAD_1="$HEAD_1"
       else
         if test "`cat conftest.head | $ac_prog`" = "a"; then
-          { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
           ac_cv_prog_HEAD_1="$ac_prog"
-        else
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
         fi
       fi
 
 fi
 
-    test -n "$ac_cv_prog_HEAD_1" && break
+    if test -n "$ac_cv_prog_HEAD_1"; then
+      { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+      break
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    fi
   done
 
   if test "x$ac_cv_prog_HEAD_1" = "x"; then
@@ -4059,15 +4061,7 @@
 
 
 
-  # Check whether --enable-strip was given.
-if test "${enable_strip+set}" = set; then
-  enableval=$enable_strip; enable_strip="$enableval"
-else
-  enable_strip="no"
-fi
-
-  if test "$enable_strip" = "yes"; then
-    # Extract the first word of "strip", so it can be a program name with args.
+  # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -4104,24 +4098,7 @@
 fi
 
 
-    if test "x$STRIP" = "x"; then
-      STRIP=touch
-    else
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_STRIP 1
-_ACEOF
-
-      cat << 'EOF' >&2
-configure: WARNING:
-
-  Stripping the executable, while saving some disk space, will make bug
-  reports nearly worthless. If Eggdrop crashes and you wish to report
-  a bug, you will need to recompile with stripping disabled.
-
-EOF
-    fi
-  else
+  if test "x$STRIP" = "x"; then
     STRIP=touch
   fi
 
@@ -4267,6 +4244,37 @@
 
 
 
+# Check if we will strip the binary
+# Do this *before* EGG_CHECK_OS
+
+  # Check whether --enable-strip was given.
+if test "${enable_strip+set}" = set; then
+  enableval=$enable_strip; enable_strip="$enableval"
+else
+  enable_strip="no"
+fi
+
+  if test "$enable_strip" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_STRIP 1
+_ACEOF
+
+    cat << 'EOF' >&2
+
+configure: WARNING:
+
+  Stripping the executable, while saving some disk space, will make bug
+  reports nearly worthless. If Eggdrop crashes and you wish to report
+  a bug, you will need to recompile with stripping disabled.
+
+EOF
+  else
+    STRIP="touch"
+  fi
+
+
+
 # Checks for system libraries.
 
   # FIXME: this needs to be fixed so that it works on IRIX
Index: eggdrop1.6/configure.ac
diff -u eggdrop1.6/configure.ac:1.29 eggdrop1.6/configure.ac:1.30
--- eggdrop1.6/configure.ac:1.29	Sat Apr 19 09:57:10 2008
+++ eggdrop1.6/configure.ac	Wed Jul  2 02:31:27 2008
@@ -1,11 +1,11 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.29 2008-04-19 14:57:10 guppy Exp $
+dnl $Id: configure.ac,v 1.30 2008-07-02 07:31:27 tothwolf Exp $
 
 AC_PREREQ(2.59)
 AC_INIT([Eggdrop],[1.6.20],[bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2008 Eggheads Development Team])
-AC_REVISION($Revision: 1.29 $)
+AC_REVISION($Revision: 1.30 $)
 AC_CONFIG_SRCDIR(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
 AC_CONFIG_HEADER(config.h)
@@ -47,6 +47,11 @@
 AC_CHECK_PROG(UNAME,uname,uname)
 
 
+# Check if we will strip the binary
+# Do this *before* EGG_CHECK_OS
+EGG_ENABLE_STRIP
+
+
 # Checks for system libraries.
 EGG_CHECK_LIBS
 
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.660 eggdrop1.6/doc/UPDATES1.6:1.661
--- eggdrop1.6/doc/UPDATES1.6:1.660	Mon Jun 30 19:20:03 2008
+++ eggdrop1.6/doc/UPDATES1.6	Wed Jul  2 02:31:27 2008
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.660 2008-07-01 00:20:03 tothwolf Exp $
+$Id: UPDATES1.6,v 1.661 2008-07-02 07:31:27 tothwolf Exp $
 
 Eggdrop Changes (since v1.6.0)
     _____________________________________________________________________
@@ -12,6 +12,12 @@
 
 
   1.6.20:
+    - Fixed EGG_PROG_HEAD_1 autoconf macro cache checking. You can't use
+      AC_MSG_RESULT() within AC_CACHE_VAL().
+    - Moved --enable-strip configure check from EGG_PROG_STRIP to it's own
+      macro: EGG_ENABLE_STRIP()
+    * Patch by: Tothwolf
+
     - Bot would send 'JOIN #chan ' to the server with trailing whitespace
       when joining channels that didn't require a key.
     * Found by: simple - Patch by: Tothwolf
----------------------- End of diff -----------------------



More information about the Changes mailing list