libast: fix autoreconf

SVN-Revision: 24521

diff --git a/Xorg/lib/libast/Makefile b/Xorg/lib/libast/Makefile
index fea8fbf0d864eaee1f621f5911f2a2706c4b9007..08b64a68fa4b6cf0e31fc94dea9a303e61b98681 100644 (file)
--- 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 343a196e97007a902193ad45e741ff66f07258a6..1d602a828a4568f5f60fb12fc550df6d7dc1b218 100644 (file)
--- 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 6da61181dc86ede7c11c2d84b7a2ef94e3131005..6ca1be64c62d552f2154b5cc75ed62b64996b702 100644 (file)
--- 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