Author: metze Date: 2006-10-11 05:18:20 +0000 (Wed, 11 Oct 2006) New Revision: 19232
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19232 Log: merge from samba4: - machine/sys/getppdp.h workaround for HPUX 11.23 - more verbose check for net/if.h metze Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4 branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4 =================================================================== --- branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2006-10-11 00:33:48 UTC (rev 19231) +++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2006-10-11 05:18:20 UTC (rev 19232) @@ -102,23 +102,22 @@ dnl we need to check that net/if.h really can be used, to cope with hpux dnl where including it always fails -AC_TRY_COMPILE([ - #include <stdio.h> - #if STDC_HEADERS - # include <stdlib.h> - # include <stddef.h> - #else - # if HAVE_STDLIB_H - # include <stdlib.h> - # endif - #endif - #if HAVE_SYS_SOCKET_H - # include <sys/socket.h> - #endif], - [#include <net/if.h>], - AC_DEFINE(HAVE_NET_IF_H, 1, usability of net/if.h)) +AC_CACHE_CHECK([for usable net/if.h],libreplace_cv_USABLE_NET_IF_H,[ + AC_COMPILE_IFELSE([ + AC_INCLUDES_DEFAULT + #if HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + #include <net/if.h> + int main(void) {return 0;}], + [libreplace_cv_USABLE_NET_IF_H=yes], + [libreplace_cv_USABLE_NET_IF_H=no] + ) +]) +if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then + AC_DEFINE(HAVE_NET_IF_H, 1, usability of net/if.h) +fi - AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[ AC_TRY_RUN([ #include <stdio.h> Modified: branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4 =================================================================== --- branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4 2006-10-11 00:33:48 UTC (rev 19231) +++ branches/SAMBA_3_0/source/lib/replace/libreplace_cc.m4 2006-10-11 05:18:20 UTC (rev 19232) @@ -64,6 +64,10 @@ AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS="$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000" fi + if test "`uname -r`" = "B.11.23"; then + AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround]) + CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED" + fi ;; *aix*) AC_DEFINE(BROKEN_STRNDUP, 1, [Whether strndup is broken])
