[Fedora-directory-commits] adminserver/include/base nsassert.h, 1.4, 1.5 systems.h, 1.4, 1.5

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/include/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/adminserver/include/base

Modified Files:
	nsassert.h systems.h 
Log Message:
Resolves: bug 250324
Bug Description: adminserver: port to HP-UX
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: 1) We need the same --enable-bundle option as ldapserver, so that adminserver knows where to find the shared libraries at runtime.  2) The adminserver Makefile constructs the LIBPATH for scripts to use.  Use this consistently
3) Need to use -lpthread before -lc
4) Use same --enable-debug as ldapserver
5) HP-UX has group "nogroup" instead of "nobody"
6) Use same libtool gcc hack as ldapserver uses
7) mod_deflate is not supported on HP-UX
Doing a DEBUG build caused breakage due to missing ereport.  Instead, just use PR_ASSERT for NS_ASSERT.
HAVE_STRFTIME is now defined in config.h.
Platforms tested: HP-UX 11.23 IPF 64bit, RHEL4
Flag Day: Yes - autotool file changes
Doc impact: no



Index: nsassert.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/base/nsassert.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsassert.h	18 Aug 2005 19:14:43 -0000	1.4
+++ nsassert.h	1 Aug 2007 18:14:54 -0000	1.5
@@ -28,23 +28,9 @@
 #ifndef BASE_NSASSERT_H
 #define BASE_NSASSERT_H
 
-#if defined(_DEBUG) || defined(DEBUG)
+#include <prlog.h>
 
-#ifndef BASE_EREPORT_H
-#include "ereport.h"
-#endif /* !BASE_EREPORT_H */
-
-NSPR_BEGIN_EXTERN_C
-
-#define NS_ASSERT(x)   (x)?0:ereport(0, "assert failed! %s (%d, %s)", \
-                    #x, __LINE__, __FILE__)
-NSPR_END_EXTERN_C
-
-#else
-
-#define NS_ASSERT(x) 
-
-#endif
+#define NS_ASSERT(x) PR_ASSERT(x)
 
 #endif /* !BASE_NSASSERT_H */
 


Index: systems.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/base/systems.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- systems.h	9 May 2007 00:26:35 -0000	1.4
+++ systems.h	1 Aug 2007 18:14:54 -0000	1.5
@@ -119,7 +119,6 @@
 #define FILE_MMAP_FLAGS MAP_PRIVATE
 #define HAS_STATFS
 #define HAVE_ATEXIT
-#define HAVE_STRFTIME
 #define JAVA_STATIC_LINK
 #undef NEED_CRYPT_H
 #define NET_SOCKETS