81 lines
2.2 KiB
Diff
81 lines
2.2 KiB
Diff
|
diff -Naur bacula-5.2.8.old/autoconf/configure.in bacula-5.2.8/autoconf/configure.in
|
||
|
|
--- bacula-5.2.8.old/autoconf/configure.in 2012-06-10 12:00:42.000000000 +0200
|
||
|
|
+++ bacula-5.2.8/autoconf/configure.in 2012-06-11 14:34:41.612673957 +0200
|
||
|
|
@@ -854,6 +854,9 @@
|
||
|
|
fi
|
||
|
|
]
|
||
|
|
)
|
||
|
|
+if test x$TERM_LIB = x ; then
|
||
|
|
+ support_readline=no
|
||
|
|
+fi
|
||
|
|
|
||
|
|
got_readline="no"
|
||
|
|
READLINE_SRC=
|
||
|
|
@@ -880,7 +883,7 @@
|
||
|
|
AC_CHECK_HEADER(${with_readline}/readline.h,
|
||
|
|
[
|
||
|
|
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
|
||
|
|
- CONS_LIBS="-lreadline -lhistory"
|
||
|
|
+ CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
||
|
|
got_readline="yes"
|
||
|
|
], [
|
||
|
|
echo " "
|
||
|
|
@@ -897,7 +900,7 @@
|
||
|
|
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
|
||
|
|
got_readline="yes"
|
||
|
|
CONS_INC="-I/usr/include/readline"
|
||
|
|
- CONS_LIBS="-lreadline"
|
||
|
|
+ CONS_LIBS="-lreadline $TERM_LIB"
|
||
|
|
], [
|
||
|
|
dnl Did not find standard library, so try Bacula's default
|
||
|
|
AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h,
|
||
|
|
@@ -905,7 +908,7 @@
|
||
|
|
AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
|
||
|
|
got_readline="yes"
|
||
|
|
CONS_INC="-I${TOP_DIR}/depkgs/readline"
|
||
|
|
- CONS_LIBS="-lreadline -lhistory"
|
||
|
|
+ CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
||
|
|
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
|
||
|
|
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
|
||
|
|
], [
|
||
|
|
diff -Naur bacula-5.2.8.old/configure bacula-5.2.8/configure
|
||
|
|
--- bacula-5.2.8.old/configure 2012-06-10 12:00:42.000000000 +0200
|
||
|
|
+++ bacula-5.2.8/configure 2012-06-11 14:47:45.700775708 +0200
|
||
|
|
@@ -22352,6 +22352,9 @@
|
||
|
|
|
||
|
|
fi
|
||
|
|
|
||
|
|
+if test x$TERM_LIB = x ; then
|
||
|
|
+ support_readline=no
|
||
|
|
+fi
|
||
|
|
|
||
|
|
got_readline="no"
|
||
|
|
READLINE_SRC=
|
||
|
|
@@ -22383,7 +22386,7 @@
|
||
|
|
|
||
|
|
$as_echo "#define HAVE_READLINE 1" >>confdefs.h
|
||
|
|
|
||
|
|
- CONS_LIBS="-lreadline -lhistory"
|
||
|
|
+ CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
||
|
|
got_readline="yes"
|
||
|
|
|
||
|
|
else
|
||
|
|
@@ -22409,7 +22412,7 @@
|
||
|
|
|
||
|
|
got_readline="yes"
|
||
|
|
CONS_INC="-I/usr/include/readline"
|
||
|
|
- CONS_LIBS="-lreadline"
|
||
|
|
+ CONS_LIBS="-lreadline $TERM_LIB"
|
||
|
|
|
||
|
|
else
|
||
|
|
|
||
|
|
@@ -22422,7 +22425,7 @@
|
||
|
|
|
||
|
|
got_readline="yes"
|
||
|
|
CONS_INC="-I${TOP_DIR}/depkgs/readline"
|
||
|
|
- CONS_LIBS="-lreadline -lhistory"
|
||
|
|
+ CONS_LIBS="-lreadline -lhistory $TERM_LIB"
|
||
|
|
CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
|
||
|
|
PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
|
||
|
|
|