Don't bail out, if no C++ compiler is found. Define G_HAVE_ISO_VARARGS

2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* configure.in: Don't bail out, if no C++ compiler is
	found. Define G_HAVE_ISO_VARARGS only if appropriate.

	* gmessages.h: Thus we can revert the previous patch.

diff --git a/ChangeLog b/ChangeLog
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7176010..d6cbed9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-05-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Don't bail out, if no C++ compiler is
+       found. Define G_HAVE_ISO_VARARGS only if appropriate.
+
+       * gmessages.h: Thus we can revert the previous patch.
+
 2001-05-29  James Henstridge  <james@daa.com.au>
 
        * gmessages.h: "#ifdef G_HAVE_ISO_VARARGS" will always succeed

diff --git a/configure.in b/configure.in
index 2de7bec..741fa37 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -136,7 +136,14 @@ fi
 
 dnl Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
+
+dnl Check for a working C++ compiler, but do not bail out, if none is found.
+AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
+AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
+AC_LANG_RESTORE
 
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
@@ -387,7 +394,7 @@ call_a(2,3);
 AC_MSG_RESULT($g_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for ISO C99 varargs macros in C++)
-if test $CXX = gcc ; then
+if test "$CXX" = ""; then
 dnl No C++ compiler
   g_have_iso_cxx_varargs=no
 else
@@ -1674,7 +1681,9 @@ _______EOF
        fi
        cat >>$outfile <<_______EOF
 
-#define G_HAVE_ISO_VARARGS (defined(__cplusplus) ? defined(G_HAVE_ISO_CXX_VARARGS) : defined(G_HAVE_ISO_C_VARARGS))
+#if (defined(__cplusplus) ? defined(G_HAVE_ISO_CXX_VARARGS) : defined(G_HAVE_ISO_C_VARARGS))
+# define G_HAVE_ISO_VARARGS 1
+#endif
 _______EOF
 
        if test x$g_have_gnuc_varargs = xyes ; then

diff --git a/glib/gmessages.h b/glib/gmessages.h
index 26ee03c..817957d 100644 (file)
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -97,7 +97,7 @@ GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 #ifndef G_LOG_DOMAIN
 #define G_LOG_DOMAIN    ((gchar*) 0)
 #endif  /* G_LOG_DOMAIN */
-#if G_HAVE_ISO_VARARGS
+#ifdef G_HAVE_ISO_VARARGS
 #define g_error(...)    g_log (G_LOG_DOMAIN,         \
                                G_LOG_LEVEL_ERROR,    \
                                __VA_ARGS__)

diff --git a/gmessages.h b/gmessages.h
index 26ee03c..817957d 100644 (file)
--- a/gmessages.h
+++ b/gmessages.h
@@ -97,7 +97,7 @@ GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
 #ifndef G_LOG_DOMAIN
 #define G_LOG_DOMAIN    ((gchar*) 0)
 #endif  /* G_LOG_DOMAIN */
-#if G_HAVE_ISO_VARARGS
+#ifdef G_HAVE_ISO_VARARGS
 #define g_error(...)    g_log (G_LOG_DOMAIN,         \
                                G_LOG_LEVEL_ERROR,    \
                                __VA_ARGS__)