mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configure checks to see if 'using namespace std' and

Browse Source 
'#include <string>' work in the local C++ compiler.
This commit is contained in:
Tom Lane 2000-03-30 05:29:21 +00:00
parent a1916dafe0
commit 0a1ed443f8
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.global.in
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.67 2000/03/08 01:58:15 momjian Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.68 2000/03/30 05:29:20 tgl Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
@ -105,7 +105,7 @@ ODBCINST= $(POSTGRESDIR)
# (that is, prepend '#', don't set it to "0" or "no"). # (that is, prepend '#', don't set it to "0" or "no").
# Compile libpq++ # Compile libpq++
@HAVECXX@ HAVE_Cplusplus=@HAVECXX@
# Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to # Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to
# multi-byte types to generate a bus error. # multi-byte types to generate a bus error.

27
src/configure.in
View File

@ -488,7 +488,7 @@ AC_SUBST(USE_ODBC)
AC_SUBST(MULTIBYTE) AC_SUBST(MULTIBYTE)
dnl Check for C++ support (allow override if needed) dnl Check for C++ support (allow override if needed)
HAVECXX='HAVE_Cplusplus=true' HAVECXX='true'
AC_ARG_WITH(CXX, AC_ARG_WITH(CXX,
[ --with-CXX=compiler use specific C++ compiler [ --with-CXX=compiler use specific C++ compiler
--without-CXX prevent building C++ code ], --without-CXX prevent building C++ code ],
@ -498,7 +498,7 @@ AC_ARG_WITH(CXX,
AC_MSG_ERROR([*** You must supply an argument to the --with-CC option.]) AC_MSG_ERROR([*** You must supply an argument to the --with-CC option.])
;; ;;
n | no) n | no)
HAVECXX='HAVE_Cplusplus=false' HAVECXX='false'
;; ;;
esac esac
CXX="$withval" CXX="$withval"
@ -506,6 +506,29 @@ AC_ARG_WITH(CXX,
[ AC_PROG_CXX]) [ AC_PROG_CXX])
AC_SUBST(HAVECXX) AC_SUBST(HAVECXX)
if test "$HAVECXX" = 'true' ; then
AC_LANG_CPLUSPLUS
dnl check whether "using namespace std" works on this C++ compiler
AC_MSG_CHECKING([for namespace std in C++])
AC_TRY_COMPILE([#include <stdio.h>
#include <stdlib.h>
using namespace std;
], [],
[AC_DEFINE(HAVE_NAMESPACE_STD) AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
dnl check whether "#include <string>" works on this C++ compiler
AC_MSG_CHECKING([for include <string> in C++])
AC_TRY_COMPILE([#include <stdio.h>
#include <stdlib.h>
#include <string>
], [],
[AC_DEFINE(HAVE_CXX_STRING_HEADER) AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
fi
dnl make sure we revert to C compiler, not C++, for subsequent tests dnl make sure we revert to C compiler, not C++, for subsequent tests
AC_LANG_C AC_LANG_C

9
src/include/config.h.in
View File

@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your * or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: config.h.in,v 1.110 2000/03/17 05:29:06 tgl Exp $ * $Id: config.h.in,v 1.111 2000/03/30 05:29:21 tgl Exp $
*/ */
#ifndef CONFIG_H #ifndef CONFIG_H
@ -529,6 +529,13 @@ extern void srandom(unsigned int seed);
/* Define if POSIX signal interface is available */ /* Define if POSIX signal interface is available */
#undef USE_POSIX_SIGNALS #undef USE_POSIX_SIGNALS
/* Define if C++ compiler accepts "using namespace std" */
#undef HAVE_NAMESPACE_STD
/* Define if C++ compiler accepts "#include <string>" */
#undef HAVE_CXX_STRING_HEADER
/* /*
* Pull in OS-specific declarations (using link created by configure) * Pull in OS-specific declarations (using link created by configure)
*/ */