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

Commit76392f8

Browse files
committed
Autoconf
1 parentdb882f6 commit76392f8

File tree

1 file changed

+68
-11
lines changed

1 file changed

+68
-11
lines changed

‎src/configure

Lines changed: 68 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6112,6 +6112,30 @@ fi
61126112

61136113
fi
61146114

6115+
iftest"$USE_TCL";then
6116+
echo$ac_n"checking for tclConfig.sh""...$ac_c"1>&6
6117+
echo"configure:6118: checking for tclConfig.sh">&5
6118+
library_dirs="/usr/lib$LIBRARY_DIRS"
6119+
TCL_CONFIG_SH=
6120+
fordirin$library_dirs;do
6121+
fortcl_dirin$tcl_dirs;do
6122+
iftest -z"$TCL_CONFIG_SH";then
6123+
iftest -d"$dir/$tcl_dir" -a -r"$dir/$tcl_dir/tclConfig.sh";then
6124+
TCL_CONFIG_SH=$dir/$tcl_dir/tclConfig.sh
6125+
fi
6126+
fi
6127+
done
6128+
done
6129+
iftest -z"$TCL_CONFIG_SH";then
6130+
echo"$ac_t""no"1>&6
6131+
echo"configure: warning: tcl support disabled; Tcl configuration script missing"1>&2
6132+
USE_TCL=
6133+
else
6134+
echo"$ac_t""$TCL_CONFIG_SH"1>&6
6135+
6136+
fi
6137+
fi
6138+
61156139

