summaryrefslogtreecommitdiff
path: root/source4/lib/replace
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-12 13:36:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:06 -0500
commit33647bd841c1c74e7dc50e93379e372056ac2df1 (patch)
tree7a53e6b05cbbe239b69988f33e217194c4f40dae /source4/lib/replace
parent66e3a63c19b3541c439778ad3d8cab1d8acf29d4 (diff)
downloadsamba-33647bd841c1c74e7dc50e93379e372056ac2df1.tar.gz
samba-33647bd841c1c74e7dc50e93379e372056ac2df1.tar.bz2
samba-33647bd841c1c74e7dc50e93379e372056ac2df1.zip
r14240: fix summary output (step 2)
we now need to explicit enable external libraries in *.m4 files again... metze (This used to be commit ca809a7910b16a248fffddc640298bbe4cdedc01)
Diffstat (limited to 'source4/lib/replace')
-rw-r--r--source4/lib/replace/readline.m423
1 files changed, 18 insertions, 5 deletions
diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4
index 0d1aa60d17..8248a1d900 100644
--- a/source4/lib/replace/readline.m4
+++ b/source4/lib/replace/readline.m4
@@ -2,6 +2,7 @@
# Readline included by default unless explicitly asked not to
test "${with_readline+set}" != "set" && with_readline=yes
+EXTERNAL_READLINE=no
# test for where we get readline() from
AC_MSG_CHECKING(whether to use readline)
AC_ARG_WITH(readline,
@@ -19,7 +20,7 @@ AC_ARG_WITH(readline,
done
AC_CHECK_LIB(readline, rl_callback_handler_install,
[TERMLIBS="-lreadline $TERMLIBS"
- AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+ EXTERNAL_READLINE=yes
break], [TERMLIBS=], $TERMLIBS)])
;;
no)
@@ -50,7 +51,7 @@ AC_ARG_WITH(readline,
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
TERMLIBS="-lreadline $TERMLIBS"
- AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+ EXTERNAL_READLINE=yes
break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)])
;;
@@ -67,6 +68,18 @@ AC_CHECK_LIB(readline, rl_completion_matches,
[],
[$TERMLIBS])
-SMB_EXT_LIB(READLINE, [${TERMLIBS}])
-
-SMB_SUBSYSTEM(LIBREADLINE, [lib/replace/readline.o], [EXT_LIB_READLINE])
+AC_MSG_CHECKING(whether to use extern readline)
+if test x"$EXTERNAL_READLINE" = x"yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
+ SMB_SUBSYSTEM(LIBREADLINE,
+ [lib/replace/readline.o],
+ [EXT_LIB_READLINE])
+ SMB_EXT_LIB(READLINE, [${TERMLIBS}])
+ SMB_EXT_LIB_ENABLE(READLINE,YES)
+else
+ SMB_SUBSYSTEM(LIBREADLINE,
+ [lib/replace/readline.o],
+ [])
+ AC_MSG_RESULT(no)
+fi