diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | Makefile.in | 15 | ||||
| -rw-r--r-- | build/Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 42 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | contrib/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/addtiffo/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/dbs/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/dbs/xtiff/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/iptcutil/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/mfs/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/pds/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/ras/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/stream/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/tags/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/win_dib/Makefile.in | 1 | ||||
| -rw-r--r-- | html/Makefile.in | 1 | ||||
| -rw-r--r-- | html/images/Makefile.in | 1 | ||||
| -rw-r--r-- | html/man/Makefile.in | 1 | ||||
| -rw-r--r-- | libtiff/Makefile.in | 1 | ||||
| -rw-r--r-- | man/Makefile.in | 1 | ||||
| -rw-r--r-- | port/Makefile.in | 1 | ||||
| -rw-r--r-- | test/Makefile.in | 1 | ||||
| -rw-r--r-- | tools/Makefile.in | 1 |
25 files changed, 87 insertions, 12 deletions
@@ -1,5 +1,10 @@ 2015-09-01 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + * Makefile.am (distcheck-hook), configure.ac: Applied patches by + Roger Leigh (via tiff mailing list on 2015-09-01) to fix issue + with BSD make and to make use of cmake in 'distcheck' target + conditional on if cmake is available. + * CMakeLists.txt, Makefile.am, configure.ac: Applied patches by Roger Leigh (via tiff mailing list on 2015-09-01). diff --git a/Makefile.am b/Makefile.am index 012794b2..b10f4900 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,12 +50,14 @@ EXTRA_DIST = \ dist_doc_DATA = $(docfiles) distcheck-hook: - mkdir $(distdir)/_build/cmake \ - && cd $(distdir)/_build/cmake \ - && cmake ../.. \ - && $(MAKE) \ - && ctest -V \ - && $(MAKE) DESTDIR=../../_inst/cmake install + if [ -x "$(CMAKE)" ]; then \ + mkdir $(distdir)/_build/cmake \ + && cd $(distdir)/_build/cmake \ + && cmake ../.. \ + && $(MAKE) \ + && ctest -V \ + && $(MAKE) DESTDIR=../../_inst/cmake install ; \ + fi $(RM) -r $(distdir)/_build/cmake $(RM) -r $(distdir)/_inst/cmake diff --git a/Makefile.in b/Makefile.in index 12f0e620..b98c6669 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,6 +278,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -953,12 +954,14 @@ uninstall-am: uninstall-dist_docDATA uninstall-pkgconfigDATA distcheck-hook: - mkdir $(distdir)/_build/cmake \ - && cd $(distdir)/_build/cmake \ - && cmake ../.. \ - && $(MAKE) \ - && ctest -V \ - && $(MAKE) DESTDIR=../../_inst/cmake install + if [ -x "$(CMAKE)" ]; then \ + mkdir $(distdir)/_build/cmake \ + && cd $(distdir)/_build/cmake \ + && cmake ../.. \ + && $(MAKE) \ + && ctest -V \ + && $(MAKE) DESTDIR=../../_inst/cmake install ; \ + fi $(RM) -r $(distdir)/_build/cmake $(RM) -r $(distdir)/_inst/cmake diff --git a/build/Makefile.in b/build/Makefile.in index b12c098b..912f83df 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -222,6 +222,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -698,6 +698,7 @@ DLLTOOL AS HAVE_LD_VERSION_SCRIPT_FALSE HAVE_LD_VERSION_SCRIPT_TRUE +CMAKE LN_S am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -4770,6 +4771,47 @@ else $as_echo "no, using $LN_S" >&6; } fi +# Used only for validating the source distribution during distcheck +# Extract the first word of "cmake", so it can be a program name with args. +set dummy cmake; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CMAKE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CMAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_CMAKE="$CMAKE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CMAKE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +CMAKE=$ac_cv_path_CMAKE +if test -n "$CMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMAKE" >&5 +$as_echo "$CMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Check if LD supports linker scripts, and define automake conditional diff --git a/configure.ac b/configure.ac index f9785227..c195bd8c 100644 --- a/configure.ac +++ b/configure.ac @@ -109,8 +109,11 @@ AM_PROG_CC_C_O dnl We want warnings. As many warnings as possible. VL_PROG_CC_WARNINGS() +dnl Checks for programs AC_PROG_INSTALL AC_PROG_LN_S +# Used only for validating the source distribution during distcheck +AC_PATH_PROG(CMAKE, cmake) # Check if LD supports linker scripts, and define automake conditional diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 9c885fa1..e7eab070 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -221,6 +221,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/addtiffo/Makefile.in b/contrib/addtiffo/Makefile.in index 8c872b5e..965538c2 100644 --- a/contrib/addtiffo/Makefile.in +++ b/contrib/addtiffo/Makefile.in @@ -212,6 +212,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/dbs/Makefile.in b/contrib/dbs/Makefile.in index a98dace1..b8ecf5cb 100644 --- a/contrib/dbs/Makefile.in +++ b/contrib/dbs/Makefile.in @@ -265,6 +265,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in index 25d3f584..78607e50 100644 --- a/contrib/dbs/xtiff/Makefile.in +++ b/contrib/dbs/xtiff/Makefile.in @@ -164,6 +164,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/iptcutil/Makefile.in b/contrib/iptcutil/Makefile.in index e30ea564..31a68d7c 100644 --- a/contrib/iptcutil/Makefile.in +++ b/contrib/iptcutil/Makefile.in @@ -211,6 +211,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/mfs/Makefile.in b/contrib/mfs/Makefile.in index 6fda13b7..0ac42efc 100644 --- a/contrib/mfs/Makefile.in +++ b/contrib/mfs/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/pds/Makefile.in b/contrib/pds/Makefile.in index 27f07121..e5349eb3 100644 --- a/contrib/pds/Makefile.in +++ b/contrib/pds/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/ras/Makefile.in b/contrib/ras/Makefile.in index 51691d9d..5eb9312f 100644 --- a/contrib/ras/Makefile.in +++ b/contrib/ras/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/stream/Makefile.in b/contrib/stream/Makefile.in index c2d287cf..a72e6d4e 100644 --- a/contrib/stream/Makefile.in +++ b/contrib/stream/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/tags/Makefile.in b/contrib/tags/Makefile.in index ad328f17..866c2dd6 100644 --- a/contrib/tags/Makefile.in +++ b/contrib/tags/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/contrib/win_dib/Makefile.in b/contrib/win_dib/Makefile.in index 76e5c174..7515febd 100644 --- a/contrib/win_dib/Makefile.in +++ b/contrib/win_dib/Makefile.in @@ -161,6 +161,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/html/Makefile.in b/html/Makefile.in index 06568f47..51653e56 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -253,6 +253,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/html/images/Makefile.in b/html/images/Makefile.in index 5a23411f..b505d31e 100644 --- a/html/images/Makefile.in +++ b/html/images/Makefile.in @@ -192,6 +192,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/html/man/Makefile.in b/html/man/Makefile.in index 31eebf55..30e41136 100644 --- a/html/man/Makefile.in +++ b/html/man/Makefile.in @@ -192,6 +192,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 7c7f9f7f..7343e8f6 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -313,6 +313,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/man/Makefile.in b/man/Makefile.in index c042344c..91255373 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -193,6 +193,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/port/Makefile.in b/port/Makefile.in index c7cd118f..7c2971c2 100644 --- a/port/Makefile.in +++ b/port/Makefile.in @@ -211,6 +211,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/test/Makefile.in b/test/Makefile.in index 0b2cf1d6..29b008a1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -494,6 +494,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 317b3922..43e4347e 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -321,6 +321,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CMAKE = @CMAKE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ |