From a0db000977425a956c78017cc429fa8ea78a93fb Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Dec 2010 19:12:19 +0000
Subject: [PATCH] [packages] libast: fix autoreconf

git-svn-id: svn://svn.openwrt.org/openwrt/packages@24521 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Xorg/lib/libast/Makefile                      |  1 +
 .../patches/010-dont-add-host-paths.patch     | 17 +++++++++++++++--
 Xorg/lib/libast/patches/100-configure.patch   | 19 ++++++++++++++-----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Xorg/lib/libast/Makefile b/Xorg/lib/libast/Makefile
index fea8fbf0d..08b64a68f 100644
--- a/Xorg/lib/libast/Makefile
+++ b/Xorg/lib/libast/Makefile
@@ -48,6 +48,7 @@ endif
 CONFIGURE_VARS+= \
 	dps_cv_snprintf_bug=0 \
 	dps_cv_vsnprintf_bug=0 \
+	dps_cv_symlink_open_bug=0 \
 
 EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
diff --git a/Xorg/lib/libast/patches/010-dont-add-host-paths.patch b/Xorg/lib/libast/patches/010-dont-add-host-paths.patch
index 343a196e9..1d602a828 100644
--- a/Xorg/lib/libast/patches/010-dont-add-host-paths.patch
+++ b/Xorg/lib/libast/patches/010-dont-add-host-paths.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 713e65e..9879341 100755
 --- a/configure
 +++ b/configure
 @@ -27152,10 +27152,10 @@ fi;
@@ -15,3 +13,18 @@ index 713e65e..9879341 100755
      LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
      LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
  
+--- a/libast.m4
++++ b/libast.m4
+@@ -398,10 +398,10 @@ dnl#
+ dnl# LibAST macro for flag post-processing
+ dnl#
+ AC_DEFUN([AST_FLAGS], [
+-    CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"`
++    CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"`
+     CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
+     CFLAGS=${CFLAGS--O}
+-    LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"`
++    LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"`
+     LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
+     LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
+ ])
diff --git a/Xorg/lib/libast/patches/100-configure.patch b/Xorg/lib/libast/patches/100-configure.patch
index 6da61181d..6ca1be64c 100644
--- a/Xorg/lib/libast/patches/100-configure.patch
+++ b/Xorg/lib/libast/patches/100-configure.patch
@@ -1,7 +1,6 @@
-diff -urN libast-0.7.orig/configure libast-0.7/configure
---- libast-0.7.orig/configure	2007-10-09 19:54:01.000000000 +0200
-+++ libast-0.7/configure	2007-10-09 19:57:29.000000000 +0200
-@@ -23906,7 +23906,7 @@
+--- a/configure
++++ b/configure
+@@ -23906,7 +23906,7 @@ else
  
          mkdir conftest.d
          if test "$cross_compiling" = yes; then
@@ -10,4 +9,14 @@ diff -urN libast-0.7.orig/configure libast-0.7/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-
+--- a/libast.m4
++++ b/libast.m4
+@@ -573,7 +573,7 @@ int main(void)
+                 dps_cv_symlink_open_bug=1
+             fi
+         ],
+-        dps_cv_symlink_open_buf=3)
++        dps_cv_symlink_open_bug=3)
+         rm -rf conftest.d
+     ])
+     case "$dps_cv_symlink_open_bug" in