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

Commit256ee0d

Browse files
committed
Use $PORTNAME consistently instead of $host_os, where appropriate.
1 parent594be44 commit256ee0d

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

‎configure

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3412,13 +3412,13 @@ fi;
34123412
# readline on MinGW has problems with backslashes in psql and other bugs.
34133413
# This is particularly a problem with non-US code pages.
34143414
# Therefore disable its use until we understand the cause. 2004-07-20
3415-
case $host_os in mingw*)
3415+
if test "$PORTNAME" = "win32"; then
34163416
if test "$with_readline" = yes; then
34173417
{ echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
34183418
echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
34193419
with_readline=no
3420-
fi;;
3421-
esac
3420+
fi
3421+
fi
34223422

34233423

34243424
#
@@ -10701,7 +10701,6 @@ fi
1070110701

1070210702
fi
1070310703

10704-
1070510704
##
1070610705
## Functions, global variables
1070710706
##
@@ -12054,12 +12053,12 @@ ac_cv_func_fseeko=yes
1205412053
esac
1205512054

1205612055
# Solaris has a very slow qsort in certain cases, so we replace it.
12057-
case $host_os insolaris*)
12058-
LIBOBJS="$LIBOBJS qsort.$ac_objext" ;;
12059-
esac
12056+
if test "$PORTNAME" = "solaris"; then
12057+
LIBOBJS="$LIBOBJS qsort.$ac_objext"
12058+
fi
1206012059

1206112060
# Win32 support
12062-
case $host_os in mingw*)
12061+
if test "$PORTNAME" = "win32"; then
1206312062
LIBOBJS="$LIBOBJS copydir.$ac_objext"
1206412063
LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"
1206512064
LIBOBJS="$LIBOBJS kill.$ac_objext"
@@ -12070,8 +12069,7 @@ cat >>confdefs.h <<\_ACEOF
1207012069
#define HAVE_SYMLINK 1
1207112070
_ACEOF
1207212071

12073-
;;
12074-
esac
12072+
fi
1207512073

1207612074
if test "$with_readline" = yes; then
1207712075
echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
@@ -18107,11 +18105,10 @@ ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1810718105
ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
1810818106

1810918107

18110-
case $host_os in mingw*)
18108+
if test "$PORTNAME" = "win32"; then
1811118109
ac_config_commands="$ac_config_commands check_win32_symlinks"
1811218110

18113-
;;
18114-
esac
18111+
fi
1811518112

1811618113
ac_config_headers="$ac_config_headers src/include/pg_config.h"
1811718114

‎configure.in

Lines changed: 11 additions & 14 deletions
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 $PostgreSQL: pgsql/configure.in,v 1.375 2004/09/02 15:39:56 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.376 2004/09/10 13:53:40 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -483,12 +483,12 @@ PGAC_ARG_BOOL(with, readline, yes,
483483
# readline on MinGW has problems with backslashes in psql and other bugs.
484484
# This is particularly a problem with non-US code pages.
485485
# Therefore disable its use until we understand the cause. 2004-07-20
486-
case $host_os in mingw*)
486+
if test "$PORTNAME" = "win32"; then
487487
if test "$with_readline" = yes; then
488488
AC_MSG_WARN([*** Readline does not work on MinGW --- disabling])
489489
with_readline=no
490-
fi;;
491-
esac
490+
fi
491+
fi
492492

493493

494494
#
@@ -798,7 +798,6 @@ if test "$with_krb5" = yes; then
798798
[#include <krb5.h>])
799799
fi
800800

801-
802801
##
803802
## Functions, global variables
804803
##
@@ -898,21 +897,20 @@ ac_cv_func_fseeko=yes
898897
esac
899898

900899
# Solaris has a very slow qsort in certain cases, so we replace it.
901-
case $host_os insolaris*)
902-
AC_LIBOBJ(qsort) ;;
903-
esac
900+
if test "$PORTNAME" = "solaris"; then
901+
AC_LIBOBJ(qsort)
902+
fi
904903

905904
# Win32 support
906-
case $host_os in mingw*)
905+
if test "$PORTNAME" = "win32"; then
907906
AC_LIBOBJ(copydir)
908907
AC_LIBOBJ(gettimeofday)
909908
AC_LIBOBJ(kill)
910909
AC_LIBOBJ(open)
911910
AC_LIBOBJ(rand)
912911
AC_DEFINE([HAVE_SYMLINK], 1,
913912
[Define to 1 if you have the `symlink' function.])
914-
;;
915-
esac
913+
fi
916914

917915
if test "$with_readline" = yes; then
918916
PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
@@ -1262,7 +1260,7 @@ AC_CONFIG_LINKS([
12621260
src/Makefile.port:src/makefiles/Makefile.${template}
12631261
])
12641262

1265-
case $host_os in mingw*)
1263+
if test "$PORTNAME" = "win32"; then
12661264
AC_CONFIG_COMMANDS([check_win32_symlinks],[
12671265
# Links sometimes fail undetected on Mingw -
12681266
# so here we detect it and warn the user
@@ -1272,8 +1270,7 @@ for FILE in $CONFIG_LINKS
12721270
test -e `expr "$FILE" : '\([[^:]]*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
12731271
done
12741272
])
1275-
;;
1276-
esac
1273+
fi
12771274

12781275
AC_CONFIG_HEADERS([src/include/pg_config.h],
12791276
[

0 commit comments

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