Touch up some of the autotools files
authorKevin Coffman <kwc@citi.umich.edu>
Thu, 8 Feb 2007 22:26:53 +0000 (17:26 -0500)
committerNeil Brown <neilb@suse.de>
Fri, 9 Feb 2007 00:23:32 +0000 (11:23 +1100)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
this patch touches up the autotool code a bit in nfs-utils:
 - run autogen.sh with -e so if something fails, it'll abort properly
 - set ACLOCAL_AMFLAGS so that when running autoreconf or when
   autotools re-runs itself, the m4 files are found properly
 - make sure we include bsdsignals.m4 in the final tarball
 - add some cross-compiling fallback logic to bsdsignals.m4 so that
   when cross-compiling nfs-utils, the configure is a bit more nice
   than simply:
      checking for BSD signal semantics... configure: error: cannot run test program while cross compiling
Signed-off-by: Neil Brown <neilb@suse.de>
Makefile.am
aclocal/bsdsignals.m4
autogen.sh

index 8298aa0..c04e9de 100644 (file)
@@ -35,10 +35,13 @@ EXTRA_DIST = \
        debian/nhfsstone.prerm \
        debian/rules \
        \
+       aclocal/bsdsignals.m4 \
        aclocal/nfs-utils.m4 \
        aclocal/kerberos5.m4 \
        aclocal/tcp-wrappers.m4
 
+ACLOCAL_AMFLAGS = -I aclocal
+
 install-data-hook:
        if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi
        touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
index e951194..24572aa 100644 (file)
@@ -23,7 +23,14 @@ AC_DEFUN([AC_BSD_SIGNALS], [
                kill(getpid(), SIGHUP); kill(getpid(), SIGHUP);
                return (counter == 2)? 0 : 1;
        }
-    ], knfsd_cv_bsd_signals=yes, knfsd_cv_bsd_signals=no)]) dnl
+    ], knfsd_cv_bsd_signals=yes, knfsd_cv_bsd_signals=no,
+    [
+      case "$host_os" in
+        *linux*) knfsd_cv_bsd_signals=no;;
+        *bsd*)   knfsd_cv_bsd_signals=yes;;
+        *)       AC_MSG_ERROR([unable to guess signal semantics for $host_os; please set knfsd_cv_bsd_signals]);;
+      esac
+    ])]) dnl
     AC_MSG_RESULT($knfsd_cv_bsd_signals)
     test $knfsd_cv_bsd_signals = yes && AC_DEFINE(HAVE_BSD_SIGNALS, 1, [Define this if you want to use BSD signal semantics])
 ])dnl
index c89e674..9e8b89b 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 echo -n cleaning up .