From: David Levine <levinedl@acm.org>
Date: Fri, 6 Dec 2013 04:49:54 +0000 (-0600)
Subject: Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/32fde56da3936f39cd11a4eee52600164076e8e1?hp=2734ae8bfd1261aae65da3e14453dcfc1896f8d4

Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
---

diff --git a/configure.ac b/configure.ac
index 59389360..a8072050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,14 +156,12 @@ if test -n "$auto_cflags"; then
  	  LDFLAGS=
           ;;
 	*)
-#	  LDFLAGS=-s
-	  LDFLAGS=
+	  LDFLAGS=-s
 	  ;;
       esac
     fi
     if test -n "$GCC"; then
-#      test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -O2"
-      test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -g" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -g"
+      test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -O2"
     else
       test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
     fi
diff --git a/test/inc/test-deb359167 b/test/inc/test-deb359167
index c35d82b5..92f4c61a 100755
--- a/test/inc/test-deb359167
+++ b/test/inc/test-deb359167
@@ -27,6 +27,5 @@ fi
 #
 
 chmod 755 ${MH_INST_DIR}${bindir}/inc
-file ${MH_INST_DIR}${bindir}/inc
 
 valgrind --error-exitcode=1 --quiet inc -silent -file "$TESTMBOX"