Update to rev 2

[openldap] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 10a30e02e7f946f8e073ff076dda2a2ee7bb27e2..9e714628bc9ce06c5b95af3efafc91231c016918 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,11 +11,13 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
 dnl $OpenLDAP$
 dnl PARTICULAR PURPOSE.
 
 dnl $OpenLDAP$

-dnl Copyright 1998-1999 The OpenLDAP Foundation,  All Rights Reserved.
+dnl
+dnl Copyright 1998-2000 The OpenLDAP Foundation,  All Rights Reserved.

 dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl
 dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl

+divert(-1)

 builtin(include, build/openldap.m4)dnl
 
 # Do all the work for Automake.  This macro actually does too much --
 builtin(include, build/openldap.m4)dnl
 
 # Do all the work for Automake.  This macro actually does too much --


@@ -146,7 +148,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \

-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \

 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig


@@ -178,6 +180,11 @@ AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 

+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+

 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"


@@ -196,7 +203,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.

-case "$host" in
+case "$lt_target" in

 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext


@@ -412,7 +419,6 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])

-AC_SUBST(LD)

 AC_PROG_LD_GNU
 ])
 
 AC_PROG_LD_GNU
 ])
 


@@ -458,14 +464,13 @@ else
 fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])

-AC_SUBST(NM)

 ])
 
 # AC_CHECK_LIBM - check for math library
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 ])
 
 # AC_CHECK_LIBM - check for math library
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=

-case "$host" in
+case "$lt_target" in

 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;