Bryan Drewery 22 лет назад
Родитель
Сommit
7758742c31
1 измененных файлов с 103 добавлено и 280 удалено
  1. 103 280
      configure

+ 103 - 280
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.31 .
+# From configure.ac Revision: 1.32 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -1350,222 +1350,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in gcc34 gcc33 gcc3 gcc-3.4 gcc-3.3 gcc cc c1
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -1607,7 +1392,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in gcc34 gcc33 gcc3 gcc-3.4 gcc-3.3 gcc cc c1
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -1650,8 +1435,6 @@ done
   CC=$ac_ct_CC
 fi
 
-fi
-
 
 test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
@@ -2280,6 +2063,11 @@ EOF
   exit 1
 fi
 
+if test -n "$GCC"; then
+  CFLAGS="$CFLAGS -O3"
+fi
+
+
 
 # Crazy machines
 
@@ -3087,31 +2875,85 @@ fi
 rm -f confcache
 
 # Speedup compile
-if test -z "$no_pipe"
-then
-  if test -n "$GCC"
-  then
+
+  if test -n "$GCC" && test -z "$no_wall"; then
+    echo "$as_me:$LINENO: checking whether the compiler understands -Wall" >&5
+echo $ECHO_N "checking whether the compiler understands -Wall... $ECHO_C" >&6
+if test "${egg_cv_var_ccwall+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      ac_old_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Wall"
+       cat >conftest.$ac_ext <<_ACEOF
+
+         int main ()
+         {
+           return(0);
+         }
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+         egg_cv_var_ccwall="yes"
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+         egg_cv_var_ccwall="no"
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+      CFLAGS="$ac_old_CFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $egg_cv_var_ccwall" >&5
+echo "${ECHO_T}$egg_cv_var_ccwall" >&6
+
+    if test "$egg_cv_var_ccwall" = "yes"; then
+      CFLAGS="$CFLAGS -Wall"
+    fi
+  fi
+
+
+  if test -n "$GCC" && test -z "$no_pipe"; then
     echo "$as_me:$LINENO: checking whether the compiler understands -pipe" >&5
 echo $ECHO_N "checking whether the compiler understands -pipe... $ECHO_C" >&6
 if test "${egg_cv_var_ccpipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+
         ac_old_CC="$CC"
-      CC="$CC -pipe"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        CC="$CC -pipe"
+        cat >conftest.$ac_ext <<_ACEOF
 
-int
-main ()
-{
+          int main ()
+          {
+            return(0);
+          }
 
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3134,31 +2976,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  egg_cv_var_ccpipe="yes"
+
+          egg_cv_var_ccpipe="yes"
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-egg_cv_var_ccpipe="no"
+
+          egg_cv_var_ccpipe="no"
+
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-      CC="$ac_old_CC"
+        CC="$ac_old_CC"
 
 fi
 echo "$as_me:$LINENO: result: $egg_cv_var_ccpipe" >&5
 echo "${ECHO_T}$egg_cv_var_ccpipe" >&6
-    if test "$egg_cv_var_ccpipe" = "yes"
-    then
+
+    if test "$egg_cv_var_ccpipe" = "yes"; then
       CC="$CC -pipe"
     fi
   fi
-fi
 
 
 CCDEPMODE=gcc
 num=`$CC -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
 if test $num = "3"; then
   CCDEPMODE=gcc3
+#  GCC3="-Wpadded -Wpacked -Wno-unused-parameter -Wmissing-format-attribute -Wdisabled-optimization"
   GCC3="-Wpacked -Wno-unused-parameter -Wmissing-format-attribute -Wdisabled-optimization"
 fi
 
@@ -3565,9 +3411,6 @@ fi
 
 
 # Test the os and set the module linking settings
-LINUX=no
-IRIX=no
-SUNOS=no
 EGG_CYGWIN=no
 
 echo "$as_me:$LINENO: checking system type" >&5
@@ -3591,17 +3434,8 @@ echo "${ECHO_T}$egg_cv_var_system_release" >&6
 
 case "$egg_cv_var_system_type" in
   BSD/OS)
-    case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
-      2)
-      ;;
-      *)
-        CFLAGS="$CFLAGS -Wall"
-      ;;
-    esac
   ;;
   CYGWI*)
-    case "`echo $egg_cv_var_system_release | cut -c 1-3`" in
-      1.*)
 
 echo "$as_me:$LINENO: checking how to access the Win32 API" >&5
 echo $ECHO_N "checking how to access the Win32 API... $ECHO_C" >&6
@@ -3725,27 +3559,24 @@ fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-        CC="$CC $WIN32FLAGS"
-        echo "$as_me:$LINENO: checking for /usr/lib/binmode.o" >&5
+    CC="$CC $WIN32FLAGS"
+    EGG_CYGWIN="yes"
+
+  if test $EGG_CYGWIN = "yes"; then
+    echo "$as_me:$LINENO: checking for /usr/lib/binmode.o" >&5
 echo $ECHO_N "checking for /usr/lib/binmode.o... $ECHO_C" >&6
-        if test -r /usr/lib/binmode.o
-        then
-          echo "$as_me:$LINENO: result: yes" >&5
+    if test -r /usr/lib/binmode.o; then
+      echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-          LIBS="$LIBS /usr/lib/binmode.o"
-        else
-          echo "$as_me:$LINENO: result: no" >&5
+      LIBS="$LIBS /usr/lib/binmode.o"
+    else
+      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-          { echo "$as_me:$LINENO: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&5
+      { echo "$as_me:$LINENO: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&5
 echo "$as_me: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&2;}
-        fi
-      ;;
-      *)
-        { echo "$as_me:$LINENO: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&5
-echo "$as_me: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&2;}
-      ;;
-    esac
-    EGG_CYGWIN=yes
+    fi
+  fi
+
 
 cat >>confdefs.h <<\_ACEOF
 #define CYGWIN_HACKS 1
@@ -3758,7 +3589,6 @@ _ACEOF
 
   ;;
   IRIX)
-    IRIX=yes
   ;;
   Ultrix)
     SHELL=/bin/sh5
@@ -3768,8 +3598,6 @@ _ACEOF
   BeOS)
   ;;
   Linux)
-    LINUX=yes
-    CFLAGS="$CFLAGS -Wall"
   ;;
   Lynx)
   ;;
@@ -3808,11 +3636,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
   ;;
   SunOS)
-    if ! test "`echo $egg_cv_var_system_release | cut -d . -f 1`" = "5"
-      then
-      # SunOS 4
-      SUNOS=yes
-    fi
   ;;
   *BSD)
     # FreeBSD/OpenBSD/NetBSD