Codebase list libgeotiff / upstream/1.4.2_rc4
Imported Upstream version 1.4.2~rc4 Bas Couwenberg 7 years ago
8 changed file(s) with 47 addition(s) and 47 deletion(s). Raw diff Collapse all Expand all
0 2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
0 2016-08-18 Even Rouault <even dot rouault at spatialys dot com>
1
2 * Makefile.am: Fix build issue on Windows with cmake by not
3 including generate geo_config.h in the dist .zip/.tar.gz
4 * geotiff.h cpl_serv.h: change #include "geo_config.h" to #include <geo_config.h>
5 * cpl_serv.h: do not include <strings.h> on _WIN32 even if HAVE_STRINGS_H is defined
6 * cpl_config.h.vc: remove #define HAVE_STRINGS_H 1
7 * cpl_serv.c: remove includes of string.h and strings.h. Already done by cpl_serv.h
8 * Prepare for 1.4.2RC4
9
10 2016-08-17 Even Rouault <even dot rouault at spatialys dot com>
111
212 * Prepare for 1.4.2RC3
313
5959 csv/vertcs.override.csv
6060
6161 include_HEADERS = geotiff.h \
62 geo_config.h \
6362 geotiffio.h \
6463 geovalues.h \
6564 geonames.h \
8180 geokeys.inc \
8281 geo_incode_defs.h
8382
83 nodist_include_HEADERS = geo_config.h
8484
8585 libgeotiff_la_SOURCES = cpl_serv.c \
8686 cpl_csv.c \
167167 $(am__cd) "$$dir" && rm -f $$files; }; \
168168 }
169169 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" \
170 "$(DESTDIR)$(includedir)"
170 "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
171171 LTLIBRARIES = $(lib_LTLIBRARIES)
172172 libgeotiff_la_DEPENDENCIES = libxtiff/libxtiff.la
173173 am__libgeotiff_la_SOURCES_DIST = cpl_serv.c cpl_csv.c geo_extra.c \
244244 *) (install-info --version) >/dev/null 2>&1;; \
245245 esac
246246 DATA = $(dist_csv_DATA)
247 HEADERS = $(include_HEADERS)
247 HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
248248 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
249249 distclean-recursive maintainer-clean-recursive
250250 am__recursive_targets = \
540540 csv/vertcs.override.csv
541541
542542 include_HEADERS = geotiff.h \
543 geo_config.h \
544543 geotiffio.h \
545544 geovalues.h \
546545 geonames.h \
562561 geokeys.inc \
563562 geo_incode_defs.h
564563
564 nodist_include_HEADERS = geo_config.h
565565 libgeotiff_la_SOURCES = cpl_serv.c cpl_csv.c geo_extra.c geo_free.c \
566566 geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \
567567 geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \
801801 uninstall-includeHEADERS:
802802 @$(NORMAL_UNINSTALL)
803803 @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
804 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
805 dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
806 install-nodist_includeHEADERS: $(nodist_include_HEADERS)
807 @$(NORMAL_INSTALL)
808 @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
809 if test -n "$$list"; then \
810 echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
811 $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
812 fi; \
813 for p in $$list; do \
814 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
815 echo "$$d$$p"; \
816 done | $(am__base_list) | \
817 while read files; do \
818 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
819 $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
820 done
821
822 uninstall-nodist_includeHEADERS:
823 @$(NORMAL_UNINSTALL)
824 @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
804825 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
805826 dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
806827
11021123 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) geo_config.h
11031124 installdirs: installdirs-recursive
11041125 installdirs-am:
1105 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)"; do \
1126 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
11061127 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
11071128 done
11081129 install: install-recursive
11621183
11631184 info-am:
11641185
1165 install-data-am: install-dist_csvDATA install-includeHEADERS
1186 install-data-am: install-dist_csvDATA install-includeHEADERS \
1187 install-nodist_includeHEADERS
11661188
11671189 install-dvi: install-dvi-recursive
11681190
12111233 ps-am:
12121234
12131235 uninstall-am: uninstall-dist_csvDATA uninstall-includeHEADERS \
1214 uninstall-libLTLIBRARIES
1236 uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
12151237
12161238 .MAKE: $(am__recursive_targets) all install-am install-strip
12171239
12271249 install-dist_csvDATA install-dvi install-dvi-am install-exec \
12281250 install-exec-am install-html install-html-am \
12291251 install-includeHEADERS install-info install-info-am \
1230 install-libLTLIBRARIES install-man install-pdf install-pdf-am \
1252 install-libLTLIBRARIES install-man \
1253 install-nodist_includeHEADERS install-pdf install-pdf-am \
12311254 install-ps install-ps-am install-strip installcheck \
12321255 installcheck-am installdirs installdirs-am maintainer-clean \
12331256 maintainer-clean-generic mostlyclean mostlyclean-compile \
12341257 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
12351258 tags tags-am uninstall uninstall-am uninstall-dist_csvDATA \
1236 uninstall-includeHEADERS uninstall-libLTLIBRARIES
1259 uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1260 uninstall-nodist_includeHEADERS
12371261
12381262
12391263 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
2525
2626 #include "cpl_serv.h"
2727 #include "geo_tiffp.h"
28
29 #ifdef HAVE_STRING_H
30 # include <string.h>
31 #endif
32 #if defined(HAVE_STRINGS_H) && !defined(HAVE_STRING_H)
33 # include <strings.h>
34 #endif
3528
3629 /************************************************************************/
3730 /* CPLCalloc() */
3232 /* Standard include files. */
3333 /* ==================================================================== */
3434
35 #include "geo_config.h"
35 #include <geo_config.h>
3636 #include <stdio.h>
3737
3838 #include <math.h>
4040 #ifdef HAVE_STRING_H
4141 # include <string.h>
4242 #endif
43 #ifdef HAVE_STRINGS_H
43 #if defined(HAVE_STRINGS_H) && !defined(_WIN32)
4444 # include <strings.h>
4545 #endif
4646 #ifdef HAVE_STDLIB_H
+0
-22
geo_config.h less more
0 /* geo_config.h. Generated from geo_config.h.in by configure. */
1 #ifndef GEO_CONFIG_H
2 #define GEO_CONFIG_H
3
4 /* Define if you have the ANSI C header files. */
5 #define STDC_HEADERS 1
6
7 /* Define if you have the <stdlib.h> header file. */
8 #define HAVE_STDLIB_H 1
9
10 /* Define if you have the <string.h> header file. */
11 #define HAVE_STRING_H 1
12
13 /* Define if you have the <strings.h> header file. */
14 #define HAVE_STRINGS_H 1
15
16 #define HAVE_LIBPROJ 1
17 /* #undef HAVE_PROJECTS_H */
18
19 /* #undef GEO_NORMALIZE_DISABLE_TOWGS84 */
20
21 #endif /* ndef GEO_CONFIG_H */
1919 #define HAVE_STRING_H 1
2020 #endif
2121
22 /* Define if you have the <strings.h> header file. */
23 #ifndef HAVE_STRINGS_H
24 #define HAVE_STRINGS_H 1
25 #endif
26
2722 /* Build as DLL */
2823 #define BUILD_AS_DLL 1
2924
3131
3232 #define LIBGEOTIFF_VERSION 1420
3333
34 #include "geo_config.h"
34 #include <geo_config.h>
3535 #include "geokeys.h"
3636
3737 /**********************************************************************