From e21afe6f6ea6616d83b0b368d05268e887d65ee7 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 28 May 2014 16:51:32 +0000 Subject: [PATCH] enhanced c++ compiler detection --- qse/Makefile.in | 1 + qse/aclocal.m4 | 1 + qse/cmd/Makefile.in | 1 + qse/cmd/awk/Makefile.in | 1 + qse/cmd/http/Makefile.in | 1 + qse/cmd/sed/Makefile.in | 1 + qse/cmd/xli/Makefile.in | 1 + qse/configure | 54 +++++++++++++++++++++++++++++++- qse/configure.ac | 17 ++++++++-- qse/doc/Makefile.in | 1 + qse/include/Makefile.in | 1 + qse/include/qse/Makefile.in | 1 + qse/include/qse/awk/Makefile.in | 1 + qse/include/qse/cmn/Makefile.in | 1 + qse/include/qse/config.h.in | 3 ++ qse/include/qse/http/Makefile.in | 1 + qse/include/qse/sed/Makefile.in | 1 + qse/include/qse/xli/Makefile.in | 1 + qse/lib/Makefile.in | 1 + qse/lib/awk/Makefile.in | 1 + qse/lib/cmn/Makefile.in | 1 + qse/lib/http/Makefile.in | 1 + qse/lib/sed/Makefile.in | 1 + qse/lib/xli/Makefile.in | 1 + qse/m4/ax_cxx_namespace.m4 | 25 +++++++++++++++ qse/regress/Makefile.in | 1 + qse/regress/awk/Makefile.in | 1 + qse/regress/sed/Makefile.in | 1 + qse/samples/Makefile.in | 1 + qse/samples/awk/Makefile.in | 1 + qse/samples/cmn/Makefile.in | 1 + qse/samples/http/Makefile.in | 1 + qse/samples/sed/Makefile.in | 1 + qse/tools/Makefile.in | 1 + 34 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 qse/m4/ax_cxx_namespace.m4 diff --git a/qse/Makefile.in b/qse/Makefile.in index 06dce1e1..27a2cdfb 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -57,6 +57,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ ac/depcomp ac/install-sh ac/ltmain.sh ac/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/aclocal.m4 b/qse/aclocal.m4 index 6a1e6929..67fd387d 100644 --- a/qse/aclocal.m4 +++ b/qse/aclocal.m4 @@ -1027,6 +1027,7 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/argz.m4]) +m4_include([m4/ax_cxx_namespace.m4]) m4_include([m4/ax_numval.m4]) m4_include([m4/ax_pthread.m4]) m4_include([m4/libtool.m4]) diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index 909330d0..070fa133 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -54,6 +54,7 @@ subdir = cmd DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index 2c5a1114..92dc4041 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -64,6 +64,7 @@ subdir = cmd/awk DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/cmd/http/Makefile.in b/qse/cmd/http/Makefile.in index dfbe8c0e..c3e7dc0e 100644 --- a/qse/cmd/http/Makefile.in +++ b/qse/cmd/http/Makefile.in @@ -58,6 +58,7 @@ subdir = cmd/http DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/cmd/sed/Makefile.in b/qse/cmd/sed/Makefile.in index ba927d54..8e68f613 100644 --- a/qse/cmd/sed/Makefile.in +++ b/qse/cmd/sed/Makefile.in @@ -57,6 +57,7 @@ subdir = cmd/sed DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/cmd/xli/Makefile.in b/qse/cmd/xli/Makefile.in index d15cdcb3..2ca68d3c 100644 --- a/qse/cmd/xli/Makefile.in +++ b/qse/cmd/xli/Makefile.in @@ -57,6 +57,7 @@ subdir = cmd/xli DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/configure b/qse/configure index 5aceacb8..92c6e0f7 100755 --- a/qse/configure +++ b/qse/configure @@ -4759,6 +4759,55 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if c++ supports namespace std" >&5 +$as_echo_n "checking if c++ supports namespace std... " >&6; } +if ${ax_cv_cxx_have_std_namespace+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + std::istream& is = std::cin; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_cxx_have_std_namespace=yes +else + ax_cv_cxx_have_std_namespace=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_have_std_namespace" >&5 +$as_echo "$ax_cv_cxx_have_std_namespace" >&6; } + if test "$ax_cv_cxx_have_std_namespace" = yes; then + +$as_echo "#define HAVE_CXX_NAMESPACE_STD /**/" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } if ${ac_cv_path_GREP+:} false; then : @@ -8703,7 +8752,6 @@ done - func_stripname_cnf () { case ${2} in @@ -20623,9 +20671,13 @@ if test "${enable_cxx+set}" = set; then : enableval=$enable_cxx; enable_cxx_is=$enableval else enable_cxx_is=yes + fi + test "${HAVE_CXX}" = "yes" || enable_cxx_is="no" +test "${HAVE_CXX_NAMESPACE_STD}" = "yes" || enable_cxx_is="no" + if test "${enable_cxx_is}" = "yes" ; then ENABLE_CXX_TRUE= ENABLE_CXX_FALSE='#' diff --git a/qse/configure.ac b/qse/configure.ac index be6b86c7..b2f2efec 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -26,9 +26,12 @@ AC_PROG_CC dnl determine a C++ compiler to use AC_PROG_CXX -dnl check if the C++ compiler exists in PATH. +dnl check if the C++ compiler exists in PATH AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) +dnl check if the C++ compiler supports namespace +AX_CXX_NAMESPACE_STD + dnl determine some key programs AC_PROG_INSTALL AC_PROG_EGREP @@ -568,9 +571,17 @@ else AC_SUBST(BUILD_MODE, "release") fi -AC_ARG_ENABLE([cxx], [AS_HELP_STRING([--enable-cxx],[build the library for C++ if a C++ compiler is available (default. yes)])], - enable_cxx_is=$enableval,enable_cxx_is=yes) +AC_ARG_ENABLE([cxx], + [AS_HELP_STRING([--enable-cxx],[build the library for C++ if a C++ compiler is available (default. yes)])], + enable_cxx_is=$enableval, + enable_cxx_is=yes +) + +dnl disable c++ if no c++ compiler was found [test "${HAVE_CXX}" = "yes" || enable_cxx_is="no"] +dnl disable c++ if the compiler is too old. +[test "${HAVE_CXX_NAMESPACE_STD}" = "yes" || enable_cxx_is="no"] + AM_CONDITIONAL(ENABLE_CXX, test "${enable_cxx_is}" = "yes" ) AX_PTHREAD() diff --git a/qse/doc/Makefile.in b/qse/doc/Makefile.in index 109e194b..35db36f1 100644 --- a/qse/doc/Makefile.in +++ b/qse/doc/Makefile.in @@ -55,6 +55,7 @@ DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index 0ad6d18f..539a4a42 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -54,6 +54,7 @@ subdir = include DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index 1efc2493..9f10ad35 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index 64030d15..f7b53d62 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index 0361b727..1f1c55ed 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in index ebdd1e3b..44d5757d 100644 --- a/qse/include/qse/config.h.in +++ b/qse/include/qse/config.h.in @@ -90,6 +90,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CRT_EXTERNS_H +/* Define if c++ supports namespace std. */ +#undef HAVE_CXX_NAMESPACE_STD + /* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if you don't. */ #undef HAVE_DECL_CYGWIN_CONV_PATH diff --git a/qse/include/qse/http/Makefile.in b/qse/include/qse/http/Makefile.in index 49939f90..02560613 100644 --- a/qse/include/qse/http/Makefile.in +++ b/qse/include/qse/http/Makefile.in @@ -55,6 +55,7 @@ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/sed/Makefile.in b/qse/include/qse/sed/Makefile.in index f53294de..5a776e6a 100644 --- a/qse/include/qse/sed/Makefile.in +++ b/qse/include/qse/sed/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/include/qse/xli/Makefile.in b/qse/include/qse/xli/Makefile.in index cf9a79d1..2f3ecadb 100644 --- a/qse/include/qse/xli/Makefile.in +++ b/qse/include/qse/xli/Makefile.in @@ -55,6 +55,7 @@ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index d7a03f1c..8b922b14 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -54,6 +54,7 @@ subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index e3ad125b..f083a96b 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -79,6 +79,7 @@ subdir = lib/awk DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index eaeea1da..844bc948 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -60,6 +60,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/http/Makefile.in b/qse/lib/http/Makefile.in index be458a87..9f61253e 100644 --- a/qse/lib/http/Makefile.in +++ b/qse/lib/http/Makefile.in @@ -55,6 +55,7 @@ subdir = lib/http DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/sed/Makefile.in b/qse/lib/sed/Makefile.in index 1ac14686..2c82b55c 100644 --- a/qse/lib/sed/Makefile.in +++ b/qse/lib/sed/Makefile.in @@ -56,6 +56,7 @@ subdir = lib/sed DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/lib/xli/Makefile.in b/qse/lib/xli/Makefile.in index 47fe61a9..daa8d381 100644 --- a/qse/lib/xli/Makefile.in +++ b/qse/lib/xli/Makefile.in @@ -55,6 +55,7 @@ subdir = lib/xli DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/m4/ax_cxx_namespace.m4 b/qse/m4/ax_cxx_namespace.m4 new file mode 100644 index 00000000..e983bef7 --- /dev/null +++ b/qse/m4/ax_cxx_namespace.m4 @@ -0,0 +1,25 @@ +dnl @synopsis AX_CXX_NAMESPACE_STD +dnl +dnl If the compiler supports namespace std, define +dnl HAVE_CXX_NAMESPACE_STD. +dnl +dnl @category Cxx +dnl @author Todd Veldhuizen +dnl @author Luc Maisonobe +dnl @version 2004-02-04 +dnl @license AllPermissive + +AC_DEFUN([AX_CXX_NAMESPACE_STD], [ + AC_CACHE_CHECK(if c++ supports namespace std, + ax_cv_cxx_have_std_namespace, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + std::istream& is = std::cin;],, + ax_cv_cxx_have_std_namespace=yes, ax_cv_cxx_have_std_namespace=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_have_std_namespace" = yes; then + AC_DEFINE(HAVE_CXX_NAMESPACE_STD,,[Define if c++ supports namespace std. ]) + fi +]) diff --git a/qse/regress/Makefile.in b/qse/regress/Makefile.in index d9f1ac6f..30977b99 100644 --- a/qse/regress/Makefile.in +++ b/qse/regress/Makefile.in @@ -54,6 +54,7 @@ subdir = regress DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/regress/awk/Makefile.in b/qse/regress/awk/Makefile.in index 7d364300..4d778a55 100644 --- a/qse/regress/awk/Makefile.in +++ b/qse/regress/awk/Makefile.in @@ -55,6 +55,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/regress.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/regress/sed/Makefile.in b/qse/regress/sed/Makefile.in index 55464a37..095222e6 100644 --- a/qse/regress/sed/Makefile.in +++ b/qse/regress/sed/Makefile.in @@ -56,6 +56,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/regress.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/samples/Makefile.in b/qse/samples/Makefile.in index 3e987cd7..77f0b4e4 100644 --- a/qse/samples/Makefile.in +++ b/qse/samples/Makefile.in @@ -54,6 +54,7 @@ subdir = samples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/samples/awk/Makefile.in b/qse/samples/awk/Makefile.in index af5a65e1..90fc4557 100644 --- a/qse/samples/awk/Makefile.in +++ b/qse/samples/awk/Makefile.in @@ -61,6 +61,7 @@ subdir = samples/awk DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/samples/cmn/Makefile.in b/qse/samples/cmn/Makefile.in index 00855c9a..1fcf1d8f 100644 --- a/qse/samples/cmn/Makefile.in +++ b/qse/samples/cmn/Makefile.in @@ -66,6 +66,7 @@ subdir = samples/cmn DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/samples/http/Makefile.in b/qse/samples/http/Makefile.in index 0c1ed3c3..70ad9eb6 100644 --- a/qse/samples/http/Makefile.in +++ b/qse/samples/http/Makefile.in @@ -57,6 +57,7 @@ subdir = samples/http DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/samples/sed/Makefile.in b/qse/samples/sed/Makefile.in index b4194a9d..7005f2d5 100644 --- a/qse/samples/sed/Makefile.in +++ b/qse/samples/sed/Makefile.in @@ -59,6 +59,7 @@ subdir = samples/sed DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff --git a/qse/tools/Makefile.in b/qse/tools/Makefile.in index 6a200fa4..955e773e 100644 --- a/qse/tools/Makefile.in +++ b/qse/tools/Makefile.in @@ -54,6 +54,7 @@ subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_cxx_namespace.m4 \ $(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \