- x32 rebuild

[packages/bash.git] / bash-autoconf.patch

diff --git a/bash-autoconf.patch b/bash-autoconf.patch
index f712d02827ac6d66667830174b64ebe2367153be..59e9d2315d16d560d2a41d22afaf9195e15e2f36 100644 (file)
--- a/bash-autoconf.patch
+++ b/bash-autoconf.patch
@@ -1,26 +1,31 @@
---- bash-2.05b-new/aclocal.m4  Fri Feb  8 00:20:35 2002
-+++ bash-2.05b/aclocal.m4      Thu Feb  7 22:38:32 2002
-@@ -921,8 +921,8 @@
- _bash_needmsg=
+--- bash-3.0/aclocal.m4.orig   2004-05-13 19:37:25.000000000 +0200
++++ bash-3.0/aclocal.m4        2004-08-06 08:39:20.961425816 +0200
+@@ -943,10 +943,10 @@
  fi
  AC_CACHE_VAL(bash_cv_termcap_lib,
--[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+ [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+-  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
 -    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+    [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
-           [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-               bash_cv_termcap_lib=gnutermcap)])])])])
+-        [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
+-          [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
++      [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
++      [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++          [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+               bash_cv_termcap_lib=gnutermcap)])])])])])
+ if test "X$_bash_needmsg" = "Xyes"; then
+ AC_MSG_CHECKING(which library has the termcap functions)
 --- bash-2.05a-new/Makefile.in Fri Feb  8 00:20:46 2002
 +++ bash-2.05a/Makefile.in     Thu Feb  7 22:38:32 2002
-@@ -592,8 +592,8 @@
-       $(SHELL) ./config.status --recheck
+@@ -727,8 +727,8 @@ pathnames.h:               Makefile $(srcdir)/pathnam
+       @${RM} pathnames.tmp
  
  # comment out for distribution
--$(srcdir)/configure:  $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
+-$(srcdir)/configure:  $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
 -      cd $(srcdir) && autoconf
-+#$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
++#$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
 +#     cd $(srcdir) && autoconf
  
  # for chet
  reconfig: force
+