*** bash-2.05a/configure.orig Tue Feb 12 17:51:51 2002 --- bash-2.05a/configure Tue Feb 12 18:45:25 2002 *************** *** 10,15 **** --- 10,24 ---- # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. + #=================================================================== + # This file was modified by SAKAIDA Masaaki. + # + # Change Logs + # 1. Add '../exec_sql/Makefile' into "trap 'rm -fr `echo ..". + # 2. Add '--pginc-prefix, --pglib-prefix' options. + # + #=================================================================== + # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' *************** *** 97,102 **** --- 106,114 ---- # Initializations. # ac_default_prefix=/usr/local + ac_default_pginc_prefix=/usr/local/pgsql/include + ac_default_pglib_prefix=/usr/local/pgsql/lib + cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= *************** *** 151,156 **** --- 163,170 ---- # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null + pginc_prefix=NONE + pglib_prefix=NONE exec_prefix=NONE no_create= no_recursion= *************** *** 263,268 **** --- 277,287 ---- | --exec=* | --exe=* | --ex=*) exec_prefix=$ac_optarg ;; + -pginc-prefix=* | --pginc-prefix=*) + pginc_prefix="$ac_optarg" ;; + -pglib-prefix=* | --pglib-prefix=*) + pglib_prefix="$ac_optarg" ;; + -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; *************** *** 14281,14287 **** #AC_SUBST(ALLOCA_SOURCE) #AC_SUBST(ALLOCA_OBJECT) ! ac_config_files="$ac_config_files Makefile builtins/Makefile lib/readline/Makefile lib/glob/Makefile lib/malloc/Makefile lib/sh/Makefile lib/termcap/Makefile lib/tilde/Makefile doc/Makefile support/Makefile examples/loadables/Makefile examples/loadables/perl/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 14300,14307 ---- #AC_SUBST(ALLOCA_SOURCE) #AC_SUBST(ALLOCA_OBJECT) ! ac_config_files="$ac_config_files ../exec_sql/Makefile Makefile builtins/Makefile lib/readline/Makefile lib/glob/Makefile lib/malloc/Makefile lib/sh/Makefile lib/termcap/Makefile lib/tilde/Makefile doc/Makefile support/Makefile examples/loadables/Makefile examples/loadables/perl/Makefile" ! ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 14341,14346 **** --- 14361,14368 ---- test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + test "x$pginc_prefix" = xNONE && pginc_prefix=$ac_default_pginc_prefix + test "x$pglib_prefix" = xNONE && pglib_prefix=$ac_default_pglib_prefix # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and *************** *** 14592,14597 **** --- 14614,14620 ---- do case "$ac_config_target" in # Handling of arguments. + "../exec_sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../exec_sql/Makefile" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "builtins/Makefile" ) CONFIG_FILES="$CONFIG_FILES builtins/Makefile" ;; "lib/readline/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/readline/Makefile" ;; *************** *** 14659,14664 **** --- 14682,14689 ---- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t + s,@pginc_prefix@,$pginc_prefix,;t t + s,@pglib_prefix@,$pglib_prefix,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t