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

Commit4890ec9

Browse files
committed
Re-enable perl configure tests for psql help file generation.
1 parentf7e089b commit4890ec9

File tree

2 files changed

+142
-1
lines changed

2 files changed

+142
-1
lines changed

‎configure‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +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 Perl interface and PL/Perl
863864
--with-python build Python interface module
864865
--with-java build JDBC interface and Java tools
865866
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]
@@ -2944,6 +2945,41 @@ echo "$as_me: error: argument required for --with-tkconfig option" >&2;}
29442945
fi;
29452946
29462947
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+
iftest"${with_perl+set}" =set;then
2958+
withval="$with_perl"
2959+
2960+
case$withvalin
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+
29472983
#
29482984
# Optionally build Python interface module
29492985
#
@@ -4120,6 +4156,87 @@ echo "$as_me: error: 'wish' is required for Tk support" >&2;}
41204156
{ (exit 1);exit 1; }; }
41214157
fi
41224158
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+
iftest"${ac_cv_path_PERL+set}" =set;then
4164+
echo$ECHO_N"(cached)$ECHO_C">&6
4165+
else
4166+
case$PERLin
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+
foras_dirin$PATH
4173+
do
4174+
IFS=$as_save_IFS
4175+
test -z"$as_dir"&& as_dir=.
4176+
forac_exec_extin''$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+
iftest -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+
iftest"$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+
41234240
iftest"$with_python" = yes;then
41244241
# Extract the first word of "python", so it can be a program name with args.
41254242
set dummy python; ac_word=$2
@@ -16173,6 +16290,7 @@ s,@autodepend@,$autodepend,;t t
1617316290
s,@INCLUDES@,$INCLUDES,;t t
1617416291
s,@with_tcl@,$with_tcl,;t t
1617516292
s,@with_tk@,$with_tk,;t t
16293+
s,@with_perl@,$with_perl,;t t
1617616294
s,@with_python@,$with_python,;t t
1617716295
s,@ANT@,$ANT,;t t
1617816296
s,@with_java@,$with_java,;t t
@@ -16200,6 +16318,14 @@ s,@STRIP_SHARED_LIB@,$STRIP_SHARED_LIB,;t t
1620016318
s,@YACC@,$YACC,;t t
1620116319
s,@YFLAGS@,$YFLAGS,;t t
1620216320
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
1620316329
s,@PYTHON@,$PYTHON,;t t
1620416330
s,@python_version@,$python_version,;t t
1620516331
s,@python_prefix@,$python_prefix,;t t

‎configure.in‎

Lines changed: 16 additions & 1 deletion
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.198 2002/08/3013:06:17 scrappy Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.199 2002/08/3016:23:21 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -356,6 +356,14 @@ 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+
359367
#
360368
# Optionally build Python interface module
361369
#
@@ -571,6 +579,13 @@ if test "$with_tk" = yes; then
571579
test -z "$WISH" && AC_MSG_ERROR(['wish' is required for Tk support])
572580
fi
573581

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+
574589
if test "$with_python" = yes; then
575590
PGAC_PATH_PYTHON
576591
PGAC_CHECK_PYTHON_MODULE_SETUP

0 commit comments

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