From: Rob Browning <rlb@defaultvalue.org>
Date: Tue, 17 Sep 2013 02:11:09 +0000 (-0500)
Subject: Fix ./configure handling of OS_* for GNU/kFreeBSD.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=865fc83b01db51264f61055660c71718f1ec9c98;p=packages%2Fb%2Fbup.git

Fix ./configure handling of OS_* for GNU/kFreeBSD.

Thanks to Robert Edmonds <edmonds@debian.org> for the initial report.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/config/configure b/config/configure
index e3866ec..0e81ed3 100755
--- a/config/configure
+++ b/config/configure
@@ -50,7 +50,7 @@ AC_CHECK_HEADERS linux/fs.h
 AC_CHECK_HEADERS sys/ioctl.h
 
 # On GNU/kFreeBSD utimensat is defined in GNU libc, but won't work.
-if [ -z "$OS_GNUKFREEBSD" ]; then
+if [ -z "$OS_GNU_KFREEBSD" ]; then
     AC_CHECK_FUNCS utimensat
 fi
 AC_CHECK_FUNCS utimes
diff --git a/config/configure.inc b/config/configure.inc
index 2f293de..f813656 100644
--- a/config/configure.inc
+++ b/config/configure.inc
@@ -655,7 +655,7 @@ EOF
     AC_PROG_CPP
     AC_PROG_INSTALL
 
-    ac_os=`uname -s | sed 's/[-_].*//'`
+    ac_os=`uname -s | sed 's/[-_].*//; s/[^a-zA-Z0-9]/_/g'`
     _os=`echo $ac_os | tr '[a-z]' '[A-Z]'`
     AC_DEFINE OS_$_os	1
     eval OS_${_os}=1