Просмотр исходного кода

Stripped some bloat text from configure

svn: 89
Bryan Drewery 23 лет назад
Родитель
Сommit
7d8f8ed721
3 измененных файлов с 117 добавлено и 190 удалено
  1. 1 49
      aclocal.m4
  2. 116 135
      configure
  3. 0 6
      configure.in

+ 1 - 49
aclocal.m4

@@ -4,36 +4,6 @@ dnl
 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()
-])dnl
-
-
-dnl  EGG_MSG_CONFIGURE_END()
-dnl
-AC_DEFUN(EGG_MSG_CONFIGURE_END, [dnl
-AC_MSG_RESULT()
-AC_MSG_RESULT(Configure is done.)
-AC_MSG_RESULT()
-AC_MSG_RESULT([Type 'make config' to configure the modules, or type 'make iconfig'])
-AC_MSG_RESULT(to interactively choose which modules to compile.)
-AC_MSG_RESULT()
-if test -f "./$EGGEXEC"
-then
-  AC_MSG_RESULT([After that, type 'make clean' and then 'make' to create the bot.])
-else
-  AC_MSG_RESULT([After that, type 'make' to create the bot.])
-fi
-AC_MSG_RESULT()
-])dnl
-
-
 dnl  EGG_CHECK_CC()
 dnl
 dnl  FIXME: make a better test
@@ -126,16 +96,6 @@ fi
 ])dnl
 
 
-dnl  EGG_DISABLE_CC_OPTIMIZATION()
-dnl
-dnl check if user requested to remove -O2 cflag 
-dnl would be usefull on some weird *nix
-AC_DEFUN(EGG_DISABLE_CC_OPTIMIZATION, [dnl
- AC_ARG_ENABLE(cc-optimization,
-   [  --disable-cc-optimization   disable -O2 cflag],  
-   CFLAGS=`echo $CFLAGS | sed 's/\-O2//'`)
-])dnl
-
 dnl  EGG_CHECK_OS()
 dnl
 dnl  FIXME/NOTICE:
@@ -909,15 +869,7 @@ then
 configure: error:
 
   I can't find Tcl on this system.
-
-  Eggdrop requires Tcl to compile.  If you already have Tcl installed
-  on this system, and I just wasn't looking in the right place for it,
-  set the environment variables TCLLIB and TCLINC so I will know where
-  to find 'libtcl.a' (or 'libtcl.so') and 'tcl.h' (respectively). Then
-  run 'configure' again.
-
-  Read the README file if you don't know what Tcl is or how to get it
-  and install it.
+  You must set the path for it in pack/conf.h
 
 EOF
   exit 1

Разница между файлами не показана из-за своего большого размера
+ 116 - 135
configure


+ 0 - 6
configure.in

@@ -1,10 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
-AC_PREFIX_DEFAULT([\${HOME}/eggdrop])
 AC_CONFIG_HEADER(config.h)
 
-EGG_MSG_CONFIGURE_START
 EGG_SAVE_PARAMETERS
 
 # Setup build environment
@@ -29,9 +27,6 @@ EGG_PROG_AWK
 EGG_PROG_BASENAME
 AC_CHECK_PROG(UNAME,uname,uname)
 
-# Should -O2 CFLAG be removed? 
-EGG_DISABLE_CC_OPTIMIZATION
-
 # Test the os and set the module linking settings
 EGG_CHECK_OS
 
@@ -130,4 +125,3 @@ EGG_CATCH_MAKEFILE_REBUILD
 
 AC_OUTPUT(Makefile src/Makefile src/md5/Makefile src/compat/Makefile src/mod/Makefile)
 
-EGG_MSG_CONFIGURE_END

Некоторые файлы не были показаны из-за большого количества измененных файлов