Commit 2db18876 authored by demo's avatar demo
Browse files

update for fedora and Mac OS compilation

parent 917937fd
Pipeline #141 passed with stage
in 36 minutes and 57 seconds
......@@ -3,7 +3,7 @@ Type: Package
Encoding: UTF-8
Title: Landscape Epidemiology and Evolution
Version: 0.0.4
Date: 2018-04-09
Date: 2018-04-10
Authors@R: c(person("Loup", "Rimbaud", role = "aut", email = "loup.rimbaud@csiro.au"),
person("Julien", "Papaix", role = "aut", email = "julien.papaix@inra.fr"),
person("Jean-Francois", "Rey", role = "cre", email = "jean-francois.rey@inra.fr"))
......
......@@ -37,7 +37,7 @@
#' Package: \tab lansepi\cr
#' Type: \tab Package\cr
#' Version: \tab 0.0.4\cr
#' Date: \tab 2018-04-09\cr
#' Date: \tab 2018-04-10\cr
#' License: \tab GPL (>=2)\cr
#' }
#'
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for landsepi 0.0.3.
# Generated by GNU Autoconf 2.69 for landsepi 0.0.4.
#
# Report bugs to <jean-francois.rey@inra.fr>.
#
......@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='landsepi'
PACKAGE_TARNAME='landsepi'
PACKAGE_VERSION='0.0.3'
PACKAGE_STRING='landsepi 0.0.3'
PACKAGE_VERSION='0.0.4'
PACKAGE_STRING='landsepi 0.0.4'
PACKAGE_BUGREPORT='jean-francois.rey@inra.fr'
PACKAGE_URL=''
......@@ -588,14 +588,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
CXX1XFLAGS
CXX11
host_os
host_vendor
host_cpu
host
build_os
build_vendor
build_cpu
build
OBJEXT
EXEEXT
ac_ct_CXX
......@@ -1208,7 +1200,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures landsepi 0.0.3 to adapt to many kinds of systems.
\`configure' configures landsepi 0.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1265,16 +1257,12 @@ Fine tuning of the installation directories:
_ACEOF
cat <<\_ACEOF
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of landsepi 0.0.3:";;
short | recursive ) echo "Configuration of landsepi 0.0.4:";;
esac
cat <<\_ACEOF
......@@ -1359,7 +1347,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
landsepi configure 0.0.3
landsepi configure 0.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1460,7 +1448,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by landsepi $as_me 0.0.3, which was
It was created by landsepi $as_me 0.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2559,120 +2547,63 @@ $as_echo "yes" >&6; }
CXXFLAGS="${CXXFLAGS} ${GDAL_CFLAGS}"
fi
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
# test if need dep libs ( script from rgdal)
cat > gdal_test.cc <<_EOCONF
#include <gdal.h>
#ifdef __cplusplus
extern "C" {
#endif
int main() {
GDALAllRegister();
}
#ifdef __cplusplus
}
#endif
_EOCONF
LIBS="${LDFLAGS} ${GDAL_LIBS}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gdal: linking with --libs only" >&5
$as_echo_n "checking gdal: linking with --libs only... " >&6; }
${CXX} ${CPPFLAGS} ${CXXFLAGS} -o gdal_test gdal_test.cc ${LIBS} 2> errors.txt
if test `echo $?` -ne 0 ; then
gdalok=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
# These three variables are undocumented and unsupported,
# and are intended to be withdrawn in a future Autoconf release.
# They can cause serious problems if a builder's source tree is in a directory
# whose full name contains unusual characters.
ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_build
shift
build_cpu=$1
build_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
build_os=$*
IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
if test "${gdalok}" = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gdal: linking with --libs and --dep-libs" >&5
$as_echo_n "checking gdal: linking with --libs and --dep-libs... " >&6; }
LIBS="${LIBS} ${GDAL_DEP_LIBS}"
gdalok=yes
${CXX} ${CPPFLAGS} ${CXXFLAGS} -o gdal_test gdal_test.cc ${LIBS} 2>> errors.txt
if test `echo $?` -ne 0 ; then
gdalok=no
fi
if test "${gdalok}" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test "${gdalok}" = no; then
cat errors.txt
{ $as_echo "$as_me:${as_lineno-$LINENO}: Install failure: compilation and/or linkage problems." >&5
$as_echo "$as_me: Install failure: compilation and/or linkage problems." >&6;}
as_fn_error $? "GDALAllRegister not found in libgdal." "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_host
shift
host_cpu=$1
host_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
host_os=$*
IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# Detect the target system
case "${host_os}" in
*darwin*|*elcaptain*|*apple*|*Mac*)
LDFLAGS="${LDFLAGS} ${GDAL_DEP_LIBS}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: \"link static for ${host_os}\"" >&5
$as_echo "$as_me: \"link static for ${host_os}\"" >&6;}
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: \"Normal link for ${host_os}\"" >&5
$as_echo "$as_me: \"Normal link for ${host_os}\"" >&6;}
;;
esac
LDFLAGS="${LDFLAGS} ${GDAL_LIBS}"
rm -f gdal_test errors.txt gdal_test.cc
## /end rgdal script
LDFLAGS="${LIBS}"
CXXFLAGS="${CXXFLAGS}"
......@@ -3229,7 +3160,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by landsepi $as_me 0.0.3, which was
This file was extended by landsepi $as_me 0.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -3282,7 +3213,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
landsepi config.status 0.0.3
landsepi config.status 0.0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -11,7 +11,7 @@ dnl -----------------------------------------------
dnl Package name and version number (user defined)
dnl -----------------------------------------------
define([THE_PACKAGE_NAME], [landsepi])
define([THE_PACKAGE_VERSION], [0.0.3])
define([THE_PACKAGE_VERSION], [0.0.4])
define([THE_PACKAGE_MAINTAINER], [jean-francois.rey@inra.fr])
dnl --------------------------------
......@@ -110,19 +110,56 @@ else
CXXFLAGS="${CXXFLAGS} ${GDAL_CFLAGS}"
fi
AC_CANONICAL_HOST
# Detect the target system
case "${host_os}" in
*darwin*|*elcaptain*|*apple*|*Mac*)
LDFLAGS="${LDFLAGS} ${GDAL_DEP_LIBS}"
AC_MSG_NOTICE(["link static for ${host_os}"])
;;
*)
AC_MSG_NOTICE(["Normal link for ${host_os}"])
;;
esac
LDFLAGS="${LDFLAGS} ${GDAL_LIBS}"
# test if need dep libs ( script from rgdal)
[cat > gdal_test.cc <<_EOCONF
#include <gdal.h>
#ifdef __cplusplus
extern "C" {
#endif
int main() {
GDALAllRegister();
}
#ifdef __cplusplus
}
#endif
_EOCONF]
LIBS="${LDFLAGS} ${GDAL_LIBS}"
AC_MSG_CHECKING(gdal: linking with --libs only)
${CXX} ${CPPFLAGS} ${CXXFLAGS} -o gdal_test gdal_test.cc ${LIBS} 2> errors.txt
if test `echo $?` -ne 0 ; then
gdalok=no
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
fi
if test "${gdalok}" = no; then
AC_MSG_CHECKING(gdal: linking with --libs and --dep-libs)
LIBS="${LIBS} ${GDAL_DEP_LIBS}"
gdalok=yes
${CXX} ${CPPFLAGS} ${CXXFLAGS} -o gdal_test gdal_test.cc ${LIBS} 2>> errors.txt
if test `echo $?` -ne 0 ; then
gdalok=no
fi
if test "${gdalok}" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
fi
if test "${gdalok}" = no; then
cat errors.txt
AC_MSG_NOTICE([Install failure: compilation and/or linkage problems.])
AC_MSG_ERROR([GDALAllRegister not found in libgdal.])
fi
rm -f gdal_test errors.txt gdal_test.cc
## /end rgdal script
LDFLAGS="${LIBS}"
CXXFLAGS="${CXXFLAGS}"
......
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