[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sat Oct 27 08:35:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-27 13:34:27 UTC
Commited by: Federico Mennite <ite at techmonkeys.org>

Modified files:
     configure.ac acconfig/acinclude.m4

Log message:

Configure related refactoring and clean up.

---------------------- diff included ----------------------
Index: eggdrop1.7/acconfig/acinclude.m4
diff -u eggdrop1.7/acconfig/acinclude.m4:1.3 eggdrop1.7/acconfig/acinclude.m4:1.4
--- eggdrop1.7/acconfig/acinclude.m4:1.3	Thu Oct 25 15:10:05 2001
+++ eggdrop1.7/acconfig/acinclude.m4	Sat Oct 27 08:34:17 2001
@@ -1,25 +1,25 @@
 dnl acinclude.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: acinclude.m4,v 1.3 2001/10/25 20:10:05 ite Exp $
+dnl $Id: acinclude.m4,v 1.4 2001/10/27 13:34:17 ite Exp $
 dnl
 
 
 dnl  EGG_MSG_CONFIGURE_START()
 dnl
 AC_DEFUN(EGG_MSG_CONFIGURE_START, [dnl
-AC_MSG_RESULT()
-AC_MSG_RESULT(This is eggdrop's GNU configure script.)
-AC_MSG_RESULT(It's going to run a bunch of strange tests to hopefully)
-AC_MSG_RESULT(make your compile work without much twiddling.)
-AC_MSG_RESULT()
+AC_MSG_NOTICE()
+AC_MSG_NOTICE(This is eggdrop's GNU configure script.)
+AC_MSG_NOTICE(It's going to run a bunch of strange tests to hopefully)
+AC_MSG_NOTICE(make your compile work without much twiddling.)
+AC_MSG_NOTICE()
 ])
 
 
 dnl  EGG_MSG_CONFIGURE_END()
 dnl
 AC_DEFUN(EGG_MSG_CONFIGURE_END, [dnl
-AC_MSG_RESULT()
+AC_MSG_NOTICE()
 cat << EOF
 ------------------------------------------------------------------------
 Configuration:
@@ -35,11 +35,11 @@
 See config.h for further configuration information.
 ------------------------------------------------------------------------
 EOF
-AC_MSG_RESULT()
-AC_MSG_RESULT(Configure is done.)
-AC_MSG_RESULT()
-AC_MSG_RESULT([Type 'make' to create the bot.])
-AC_MSG_RESULT()
+AC_MSG_NOTICE()
+AC_MSG_NOTICE(Configure is done.)
+AC_MSG_NOTICE()
+AC_MSG_NOTICE([Type 'make' to create the bot.])
+AC_MSG_NOTICE()
 ])
 
 
@@ -109,17 +109,6 @@
 ])
 							
 
-dnl  EGG_PROG_STRIP()
-dnl
-AC_DEFUN(EGG_PROG_STRIP, [dnl
-AC_CHECK_PROG(STRIP, strip, strip)
-if test "${STRIP-x}" = "x"
-then
-  STRIP=touch
-fi
-])
-
-
 dnl  EGG_PROG_AWK()
 dnl
 AC_DEFUN(EGG_PROG_AWK, [dnl
@@ -168,13 +157,13 @@
 AC_REQUIRE([AC_CANONICAL_HOST])
 
 IRIX=no
-DEFAULT_MAKE=static
 
 AC_CACHE_CHECK(system type, egg_cv_var_system_type, egg_cv_var_system_type=`$EGG_UNAME -s`)
 AC_CACHE_CHECK(system release, egg_cv_var_system_release, egg_cv_var_system_release=`$EGG_UNAME -r`)
 
 case $host_os in
   cygwin)
+    AC_DEFINE(CYGWIN_HACKS, 1, [Define if running under cygwin])
     case "`echo $egg_cv_var_system_release | cut -c 1-3`" in
       1.*)
 	AC_PROG_CC_WIN32
@@ -344,19 +333,6 @@
 ])
 
 
-dnl  EGG_CYGWIN()
-dnl
-dnl  Check for Cygwin support.
-AC_DEFUN(EGG_CYGWIN, [dnl
-AC_CYGWIN
-if test "$ac_cv_cygwin" = "yes"
-then
-  AC_DEFINE(CYGWIN_HACKS, 1,
-            [Define if running under cygwin])
-fi
-])
-
-
 dnl  EGG_TCL_WITH_OPTIONS()
 dnl
 AC_DEFUN(EGG_TCL_WITH_OPTIONS, [dnl
@@ -911,6 +887,8 @@
 dnl  EGG_TCL_LIB_REQS()
 dnl
 AC_DEFUN(EGG_TCL_LIB_REQS, [dnl
+AC_REQUIRE([EGG_LIBTOOL])
+
 if test "$ac_cv_cygwin" = "yes"
 then
   TCL_REQS="$TCLLIB/lib$TCLLIBFN"
@@ -921,20 +899,16 @@
   TCL_REQS="$TCLLIB/lib$TCLLIBFN"
   TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
 else
-## FIXME: this needs to be changed so that it will error and exit saying
-##        you have to run ./configure --disable-shared
-  # Set default make as static for unshared Tcl library
-  if test ! "$DEFAULT_MAKE" = "static"
+  # Error and ask for a static build for unshared Tcl library
+  if test "$egg_static_build" = "no"
   then
-    cat << 'EOF' >&2
-configure: warning:
+    AC_MSG_ERROR([
 
   Your Tcl library is not a shared lib.
-  configure will now set default make type to static...
+  You have to run configure with the --disable-shared parameter to force a
+  static build.
 
-EOF
-    DEFAULT_MAKE=static
-    AC_SUBST(DEFAULT_MAKE)
+])
   fi
 
   # Are we using a pre 7.4 Tcl version ?
@@ -1196,7 +1170,10 @@
 
 if test "x$enable_shared" = "xno"
 then
-  AC_DEFINE_UNQUOTED(STATIC, 1, Define if build is static)
+  AC_DEFINE_UNQUOTED(STATIC, 1, [Define if build is static])
+  egg_static_build=yes
+else
+  egg_static_build=no
 fi
 
 # HACK: This is needed for libltdl's configure script
Index: eggdrop1.7/configure.ac
diff -u eggdrop1.7/configure.ac:1.4 eggdrop1.7/configure.ac:1.5
--- eggdrop1.7/configure.ac:1.4	Sun Oct 21 12:38:24 2001
+++ eggdrop1.7/configure.ac	Sat Oct 27 08:34:16 2001
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/eggdrop.h)
+AC_PREREQ(2.52)
 AC_CONFIG_AUX_DIR(acconfig)
 AM_CONFIG_HEADER(config.h)
 EGG_MSG_CONFIGURE_START
@@ -45,7 +46,6 @@
 
 # Checks for programs
 AC_PROG_LN_S
-EGG_PROG_STRIP
 EGG_PROG_AWK
 EGG_PROG_BASENAME
 AC_CHECK_PROG(EGG_UNAME,uname,uname)
@@ -90,9 +90,6 @@
 
 # Check if we need to compile all or part of snprintf.c
 EGG_REPLACE_SNPRINTF
-
-# Checks for cygwin
-EGG_CYGWIN
 
 # Checks for IPV6
 EGG_IPV6_SUPPORTED
----------------------- End of diff -----------------------



More information about the Changes mailing list