Skip to content

P
Postgres FD Implementation
Commit baa2f999 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Perl fixes from Brook Milligan

parent e7663e34
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 48 deletions
src/configure.in
View file @ baa2f999
...@@ -246,17 +246,6 @@ AC_ARG_WITH( ...@@ -246,17 +246,6 @@ AC_ARG_WITH(
[ USE_PERL=false; AC_MSG_RESULT(disabled) ] [ USE_PERL=false; AC_MSG_RESULT(disabled) ]
) )
dnl Verify that postgres is already installed
dnl per instructions for perl interface installation
if test "$USE_PERL" = true
then
if test "$WHOAMI" != "root"
then AC_MSG_WARN(perl support disabled; must be root to install)
USE_PERL=
fi
fi
export USE_PERL
dnl We include odbc support unless we disable it with --with-odbc=false dnl We include odbc support unless we disable it with --with-odbc=false
AC_MSG_CHECKING(setting USE_ODBC) AC_MSG_CHECKING(setting USE_ODBC)
AC_ARG_WITH( AC_ARG_WITH(
...@@ -902,6 +891,7 @@ AC_OUTPUT( ...@@ -902,6 +891,7 @@ AC_OUTPUT(
interfaces/libpgtcl/Makefile interfaces/libpgtcl/Makefile
interfaces/odbc/GNUmakefile interfaces/odbc/GNUmakefile
interfaces/odbc/Makefile.global interfaces/odbc/Makefile.global
interfaces/perl5/Makefile.PL
pl/plpgsql/src/Makefile pl/plpgsql/src/Makefile
pl/plpgsql/src/mklang.sql pl/plpgsql/src/mklang.sql
pl/tcl/mkMakefile.tcldefs.sh pl/tcl/mkMakefile.tcldefs.sh
......
src/interfaces/Makefile
View file @ baa2f999
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.16 1998/10/07 06:41:40 thomas Exp $ # $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.17 1998/10/16 04:37:37 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -15,13 +15,11 @@ SRCDIR= .. ...@@ -15,13 +15,11 @@ SRCDIR= ..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
perl-makefile-dep := PERL_CLEAN := DO_NOTHING
ifeq ($(USE_PERL), true) install: PERL_CLEAN := clean
perl-makefile-dep := perl5/Makefile
endif
.DEFAULT all install clean dep depend distclean: $(perl-makefile-dep) .DEFAULT all install clean dep depend distclean:
$(MAKE) -C libpq $@ $(MAKE) -C libpq $@
$(MAKE) -C ecpg $@ $(MAKE) -C ecpg $@
ifeq ($(HAVE_Cplusplus), true) ifeq ($(HAVE_Cplusplus), true)
...@@ -33,6 +31,8 @@ ifeq ($(USE_TCL), true) ...@@ -33,6 +31,8 @@ ifeq ($(USE_TCL), true)
$(MAKE) -C libpgtcl $@ $(MAKE) -C libpgtcl $@
endif endif
ifeq ($(USE_PERL), true) ifeq ($(USE_PERL), true)
-$(MAKE) -C perl5 $(PERL_CLEAN)
$(MAKE) perl5/Makefile
$(MAKE) -C perl5 $@ $(MAKE) -C perl5 $@
endif endif
ifeq ($(USE_ODBC), true) ifeq ($(USE_ODBC), true)
......
src/interfaces/perl5/Makefile.PL
View file @ baa2f999
#------------------------------------------------------- #-------------------------------------------------------
# #
# $Id: Makefile.PL,v 1.9 1998/09/27 19:12:21 mergl Exp $ # $Id: Makefile.PL,v 1.10 1998/10/16 04:37:38 momjian Exp $
# #
# Copyright (c) 1997, 1998 Edmund Mergl # Copyright (c) 1997, 1998 Edmund Mergl
# #
...@@ -10,29 +10,25 @@ use ExtUtils::MakeMaker; ...@@ -10,29 +10,25 @@ use ExtUtils::MakeMaker;
use Config; use Config;
use strict; use strict;
# because the perl5 interface is always contained in the source tree, # This Makefile.PL is intended for standalone use when PostgreSQL is
# we can be sure about the location of the include files and libs. # already installed. In that case, install the perl module as follows:
# For development and testing we still test for POSTGRES_HOME. #
# # setenv POSTGRES_HOME /path/to/root/of/installed/postgres
#print "\nConfiguring Pg\n"; # perl Makefile.PL
#print "Remember to actually read the README file !\n"; # make
#die "\nYou didn't read the README file !\n" unless ($] >= 5.002); # make test
# # make install
#if (! $ENV{POSTGRES_HOME}) {
# warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n"; # During normal installation of PostgreSQL, this file will be replaced
# foreach(qw(../../../ /usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) { # by one derived from Makefile.PL.in so that the installed shared
# if (-d "$_/lib") { # library libpq.so will be found during installation of this module.
# $ENV{POSTGRES_HOME} = $_; # As a result, the POSTGRES_HOME environment variable need not be set
# last; # during PostgreSQL installation. Note that ../Makefile takes care of
# } # the `perl Makefile.PL' command. Note also that it is still possible
# } # to follow the standalone installation procedure, even after
#} # configuring and installing PostgreSQL, because the `else'
# # conditional branch below is identical in both Makefile.PL and
#if (-d "$ENV{POSTGRES_HOME}/lib") { # Makefile.PL.in.
# print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
#} else {
# die "Unable to determine PostgreSQL\n";
#}
my %opts; my %opts;
...@@ -41,14 +37,17 @@ if (! $ENV{POSTGRES_HOME}) { ...@@ -41,14 +37,17 @@ if (! $ENV{POSTGRES_HOME}) {
my $cwd = `pwd`; my $cwd = `pwd`;
chop $cwd; chop $cwd;
%opts = ( print "To install the perl interface for PostgreSQL do the following:\n";
NAME => 'Pg', print " - install PostgreSQL\n";
VERSION_FROM => 'Pg.pm', print " - set the POSTGRES_HOME environment variable appropriately\n";
INC => "-I$cwd/../libpq -I$cwd/../../include", print " - in this directory ($cwd):\n";
OBJECT => "Pg\$(OBJ_EXT)", print " perl Makefile.PL\n";
LIBS => ["-L$cwd/../libpq -lpq"], print " make\n";
); print " make test [ with a postmaster running ]\n";
print " make install\n";
exit(1);
} else { } else {
%opts = ( %opts = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment