* configure.in: Look for C++ compiler.

* Makefile.am (libtool): Configure CXX tag.
* tests/Makefile.am: Test tagdemo only if CXX found.

diff --git a/ChangeLog b/ChangeLog
index 40ed392f651b4f740d862497b12af7c01640fbfa..99ca7f8f63f92e46acce7ee6101a0b1b178e5468 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-14  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
+       * configure.in: Look for C++ compiler.
+       * Makefile.am (libtool): Configure CXX tag.
+       * tests/Makefile.am: Test tagdemo only if CXX found.
+
        * libtool.m4 (_AC_PROG_LIBTOOL): Renamed from...
        (AC_PROG_LIBTOOL): Just AC_REQUIRE(_AC_PROG_LIBTOOL), to avoid
        effects of multiple runs.

diff --git a/Makefile.am b/Makefile.am
index ee9d1b58b9fa921de2cb2a34bc7c4684507fecb4..bcf3734082dfaf395adc4eb49b7c4fefcd90e980 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
 # We need to export these variables when we run ltconfig.
 CFLAGS = @CFLAGS@
 CPPLAGS = @CPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS= @LIBS@
 
@@ -39,8 +40,23 @@ libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
        reload_flag="$(reload_flag)" \
        deplibs_check_method="$(deplibs_check_method)" \
        file_magic_cmd="$(file_magic_cmd)" \
+       $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
+         --output=$@T $(srcdir)/ltmain.sh
+if HAVE_CXX
+       AR="$(AR)" CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LTCC="$(CC)" FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+       LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       STRIP="$(STRIP)" AS="$(AS)" DLLTOOL="$(DLLTOOL)" \
+       OBJDUMP="$(OBJDUMP)" \
+       objext="$(OBJEXT)" exeext="$(EXEEXT)" \
+       reload_flag="$(reload_flag)" \
+       deplibs_check_method="$(deplibs_check_method)" \
+       file_magic_cmd="$(file_magic_cmd)" \
        $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
          --output=$@ $(srcdir)/ltmain.sh
+endif
+       -rm -f $@
+       mv $@T $@
 
 # Experimental C version of libtool.
 clibtool: $(srcdir)/ltmain.c $(srcdir)/ltconfig

diff --git a/configure.in b/configure.in
index e9cc15071806cddf746b15e8f774ac7e2a5cc917..8c22a24c8403715bdb498eb9fcb88d9fb3c45a04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,11 @@ AC_SUBST(AS)
 LIBTOOL_FLAGS="$libtool_flags"
 AC_SUBST(LIBTOOL_FLAGS)
 
+pushdef([AC_MSG_ERROR], [CXX=no])
+AC_PROG_CXX
+popdef([AC_MSG_ERROR])
+AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno])
+
 AC_ARG_ENABLE(ltdl-install,
 [  --disable-ltdl-install  do not install libltdl])
 if test x"${enable_ltdl_install+set}" != xset; then

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 208ec7fff4705a1e7dcde09095a7e81c63707abb..3facda91a34a3ea1caaa35a86bc6c135f37dc83d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,13 @@
 
 AUTOMAKE_OPTIONS = gnits
 
+if HAVE_CXX
+CXX_TESTS = \
+       tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
+       tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \
+       tagdemo-shared.test tagdemo-make.test tagdemo-exec.test
+endif
+
 TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
        demo-static.test demo-make.test demo-exec.test \
        demo-inst.test demo-unst.test \
@@ -30,10 +37,7 @@ TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
        mdemo-shared.test mdemo-make.test mdemo-exec.test \
        mdemo-inst.test mdemo-unst.test \
        assign.test link.test link-2.test nomode.test \
-       quote.test sh.test suffix.test \
-       tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
-       tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \
-       tagdemo-shared.test tagdemo-make.test tagdemo-exec.test
+       quote.test sh.test suffix.test $(CXX_TESTS)
 
 demo-conf.test: $(top_builddir)/libtool