Module Name:    src
Committed By:   pooka
Date:           Sat Jan  3 13:16:41 UTC 2015

Modified Files:
        src/lib/librumpuser: configure configure.ac

Log Message:
check that sys/cdefs.h builds with -Werror (not the case on alpine linux
where it contains an unconditional #warning)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/configure \
    src/lib/librumpuser/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/librumpuser/configure
diff -u src/lib/librumpuser/configure:1.3 src/lib/librumpuser/configure:1.4
--- src/lib/librumpuser/configure:1.3	Wed Nov  5 01:40:30 2014
+++ src/lib/librumpuser/configure	Sat Jan  3 13:16:41 2015
@@ -3646,7 +3646,7 @@ fi
 done
 
 
-for ac_header in sys/cdefs.h sys/param.h sys/sysctl.h sys/disk.h \
+for ac_header in sys/param.h sys/sysctl.h sys/disk.h \
 	sys/disklabel.h sys/dkio.h sys/atomic.h paths.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4096,6 +4096,21 @@ fi
 
 SAVE_CFLAGS="${CFLAGS}"
 CFLAGS="${SAVE_CFLAGS} -Werror"
+
+for ac_header in sys/cdefs.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "#include <sys/cdefs.h>
+"
+if test "x$ac_cv_header_sys_cdefs_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_CDEFS_H 1
+_ACEOF
+
+fi
+
+done
+
+
 SAVE_LIBS="${LIBS}"
 LIBS="${LIBS} -lpthread"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument pthread_setname_np()" >&5
Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.3 src/lib/librumpuser/configure.ac:1.4
--- src/lib/librumpuser/configure.ac:1.3	Wed Nov  5 01:40:30 2014
+++ src/lib/librumpuser/configure.ac	Sat Jan  3 13:16:41 2015
@@ -19,7 +19,7 @@ AC_LANG([C])
 
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS([sys/cdefs.h sys/param.h sys/sysctl.h sys/disk.h \
+AC_CHECK_HEADERS([sys/param.h sys/sysctl.h sys/disk.h \
 	sys/disklabel.h sys/dkio.h sys/atomic.h paths.h])
 
 AC_CANONICAL_TARGET
@@ -52,6 +52,11 @@ dnl pthread_setname() sillyness is a bit
 dnl
 SAVE_CFLAGS="${CFLAGS}"
 CFLAGS="${SAVE_CFLAGS} -Werror"
+
+dnl check sys/cdefs.h creatively to process only with cc, not cpp
+dnl (sys/cdefs.h in at least in musl contains a #warning)
+AC_CHECK_HEADERS([sys/cdefs.h], [], [], [#include <sys/cdefs.h>])
+
 SAVE_LIBS="${LIBS}"
 LIBS="${LIBS} -lpthread"
 AC_MSG_CHECKING([for two-argument pthread_setname_np()])

Reply via email to