From e43ecb3d1a1c5af574fdd6333bdd64330a148bf6 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 4 Sep 2002 22:54:18 +0000
Subject: Remove leftovers from subproject removals.  Fixes for Python and
 Kerberos configuration.

---
 config/cxx.m4    | 64 --------------------------------------------------------
 config/python.m4 |  7 ++++++-
 2 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 config/cxx.m4

(limited to 'config')

diff --git a/config/cxx.m4 b/config/cxx.m4
deleted file mode 100644
index 5498db091a..0000000000
--- a/config/cxx.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-# Macros to detect certain C++ features
-# $Header: /cvsroot/pgsql/config/Attic/cxx.m4,v 1.3 2002/03/29 20:54:33 petere Exp $
-
-
-# PGAC_CLASS_STRING
-# -----------------
-# Look for class `string'. First look for the <string> header. If this
-# is found a <string> header then it's probably safe to assume that
-# class string exists.  If not, check to make sure that <string.h>
-# defines class `string'.
-AC_DEFUN([PGAC_CLASS_STRING],
-[AC_LANG_PUSH(C++)
-AC_CHECK_HEADER(string,
-                [AC_DEFINE(HAVE_CXX_STRING_HEADER, 1,
-                           [Define to 1 if you have the C++ <string> header])],
-                [AC_CACHE_CHECK([for class string in <string.h>],
-                                [pgac_cv_class_string_in_string_h],
-[AC_TRY_COMPILE([#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-],
-                [string foo = "test"],
-                [pgac_cv_class_string_in_string_h=yes],
-                [pgac_cv_class_string_in_string_h=no])])
-
-  if test x"$pgac_cv_class_string_in_string_h" != xyes ; then
-    AC_MSG_ERROR([neither <string> nor <string.h> seem to define the C++ class 'string'])
-  fi
-])
-AC_LANG_POP(C++)])# PGAC_CLASS_STRING
-
-
-# PGAC_CXX_NAMESPACE_STD
-# ----------------------
-# Check whether the C++ compiler understands `using namespace std'.
-#
-# Note 1: On at least some compilers, it will not work until you've
-# included a header that mentions namespace std. Thus, include the
-# usual suspects before trying it.
-#
-# Note 2: This test does not actually reveal whether the C++ compiler
-# properly understands namespaces in all generality. (GNU C++ 2.8.1
-# is one that doesn't.) However, we don't care.
-AC_DEFUN([PGAC_CXX_NAMESPACE_STD],
-[AC_REQUIRE([PGAC_CLASS_STRING])
-AC_CACHE_CHECK([for namespace std in C++],
-pgac_cv_cxx_namespace_std,
-[
-AC_LANG_PUSH(C++)
-AC_TRY_COMPILE(
-[#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_CXX_STRING_HEADER
-#include <string>
-#endif
-using namespace std;
-], [],
-[pgac_cv_cxx_namespace_std=yes],
-[pgac_cv_cxx_namespace_std=no])
-AC_LANG_POP(C++)])
-
-if test $pgac_cv_cxx_namespace_std = yes ; then
-    AC_DEFINE(HAVE_NAMESPACE_STD, 1, [Define to 1 if the C++ compiler understands 'using namespace std'])
-fi])# PGAC_CXX_NAMESPACE_STD
diff --git a/config/python.m4 b/config/python.m4
index 6058ef3d2a..ce126419b7 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -1,7 +1,7 @@
 #
 # Autoconf macros for configuring the build of Python extension modules
 #
-# $Header: /cvsroot/pgsql/config/python.m4,v 1.4 2002/03/29 17:32:54 petere Exp $
+# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
 #
 
 # PGAC_PATH_PYTHON
@@ -69,6 +69,11 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
 [AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
 AC_MSG_CHECKING([how to link an embedded Python application])
 
+if test ! -f "$python_configdir/Makefile"; then
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([Python Makefile not found])
+fi
+
 _python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
 _python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`
-- 
cgit v1.2.1