* Objcopy :)

svn: 674

autotools/configure.ac

@@ -38,6 +38,7 @@ 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)

autotools/includes/acinclude.m4

@@ -187,17 +187,29 @@ dnl  EGG_PROG_CCACHE()
 dnl
 AC_DEFUN(EGG_PROG_CCACHE, [dnl
 AC_CHECK_PROG(CCACHE, ccache, ccache)
-if test "${CCACHE-x}" = "x"
+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)
+if ! test "${OBJCOPY-x}" = "x"
+then
+  OBJCOPY="objcopy --remove-section=.note --remove-section=.comment"
+else
+  OBJCOPY=touch
+fi
+])dnl
+
 dnl  EGG_PROG_DISTCC()
 dnl
 AC_DEFUN(EGG_PROG_DISTCC, [dnl
 AC_CHECK_PROG(DISTCC, distcc, distcc)
-if test "${DISTCC-x}" = "x"
+if ! test "${DISTCC-x}" = "x"
 then
   DISTCC=distcc
 fi

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 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 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_files=''
 
 # Initialize some variables set by options.
@@ -3451,6 +3451,48 @@ EOF
   exit 1
 fi
 
+# 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
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # 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_OBJCOPY="objcopy"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  echo "$as_me:$LINENO: result: $OBJCOPY" >&5
+echo "${ECHO_T}$OBJCOPY" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+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
@@ -3487,7 +3529,7 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-if test "${DISTCC-x}" = "x"
+if ! test "${DISTCC-x}" = "x"
 then
   DISTCC=distcc
 fi
@@ -13990,6 +14032,7 @@ 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,@UNAME@,$UNAME,;t t
 s,@RESLIB@,$RESLIB,;t t

src/Makefile.in

@@ -11,6 +11,8 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
+OBJCOPY = @OBJCOPY@
+
 OBJS = auth.o \
 	bg.o \
 	botcmd.o \
@@ -90,6 +92,7 @@ stringfix: stringfix.c common.h ../config.h ../pack/pack.cfg eggdrop.h
 	@echo ""
 	@$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(XLIBS) compat/*.o
 	@$(STRIP) ../$(EGGEXEC)
+	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 	@echo ""