[Fedora-directory-commits] adminserver/lib/base nscputil.cpp, 1.2, 1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	nscputil.cpp 
Log Message:
Resolves: bug 245214
Bug Description: adminserver: Solaris port for 1.1
Reviewed by: nhosoi (Thanks!)
Fix Description: Fortitude can supply different components, depending on the operating system.  On Fedora, mod_nss and Apache are already there, so we don't use Fortitude.
On RHEL4, we use Fortitude for mod_nss.
On Solaris, we use Fortitude for Apache and mod_nss.
I've created a fortitude.m4 that can handle all of these cases, and changed the existing httpd.m4 and mod_nss.m4 to first see if fortitude.m4 has found the component.  configure will also pass the proper --with flags to mod_admserv and mod_restartd.
ICU introduces a dependency on C++.  Solaris requires linking with the C++ libraries and that also requires using C++ to link as well.  This means using the CXXLINK macro.
There were a few other minor porting issues which required the additional compiler defines and use of config.h.
We need to set the libpath before using the @cgibindir@/config program.
LIBPATH was not being set correctly on Solaris because I was using the extended sort flags instead of the standard ones.
Platforms tested: Solaris 9 64bit
Flag Day: no
Doc impact: no



Index: nscputil.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nscputil.cpp	9 May 2007 00:26:37 -0000	1.2
+++ nscputil.cpp	22 Jun 2007 01:34:20 -0000	1.3
@@ -25,6 +25,9 @@
  * Rob McCool
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>