X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/062356283e3de7e2da9b488853e1f4381a3e5267..8a87f7b5fd5622dcde0fc4b48d93157616b496f0:/configure.ac

diff --git a/configure.ac b/configure.ac
index e38fae1e..2e8cbd7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,17 @@ AC_PROG_LEX             dnl Check for lex/flex
 
 dnl Look for `cut'
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
+AC_PATH_PROG([cutpath], [cut], [no], [$pathtmp])
+
+dnl
+dnl Check for MD5 program and formatting command
+dnl
+AC_CHECK_PROGS([MD5SUM], [md5sum md5], [missing])
+AS_CASE(["${MD5SUM}"],
+	[md5sum], [MD5FMT="cat"],
+	[md5], [[MD5FMT="${SED} -e 's/MD5 *(\(.*\)) *= \([0-9a-f]*\)/\2  \1/'"]],
+	[MD5FMT="missing"])
+AC_SUBST([MD5FMT])
 
 dnl ----------------------------------------------
 dnl check for lclint, and lint if it doesn't exist
@@ -389,9 +399,8 @@ dnl before system header files.
 AS_CASE(["$host_os"],
 	[linux*],
 	[# Like DEFS, but doesn't get stomped on by configure when using config.h:
-    test -z "$OURDEFS"  &&  OURDEFS="-D_GNU_SOURCE"  \
-                        ||  OURDEFS="$OURDEFS -D_GNU_SOURCE"])
-AC_SUBST(OURDEFS)
+	  AS_IF([test -z "$CPPFLAGS"],[CPPFLAGS="-D_GNU_SOURCE"],
+                [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])])
 
 AC_HEADER_STDC
 AC_HEADER_TIOCGWINSZ
@@ -740,7 +749,7 @@ host os                    : ${host}
 compiler                   : ${CC}
 compiler flags             : ${CFLAGS}
 linker flags               : ${LDFLAGS}
-definitions                : ${OURDEFS}
+preprocessor flags         : ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}
 library install path       : ${nmhlib}
@@ -761,5 +770,5 @@ TLS support                : ${tls_support}
 dnl ---------------
 dnl OUTPUT MAKEFILE
 dnl ---------------
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile test/common.sh])
 AC_OUTPUT