summaryrefslogtreecommitdiff
path: root/gnu/dist/sendmail/devtools/OS
diff options
context:
space:
mode:
authoratatat <atatat@NetBSD.org>2004-03-25 19:14:30 +0000
committeratatat <atatat@NetBSD.org>2004-03-25 19:14:30 +0000
commit7a69658f3772546594e650eba3de71b6caa8bf73 (patch)
tree4761e4f199a903df417989eccd4636f76f5e04df /gnu/dist/sendmail/devtools/OS
parent8d2f43c39d67e8a64dfe068bb102054665f41cbb (diff)
resolve conflicts, pull 8.12.11 to head
Diffstat (limited to 'gnu/dist/sendmail/devtools/OS')
-rw-r--r--gnu/dist/sendmail/devtools/OS/AIX.4.38
-rw-r--r--gnu/dist/sendmail/devtools/OS/FreeBSD10
2 files changed, 13 insertions, 5 deletions
diff --git a/gnu/dist/sendmail/devtools/OS/AIX.4.3 b/gnu/dist/sendmail/devtools/OS/AIX.4.3
index 8f98053cdbc..616c083d6a9 100644
--- a/gnu/dist/sendmail/devtools/OS/AIX.4.3
+++ b/gnu/dist/sendmail/devtools/OS/AIX.4.3
@@ -1,5 +1,5 @@
-# Id: AIX.4.3,v 8.19 2002/03/21 23:59:25 gshapiro Exp
-# $NetBSD: AIX.4.3,v 1.4 2003/06/01 14:06:54 atatat Exp $
+# Id: AIX.4.3,v 8.19.2.1 2003/07/07 21:14:24 msk Exp
+# $NetBSD: AIX.4.3,v 1.5 2004/03/25 19:14:30 atatat Exp $
dnl DO NOT EDIT THIS FILE.
dnl Place personal settings in devtools/Site/site.config.m4
@@ -19,3 +19,7 @@ define(`confSM_OS_HEADER', `sm_os_aix')
define(`confMTCCOPTS', `-D_THREAD_SAFE')
define(`confMTLDOPTS', `-lpthread')
define(`confLDOPTS_SO', `-Wl,-G -Wl,-bexpall')
+
+define(`USE_ICONV',`
+ APPENDDEF(`confLIBS',`-liconv ')dnl
+')dnl
diff --git a/gnu/dist/sendmail/devtools/OS/FreeBSD b/gnu/dist/sendmail/devtools/OS/FreeBSD
index 27076a83eac..7f23dfe2c19 100644
--- a/gnu/dist/sendmail/devtools/OS/FreeBSD
+++ b/gnu/dist/sendmail/devtools/OS/FreeBSD
@@ -1,5 +1,5 @@
-# Id: FreeBSD,v 8.35 2002/03/21 23:59:25 gshapiro Exp
-# $NetBSD: FreeBSD,v 1.5 2003/06/01 14:06:54 atatat Exp $
+# Id: FreeBSD,v 8.35.2.1 2003/07/07 21:14:24 msk Exp
+# $NetBSD: FreeBSD,v 1.6 2004/03/25 19:14:30 atatat Exp $
dnl DO NOT EDIT THIS FILE.
dnl Place personal settings in devtools/Site/site.config.m4
@@ -36,4 +36,8 @@ 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