Changeset 2643 for box/trunk

Timestamp:

26/02/2010 14:11:33 (2 years ago)

Author:

chris

Message:

Detect whether rl_completion_matches or completion_matches is declared
by readline headers at configure time, and use the appropriate one in
bbackupquery. Thanks to Melissa Jenkins for reporting the compilation
failure on OSX and providing additional details.

Location:

box/trunk

Files:

• bin/bbackupquery/bbackupquery.cpp (modified) (1 diff)
• infrastructure/m4/vl_lib_readline.m4 (modified) (2 diffs)

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -133 +133 @@
         if (start == 0)
         {
-                matches = rl_completion_matches(text, command_generator);
+                #ifdef HAVE_RL_COMPLETION_MATCHES
+                        matches = rl_completion_matches(text,
+                                command_generator);
+                #elif defined HAVE_COMPLETION_MATCHES
+                        matches = completion_matches(text, command_generator);
+                #endif
         }
 

box/trunk/infrastructure/m4/vl_lib_readline.m4

@@ -80 +80 @@
 ])
 
+dnl BOX_CHECK_VAR(name, where, headers)
+AC_DEFUN([BOX_CHECK_VAR], [
+  AC_CACHE_CHECK([for $1 $2], [vl_cv_var_$1], 
+    [AC_TRY_LINK([$3], [(void) $1], [vl_cv_var_$1=yes], [vl_cv_var_$1=no])
+    ])
+  if test "${vl_cv_var_$1}" = "yes"; then
+    AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$1), 1, [Define if you have $1 $2])
+  fi
+  ])
+
 dnl VL_LIB_READLINE_CHECK(name, libraries, headers, history headers)
 AC_DEFUN([VL_LIB_READLINE_CHECK], [
@@ -109 +119 @@
   ])
 
+  vl_cv_lib_includes=""
+
   vl_cv_lib_readline_compat_found=no
   if test "x$vl_cv_lib_$1" != "xno"; then
-    AC_CHECK_HEADERS([$3], [vl_cv_lib_readline_compat_found=yes])
+    AC_CHECK_HEADERS([$3], [
+      vl_cv_lib_readline_compat_found=yes
+      vl_cv_lib_includes="$vl_cv_lib_headers #include <$ac_header>"
+    ])
   fi
 
   if test "x$vl_cv_lib_readline_compat_found" = "xyes"; then
+    BOX_CHECK_VAR([rl_completion_matches], [in readline headers],
+      [$vl_cv_lib_includes])
+
+    BOX_CHECK_VAR([completion_matches], [in readline headers],
+      [$vl_cv_lib_includes])
+
     AC_DEFINE([HAVE_LIBREADLINE], 1,
               [Define if you have a readline compatible library])