- 3.2.1

[packages/amanda.git] / amanda-as_needed.patch

diff --git a/amanda-as_needed.patch b/amanda-as_needed.patch
index c18ed0450718cb37c476c801b6f937181f6bd6fc..8dbaa01f38045f90989c908120772a112540d68d 100644 (file)
--- a/amanda-as_needed.patch
+++ b/amanda-as_needed.patch
@@ -1,20 +1,16 @@
---- amanda-2.5.1p3/tape-src/Makefile.am.orig   2007-04-01 19:13:41.000000000 +0000
-+++ amanda-2.5.1p3/tape-src/Makefile.am        2007-04-01 19:16:05.000000000 +0000
-@@ -18,6 +18,7 @@
-                       tapeio.c
- 
- libamtape_la_LDFLAGS =  -release $(VERSION)
-+libamtape_la_LIBADD =  ../common-src/libamanda.$(LIB_EXTENSION)
- 
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
---- amanda-2.5.1p3/server-src/Makefile.am.orig 2007-04-01 19:20:04.000000000 +0000
-+++ amanda-2.5.1p3/server-src/Makefile.am      2007-04-01 19:21:06.000000000 +0000
-@@ -34,6 +34,7 @@
-                         taperscan.c
- 
- libamserver_la_LDFLAGS= -release $(VERSION)
-+libamserver_la_LIBADD = ../tape-src/libamtape.$(LIB_EXTENSION)
- 
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
+--- amanda-3.2.1/config/amanda/readline.m4~    2008-03-25 21:23:05.000000000 +0100
++++ amanda-3.2.1/config/amanda/readline.m4     2008-05-07 13:30:33.000000000 +0200
+@@ -96,11 +96,11 @@
+                    ax_cv_lib_readline, [
+       ORIG_LIBS="$LIBS"
+       for readline_lib in readline edit editline; do
+-        for termcap_lib in "" termcap curses ncurses; do
++        for termcap_lib in "" ncurses curses termcap; do
+           if test -z "$termcap_lib"; then
+             TRY_LIB="-l$readline_lib"
+           else
+-            TRY_LIB="-l$readline_lib -l$termcap_lib"
++            TRY_LIB="-l$readline_lib -l$termcap_lib -ltinfo"
+           fi
+           LIBS="$ORIG_LIBS $TRY_LIB"
+           AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")