1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff -Naur libgeotiff-1.4.3.orig/bin/Makefile.am libgeotiff-1.4.3/bin/Makefile.am
--- libgeotiff-1.4.3.orig/bin/Makefile.am 2018-12-18 17:07:14.192291200 -0500
+++ libgeotiff-1.4.3/bin/Makefile.am 2018-12-18 17:08:47.527580400 -0500
@@ -12,9 +12,9 @@
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 -Naur libgeotiff-1.4.3.orig/configure.ac libgeotiff-1.4.3/configure.ac
--- libgeotiff-1.4.3.orig/configure.ac 2018-12-18 17:07:14.176672800 -0500
+++ libgeotiff-1.4.3/configure.ac 2018-12-18 17:09:41.171402100 -0500
@@ -281,8 +281,8 @@
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 -Naur libgeotiff-1.4.3.orig/libxtiff/Makefile.am libgeotiff-1.4.3/libxtiff/Makefile.am
--- libgeotiff-1.4.3.orig/libxtiff/Makefile.am 2018-12-18 17:07:14.145435400 -0500
+++ libgeotiff-1.4.3/libxtiff/Makefile.am 2018-12-18 17:10:10.334137900 -0500
@@ -4,7 +4,7 @@
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 -Naur libgeotiff-1.4.3.orig/Makefile.am libgeotiff-1.4.3/Makefile.am
--- libgeotiff-1.4.3.orig/Makefile.am 2018-12-18 17:07:14.067289600 -0500
+++ libgeotiff-1.4.3/Makefile.am 2018-12-18 17:11:10.478667900 -0500
@@ -18,7 +18,7 @@
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
@@ -110,7 +110,7 @@
csv/unit_of_measure.c
endif
-libgeotiff_la_LDFLAGS = -version-info 4:0:2
+libgeotiff_la_LDFLAGS = -version-info 4:0:2 -no-undefined
libgeotiff_la_LIBADD = libxtiff/libxtiff.la
|