Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite43ecb3

Browse files
committed
Remove leftovers from subproject removals. Fixes for Python and Kerberos
configuration.
1 parentbe475f9 commite43ecb3

21 files changed

+50
-306
lines changed

‎aclocal.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.14 2002/03/29 17:32:48 petere Exp $
1+
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.15 2002/09/04 22:54:17 petere Exp $
22
m4_include([config/ac_func_accept_argtypes.m4])
33
m4_include([config/c-compiler.m4])
44
m4_include([config/c-library.m4])
5-
m4_include([config/cxx.m4])
65
m4_include([config/docbook.m4])
76
m4_include([config/general.m4])
87
m4_include([config/java.m4])

‎config/cxx.m4

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎config/python.m4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Autoconf macros for configuring the build of Python extension modules
33
#
4-
# $Header: /cvsroot/pgsql/config/python.m4,v 1.4 2002/03/29 17:32:54 petere Exp $
4+
# $Header: /cvsroot/pgsql/config/python.m4,v 1.5 2002/09/04 22:54:18 petere Exp $
55
#
66

77
# PGAC_PATH_PYTHON
@@ -69,6 +69,11 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP],
6969
[AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS])
7070
AC_MSG_CHECKING([how to link an embedded Python application])
7171
72+
if test ! -f "$python_configdir/Makefile"; then
73+
AC_MSG_RESULT(no)
74+
AC_MSG_ERROR([Python Makefile not found])
75+
fi
76+
7277
_python_libs=`grep '^LIBS=' $python_configdir/Makefile | sed 's/^.*=//'`
7378
_python_libc=`grep '^LIBC=' $python_configdir/Makefile | sed 's/^.*=//'`
7479
_python_libm=`grep '^LIBM=' $python_configdir/Makefile | sed 's/^.*=//'`

‎configure

Lines changed: 17 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ Optional Features:
838838
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
839839
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
840840
--enable-integer-datetimes enable 64-bit integer date/time support
841-
--enable-recode enablecharacter set recode support
841+
--enable-recode enablesingle-byte recode support
842842
--enable-nls[=LANGUAGES] enable Native Language Support
843843
--disable-shared do not build shared libraries
844844
--disable-rpath do not embed shared library search path in executables
@@ -860,7 +860,7 @@ 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 PL/Perl
863+
--with-perl buildPerl modules (PL/Perl)
864864
--with-python build Python interface module
865865
--with-java build JDBC interface and Java tools
866866
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]
@@ -2935,7 +2935,7 @@ fi;
29352935
29362936
29372937
#
2938-
# Optionally build Perl modules (Pg.pm andPL/Perl)
2938+
# Optionally build Perl modules (PL/Perl)
29392939
#
29402940
echo"$as_me:$LINENO: checking whether to build Perl modules">&5
29412941
echo$ECHO_N"checking whether to build Perl modules...$ECHO_C">&6
@@ -4105,51 +4105,6 @@ echo "$as_me: WARNING:
41054105
fi
41064106
41074107
4108-
iftest"$with_tk" = yes;then
4109-
# Extract the first word of "wish", so it can be a program name with args.
4110-
set dummy wish; ac_word=$2
4111-
echo"$as_me:$LINENO: checking for$ac_word">&5
4112-
echo$ECHO_N"checking for$ac_word...$ECHO_C">&6
4113-
iftest"${ac_cv_path_WISH+set}" =set;then
4114-
echo$ECHO_N"(cached)$ECHO_C">&6
4115-
else
4116-
case$WISHin
4117-
[\\/]* |?:[\\/]*)
4118-
ac_cv_path_WISH="$WISH"# Let the user override the test with a path.
4119-
;;
4120-
*)
4121-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4122-
foras_dirin$PATH
4123-
do
4124-
IFS=$as_save_IFS
4125-
test -z"$as_dir"&& as_dir=.
4126-
forac_exec_extin''$ac_executable_extensions;do
4127-
if$as_executable_p"$as_dir/$ac_word$ac_exec_ext";then
4128-
ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"
4129-
echo"$as_me:$LINENO: found$as_dir/$ac_word$ac_exec_ext">&5
4130-
break 2
4131-
fi
4132-
done
4133-
done
4134-
4135-
;;
4136-
esac
4137-
fi
4138-
WISH=$ac_cv_path_WISH
4139-
4140-
iftest -n"$WISH";then
4141-
echo"$as_me:$LINENO: result:$WISH">&5
4142-
echo"${ECHO_T}$WISH">&6
4143-
else
4144-
echo"$as_me:$LINENO: result: no">&5
4145-
echo"${ECHO_T}no">&6
4146-
fi
4147-
4148-
test -z"$WISH"&& { {echo"$as_me:$LINENO: error: 'wish' is required for Tk support">&5
4149-
echo"$as_me: error: 'wish' is required for Tk support">&2;}
4150-
{ (exit 1);exit 1; }; }
4151-
fi
4152-
41534108
# Extract the first word of "perl", so it can be a program name with args.
41544109
set dummy perl; ac_word=$2
41554110
echo"$as_me:$LINENO: checking for$ac_word">&5
@@ -4191,16 +4146,6 @@ fi
41914146
41924147
iftest"$with_perl" = yes;then
41934148
4194-
echo"$as_me:$LINENO: checking for Perl installsitearch">&5
4195-
echo$ECHO_N"checking for Perl installsitearch...$ECHO_C">&6
4196-
perl_installsitearch=`$PERL -MConfig -e'print $Config{installsitearch}'`
4197-
echo"$as_me:$LINENO: result:$perl_installsitearch">&5
4198-
echo"${ECHO_T}$perl_installsitearch">&6
4199-
echo"$as_me:$LINENO: checking for Perl installman3dir">&5
4200-
echo$ECHO_N"checking for Perl installman3dir...$ECHO_C">&6
4201-
perl_installman3dir=`$PERL -MConfig -e'print $Config{installman3dir}'`
4202-
echo"$as_me:$LINENO: result:$perl_installman3dir">&5
4203-
echo"${ECHO_T}$perl_installman3dir">&6
42044149
echo"$as_me:$LINENO: checking for Perl archlibexp">&5
42054150
echo$ECHO_N"checking for Perl archlibexp...$ECHO_C">&6
42064151
perl_archlibexp=`$PERL -MConfig -e'print $Config{archlibexp}'`
@@ -4216,11 +4161,6 @@ echo $ECHO_N "checking for Perl useshrplib... $ECHO_C" >&6
42164161
perl_useshrplib=`$PERL -MConfig -e'print $Config{useshrplib}'`
42174162
echo"$as_me:$LINENO: result:$perl_useshrplib">&5
42184163
echo"${ECHO_T}$perl_useshrplib">&6
4219-
echo"$as_me:$LINENO: checking for Perl man3ext">&5
4220-
echo$ECHO_N"checking for Perl man3ext...$ECHO_C">&6
4221-
perl_man3ext=`$PERL -MConfig -e'print $Config{man3ext}'`
4222-
echo"$as_me:$LINENO: result:$perl_man3ext">&5
4223-
echo"${ECHO_T}$perl_man3ext">&6
42244164
42254165
echo"$as_me:$LINENO: checking for flags to link embedded Perl">&5
42264166
echo$ECHO_N"checking for flags to link embedded Perl...$ECHO_C">&6
@@ -4307,6 +4247,14 @@ fi
43074247
echo"$as_me:$LINENO: checking how to link an embedded Python application">&5
43084248
echo$ECHO_N"checking how to link an embedded Python application...$ECHO_C">&6
43094249
4250+
iftest! -f"$python_configdir/Makefile";then
4251+
echo"$as_me:$LINENO: result: no">&5
4252+
echo"${ECHO_T}no">&6
4253+
{ {echo"$as_me:$LINENO: error: Python Makefile not found">&5
4254+
echo"$as_me: error: Python Makefile not found">&2;}
4255+
{ (exit 1);exit 1; }; }
4256+
fi
4257+
43104258
_python_libs=`grep'^LIBS='$python_configdir/Makefile| sed's/^.*=//'`
43114259
_python_libc=`grep'^LIBC='$python_configdir/Makefile| sed's/^.*=//'`
43124260
_python_libm=`grep'^LIBM='$python_configdir/Makefile| sed's/^.*=//'`
@@ -9425,7 +9373,12 @@ fi
94259373
echo"$as_me:$LINENO: result:$ac_cv_member_krb5_error_e_data">&5
94269374
echo"${ECHO_T}$ac_cv_member_krb5_error_e_data">&6
94279375
iftest$ac_cv_member_krb5_error_e_data = yes;then
9428-
:
9376+
9377+
cat>>confdefs.h<<_ACEOF
9378+
#define HAVE_KRB5_ERROR_E_DATA 1
9379+
_ACEOF
9380+
9381+
94299382
else
94309383
{ {echo"$as_me:$LINENO: error: could not determine how to extract Kerberos 5 error messages">&5
94319384
echo"$as_me: error: could not determine how to extract Kerberos 5 error messages">&2;}
@@ -16310,14 +16263,10 @@ s,@STRIP_STATIC_LIB@,$STRIP_STATIC_LIB,;t t
1631016263
s,@STRIP_SHARED_LIB@,$STRIP_SHARED_LIB,;t t
1631116264
s,@YACC@,$YACC,;t t
1631216265
s,@YFLAGS@,$YFLAGS,;t t
16313-
s,@WISH@,$WISH,;t t
1631416266
s,@PERL@,$PERL,;t t
16315-
s,@perl_installsitearch@,$perl_installsitearch,;t t
16316-
s,@perl_installman3dir@,$perl_installman3dir,;t t
1631716267
s,@perl_archlibexp@,$perl_archlibexp,;t t
1631816268
s,@perl_privlibexp@,$perl_privlibexp,;t t
1631916269
s,@perl_useshrplib@,$perl_useshrplib,;t t
16320-
s,@perl_man3ext@,$perl_man3ext,;t t
1632116270
s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
1632216271
s,@PYTHON@,$PYTHON,;t t
1632316272
s,@python_version@,$python_version,;t t

‎configure.in

Lines changed: 9 additions & 15 deletions
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.204 2002/09/0408:08:29 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.205 2002/09/0422:54:18 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -155,9 +155,9 @@ AC_MSG_RESULT([$enable_integer_datetimes])
155155
# Character set recode (--enable-recode)
156156
#
157157
AC_MSG_CHECKING([whether to build with recode support])
158-
PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enablecharacter set recode support],
158+
PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enablesingle-byte recode support],
159159
[AC_DEFINE([CYR_RECODE], 1,
160-
[Set to 1 if you wantcyrillic recode support (--enable-recode)])])
160+
[Set to 1 if you wantsingle-byte recode support (--enable-recode)])])
161161
AC_MSG_RESULT([$enable_recode])
162162

