mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Use wide-character library routines, if available, for upper/lower/initcap
functions. This allows these functions to work correctly with Unicode and other multibyte encodings. Per prior discussion. Also, revert my earlier change to move installation path mashing from Makefile.global to configure. Turns out not to work well because configure script is working with unexpanded variables, and so fails to match in cases where it should match.
This commit is contained in:
63
configure
vendored
63
configure
vendored
@ -6955,7 +6955,9 @@ done
|
||||
|
||||
|
||||
|
||||
for ac_header in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h utime.h kernel/OS.h kernel/image.h SupportDefs.h
|
||||
|
||||
|
||||
for ac_header in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
@ -10968,7 +10970,9 @@ test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
|
||||
|
||||
|
||||
|
||||
for ac_func in cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmask symlink sysconf utime utimes waitpid
|
||||
|
||||
|
||||
for ac_func in cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
@ -17939,59 +17943,6 @@ CFLAGS="$_CFLAGS"
|
||||
LIBS="$_LIBS"
|
||||
fi
|
||||
|
||||
# Adjust installation directories.
|
||||
#
|
||||
# These are initially set by the equivalent --xxxdir configure options.
|
||||
# We append "postgresql" to some of them, if the string does not already
|
||||
# contain "pgsql" or "postgres", in order to avoid directory clutter.
|
||||
|
||||
if echo "$libexecdir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
libexecdir="$libexecdir/postgresql"
|
||||
fi
|
||||
|
||||
if echo "$datadir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
datadir="$datadir/postgresql"
|
||||
fi
|
||||
|
||||
if echo "$sysconfdir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
sysconfdir="$sysconfdir/postgresql"
|
||||
fi
|
||||
|
||||
pkglibdir="$libdir"
|
||||
if echo "$pkglibdir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
pkglibdir="$pkglibdir/postgresql"
|
||||
fi
|
||||
|
||||
|
||||
pkgincludedir="$includedir"
|
||||
if echo "$pkgincludedir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
pkgincludedir="$pkgincludedir/postgresql"
|
||||
fi
|
||||
|
||||
|
||||
if echo "$docdir" | egrep 'pgsql|postgres' >/dev/null 2>&1
|
||||
then
|
||||
:
|
||||
else
|
||||
docdir="$docdir/postgresql"
|
||||
fi
|
||||
|
||||
|
||||
# prepare build tree if outside source tree
|
||||
# Note 1: test -ef might not exist, but it's more reliable than `pwd`.
|
||||
# Note 2: /bin/pwd might be better than shell's built-in at getting
|
||||
@ -18692,8 +18643,6 @@ s,@have_docbook@,$have_docbook,;t t
|
||||
s,@DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t
|
||||
s,@COLLATEINDEX@,$COLLATEINDEX,;t t
|
||||
s,@SGMLSPL@,$SGMLSPL,;t t
|
||||
s,@pkglibdir@,$pkglibdir,;t t
|
||||
s,@pkgincludedir@,$pkgincludedir,;t t
|
||||
s,@vpath_build@,$vpath_build,;t t
|
||||
CEOF
|
||||
|
||||
|
Reference in New Issue
Block a user