Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9a0b4d7

Browse files
committed
perl5 interface moved to gborg
1 parent c411f51 commit 9a0b4d7

17 files changed

+5
-3805
lines changed

GNUmakefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.26 2002/08/22 22:43:08 scrappy Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.27 2002/08/30 13:06:12 scrappy Exp $
55
#
66

77
subdir =
@@ -72,7 +72,7 @@ $(distdir).tar: distdir
7272
opt_files := src/backend/utils/mb contrib/retep/build.xml \
7373
src/tools src/corba src/data src/tutorial \
7474
$(addprefix src/bin/, pgaccess pgtclsh pg_encoding) \
75-
$(addprefix src/interfaces/, libpgtcl perl5 python jdbc) \
75+
$(addprefix src/interfaces/, libpgtcl python jdbc) \
7676
$(addprefix src/pl/, plperl tcl)
7777

7878
docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail

configure

-126
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,6 @@ Optional Packages:
860860
--without-tk do not build Tk interfaces if Tcl is enabled
861861
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR
862862
--with-tkconfig=DIR tkConfig.sh is in DIR
863-
--with-perl build Perl interface and PL/Perl
864863
--with-python build Python interface module
865864
--with-java build JDBC interface and Java tools
866865
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]
@@ -2945,41 +2944,6 @@ echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
29452944
fi;
29462945
29472946
2948-
#
2949-
# Optionally build Perl modules (Pg.pm and PL/Perl)
2950-
#
2951-
echo "$as_me:$LINENO: checking whether to build Perl modules" >&5
2952-
echo $ECHO_N "checking whether to build Perl modules... $ECHO_C" >&6
2953-
2954-
2955-
2956-
# Check whether --with-perl or --without-perl was given.
2957-
if test "${with_perl+set}" = set; then
2958-
withval="$with_perl"
2959-
2960-
case $withval in
2961-
yes)
2962-
:
2963-
;;
2964-
no)
2965-
:
2966-
;;
2967-
*)
2968-
{ { echo "$as_me:$LINENO: error: no argument expected for --with-perl option" >&5
2969-
echo "$as_me: error: no argument expected for --with-perl option" >&2;}
2970-
{ (exit 1); exit 1; }; }
2971-
;;
2972-
esac
2973-
2974-
else
2975-
with_perl=no
2976-
2977-
fi;
2978-
2979-
echo "$as_me:$LINENO: result: $with_perl" >&5
2980-
echo "${ECHO_T}$with_perl" >&6
2981-
2982-
29832947
#
29842948
# Optionally build Python interface module
29852949
#
@@ -4156,87 +4120,6 @@ echo "$as_me: error: 'wish' is required for Tk support" >&2;}
41564120
{ (exit 1); exit 1; }; }
41574121
fi
41584122
4159-
# Extract the first word of "perl", so it can be a program name with args.
4160-
set dummy perl; ac_word=$2
4161-
echo "$as_me:$LINENO: checking for $ac_word" >&5
4162-
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4163-
if test "${ac_cv_path_PERL+set}" = set; then
4164-
echo $ECHO_N "(cached) $ECHO_C" >&6
4165-
else
4166-
case $PERL in
4167-
[\\/]* | ?:[\\/]*)
4168-
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
4169-
;;
4170-
*)
4171-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4172-
for as_dir in $PATH
4173-
do
4174-
IFS=$as_save_IFS
4175-
test -z "$as_dir" && as_dir=.
4176-
for ac_exec_ext in '' $ac_executable_extensions; do
4177-
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4178-
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
4179-
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4180-
break 2
4181-
fi
4182-
done
4183-
done
4184-
4185-
;;
4186-
esac
4187-
fi
4188-
PERL=$ac_cv_path_PERL
4189-
4190-
if test -n "$PERL"; then
4191-
echo "$as_me:$LINENO: result: $PERL" >&5
4192-
echo "${ECHO_T}$PERL" >&6
4193-
else
4194-
echo "$as_me:$LINENO: result: no" >&5
4195-
echo "${ECHO_T}no" >&6
4196-
fi
4197-
4198-
if test "$with_perl" = yes; then
4199-
4200-
echo "$as_me:$LINENO: checking for Perl installsitearch" >&5
4201-
echo $ECHO_N "checking for Perl installsitearch... $ECHO_C" >&6
4202-
perl_installsitearch=`$PERL -MConfig -e 'print $Config{installsitearch}'`
4203-
echo "$as_me:$LINENO: result: $perl_installsitearch" >&5
4204-
echo "${ECHO_T}$perl_installsitearch" >&6
4205-
echo "$as_me:$LINENO: checking for Perl installman3dir" >&5
4206-
echo $ECHO_N "checking for Perl installman3dir... $ECHO_C" >&6
4207-
perl_installman3dir=`$PERL -MConfig -e 'print $Config{installman3dir}'`
4208-
echo "$as_me:$LINENO: result: $perl_installman3dir" >&5
4209-
echo "${ECHO_T}$perl_installman3dir" >&6
4210-
echo "$as_me:$LINENO: checking for Perl archlibexp" >&5
4211-
echo $ECHO_N "checking for Perl archlibexp... $ECHO_C" >&6
4212-
perl_archlibexp=`$PERL -MConfig -e 'print $Config{archlibexp}'`
4213-
echo "$as_me:$LINENO: result: $perl_archlibexp" >&5
4214-
echo "${ECHO_T}$perl_archlibexp" >&6
4215-
echo "$as_me:$LINENO: checking for Perl privlibexp" >&5
4216-
echo $ECHO_N "checking for Perl privlibexp... $ECHO_C" >&6
4217-
perl_privlibexp=`$PERL -MConfig -e 'print $Config{privlibexp}'`
4218-
echo "$as_me:$LINENO: result: $perl_privlibexp" >&5
4219-
echo "${ECHO_T}$perl_privlibexp" >&6
4220-
echo "$as_me:$LINENO: checking for Perl useshrplib" >&5
4221-
echo $ECHO_N "checking for Perl useshrplib... $ECHO_C" >&6
4222-
perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
4223-
echo "$as_me:$LINENO: result: $perl_useshrplib" >&5
4224-
echo "${ECHO_T}$perl_useshrplib" >&6
4225-
echo "$as_me:$LINENO: checking for Perl man3ext" >&5
4226-
echo $ECHO_N "checking for Perl man3ext... $ECHO_C" >&6
4227-
perl_man3ext=`$PERL -MConfig -e 'print $Config{man3ext}'`
4228-
echo "$as_me:$LINENO: result: $perl_man3ext" >&5
4229-
echo "${ECHO_T}$perl_man3ext" >&6
4230-
4231-
echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
4232-
echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
4233-
pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
4234-
pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
4235-
perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
4236-
echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
4237-
echo "${ECHO_T}$perl_embed_ldflags" >&6
4238-
fi
4239-
42404123
if test "$with_python" = yes; then
42414124
# Extract the first word of "python", so it can be a program name with args.
42424125
set dummy python; ac_word=$2
@@ -16290,7 +16173,6 @@ s,@autodepend@,$autodepend,;t t
1629016173
s,@INCLUDES@,$INCLUDES,;t t
1629116174
s,@with_tcl@,$with_tcl,;t t
1629216175
s,@with_tk@,$with_tk,;t t
16293-
s,@with_perl@,$with_perl,;t t
1629416176
s,@with_python@,$with_python,;t t
1629516177
s,@ANT@,$ANT,;t t
1629616178
s,@with_java@,$with_java,;t t
@@ -16318,14 +16200,6 @@ s,@STRIP_SHARED_LIB@,$STRIP_SHARED_LIB,;t t
1631816200
s,@YACC@,$YACC,;t t
1631916201
s,@YFLAGS@,$YFLAGS,;t t
1632016202
s,@WISH@,$WISH,;t t
16321-
s,@PERL@,$PERL,;t t
16322-
s,@perl_installsitearch@,$perl_installsitearch,;t t
16323-
s,@perl_installman3dir@,$perl_installman3dir,;t t
16324-
s,@perl_archlibexp@,$perl_archlibexp,;t t
16325-
s,@perl_privlibexp@,$perl_privlibexp,;t t
16326-
s,@perl_useshrplib@,$perl_useshrplib,;t t
16327-
s,@perl_man3ext@,$perl_man3ext,;t t
16328-
s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
1632916203
s,@PYTHON@,$PYTHON,;t t
1633016204
s,@python_version@,$python_version,;t t
1633116205
s,@python_prefix@,$python_prefix,;t t

