diff options
| -rw-r--r-- | gnulib-local/ChangeLog | 6 | ||||
| -rw-r--r-- | gnulib-local/Makefile.am | 2 | ||||
| -rw-r--r-- | gnulib-local/m4/no-c++.m4 | 22 | ||||
| -rw-r--r-- | gnulib-local/modules/no-c++ | 21 |
4 files changed, 51 insertions, 0 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index b83b18e..7a2b4d3 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,5 +1,11 @@ 2006-11-26 Bruno Haible <bruno@clisp.org> + * modules/no-c++: New file. + * m4/no-c++.m4: New file. + * Makefile.am (EXTRA_DIST): Add them. + +2006-11-26 Bruno Haible <bruno@clisp.org> + Support for VPATH builds. * modules/libglib (glib/*.h): Create the glib directory if necessary. * modules/libxml (libxml/*.h): Create the libxml directory if diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index 08f96a7..3e51dbd 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -254,6 +254,7 @@ m4/hard-locale.m4.diff \ m4/libcroco.m4 \ m4/libglib.m4 \ m4/libxml.m4 \ +m4/no-c++.m4 \ m4/java.m4 \ m4/quotearg.m4.diff \ m4/quote.m4.diff \ @@ -287,6 +288,7 @@ modules/libglib \ modules/libxml \ modules/memory-ostream \ modules/moo \ +modules/no-c++ \ modules/ostream \ modules/progreloc \ modules/propername \ diff --git a/gnulib-local/m4/no-c++.m4 b/gnulib-local/m4/no-c++.m4 new file mode 100644 index 0000000..75238cb --- /dev/null +++ b/gnulib-local/m4/no-c++.m4 @@ -0,0 +1,22 @@ +# no-c++.m4 serial 1 (gettext-0.16.1) +dnl Copyright (C) 2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Support for C source files that cannot be compiled by a C++ compiler. +# Set NO_CXX to the C++ compiler flags needed to request C mode instead of +# C++ mode. +# So far only g++ is supported. + +AC_DEFUN([gt_NO_CXX], +[ + NO_CXX= + AC_EGREP_CPP([Is g++], [ +#if defined __GNUC__ && defined __cplusplus + Is g++ +#endif + ], + [NO_CXX="-x c"]) + AC_SUBST([NO_CXX]) +]) diff --git a/gnulib-local/modules/no-c++ b/gnulib-local/modules/no-c++ new file mode 100644 index 0000000..2f9e7c1 --- /dev/null +++ b/gnulib-local/modules/no-c++ @@ -0,0 +1,21 @@ +Description: +Support for compiling in C mode when CC is set to a C++ compiler. + +Files: +m4/no-c++.m4 + +Depends-on: + +configure.ac: +gt_NO_CXX + +Makefile.am: + +Include: + +License: +LGPL + +Maintainer: +Bruno Haible + |