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