update cross-configure patch after running autoconf

diff --git a/debian/patches/cross-pkg-config.patch b/debian/patches/cross-pkg-config.patch
index 87818cd..4408c1a 100644 (file)
--- a/debian/patches/cross-pkg-config.patch
+++ b/debian/patches/cross-pkg-config.patch
@@ -4,11 +4,11 @@ Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1996
 Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=1996
 Last-Update: 2011-04-02
 
-Index: b/configure
+Index: openssh/configure
 ===================================================================
---- a/configure
-+++ b/configure
-@@ -8739,8 +8739,9 @@
+--- openssh.orig/configure     2012-05-16 15:51:32.000000000 -0400
++++ openssh/configure  2012-05-16 15:52:28.000000000 -0400
+@@ -8731,8 +8731,9 @@
  if test "${with_libedit+set}" = set; then :
    withval=$with_libedit;  if test "x$withval" != "xno" ; then
                if test "x$withval" = "xyes" ; then
@@ -19,8 +19,8 @@ Index: b/configure
 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_path_PKGCONFIG+:} false; then :
-@@ -8766,7 +8767,6 @@
+ if test "${ac_cv_path_PKGCONFIG+set}" = set; then :
+@@ -8758,7 +8759,6 @@
    done
  IFS=$as_save_IFS
  
@@ -28,7 +28,7 @@ Index: b/configure
    ;;
  esac
  fi
-@@ -8780,6 +8780,63 @@
+@@ -8772,6 +8772,63 @@
  fi
  
  
@@ -39,7 +39,7 @@ Index: b/configure
 +set dummy pkg-config; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKGCONFIG+:} false; then :
++if test "${ac_cv_path_ac_pt_PKGCONFIG+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $ac_pt_PKGCONFIG in
@@ -92,10 +92,10 @@ Index: b/configure
                        if test "x$PKGCONFIG" != "xno"; then
                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about libedit" >&5
  $as_echo_n "checking if $PKGCONFIG knows about libedit... " >&6; }
-Index: b/configure.ac
+Index: openssh/configure.ac
 ===================================================================
---- a/configure.ac
-+++ b/configure.ac
+--- openssh.orig/configure.ac  2012-05-16 15:51:32.000000000 -0400
++++ openssh/configure.ac       2012-05-16 15:51:42.000000000 -0400
 @@ -1349,7 +1349,7 @@
        [  --with-libedit[[=PATH]]   Enable libedit support for sftp],
        [ if test "x$withval" != "xno" ; then
@@ -105,10 +105,10 @@ Index: b/configure.ac
                        if test "x$PKGCONFIG" != "xno"; then
                                AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
                                if "$PKGCONFIG" libedit; then
-Index: b/contrib/Makefile
+Index: openssh/contrib/Makefile
 ===================================================================
---- a/contrib/Makefile
-+++ b/contrib/Makefile
+--- openssh.orig/contrib/Makefile      2012-05-16 15:51:17.000000000 -0400
++++ openssh/contrib/Makefile   2012-05-16 15:51:42.000000000 -0400
 @@ -1,3 +1,5 @@
 +PKG_CONFIG = pkg-config
 +