mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:41:52 +02:00
Fix configure to generate correct expansion of library directory
in pl/plpgsql/src/mklang.sql.
This commit is contained in:
parent
a9bd936066
commit
5085132c6d
10
src/configure
vendored
10
src/configure
vendored
@ -7052,6 +7052,15 @@ fi
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||||
|
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||||
|
|
||||||
|
eval expanded_libdir="$libdir"
|
||||||
|
eval expanded_libdir="$expanded_libdir"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
trap '' 1 2 15
|
trap '' 1 2 15
|
||||||
cat > confcache <<\EOF
|
cat > confcache <<\EOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
@ -7282,6 +7291,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
|
|||||||
s%@X_LIBS@%$X_LIBS%g
|
s%@X_LIBS@%$X_LIBS%g
|
||||||
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
|
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
|
||||||
s%@X11_LIBS@%$X11_LIBS%g
|
s%@X11_LIBS@%$X11_LIBS%g
|
||||||
|
s%@expanded_libdir@%$expanded_libdir%g
|
||||||
|
|
||||||
CEOF
|
CEOF
|
||||||
EOF
|
EOF
|
||||||
|
@ -1138,6 +1138,26 @@ then
|
|||||||
AC_SUBST(USE_ODBC)
|
AC_SUBST(USE_ODBC)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl Output files that are neither makefiles nor shell scripts probably
|
||||||
|
dnl need fully-expanded substitutions, rather than partial expansions
|
||||||
|
dnl that include references to other variables. Currently the only
|
||||||
|
dnl such item that's needed is an expanded version of libdir, but
|
||||||
|
dnl others may be needed someday. NOTE: 'eval' technique only copes
|
||||||
|
dnl with one level of indirect reference per expansion; two levels is
|
||||||
|
dnl currently enough for libdir, but it's ugly...
|
||||||
|
|
||||||
|
dnl First we have to force 'NONE' prefix to be expanded itself.
|
||||||
|
dnl For some reason, autoconf 2.13 doesn't do this until AC_OUTPUT,
|
||||||
|
dnl which is too late...
|
||||||
|
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||||
|
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||||
|
|
||||||
|
eval expanded_libdir="$libdir"
|
||||||
|
eval expanded_libdir="$expanded_libdir"
|
||||||
|
AC_SUBST(expanded_libdir)
|
||||||
|
|
||||||
|
dnl Finally ready to produce output files ...
|
||||||
|
|
||||||
AC_OUTPUT(
|
AC_OUTPUT(
|
||||||
GNUmakefile
|
GNUmakefile
|
||||||
Makefile.global
|
Makefile.global
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
--
|
--
|
||||||
-- PL/pgSQL language declaration
|
-- PL/pgSQL language declaration
|
||||||
--
|
--
|
||||||
-- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in,v 1.3 1999/05/11 03:30:41 momjian Exp $
|
-- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in,v 1.4 1999/05/11 22:57:50 tgl Exp $
|
||||||
--
|
--
|
||||||
|
|
||||||
create function plpgsql_call_handler() returns opaque
|
create function plpgsql_call_handler() returns opaque
|
||||||
as '@libdir@/plpgsql.so'
|
as '@expanded_libdir@/plpgsql@DLSUFFIX@'
|
||||||
language 'C';
|
language 'C';
|
||||||
|
|
||||||
create trusted procedural language 'plpgsql'
|
create trusted procedural language 'plpgsql'
|
||||||
|
Loading…
Reference in New Issue
Block a user