diff options
| author | atatat <atatat@NetBSD.org> | 2004-03-25 19:14:30 +0000 |
|---|---|---|
| committer | atatat <atatat@NetBSD.org> | 2004-03-25 19:14:30 +0000 |
| commit | 7a69658f3772546594e650eba3de71b6caa8bf73 (patch) | |
| tree | 4761e4f199a903df417989eccd4636f76f5e04df /gnu/dist/sendmail/devtools | |
| parent | 8d2f43c39d67e8a64dfe068bb102054665f41cbb (diff) | |
resolve conflicts, pull 8.12.11 to head
Diffstat (limited to 'gnu/dist/sendmail/devtools')
| -rw-r--r-- | gnu/dist/sendmail/devtools/OS/AIX.4.3 | 8 | ||||
| -rw-r--r-- | gnu/dist/sendmail/devtools/OS/FreeBSD | 10 | ||||
| -rwxr-xr-x | gnu/dist/sendmail/devtools/bin/Build | 9 | ||||
| -rw-r--r-- | gnu/dist/sendmail/devtools/bin/configure.sh | 9 |
4 files changed, 23 insertions, 13 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 diff --git a/gnu/dist/sendmail/devtools/bin/Build b/gnu/dist/sendmail/devtools/bin/Build index 22cec23d530..efe1d6d5a07 100755 --- a/gnu/dist/sendmail/devtools/bin/Build +++ b/gnu/dist/sendmail/devtools/bin/Build @@ -11,8 +11,8 @@ # the sendmail distribution. # # -# Id: Build,v 8.179.2.3 2002/12/23 23:02:37 ca Exp -# $NetBSD: Build,v 1.9 2003/06/01 14:06:56 atatat Exp $ +# Id: Build,v 8.179.2.4 2003/08/20 18:08:07 gshapiro Exp +# $NetBSD: Build,v 1.10 2004/03/25 19:14:30 atatat Exp $ # # @@ -46,6 +46,7 @@ EX_OK=0 EX_USAGE=64 EX_NOINPUT=66 EX_UNAVAILABLE=69 +SHELL=/bin/sh # default to a optimized build to behave like the old system. build_variant="optimized" @@ -649,7 +650,7 @@ then echo "Cannot determine how to support $os.$rel.$arch" >&2 exit $EX_UNAVAILABLE fi - M4=`sh $BUILDTOOLS/bin/find_m4.sh` + M4=`$SHELL $BUILDTOOLS/bin/find_m4.sh` ret=$? if [ $ret -ne 0 ] then @@ -775,7 +776,7 @@ then grep "^_HCRSBIL_=" | \ sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_HCRSBIL_=//"` echo 'divert(-1)' >> $obj/.settings$$ - LIBDIRS="$libdirs" LIBSRCH="$libsrch" LIBPATH="$libpath" SITECONFIG="$siteconfig" sh $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$ + LIBDIRS="$libdirs" LIBSRCH="$libsrch" LIBPATH="$libpath" SITECONFIG="$siteconfig" $SHELL $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$ echo 'divert(0)dnl' >> $obj/.settings$$ sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' -e 's/
//g' $obj/.settings$$ | \ ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - Makefile.m4 | \ diff --git a/gnu/dist/sendmail/devtools/bin/configure.sh b/gnu/dist/sendmail/devtools/bin/configure.sh index 61498a86919..e75808cbd2e 100644 --- a/gnu/dist/sendmail/devtools/bin/configure.sh +++ b/gnu/dist/sendmail/devtools/bin/configure.sh @@ -8,13 +8,14 @@ # the sendmail distribution. # # -# Id: configure.sh,v 8.45 2001/12/13 23:56:43 gshapiro Exp -# $NetBSD: configure.sh,v 1.5 2003/06/01 14:06:56 atatat Exp $ +# Id: configure.sh,v 8.45.2.1 2003/08/20 18:08:07 gshapiro Exp +# $NetBSD: configure.sh,v 1.6 2004/03/25 19:14:30 atatat Exp $ # # Special script to autoconfigure for M4 generation of Makefile # +SHELL=/bin/sh os="" resolver="" sflag="" @@ -154,7 +155,7 @@ then echo "define(\`confLIBS', \`$libs' confLIBS)dnl" fi -if [ ! -z "`sh $find_prog ranlib`" ] +if [ ! -z "`$SHELL $find_prog ranlib`" ] then echo "define(\`confRANLIB', \`ranlib')dnl" fi @@ -162,7 +163,7 @@ fi roff_progs="groff nroff" for roff_prog in $roff_progs do - if [ ! -z "`sh $find_prog $roff_prog`" ] + if [ ! -z "`$SHELL $find_prog $roff_prog`" ] then found_roff=$roff_prog break; |
