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

Commita7da419

Browse files
committed
Add configure probe for rl_variable_bind().
Some exceedingly ancient readline libraries lack this function, causingcommit3d858af to fail. Per buildfarm (via Michael Paquier).Discussion:https://postgr.es/m/E1msTLm-0007Cm-Ri@gemulon.postgresql.org
1 parenta22d6a2 commita7da419

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎configure

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17164,19 +17164,7 @@ $as_echo "#define HAVE_RL_FILENAME_QUOTING_FUNCTION 1" >>confdefs.h
1716417164

1716517165
fi
1716617166

17167-
for ac_func in rl_completion_matches rl_filename_completion_function rl_reset_screen_size
17168-
do :
17169-
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
17170-
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
17171-
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
17172-
cat >>confdefs.h <<_ACEOF
17173-
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
17174-
_ACEOF
17175-
17176-
fi
17177-
done
17178-
17179-
for ac_func in append_history history_truncate_file
17167+
for ac_func in append_history history_truncate_file rl_completion_matches rl_filename_completion_function rl_reset_screen_size rl_variable_bind
1718017168
do :
1718117169
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1718217170
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

‎configure.ac

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,8 +2001,14 @@ LIBS="$LIBS_including_readline"
20012001

20022002
if test "$with_readline" = yes; then
20032003
PGAC_READLINE_VARIABLES
2004-
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function rl_reset_screen_size])
2005-
AC_CHECK_FUNCS([append_history history_truncate_file])
2004+
AC_CHECK_FUNCS(m4_normalize([
2005+
append_history
2006+
history_truncate_file
2007+
rl_completion_matches
2008+
rl_filename_completion_function
2009+
rl_reset_screen_size
2010+
rl_variable_bind
2011+
]))
20062012
fi
20072013

20082014

‎src/bin/psql/input.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,10 @@ initializeInput(int flags)
356356
/* set appropriate values for Readline's global variables */
357357
initialize_readline();
358358

359+
#ifdefHAVE_RL_VARIABLE_BIND
359360
/* set comment-begin to a useful value for SQL */
360361
(void)rl_variable_bind("comment-begin","-- ");
362+
#endif
361363

362364
/* this reads ~/.inputrc, so do it after rl_variable_bind */
363365
rl_initialize();

‎src/include/pg_config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@
485485
/* Define to 1 if you have the `rl_reset_screen_size' function. */
486486
#undef HAVE_RL_RESET_SCREEN_SIZE
487487

488+
/* Define to 1 if you have the `rl_variable_bind' function. */
489+
#undef HAVE_RL_VARIABLE_BIND
490+
488491
/* Define to 1 if you have the <security/pam_appl.h> header file. */
489492
#undef HAVE_SECURITY_PAM_APPL_H
490493

‎src/tools/msvc/Solution.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ sub GenerateFiles
354354
HAVE_RL_FILENAME_QUOTE_CHARACTERS=>undef,
355355
HAVE_RL_FILENAME_QUOTING_FUNCTION=>undef,
356356
HAVE_RL_RESET_SCREEN_SIZE=>undef,
357+
HAVE_RL_VARIABLE_BIND=>undef,
357358
HAVE_SECURITY_PAM_APPL_H=>undef,
358359
HAVE_SETENV=>undef,
359360
HAVE_SETPROCTITLE=>undef,

0 commit comments

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