From: Robert Boehne <rboehne@gnu.org>
Date: Thu, 20 Mar 2003 18:02:05 +0000 (+0000)
Subject: * libtool.m4 (_LT_AC_TAGCONFIG): Add test around the macro that
X-Git-Tag: release-1-5~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49f2fd2f72517559f41f50c791831699535ebc8b;p=thirdparty%2Flibtool.git

* libtool.m4 (_LT_AC_TAGCONFIG): Add test around the macro that
adds tags to the libtool script so that they won't run when not
needed.
* configure.ac: Set F77 to no when no Fortran compiler is found.
---

diff --git a/ChangeLog b/ChangeLog
index d8c6c1eb4..21a99932b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-19  Robert Boehne  <rboehne@gnu.org>
+
+	* libtool.m4 (_LT_AC_TAGCONFIG): Add test around the macro that
+	adds tags to the libtool script so that they won't run when not
+	needed.
+	* configure.ac: Set F77 to no when no Fortran compiler is found.
+
 2003-03-16  Charles Wilson  <cwilson@ece.gatech.edu>
 
 	* ltmain.in (win32_libid): use $SED, not head.
diff --git a/configure.ac b/configure.ac
index bc4b24773..b2d96d7c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,9 @@ AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno])
 pushdef([AC_MSG_ERROR], [F77=no])
 AC_PROG_F77
 popdef([AC_MSG_ERROR])
+if test -z "$F77"; then
+  F77="no"
+fi
 AM_CONDITIONAL(HAVE_F77, [test "x$F77" != xno])
 
 LT_AC_PROG_GCJ
diff --git a/libtool.m4 b/libtool.m4
index a521ed669..fdb426643 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1614,15 +1614,27 @@ if test -f "$ltmain" && test -n "$tagnames"; then
 
       case $tagname in
       CXX)
-	AC_LIBTOOL_LANG_CXX_CONFIG
+	if test "X$CXX" != "Xno"; then
+	  AC_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
 	;;
 
       F77)
-        AC_LIBTOOL_LANG_F77_CONFIG
-        ;;
+	if test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
 
       GCJ)
-	AC_LIBTOOL_LANG_GCJ_CONFIG
+	if test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
 	;;
 
       RC)