diff --git a/icu4c/source/aclocal.m4 b/icu4c/source/aclocal.m4 index d2fb880f47d..ad020558fdb 100644 --- a/icu4c/source/aclocal.m4 +++ b/icu4c/source/aclocal.m4 @@ -32,7 +32,7 @@ alpha*-*-linux-gnu) *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; *-*-linux*) icu_cv_host_frag=mh-linux ;; *-*-cygwin) icu_cv_host_frag=mh-cygwin ;; -*-*-freebsd*|*-*-netbsd*) icu_cv_host_frag=mh-bsd-gcc ;; +*-*-*bsd*) icu_cv_host_frag=mh-bsd-gcc ;; *-*-aix*) case "$CXX" in *vacpp*)icu_cv_host_frag=mh-aix-va ;; diff --git a/icu4c/source/configure b/icu4c/source/configure index d68f926106c..53823f061fa 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1297,7 +1297,7 @@ alpha*-*-linux-gnu) *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; *-*-linux*) icu_cv_host_frag=mh-linux ;; *-*-cygwin) icu_cv_host_frag=mh-cygwin ;; -*-*-freebsd*|*-*-netbsd*) icu_cv_host_frag=mh-bsd-gcc ;; +*-*-*bsd*) icu_cv_host_frag=mh-bsd-gcc ;; *-*-aix*) case "$CXX" in *vacpp*)icu_cv_host_frag=mh-aix-va ;; @@ -4007,7 +4007,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR case "${host}" in *-*-solaris*) platform=U_SOLARIS ;; *-*-linux*) platform=U_LINUX ;; - *-*-freebsd*) platform=U_LINUX ;; + *-*-*bsd*) platform=U_BSD ;; *-*-aix*) platform=AIX ;; *-sequent-*) platform=PTX ;; *-*-hpux*) platform=HPUX ;; @@ -4030,7 +4030,7 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name" case "${host}" in *-*-solaris*) ld_rpath_suf=":" ;; *-*-linux*) ld_rpath_suf=" " ;; - *-*-freebsd*) ld_rpath_suf=" " ;; + *-*-*bsd*) ld_rpath_suf=" " ;; *-*-aix*) ld_rpath_suf="" ;; *-sequent-*) ld_rpath_suf="" ;; *-*-hpux*) ld_rpath_suf=":" ;; diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index d92494df370..f7dcc53d150 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and dnl others. All Rights Reserved. dnl Stephen F. Booth, heavily modified by Yves and others -dnl $Id: configure.in,v 1.138 2001/11/11 07:22:54 yves-oss Exp $ +dnl $Id: configure.in,v 1.139 2001/11/26 21:47:42 grhoten-oss Exp $ dnl Process this file with autoconf to produce a configure script AC_INIT(common/unicode/utypes.h) @@ -747,7 +747,7 @@ dnl set ICUDATA_CHAR to 'e' for any EBCDIC (which should be big endian) platform case "${host}" in *-*-solaris*) platform=U_SOLARIS ;; *-*-linux*) platform=U_LINUX ;; - *-*-freebsd*) platform=U_LINUX ;; + *-*-*bsd*) platform=U_BSD ;; *-*-aix*) platform=AIX ;; *-sequent-*) platform=PTX ;; *-*-hpux*) platform=HPUX ;; @@ -771,7 +771,7 @@ dnl Handle -rpath options for shared library paths case "${host}" in *-*-solaris*) ld_rpath_suf=":" ;; *-*-linux*) ld_rpath_suf=" " ;; - *-*-freebsd*) ld_rpath_suf=" " ;; + *-*-*bsd*) ld_rpath_suf=" " ;; *-*-aix*) ld_rpath_suf="" ;; *-sequent-*) ld_rpath_suf="" ;; *-*-hpux*) ld_rpath_suf=":" ;; diff --git a/icu4c/source/data/icupkg.inc.in b/icu4c/source/data/icupkg.inc.in index 02857621ef5..9b1bcb3615d 100644 --- a/icu4c/source/data/icupkg.inc.in +++ b/icu4c/source/data/icupkg.inc.in @@ -108,3 +108,8 @@ endif ifeq ($(strip $(PLATFORM)),U_LINUX) TOOL=env LD_LIBRARY_PATH=$(LPATHS) endif + +ifeq ($(strip $(PLATFORM)),U_BSD) + TOOL=env LD_LIBRARY_PATH=$(LPATHS) +endif + diff --git a/icu4c/source/extra/uconv/pkgdata.inc.in b/icu4c/source/extra/uconv/pkgdata.inc.in index 02857621ef5..9b1bcb3615d 100644 --- a/icu4c/source/extra/uconv/pkgdata.inc.in +++ b/icu4c/source/extra/uconv/pkgdata.inc.in @@ -108,3 +108,8 @@ endif ifeq ($(strip $(PLATFORM)),U_LINUX) TOOL=env LD_LIBRARY_PATH=$(LPATHS) endif + +ifeq ($(strip $(PLATFORM)),U_BSD) + TOOL=env LD_LIBRARY_PATH=$(LPATHS) +endif + diff --git a/icu4c/source/tools/pkgdata/icupkg.inc.in b/icu4c/source/tools/pkgdata/icupkg.inc.in index 02857621ef5..9b1bcb3615d 100644 --- a/icu4c/source/tools/pkgdata/icupkg.inc.in +++ b/icu4c/source/tools/pkgdata/icupkg.inc.in @@ -108,3 +108,8 @@ endif ifeq ($(strip $(PLATFORM)),U_LINUX) TOOL=env LD_LIBRARY_PATH=$(LPATHS) endif + +ifeq ($(strip $(PLATFORM)),U_BSD) + TOOL=env LD_LIBRARY_PATH=$(LPATHS) +endif +