From 33a27d0a25cbe2f38fb5bb60cbc8a448b15b98cd Mon Sep 17 00:00:00 2001
From: Ossama Othman <othman@cs.wustl.edu>
Date: Sun, 5 Dec 1999 00:34:58 +0000
Subject: [PATCH] Made invocation of ltconfig in AC_LIBTOOL_CXX macro more like
 the one in AC_PROG_LIBTOOL.  This adds some ILD related flags to the
 invocation, in addition to providing the $libtool_flags to ltconfig that was
 previously in AC_PROG_LIBTOOL (via AC_LIBTOOL_SETUP).  This fixes an ILD
 related bug with the C++ support, and also fixes a problem where both the
 static and shared libraries were being built even if one of them was
 explicitly disabled.

---
 libtool.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libtool.m4 b/libtool.m4
index 58cde52d7..527f096da 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -678,7 +678,12 @@ lt_save_CC="$CC"
 lt_save_CFLAGS="$CFLAGS"
 dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
 dnl is set to the C++ compiler.
-LTCC="$CC" CC="$CXX" CFLAGS="$CXXFLAGS" ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh || AC_MSG_ERROR([libtool tag configuration failed])
+deplibs_check_method="$deplibs_check_method" \
+file_magic_cmd="$file_magic_cmd" \
+LTCC="$CC" CC="$CXX" CFLAGS="$CXXFLAGS" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+--build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh \
+|| AC_MSG_ERROR([libtool tag configuration failed])
 CC="$lt_save_CC"
 CFLAGS="$lt_save_CFLAGS"
 ])
-- 
2.47.3