Attachment 148253 Details for Bug 229095 – Revised Diffs

[patch] Revised Diffs

diffs.txt (text/plain), 2.74 KB, created by Nathan Kinder on 2007-02-16 23:18:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-02-16 23:18:57 UTC

Size: 2.74 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.19
>diff -u -5 -t -r1.19 configure.ac
>--- configure.ac	13 Feb 2007 19:00:11 -0000	1.19
>+++ configure.ac	16 Feb 2007 23:17:51 -0000
>@@ -155,20 +155,24 @@
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23])
>     AC_DEFINE([CPU_ia64], [], [cpu type ia64])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     platform="hpux"
>     ;;
>   hppa*-hp-hpux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([hpux], [1], [HP-UX])
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
>     AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     platform="hpux"
>     ;;
>   sparc-sun-solaris*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([SVR4], [1], [SVR4])
>@@ -195,10 +199,11 @@
>     platform=""
>     ;;
> esac
> AC_SUBST(initdir)
> 
>+AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
> AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
>Index: config.h.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/config.h.in,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 config.h.in
>--- config.h.in	15 Nov 2006 02:07:27 -0000	1.2
>+++ config.h.in	16 Feb 2007 23:17:51 -0000
>@@ -315,10 +315,16 @@
> #undef VERSION
> 
> /* UNIX */
> #undef XP_UNIX
> 
>+/* Source namespace */
>+#undef _HPUX_SOURCE
>+
>+/* POSIX revision */
>+#undef _POSIX_C_SOURCE
>+
> /* _REENTRANT */
> #undef _REENTRANT
> 
> /* SVID_GETTOD */
> #undef _SVID_GETTOD
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.25
>diff -u -5 -t -r1.25 Makefile.am
>--- Makefile.am	12 Feb 2007 19:39:03 -0000	1.25
>+++ Makefile.am	16 Feb 2007 23:17:51 -0000
>@@ -23,10 +23,14 @@
>         -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" \
>         -DSBINDIR="\"$(sbindir)\""
> 
> AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
> PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+# We need to make sure that libpthread is linked before libc on HP-UX.
>+if HPUX
>+AM_LDFLAGS = -lpthread
>+endif
> 
> #------------------------
> # Linker Flags
> #------------------------
> NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4

Actions: View | Diff

Attachments on bug 229095: 148252 | 148253 | 148254