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

Commit804a786

Browse files
committed
Add/fix caching on some configure checks
1 parentfe48d94 commit804a786

File tree

4 files changed

+226
-145
lines changed

4 files changed

+226
-145
lines changed

‎config/c-compiler.m4

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,18 @@ fi])# PGAC_C_FUNCNAME_SUPPORT
126126
# Given a string, check if the compiler supports the string as a
127127
# command-line option. If it does, add the string to CFLAGS.
128128
AC_DEFUN([PGAC_PROG_CC_CFLAGS_OPT],
129-
[AC_MSG_CHECKING([if $CC supports$1])
130-
pgac_save_CFLAGS=$CFLAGS
129+
[define([Ac_cachevar],[AS_TR_SH([pgac_cv_prog_cc_cflags_$1])])dnl
130+
AC_CACHE_CHECK([whether $CC supports$1],[Ac_cachevar],
131+
[pgac_save_CFLAGS=$CFLAGS
131132
CFLAGS="$pgac_save_CFLAGS$1"
132133
_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
133-
AC_MSG_RESULT(yes),
134-
[CFLAGS="$pgac_save_CFLAGS"
135-
AC_MSG_RESULT(no)])
134+
[Ac_cachevar=yes],
135+
[Ac_cachevar=no])
136+
CFLAGS="$pgac_save_CFLAGS"])
137+
if test x"$Ac_cachevar" = x"yes"; then
138+
CFLAGS="$CFLAGS$1"
139+
fi
140+
undefine([Ac_cachevar])dnl
136141
])# PGAC_PROG_CC_CFLAGS_OPT
137142

138143

@@ -145,13 +150,17 @@ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
145150
# you can link to a particular function, not just whether you can link.
146151
# In fact, we must actually check that the resulting program runs :-(
147152
AC_DEFUN([PGAC_PROG_CC_LDFLAGS_OPT],
148-
[AC_MSG_CHECKING([if $CC supports$1])
149-
pgac_save_LDFLAGS=$LDFLAGS
153+
[define([Ac_cachevar],[AS_TR_SH([pgac_cv_prog_cc_ldflags_$1])])dnl
154+
AC_CACHE_CHECK([whether $CC supports$1],[Ac_cachevar],
155+
[pgac_save_LDFLAGS=$LDFLAGS
150156
LDFLAGS="$pgac_save_LDFLAGS$1"
151157
AC_RUN_IFELSE([AC_LANG_PROGRAM([extern void$2 (); void (*fptr) () =$2;],[])],
152-
AC_MSG_RESULT(yes),
153-
[LDFLAGS="$pgac_save_LDFLAGS"
154-
AC_MSG_RESULT(no)],
155-
[LDFLAGS="$pgac_save_LDFLAGS"
156-
AC_MSG_RESULT(assumingno)])
158+
[Ac_cachevar=yes],
159+
[Ac_cachevar=no],
160+
[Ac_cachevar="assuming no"])
161+
LDFLAGS="$pgac_save_LDFLAGS"])
162+
if test x"$Ac_cachevar" = x"yes"; then
163+
LDFLAGS="$LDFLAGS$1"
164+
fi
165+
undefine([Ac_cachevar])dnl
157166
])# PGAC_PROG_CC_LDFLAGS_OPT

‎config/programs.m4

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,14 @@ AC_SUBST(FLEXFLAGS)
117117
AC_DEFUN([PGAC_CHECK_READLINE],
118118
[AC_REQUIRE([AC_CANONICAL_HOST])
119119
120-
AC_CACHE_VAL([pgac_cv_check_readline],
120+
AC_CACHE_CHECK([for library containing readline],[pgac_cv_check_readline],
121121
[pgac_cv_check_readline=no
122122
pgac_save_LIBS=$LIBS
123123
if test x"$with_libedit_preferred" != x"yes"
124124
thenREADLINE_ORDER="-lreadline -ledit"
125125
elseREADLINE_ORDER="-ledit -lreadline"
126126
fi
127127
for pgac_rllib in $READLINE_ORDER ; do
128-
AC_MSG_CHECKING([for ${pgac_rllib}])
129128
for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
130129
LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
131130
AC_TRY_LINK_FUNC([readline],[[
@@ -144,14 +143,11 @@ for pgac_rllib in $READLINE_ORDER ; do
144143
]])
145144
done
146145
if test "$pgac_cv_check_readline" != no ; then
147-
AC_MSG_RESULT([yes ($pgac_cv_check_readline)])
148146
break
149-
else
150-
AC_MSG_RESULT(no)
151147
fi
152148
done
153149
LIBS=$pgac_save_LIBS
154-
])[]dnlAC_CACHE_VAL
150+
])[]dnlAC_CACHE_CHECK
155151
156152
if test "$pgac_cv_check_readline" != no ; then
157153
LIBS="$pgac_cv_check_readline $LIBS"
@@ -167,19 +163,21 @@ fi
167163
# Readline versions < 2.1 don't have rl_completion_append_character
168164

169165
AC_DEFUN([PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER],
170-
[AC_MSG_CHECKING([for rl_completion_append_character])
171-
AC_TRY_LINK([#include <stdio.h>
166+
[AC_CACHE_CHECK([for rl_completion_append_character],pgac_cv_var_rl_completion_append_character,
167+
[AC_TRY_LINK([#include <stdio.h>
172168
#ifdef HAVE_READLINE_READLINE_H
173169
# include <readline/readline.h>
174170
#elif defined(HAVE_READLINE_H)
175171
# include <readline.h>
176172
#endif
177173
],
178174
[rl_completion_append_character = 'x';],
179-
[AC_MSG_RESULT(yes)
175+
[pgac_cv_var_rl_completion_append_character=yes],
176+
[pgac_cv_var_rl_completion_append_character=no])])
177+
if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
180178
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER,1,
181-
[Define to 1 if you have the global variable 'rl_completion_append_character'.])],
182-
[AC_MSG_RESULT(no)])])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
179+
[Define to 1 if you have the global variable 'rl_completion_append_character'.])
180+
fi])# PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
183181

184182

185183

0 commit comments

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