From: Peter Johnson <peter@tortall.net>
Date: Tue, 18 Mar 2003 04:42:49 +0000 (-0000)
Subject: Take out the CXX and GCJ tests; we don't need them, and they break builds on
X-Git-Tag: v0.2.2~3^2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0d47c53660431b0ec66c1dc2db1a3414636d5d1;p=yasm

Take out the CXX and GCJ tests; we don't need them, and they break builds on
some OS'es.

svn path=/trunk/yasm/; revision=876
---

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 5de2188d..e6e50603 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -38,36 +38,7 @@ m4_ifdef([AC_PROVIDE_IFELSE],
 # AC_PROG_LIBTOOL
 # ---------------
 AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
+[AC_REQUIRE([_AC_PROG_LIBTOOL])])
 
 
 # _AC_PROG_LIBTOOL