autogen.sh: Delete all trailing blank lines at end of configure.

Same as in tcpslice and libpcap.

diff --git a/CHANGES b/CHANGES
index c2ee030c221b32e0e1318bd4e722654334e95721..87318cc29acc316599af40bdb3ac3e5dce49c389 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -66,6 +66,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
         .devel file does not exists.
       tests: On HP-UX use "diff -c" by default.
       autogen.sh: Allow to configure Autoconf warnings.
+      autogen.sh: Delete all trailing blank lines at end of configure.
     Documentation:
       man: Clarify the "any" pseudo-interface further.
 

diff --git a/autogen.sh b/autogen.sh
index 78b749a476da9a42dc06c50556e84cd350125d0e..e0f53398bb378dd74244be14885016d56e8037da 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,3 +29,13 @@ echo "$AUTORECONF identification: $AUTORECONFVERSION"
 # the branch) amount of noise to the build matrix output, so provide a means
 # to silence that.
 env ${AUTOCONF_WARNINGS:+WARNINGS="$AUTOCONF_WARNINGS"} "$AUTORECONF" -f
+
+# Autoconf 2.71 adds a blank line after the final "exit 0" on Linux, but not
+# on OpenBSD.  Remove this difference to make it easier to compare the result
+# of "make releasetar" across different platforms.  From sed one-liners:
+# "delete all trailing blank lines at end of file (works on all seds)".  Don't
+# use mktemp(1) because AIX does not have it.
+CONFIGURE_NEW="configure.new$$"
+sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' <configure >"$CONFIGURE_NEW"
+cmp -s configure "$CONFIGURE_NEW" || cat "$CONFIGURE_NEW" >configure
+rm -f "$CONFIGURE_NEW"