163163

@@ -350,10 +350,10 @@ PGAC_ARG_REQ(with, tclconfig, [ --with-tclconfig=DIR tclConfig.sh and tkConf
350350
PGAC_ARG_REQ(with, tkconfig, [ --with-tkconfig=DIR tkConfig.sh is in DIR])
351351

352352
#
353-
# Optionally build Perl modules (Pg.pm andPL/Perl)
353+
# Optionally build Perl modules (PL/Perl)
354354
#
355355
AC_MSG_CHECKING([whether to build Perl modules])
356-
PGAC_ARG_BOOL(with, perl, no, [ --with-perl build PL/Perl])
356+
PGAC_ARG_BOOL(with, perl, no, [ --with-perl buildPerl modules (PL/Perl)])
357357
AC_MSG_RESULT([$with_perl])
358358
AC_SUBST(with_perl)
359359

@@ -570,15 +570,9 @@ if test -z "$YACC"; then
570570
fi
571571
AC_SUBST(YFLAGS)
572572

573-
if test "$with_tk" = yes; then
574-
AC_PATH_PROG(WISH, wish)
575-
test -z "$WISH" && AC_MSG_ERROR(['wish' is required for Tk support])
576-
fi
577-
578573
PGAC_PATH_PERL
579574
if test "$with_perl" = yes; then
580-
PGAC_CHECK_PERL_CONFIGS([installsitearch,installman3dir,
581-
archlibexp,privlibexp,useshrplib,man3ext])
575+
PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
582576
PGAC_CHECK_PERL_EMBED_LDFLAGS
583577
fi
584578

@@ -748,9 +742,9 @@ if test "$with_krb5" = yes; then
748742
[#include <krb5.h>])],
749743
[#include <krb5.h>])
750744
AC_CHECK_MEMBERS([krb5_error.text.data], [],
751-
[AC_CHECK_MEMBER([krb5_error.e_data], [],
752-
[AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])],
753-
[#include <krb5.h>])],
745+
[AC_CHECK_MEMBERS([krb5_error.e_data], [],
746+
[AC_MSG_ERROR([could not determine how to extract Kerberos 5 error messages])],
747+
[#include <krb5.h>])],
754748
[#include <krb5.h>])
755749
fi
756750

‎src/Makefile.global.in

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.154 2002/09/03 21:45:41 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.155 2002/09/04 22:54:18 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -121,7 +121,6 @@ localedir := @localedir@
121121
#
122122
# Records the choice of the various --enable-xxx and --with-xxx options.
123123

124-
with_CXX= @with_CXX@
125124
with_java= @with_java@
126125
with_perl= @with_perl@
127126
with_python= @with_python@
@@ -177,13 +176,6 @@ ifeq ($(GCC), yes)
177176
CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
178177
endif
179178

180-
CXX = @CXX@
181-
GXX = @GXX@
182-
CXXFLAGS = @CXXFLAGS@
183-
ifeq ($(GXX), yes)
184-
CXXFLAGS += -Wall
185-
endif
186-
187179
# Kind-of compilers
188180

189181
YACC = @YACC@
@@ -207,13 +199,10 @@ X = @EXEEXT@
207199
# Perl
208200

209201
PERL= @PERL@
210-
perl_installsitearch= @perl_installsitearch@
211-
perl_installman3dir= @perl_installman3dir@
212202
perl_archlibexp= @perl_archlibexp@
213203
perl_privlibexp= @perl_privlibexp@
214204
perl_useshrplib= @perl_useshrplib@
215205
perl_embed_ldflags= @perl_embed_ldflags@
216-
perl_man3ext= @perl_man3ext@
217206

218207
# Miscellaneous
219208

@@ -224,7 +213,6 @@ MSGFMT = @MSGFMT@
224213
MSGMERGE = @MSGMERGE@
225214
PYTHON= @PYTHON@
226215
TAR= @TAR@
227-
WISH= @WISH@
228216
XGETTEXT = @XGETTEXT@
229217

230218
GZIP= gzip
@@ -436,10 +424,6 @@ ifndef COMPILE.c
436424
COMPILE.c =$(CC)$(CFLAGS)$(CPPFLAGS) -c
437425
endif
438426

439-
ifndefCOMPILE.cc
440-
COMPILE.cc =$(CXX)$(CXXFLAGS)$(CPPFLAGS) -c
441-
endif
442-
443427
DEPDIR = .deps
444428
df =$(DEPDIR)/$(*F)
445429

@@ -462,14 +446,6 @@ ifeq ($(GCC), yes)
462446

463447
endif# GCC
464448

465-
ifeq ($(GXX), yes)
466-
467-
%.o :%.cc
468-
$(COMPILE.cc) -o$@$< -MMD
469-
$(postprocess-depend)
470-
471-
endif# GXX
472-
473449
# Include all the dependency files generated for the current
474450
# directory. List /dev/null as dummy because if the wildcard expands
475451
# to nothing then make would complain.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp