- (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX

   10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
   only if a conflict is detected.

diff --git a/ChangeLog b/ChangeLog
index 9fc25db209ab1b02d9a67b95f6ec457a44e0bd0d..d79a653fac25b6b9e04428f54cc78ed7664095be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20041102
+ - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
+   10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
+   only if a conflict is detected.
+
 20041019
  - (dtucker) [uidswap.c] Don't test dropping of gids for the root user or
    on Cygwin.  Cygwin parts from vinschen at redhat com; ok djm@

diff --git a/configure.ac b/configure.ac
index 39a38dc774c023eeb05661d564a1ef239f6b0990..91cf8f7ef2c8053168b84e1549de280206976d49 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(LOCKED_PASSWD_STRING, "*")
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
        check_for_hpux_broken_getaddrinfo=1
+       check_for_conflicting_getspnam=1
        LIBS="$LIBS -lsec"
        AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
        ;;
@@ -1123,6 +1124,24 @@ main(void)
        )
 fi
 
+if test "x$check_for_conflicting_getspnam" = "x1"; then
+       AC_MSG_CHECKING(for conflicting getspnam in shadow.h)
+       AC_COMPILE_IFELSE(
+               [
+#include <shadow.h>
+int main(void) {exit(0);}
+               ],
+               [
+                       AC_MSG_RESULT(no)
+               ],
+               [
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(GETSPNAM_CONFLICTING_DEFS, 1,
+                           [Conflicting defs for getspnam])
+               ]
+       )
+fi
+
 AC_FUNC_GETPGRP
 
 # Check for PAM libs

diff --git a/includes.h b/includes.h
index 3a6b4c32bbac488fca8a7b55e318620335bcb4dd..3d3aa3b21c3463ea9740b461a6814cd12bbef844 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -185,7 +185,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
  * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations
  * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
  */
-#ifdef __hpux
+#ifdef GETSPNAM_CONFLICTING_DEFS
 # ifdef _INCLUDE__STDC__
 #  undef _INCLUDE__STDC__
 # endif