Sophie: mingw-libgeotiff-1.4.0-4.mga5 src

mingw-libgeotiff-1.4.0-4.mga5.src.rpm

diff -rupN libgeotiff-1.4.0/bin/Makefile.am libgeotiff-1.4.0-new/bin/Makefile.am
--- libgeotiff-1.4.0/bin/Makefile.am	2011-10-05 23:34:23.000000000 +0200
+++ libgeotiff-1.4.0-new/bin/Makefile.am	2013-08-08 23:45:38.376229660 +0200
@@ -10,9 +10,9 @@ if TIFF_IS_CONFIG
 TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
 endif
 
-AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) 
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS)
 
-LDADD = ../libgeotiff.la
+LDADD = $(top_builddir)/libgeotiff.la
 
 EXTRA_DIST =    getopt.c
 
diff -rupN libgeotiff-1.4.0/configure.ac libgeotiff-1.4.0-new/configure.ac
--- libgeotiff-1.4.0/configure.ac	2011-10-05 23:34:23.000000000 +0200
+++ libgeotiff-1.4.0-new/configure.ac	2013-08-08 21:43:15.500186740 +0200
@@ -280,8 +280,8 @@ elif test "$PROJ_LIB" != "" -a "$PROJ_IN
   PROJ_INC=-I$PROJ_INC
 
   AC_SUBST(PROJ_INC,$PROJ_INC)
-  AC_DEFINE(HAVE_PROJECTS_H)
-  AC_DEFINE(HAVE_LIBPROJ)
+  AC_DEFINE([HAVE_PROJECTS_H],[1],[have projects.h])
+  AC_DEFINE(HAVE_LIBPROJ,[1],[have libproj])
   AC_SUBST([HAVE_LIBPROJ])
   PROJ_CONFIG="yes"
 
diff -rupN libgeotiff-1.4.0/libxtiff/Makefile.am libgeotiff-1.4.0-new/libxtiff/Makefile.am
--- libgeotiff-1.4.0/libxtiff/Makefile.am	2011-10-05 23:34:23.000000000 +0200
+++ libgeotiff-1.4.0-new/libxtiff/Makefile.am	2013-08-08 21:57:03.808680050 +0200
@@ -4,7 +4,7 @@ if TIFF_IS_CONFIG
 TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
 endif
 
-AM_CFLAGS = -I../ $(TIFF_CFLAGS) 
+AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS)
 
 libxtiff_la_SOURCES = xtiff.c
 
diff -rupN libgeotiff-1.4.0/Makefile.am libgeotiff-1.4.0-new/Makefile.am
--- libgeotiff-1.4.0/Makefile.am	2012-02-24 21:05:38.000000000 +0100
+++ libgeotiff-1.4.0-new/Makefile.am	2013-08-08 23:24:30.878799727 +0200
@@ -18,7 +18,7 @@ if TIFF_IS_CONFIG
 TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
 endif
 
-AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS) \
+AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS) \
 			-DCSV_DATA_DIR=\"$(datadir)/epsg_csv\"
 
 csvdir = $(datadir)/epsg_csv
@@ -108,7 +108,7 @@ if CSV_IS_CONFIG
                              csv/unit_of_measure.c 
 endif
 
-libgeotiff_la_LDFLAGS = -version-info 3:0:1
+libgeotiff_la_LDFLAGS = -version-info 3:0:1 -no-undefined
 
 libgeotiff_la_LIBADD = libxtiff/libxtiff.la