* Doh, now it works as intended!

svn: 679

autotools/configure.ac

@@ -35,13 +35,14 @@ AC_SUBST(CCDEBUG)dnl
 # Checks for programs
 AC_PROG_MAKE_SET
 EGG_PROG_HEAD_1
-EGG_PROG_STRIP
 EGG_PROG_AWK
 EGG_PROG_BASENAME
-EGG_PROG_OBJCOPY
-#EGG_PROG_CCACHE
-EGG_PROG_DISTCC
-AC_CHECK_PROG(UNAME,uname,uname)
+#EGG_PROG_OBJCOPY
+AC_CHECK_PROG(OBJCOPY, objcopy, [objcopy --remove-section=.note --remove-section=.comment])
+AC_CHECK_PROG(STRIP, strip, strip, touch)
+AC_CHECK_PROG(UNAME, uname, uname)
+#AC_CHECK_PROG(CCACHE, ccache, ccache)
+AC_CHECK_PROG(DISTCC, distcc, distcc)
 
 # Test the os and set the module linking settings
 EGG_CHECK_OS

autotools/includes/acinclude.m4

@@ -172,31 +172,10 @@ AC_SUBST(HEAD_1)dnl
 ])dnl
 
 
-
-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
-
-dnl  EGG_PROG_CCACHE()
-dnl
-AC_DEFUN(EGG_PROG_CCACHE, [dnl
-AC_CHECK_PROG(CCACHE, ccache, ccache)
-if ! test "${CCACHE-x}" = "x"
-then
-  CCACHE=ccache
-fi
-])dnl
-
 dnl  EGG_PROG_OBJCOPY()
 dnl
 AC_DEFUN(EGG_PROG_OBJCOPY, [dnl
-AC_CHECK_PROG(OBJCOPY, objcopy, objcopy)
+AC_CHECK_PROG(OBJCOPY, objcopy,)
 if ! test "${OBJCOPY-x}" = "x"
 then
   OBJCOPY="objcopy --remove-section=.note --remove-section=.comment"
@@ -205,18 +184,6 @@ else
 fi
 ])dnl
 
-dnl  EGG_PROG_DISTCC()
-dnl
-AC_DEFUN(EGG_PROG_DISTCC, [dnl
-AC_CHECK_PROG(DISTCC, distcc, distcc)
-if ! test "${DISTCC-x}" = "x"
-then
-  DISTCC=distcc
-else
-  DISTCC=
-fi
-])dnl
-
 dnl  EGG_PROG_AWK()
 dnl
 AC_DEFUN(EGG_PROG_AWK, [dnl

configure

@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE CCDEBUG SET_MAKE HEAD_1 STRIP AWK BASENAME OBJCOPY DISTCC UNAME RESLIB RESINCLUDE ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE CCDEBUG SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC RESLIB RESINCLUDE ZLIB SSL LIBOBJS TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS VERSION NUMVER PACKNAME MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3310,46 +3310,6 @@ fi
 rm -f conftest.head
 HEAD_1=$ac_cv_prog_HEAD_1
 
-# 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
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # 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_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "${STRIP-x}" = "x"
-then
-  STRIP=touch
-fi
-
 # awk is needed for Tcl library and header checks, and eggdrop version subst
 for ac_prog in gawk mawk nawk awk
 do
@@ -3451,6 +3411,7 @@ EOF
   exit 1
 fi
 
+#EGG_PROG_OBJCOPY
 # Extract the first word of "objcopy", so it can be a program name with args.
 set dummy objcopy; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3468,7 +3429,7 @@ do
   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_OBJCOPY="objcopy"
+    ac_cv_prog_OBJCOPY="objcopy --remove-section=.note --remove-section=.comment"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3486,23 +3447,15 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-if ! test "${OBJCOPY-x}" = "x"
-then
-  OBJCOPY="objcopy --remove-section=.note --remove-section=.comment"
-else
-  OBJCOPY=touch
-fi
-
-#EGG_PROG_CCACHE
-# Extract the first word of "distcc", so it can be a program name with args.
-set dummy distcc; ac_word=$2
+# 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
-if test "${ac_cv_prog_DISTCC+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$DISTCC"; then
-  ac_cv_prog_DISTCC="$DISTCC" # Let the user override the test.
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3511,31 +3464,25 @@ do
   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_DISTCC="distcc"
+    ac_cv_prog_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 
+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="touch"
 fi
 fi
-DISTCC=$ac_cv_prog_DISTCC
-if test -n "$DISTCC"; then
-  echo "$as_me:$LINENO: result: $DISTCC" >&5
-echo "${ECHO_T}$DISTCC" >&6
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-if ! test "${DISTCC-x}" = "x"
-then
-  DISTCC=distcc
-else
-  DISTCC=
-fi
-
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3571,6 +3518,42 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+#AC_CHECK_PROG(CCACHE, ccache, ccache)
+# Extract the first word of "distcc", so it can be a program name with args.
+set dummy distcc; 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_DISTCC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DISTCC"; then
+  ac_cv_prog_DISTCC="$DISTCC" # 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_DISTCC="distcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+DISTCC=$ac_cv_prog_DISTCC
+if test -n "$DISTCC"; then
+  echo "$as_me:$LINENO: result: $DISTCC" >&5
+echo "${ECHO_T}$DISTCC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 
 # Test the os and set the module linking settings
 LINUX=no
@@ -14031,12 +14014,12 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@CCDEBUG@,$CCDEBUG,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@HEAD_1@,$HEAD_1,;t t
-s,@STRIP@,$STRIP,;t t
 s,@AWK@,$AWK,;t t
 s,@BASENAME@,$BASENAME,;t t
 s,@OBJCOPY@,$OBJCOPY,;t t
-s,@DISTCC@,$DISTCC,;t t
+s,@STRIP@,$STRIP,;t t
 s,@UNAME@,$UNAME,;t t
+s,@DISTCC@,$DISTCC,;t t
 s,@RESLIB@,$RESLIB,;t t
 s,@RESINCLUDE@,$RESINCLUDE,;t t
 s,@ZLIB@,$ZLIB,;t t