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 e3866ecec15d30d44da14a18ab4ea84ea2362fce..0e81ed392f5ced142c98af045d197bc0e58249a0 100755 (executable)
--- 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.
 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
     AC_CHECK_FUNCS utimensat
 fi
 AC_CHECK_FUNCS utimes

diff --git a/config/configure.inc b/config/configure.inc
index 2f293deb44f60eee7cb3e460ebdb53062798bb9f..f813656d081749ab20c8c2220433adab85a68fa8 100644 (file)
--- a/config/configure.inc
+++ b/config/configure.inc
@@ -655,7 +655,7 @@ EOF
     AC_PROG_CPP
     AC_PROG_INSTALL
 
     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
     _os=`echo $ac_os | tr '[a-z]' '[A-Z]'`
     AC_DEFINE OS_$_os  1
     eval OS_${_os}=1