Changeset 1720

Timestamp:

02/13/05 13:50:58 (4 years ago)

Author:

morris

Message:

Make rl_completion_display_matches_hook test pass.

Files:

• wire/trunk/configure (modified) (3 diffs)
• wire/trunk/configure.in (modified) (3 diffs)

wire/trunk/configure

@@ -4962 +4962 @@
-                        #include <stdio.h>
-                        #include <readline/readline.h>
+                        char * generator(const char *, int);
-                        char * generator(const char *text, int state) {
-                                return NULL;
-                        }
-                        int main(void) {
-char **matches =
+(void)
-
-                                return 0;
@@ -5006 +5007 @@
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+
+                echo "$as_me:$LINENO: checking whether rl_completion_display_matches_hook is declared" >&5
+echo $ECHO_N "checking whether rl_completion_display_matches_hook is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_rl_completion_display_matches_hook+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                        #include <stdio.h>
+                        #include <readline/readline.h>
+
+
+int
+main ()
+{
+#ifndef rl_completion_display_matches_hook
+  char *p = (char *) rl_completion_display_matches_hook;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl_rl_completion_display_matches_hook=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_rl_completion_display_matches_hook=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_completion_display_matches_hook" >&5
+echo "${ECHO_T}$ac_cv_have_decl_rl_completion_display_matches_hook" >&6
+if test $ac_cv_have_decl_rl_completion_display_matches_hook = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_RL_COMPLETION_DISPLAY_MATCHES_HOOK 0
+_ACEOF
+
+
+fi
+
+
-
-else
@@ -5670 +5739 @@
-#######################################################################
-# Checks for typedefs, structures, and compiler characteristics
-
-echo "$as_me:$LINENO: checking whether rl_completion_display_matches_hook is declared" >&5
-echo $ECHO_N "checking whether rl_completion_display_matches_hook is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_rl_completion_display_matches_hook+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        #include <readline/readline.h>
-
-
-int
-main ()
-{
-#ifndef rl_completion_display_matches_hook
-  char *p = (char *) rl_completion_display_matches_hook;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_rl_completion_display_matches_hook=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl_rl_completion_display_matches_hook=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_completion_display_matches_hook" >&5
-echo "${ECHO_T}$ac_cv_have_decl_rl_completion_display_matches_hook" >&6
-if test $ac_cv_have_decl_rl_completion_display_matches_hook = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_RL_COMPLETION_DISPLAY_MATCHES_HOOK 0
-_ACEOF
-
-
-fi
-
-
-
-# Check whether --enable-largefile or --disable-largefile was given.

wire/trunk/configure.in

@@ -205 +205 @@
-                        #include <stdio.h>
-                        #include <readline/readline.h>
+                        char * generator(const char *, int);
-                        char * generator(const char *text, int state) {
-                                return NULL;
-                        }
-                        int main(void) {
-char **matches =
+(void)
-
-                                return 0;
@@ -219 +220 @@
-                ], [
-                        AC_MSG_RESULT([no])
+                ])
+
+                AC_CHECK_DECLS([rl_completion_display_matches_hook], [], [], [
+                        #include <stdio.h>
+                        #include <readline/readline.h>
-                ])
-        ], [
@@ -259 +265 @@
-#######################################################################
-# Checks for typedefs, structures, and compiler characteristics
-
-AC_CHECK_DECLS([rl_completion_display_matches_hook], [], [], [
-        #include <readline/readline.h>
-])
-
-AC_SYS_LARGEFILE