3 files changed, 31 insertions, 5 deletions
diff --git a/devtools/OS/Linux b/devtools/OS/Linux
index 52418c8473aa..119b6f9f830f 100644
--- a/devtools/OS/Linux
+++ b/devtools/OS/Linux
@@ -1,9 +1,10 @@
-#	$Id: Linux,v 8.30 2002/03/21 23:59:25 gshapiro Exp $
+#	$Id: Linux,v 8.31 2009/01/22 02:15:42 guenther Exp $
 
 dnl	DO NOT EDIT THIS FILE.
 dnl	Place personal settings in devtools/Site/site.config.m4
 
 define(`confDEPEND_TYPE', `CC-M')
+define(`confCCOPTS_SO', `-fPIC')
 define(`confSM_OS_HEADER', `sm_os_linux')
 define(`confMANROOT', `/usr/man/man')
 define(`confLIBS', `-ldl')
diff --git a/devtools/OS/OpenBSD b/devtools/OS/OpenBSD
index 07bec0fd2f52..5b28c017c950 100644
--- a/devtools/OS/OpenBSD
+++ b/devtools/OS/OpenBSD
@@ -1,4 +1,4 @@
-#	$Id: OpenBSD,v 8.20 2002/03/21 23:59:25 gshapiro Exp $
+#	$Id: OpenBSD,v 8.21 2008/08/06 23:41:44 guenther Exp $
 
 dnl	DO NOT EDIT THIS FILE.
 dnl	Place personal settings in devtools/Site/site.config.m4
@@ -8,7 +8,32 @@ define(`confLDOPTS_SO', `-shared')
 define(`confCCOPTS_SO', `-fPIC')
 
 define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
-define(`confENVDEF', ` -DNETISO -DFAST_PID_RECYCLE')
+define(`confENVDEF', ` -DFAST_PID_RECYCLE')
 define(`confSM_OS_HEADER', `sm_os_openbsd')
 define(`confMTCCOPTS', `-pthread')
 define(`confMTLDOPTS', `-pthread')
+
+ifelse(confBLDVARIANT, `DEBUG',
+dnl Debug build
+`
+	define(`confOPTIMIZE',`-g')
+',
+dnl Optimized build
+confBLDVARIANT, `OPTIMIZED',
+`
+	define(`confOPTIMIZE',`-O')
+',
+dnl Purify build
+confBLDVARIANT, `PURIFY',
+`
+	define(`confOPTIMIZE',`-g')
+',
+dnl default
+`
+	define(`confOPTIMIZE',`-O')
+')
+define(`USE_ICONV',`
+	APPENDDEF(`confLIBS',`-liconv ')dnl
+	APPENDDEF(`confLIBDIRS',`-L/usr/local/lib ')dnl
+	APPENDDEF(`confINCDIRS',`-I/usr/local/include ')dnl
+')dnl
diff --git a/devtools/OS/SunOS.5.11 b/devtools/OS/SunOS.5.11
index 0001caab178c..d383aeaa1916 100644
--- a/devtools/OS/SunOS.5.11
+++ b/devtools/OS/SunOS.5.11
@@ -1,4 +1,4 @@
-#	$Id: SunOS.5.11,v 1.1 2005/06/20 23:52:31 ca Exp $
+#	$Id: SunOS.5.11,v 1.2 2009/10/13 21:46:01 ca Exp $
 
 dnl	DO NOT EDIT THIS FILE.
 dnl	Place personal settings in devtools/Site/site.config.m4
@@ -6,7 +6,7 @@ dnl	Place personal settings in devtools/Site/site.config.m4
 define(`confCC', `gcc')
 define(`confLDOPTS_SO', `-G')
 define(`confBEFORE', `sysexits.h')
-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
 define(`confENVDEF', `-DSOLARIS=21100 -DNETINET6')
 define(`confSM_OS_HEADER', `sm_os_sunos')
 define(`confLIBS', `-lsocket -lnsl')