Turn on plpython build by default if we have something that looks like a
shared library, or we can do without one.
This commit is contained in:
parent
af70014686
commit
42ae4f2940
|
@ -1,5 +1,5 @@
|
||||||
# -*-makefile-*-
|
# -*-makefile-*-
|
||||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.133 2001/08/26 22:28:04 petere Exp $
|
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.134 2001/08/27 00:29:49 petere Exp $
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# All PostgreSQL makefiles include this file and use the variables it sets,
|
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||||
|
@ -128,6 +128,7 @@ python_includespec = @python_includespec@
|
||||||
python_moduledir = @python_moduledir@
|
python_moduledir = @python_moduledir@
|
||||||
python_moduleexecdir = @python_moduleexecdir@
|
python_moduleexecdir = @python_moduleexecdir@
|
||||||
python_libspec = @python_libspec@
|
python_libspec = @python_libspec@
|
||||||
|
python_configdir = @python_configdir@
|
||||||
|
|
||||||
krb_srvtab = @krb_srvtab@
|
krb_srvtab = @krb_srvtab@
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 1994, Regents of the University of California
|
# Copyright (c) 1994, Regents of the University of California
|
||||||
#
|
#
|
||||||
# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.20 2001/05/12 01:30:30 petere Exp $
|
# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.21 2001/08/27 00:29:49 petere Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -22,10 +22,9 @@ ifeq ($(with_perl), yes)
|
||||||
DIRS += plperl
|
DIRS += plperl
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Doesn't build portably yet.
|
ifeq ($(with_python), yes)
|
||||||
#ifeq ($(with_python), yes)
|
DIRS += plpython
|
||||||
#DIRS += plpython
|
endif
|
||||||
#endif
|
|
||||||
|
|
||||||
all install installdirs uninstall depend distprep:
|
all install installdirs uninstall depend distprep:
|
||||||
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
|
||||||
|
|
|
@ -1,10 +1,21 @@
|
||||||
# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.8 2001/07/10 16:33:02 petere Exp $
|
# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.9 2001/08/27 00:29:49 petere Exp $
|
||||||
|
|
||||||
subdir = src/pl/plpython
|
subdir = src/pl/plpython
|
||||||
top_builddir = ../../..
|
top_builddir = ../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
|
|
||||||
|
# On some platforms we can only build PL/Python if libpython is a
|
||||||
|
# shared library. Since there is no official way to determine this,
|
||||||
|
# we see if there is a file that is named like a shared library.
|
||||||
|
ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
|
||||||
|
shared_libpython = yes
|
||||||
|
endif
|
||||||
|
|
||||||
|
# If we don't have a shared library and the platform doesn't allow it
|
||||||
|
# to work without, we have to skip it.
|
||||||
|
ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
|
||||||
|
|
||||||
override CPPFLAGS := -I$(srcdir) $(python_includespec) $(CPPFLAGS)
|
override CPPFLAGS := -I$(srcdir) $(python_includespec) $(CPPFLAGS)
|
||||||
|
|
||||||
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
|
override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
|
||||||
|
@ -36,3 +47,14 @@ clean distclean maintainer-clean: clean-lib
|
||||||
|
|
||||||
installcheck:
|
installcheck:
|
||||||
PATH=$(bindir):$$PATH $(SHELL) $(srcdir)/test.sh
|
PATH=$(bindir):$$PATH $(SHELL) $(srcdir)/test.sh
|
||||||
|
|
||||||
|
else # can't build
|
||||||
|
|
||||||
|
all:
|
||||||
|
@echo ""; \
|
||||||
|
echo "*** Cannot build PL/Python because libpython is not a shared library." ; \
|
||||||
|
echo "*** You might have to rebuild your Python installation. Refer to"; \
|
||||||
|
echo "*** the documentation for details."; \
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
endif # can't build
|
||||||
|
|
Loading…
Reference in New Issue