Commit a9afad2a authored by Bob Friesenhahn's avatar Bob Friesenhahn

* 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.
parent e762ba3d
2015-09-01 Bob Friesenhahn <[email protected]>
* 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).
......
......@@ -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
......
......@@ -278,6 +278,7 @@ AWK = @[email protected]
CC = @[email protected]
CCDEPMODE = @[email protected]
CFLAGS = @[email protected]
CMAKE = @[email protected]
CPP = @[email protected]
CPPFLAGS = @[email protected]
CXX = @[email protected]
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment