From ca2549174c6ae817e30168044315dc9a87de56d5 Mon Sep 17 00:00:00 2001
From: Rashad M <mohammedrashadkm@gmail.com>
Date: Sun, 21 Jun 2015 12:44:57 +0200
Subject: libgeotiff: remove ltmain.sh patch and use autoreconf -fi

---
 src/libgeotiff-1-fixes.patch            | 12 ++++++++++++
 src/libgeotiff-1-libtoolfilemagic.patch | 12 ------------
 src/libgeotiff.mk                       |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 src/libgeotiff-1-fixes.patch
 delete mode 100644 src/libgeotiff-1-libtoolfilemagic.patch

diff --git a/src/libgeotiff-1-fixes.patch b/src/libgeotiff-1-fixes.patch
new file mode 100644
index 0000000..aa831b4
--- /dev/null
+++ b/src/libgeotiff-1-fixes.patch
@@ -0,0 +1,12 @@
+diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac
+--- libgeotiff-1.4.0.orig/configure.ac	2015-06-21 03:50:03.341076086 +0200
++++ libgeotiff-1.4.0/configure.ac	2015-06-21 03:50:39.741125191 +0200
+@@ -280,7 +280,7 @@
+   PROJ_INC=-I$PROJ_INC
+ 
+   AC_SUBST(PROJ_INC,$PROJ_INC)
+-  AC_DEFINE(HAVE_PROJECTS_H)
++  AC_DEFINE([HAVE_PROJECTS_H], [], [Description])
+   AC_DEFINE(HAVE_LIBPROJ)
+   AC_SUBST([HAVE_LIBPROJ])
+   PROJ_CONFIG="yes"
diff --git a/src/libgeotiff-1-libtoolfilemagic.patch b/src/libgeotiff-1-libtoolfilemagic.patch
deleted file mode 100644
index 2b213ea..0000000
--- a/src/libgeotiff-1-libtoolfilemagic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bur libgeotiff-1.4.0.orig/ltmain.sh libgeotiff-1.4.0/ltmain.sh
---- libgeotiff-1.4.0.orig/ltmain.sh	2014-10-24 01:20:03.172985419 +0530
-+++ libgeotiff-1.4.0/ltmain.sh	2014-10-24 01:58:50.983491081 +0530
-@@ -2560,7 +2560,7 @@
-     ;;
-   *ar\ archive*) # could be an import, or static
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+       $EGREP 'file format pe-i386(.*architecture: i386)?|pe-x86-64' >/dev/null ; then
-       win32_nmres=`eval $NM -f posix -A $1 |
- 	$SED -n -e '
- 	    1,100{
diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk
index 6dfd961..bdd41fd 100644
--- a/src/libgeotiff.mk
+++ b/src/libgeotiff.mk
@@ -20,6 +20,7 @@ endef
 define $(PKG)_BUILD
     $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in'
     touch '$(1)/configure'
+    cd '$(1)' && autoreconf -fi
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --with-jpeg \
-- 
cgit v0.12