configure.in

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.197 2002/08/22 22:43:08 scrappy Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.198 2002/08/30 13:06:17 scrappy Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -356,14 +356,6 @@ PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConf
356356

357357
PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR])
358358

359-
#
360-
# Optionally build Perl modules (Pg.pm and PL/Perl)
361-
#
362-
AC_MSG_CHECKING([whether to build Perl modules])
363-
PGAC_ARG_BOOL(with, perl, no, [ --with-perl build Perl interface and PL/Perl])
364-
AC_MSG_RESULT([$with_perl])
365-
AC_SUBST(with_perl)
366-
367359
#
368360
# Optionally build Python interface module
369361
#
@@ -579,13 +571,6 @@ if test "$with_tk" = yes; then
579571
test -z "$WISH" && AC_MSG_ERROR(['wish' is required for Tk support])
580572
fi
581573

582-
PGAC_PATH_PERL
583-
if test "$with_perl" = yes; then
584-
PGAC_CHECK_PERL_CONFIGS([installsitearch,installman3dir,
585-
archlibexp,privlibexp,useshrplib,man3ext])
586-
PGAC_CHECK_PERL_EMBED_LDFLAGS
587-
fi
588-
589574
if test "$with_python" = yes; then
590575
PGAC_PATH_PYTHON
591576
PGAC_CHECK_PYTHON_MODULE_SETUP

src/interfaces/Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.48 2002/08/30 13:03:09 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.49 2002/08/30 13:06:20 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,16 +14,12 @@ include $(top_builddir)/src/Makefile.global
1414

1515
DIRS := libpq ecpg
1616

17-
ALLDIRS := $(DIRS) libpgtcl perl5 python jdbc
17+
ALLDIRS := $(DIRS) libpgtcl python jdbc
1818

1919
ifeq ($(with_tcl), yes)
2020
DIRS += libpgtcl
2121
endif
2222

23-
ifeq ($(with_perl), yes)
24-
DIRS += perl5
25-
endif
26-
2723
ifeq ($(with_python), yes)
2824
DIRS += python
2925
endif

src/interfaces/perl5/Changes

-126
This file was deleted.

0 commit comments

Comments
 (0)