Enhancement appneta#334 - modernize configure.ac (appneta#338)

* En appneta#334 - modernize configure.ac * Enhancement appneta#334 - fix install on OS X
baigubulu · Mar 19, 2017 · 313ccdb · 313ccdb
1 parent 118fb91
commit 313ccdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,4 @@
 # $Id$
-AUTOMAKE_OPTIONS = foreign
-
 ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 
 if NEED_LIBOPTS

diff --git a/configure.ac b/configure.ac
@@ -25,13 +25,13 @@ PACKAGE_URL=http://tcpreplay.appneta.com/
 dnl Release is only used for the RPM spec file
 TCPREPLAY_RELEASE=1
 
-AC_DEFINE(PACKAGE, [tcpreplay], [This is our package name])
-AC_DEFINE_UNQUOTED(VERSION, "$TCPREPLAY_VERSION", [What is our version?])
+AC_DEFINE(PACKAGE, [tcpreplay])
+AC_DEFINE_UNQUOTED(VERSION, "$TCPREPLAY_VERSION")
 AC_SUBST(TCPREPLAY_VERSION)
 AC_SUBST(TCPREPLAY_RELEASE)
 
 USER_CFLAGS=$CFLAGS
-CFLAGS="-Wall -std=gnu99 ${CFLAGS}"
+CFLAGS="-Wall -Wno-format-contains-nul -std=gnu99 ${CFLAGS}"
 
 dnl Determine OS
 AC_CANONICAL_BUILD
@@ -141,7 +141,7 @@ else
 fi
 
 
-AM_INIT_AUTOMAKE(tcpreplay, $TCPREPLAY_VERSION, nodefine)
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 
 dnl Checks for programs.

diff --git a/src/config.h.in b/src/config.h.in
@@ -618,7 +618,7 @@
 /* Define this if optional arguments are disallowed */
 #undef NO_OPTIONAL_OPT_ARGS
 
-/* This is our package name */
+/* Name of package */
 #undef PACKAGE
 
 /* Define to the address where bug reports for this package should be sent. */
@@ -675,7 +675,7 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* What is our version? */
+/* Version number of package */
 #undef VERSION
 
 /* Define if using the dmalloc debugging malloc package */