61166140
iftest"$USE_TCL" ="true"
61176141
then
@@ -6125,17 +6149,17 @@ then
61256149
TK_INCDIR=no
61266150
ac_safe=`echo"tk.h"| sed'y%./+-%__p_%'`
61276151
echo$ac_n"checking for tk.h""...$ac_c"1>&6
6128-
echo"configure:6129: checking for tk.h">&5
6152+
echo"configure:6153: checking for tk.h">&5
61296153
ifeval"test\"`echo'$''{'ac_cv_header_$ac_safe'+set}'`\" = set";then
61306154
echo$ac_n"(cached)$ac_c"1>&6
61316155
else
61326156
cat> conftest.$ac_ext<<EOF
6133-
#line6134 "configure"
6157+
#line6158 "configure"
61346158
#include "confdefs.h"
61356159
#include <tk.h>
61366160
EOF
61376161
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6138-
{ (evalecho configure:6139:\"$ac_try\")1>&5; (eval$ac_try)2>&5; }
6162+
{ (evalecho configure:6163:\"$ac_try\")1>&5; (eval$ac_try)2>&5; }
61396163
ac_err=`grep -v'^ *+' conftest.out`
61406164
iftest -z"$ac_err";then
61416165
rm -rf conftest*
@@ -6184,22 +6208,22 @@ then
61846208
fortk_libin$tk_libs;do
61856209
iftest -z"$TK_LIB";then
61866210
echo$ac_n"checking for main in -l$tk_lib""...$ac_c"1>&6
6187-
echo"configure:6188: checking for main in -l$tk_lib">&5
6211+
echo"configure:6212: checking for main in -l$tk_lib">&5
61886212
ac_lib_var=`echo$tk_lib'_'main| sed'y%./+-%__p_%'`
61896213
ifeval"test\"`echo'$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set";then
61906214
echo$ac_n"(cached)$ac_c"1>&6
61916215
else
61926216
ac_save_LIBS="$LIBS"
61936217
LIBS="-l$tk_lib$LIBS"
61946218
cat> conftest.$ac_ext<<EOF
6195-
#line6196 "configure"
6219+
#line6220 "configure"
61966220
#include "confdefs.h"
61976221
61986222
int main() {
61996223
main()
62006224
; return 0; }
62016225
EOF
6202-
if { (evalecho configure:6203:\"$ac_link\")1>&5; (eval$ac_link)2>&5; }&&test -s conftest;then
6226+
if { (evalecho configure:6227:\"$ac_link\")1>&5; (eval$ac_link)2>&5; }&&test -s conftest;then
62036227
rm -rf conftest*
62046228
eval"ac_cv_lib_$ac_lib_var=yes"
62056229
else
@@ -6245,17 +6269,17 @@ then
62456269
PWD_INCDIR=no
62466270
ac_safe=`echo"pwd.h"| sed'y%./+-%__p_%'`
62476271
echo$ac_n"checking for pwd.h""...$ac_c"1>&6
6248-
echo"configure:6249: checking for pwd.h">&5
6272+
echo"configure:6273: checking for pwd.h">&5
62496273
ifeval"test\"`echo'$''{'ac_cv_header_$ac_safe'+set}'`\" = set";then
62506274
echo$ac_n"(cached)$ac_c"1>&6
62516275
else
62526276
cat> conftest.$ac_ext<<EOF
6253-
#line6254 "configure"
6277+
#line6278 "configure"
62546278
#include "confdefs.h"
62556279
#include <pwd.h>
62566280
EOF
62576281
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6258-
{ (evalecho configure:6259:\"$ac_try\")1>&5; (eval$ac_try)2>&5; }
6282+
{ (evalecho configure:6283:\"$ac_try\")1>&5; (eval$ac_try)2>&5; }
62596283
ac_err=`grep -v'^ *+' conftest.out`
62606284
iftest -z"$ac_err";then
62616285
rm -rf conftest*
@@ -6385,7 +6409,23 @@ done
63856409
63866410
ac_given_srcdir=$srcdir
63876411
6388-
trap 'rm -fr`echo"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpq++/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile include/version.h interfaces/odbc/Makefile.global interfaces/odbc/GNUmakefile include/config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
6412+
trap 'rm -fr`echo"GNUmakefile
6413+
Makefile.global
6414+
backend/port/Makefile
6415+
backend/utils/Gen_fmgrtab.sh
6416+
bin/pg_dump/Makefile
6417+
bin/pg_version/Makefile
6418+
bin/psql/Makefile
6419+
include/version.h
6420+
interfaces/ecpg/lib/Makefile
6421+
interfaces/libpgtcl/Makefile
6422+
interfaces/libpq++/Makefile
6423+
interfaces/libpq/Makefile
6424+
interfaces/odbc/GNUmakefile
6425+
interfaces/odbc/Makefile.global
6426+
pl/plpgsql/src/Makefile
6427+
pl/tcl/mkMakefile.tcldefs.sh
6428+
include/config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
63896429
EOF
63906430
cat>>$CONFIG_STATUS<<EOF
63916431
@@ -6482,6 +6522,7 @@ s%@X_LIBS@%$X_LIBS%g
64826522
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
64836523
s%@X11_LIBS@%$X11_LIBS%g
64846524
s%@TCL_LIB@%$TCL_LIB%g
6525+
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
64856526
s%@TK_LIB@%$TK_LIB%g
64866527
64876528
CEOF
@@ -6524,7 +6565,23 @@ EOF
65246565

65256566
cat>>$CONFIG_STATUS<<EOF
65266567
6527-
CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpq++/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile include/version.h interfaces/odbc/Makefile.global interfaces/odbc/GNUmakefile"}
6568+
CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
6569+
Makefile.global
6570+
backend/port/Makefile
6571+
backend/utils/Gen_fmgrtab.sh
6572+
bin/pg_dump/Makefile
6573+
bin/pg_version/Makefile
6574+
bin/psql/Makefile
6575+
include/version.h
6576+
interfaces/ecpg/lib/Makefile
6577+
interfaces/libpgtcl/Makefile
6578+
interfaces/libpq++/Makefile
6579+
interfaces/libpq/Makefile
6580+
interfaces/odbc/GNUmakefile
6581+
interfaces/odbc/Makefile.global
6582+
pl/plpgsql/src/Makefile
6583+
pl/tcl/mkMakefile.tcldefs.sh
6584+
"}
65286585
EOF
65296586
cat>>$CONFIG_STATUS<<\EOF
65306587
for ac_file in ..$CONFIG_FILES; do if test "x$ac_file" != x..; then

0 commit comments

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