Mercurial > mxe-octave
annotate src/libgeotiff-1-noundefined.patch @ 4286:03a2432afc32
libgeotiff: update to v1.4.2
* src/libgeotiff-1-noundefined.patch: update patch
* src/libgeotiff.mk: update version, checksum
| author | John D |
|---|---|
| date | Tue, 20 Dec 2016 08:05:57 -0500 |
| parents | 6a4b0052211f |
| children | 8212b14b3233 |
| rev | line source |
|---|---|
| 4286 | 1 diff -ur libgeotiff-1.4.2.orig/configure.ac libgeotiff-1.4.2/configure.ac |
| 2 --- libgeotiff-1.4.2.orig/configure.ac 2016-12-20 07:54:57.947571494 -0500 | |
| 3 +++ libgeotiff-1.4.2/configure.ac 2016-12-20 08:04:22.867573204 -0500 | |
| 4 @@ -281,7 +281,7 @@ | |
|
4033
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
5 PROJ_INC=-I$PROJ_INC |
|
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
6 |
|
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
7 AC_SUBST(PROJ_INC,$PROJ_INC) |
|
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
8 - AC_DEFINE(HAVE_PROJECTS_H) |
| 4286 | 9 + AC_DEFINE([HAVE_PROJECTS_H],[],[D]) |
|
4033
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
10 AC_DEFINE(HAVE_LIBPROJ) |
|
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
11 AC_SUBST([HAVE_LIBPROJ]) |
|
6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents:
3627
diff
changeset
|
12 PROJ_CONFIG="yes" |
| 4286 | 13 @@ -317,7 +317,7 @@ |
| 14 AM_CONDITIONAL([CSV_IS_CONFIG], [test ! x$CSV_CONFIG = xno]) | |
| 15 | |
| 16 | |
| 17 -AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84)) | |
| 18 +AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE([GEO_NORMALIZE_DISABLE_TOWGS84],[],[D])) | |
| 19 | |
| 20 dnl ######################################################################### | |
| 21 dnl Doxygen settings | |
| 22 diff -ur libgeotiff-1.4.2.orig/libxtiff/Makefile.am libgeotiff-1.4.2/libxtiff/Makefile.am | |
| 23 --- libgeotiff-1.4.2.orig/libxtiff/Makefile.am 2016-12-20 07:54:57.946488133 -0500 | |
| 24 +++ libgeotiff-1.4.2/libxtiff/Makefile.am 2016-12-20 07:55:59.005822766 -0500 | |
| 25 @@ -7,5 +7,6 @@ | |
| 26 AM_CFLAGS = -I../ $(TIFF_CFLAGS) | |
| 27 | |
| 28 libxtiff_la_SOURCES = xtiff.c | |
| 29 +libxtiff_la_LIBADD = -ltiff | |
| 30 | |
| 31 noinst_LTLIBRARIES = libxtiff.la | |
| 32 diff -ur libgeotiff-1.4.2.orig/Makefile.am libgeotiff-1.4.2/Makefile.am | |
| 33 --- libgeotiff-1.4.2.orig/Makefile.am 2016-12-20 07:54:57.948654856 -0500 | |
| 34 +++ libgeotiff-1.4.2/Makefile.am 2016-12-20 07:57:15.239801217 -0500 | |
| 35 @@ -110,7 +110,7 @@ | |
| 36 csv/unit_of_measure.c | |
| 37 endif | |
| 38 | |
| 39 -libgeotiff_la_LDFLAGS = -version-info 3:2:1 | |
| 40 +libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined | |
| 41 | |
| 42 libgeotiff_la_LIBADD = libxtiff/libxtiff.la | |
| 43 | |
| 44 diff -ur libgeotiff-1.4.2.orig/Makefile.in libgeotiff-1.4.2/Makefile.in | |
| 45 --- libgeotiff-1.4.2.orig/Makefile.in 2016-12-20 07:54:57.931321073 -0500 | |
| 46 +++ libgeotiff-1.4.2/Makefile.in 2016-12-20 07:57:58.276334784 -0500 | |
| 47 @@ -567,7 +567,7 @@ | |
| 48 geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \ | |
| 49 geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \ | |
| 50 geo_strtod.c geotiff_proj4.c $(am__append_3) | |
| 51 -libgeotiff_la_LDFLAGS = -version-info 3:2:1 | |
| 52 +libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined | |
| 53 libgeotiff_la_LIBADD = libxtiff/libxtiff.la | |
| 54 lib_LTLIBRARIES = libgeotiff.la | |
| 55 EXTRA_DIST = autogen.sh \ |