summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--m4/slibtool.m443
1 files changed, 21 insertions, 22 deletions
diff --git a/m4/slibtool.m4 b/m4/slibtool.m4
index aeec7ec..4baab5c 100644
--- a/m4/slibtool.m4
+++ b/m4/slibtool.m4
@@ -447,6 +447,27 @@ m4_define([SLIBTOOL_INIT])
# -------------------------
AC_DEFUN([SLIBTOOL_LANG],[
AC_REQUIRE([SLIBTOOL_PREREQ])
+
+# slibtool: SLIBTOOL_LANG(C)
+m4_if([$1],[C],[
+AC_PROG_CC
+AC_PROG_CPP
+])
+
+
+m4_if([$1],[C++],[
+# slibtool: SLIBTOOL_LANG(C++)
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_CXXCPP
+])
+
+m4_if([$1],[Fortran 77],[
+# slibtool: SLIBTOOL_LANG(Fortran 77)
+AC_PROG_FC
+AC_PROG_F77
+])
])
@@ -459,12 +480,6 @@ AC_REQUIRE([AC_PROG_CPP])
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_PROG_CXXCPP])
-AC_REQUIRE([AC_PROG_OBJC])
-AC_REQUIRE([AC_PROG_OBJCPP])
-
-AC_REQUIRE([AC_PROG_FC])
-AC_REQUIRE([AC_PROG_F77])
-
AC_REQUIRE([AC_PROG_AWK])
AC_REQUIRE([AC_PROG_LEX])
AC_REQUIRE([AC_PROG_SED])
@@ -477,22 +492,6 @@ AC_REQUIRE([AC_PROG_RANLIB])
AC_REQUIRE([AC_PROG_LN_S])
AC_REQUIRE([AC_PROG_MKDIR_P])
-m4_ifndef([AC_PROG_OBJCXX], [AC_DEFUN([AC_PROG_OBJCXX],[AC_SUBST([OBJCXX])])])
-m4_ifndef([AC_PROG_OBJCXXCPP], [AC_DEFUN([AC_PROG_OBJCXXCPP],[AC_SUBST([OBJCXXCPP])])])
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-AC_PROG_OBJC
-AC_PROG_OBJCPP
-AC_PROG_OBJCXX
-AC_PROG_OBJCXXCPP
-
-AC_PROG_FC
-AC_PROG_F77
-
AC_PROG_AWK
AC_PROG_LEX
AC_PROG_SED