Changeset 4379

Timestamp:

09/20/06 22:54:14 (2 years ago)

Author:

morris

Message:

Detect when using non-GNU readline (such as the default editline wrapper on OSX)

Files:

• wire/trunk/configure (modified) (1 diff)
• wire/trunk/configure.in (modified) (1 diff)

wire/trunk/configure

@@ -5849 +5849 @@
-
-                LIBS="$LIBS -lreadline"
+
+                echo "$as_me:$LINENO: checking for GNU readline" >&5
+echo $ECHO_N "checking for GNU readline... $ECHO_C" >&6
+                if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+
+                        #include <stdio.h>
+                        #include <readline/readline.h>
+                        int main(void) {
+                                return rl_gnu_readline_p ? 0 : 1;
+                        }
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (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
+
+                        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+
+                        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+        { { echo "$as_me:$LINENO: error: could not locate GNU readline
+
+If you installed GNU readline into a non-standard directory, please run:
+
+    CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&5
+echo "$as_me: error: could not locate GNU readline
+
+If you installed GNU readline into a non-standard directory, please run:
+
+    CPPFLAGS=\"-I/path/to/include\" LDFLAGS=\"-L/path/to/lib\" ./configure" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
-
-                echo "$as_me:$LINENO: checking for rl_completion_matches" >&5

wire/trunk/configure.in

@@ -263 +263 @@
-                LIBS="$LIBS -lreadline"
-
+                AC_MSG_CHECKING([for GNU readline])
+                AC_RUN_IFELSE([
+                        #include <stdio.h>
+                        #include <readline/readline.h>
+                        int main(void) {
+                                return rl_gnu_readline_p ? 0 : 1;
+                        }
+                ], [
+                        AC_MSG_RESULT([yes])
+                ], [
+                        AC_MSG_RESULT([no])
+                        WR_MSG_LIB_ERROR([GNU readline])
+                ])
+
-                AC_MSG_CHECKING([for rl_completion_matches])
-                AC_RUN_IFELSE([