configure.ac (gnumeric-1.12.49.tar.xz) | : | configure.ac (gnumeric-1.12.50.tar.xz) | ||
---|---|---|---|---|
-*- mode: m4 -*- | -*- mode: m4 -*- | |||
dnl We require Automake 1.7.2, which requires Autoconf 2.54. | dnl We require Automake 1.7.2, which requires Autoconf 2.54. | |||
dnl (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.) | dnl (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.) | |||
AC_PREREQ(2.54) | AC_PREREQ(2.54) | |||
AC_CONFIG_MACRO_DIR([m4]) | AC_CONFIG_MACRO_DIR([m4]) | |||
AX_IS_RELEASE([git-directory]) | AX_IS_RELEASE([git-directory]) | |||
m4_define([gnumeric_version_epoch], [1]) | m4_define([gnumeric_version_epoch], [1]) | |||
m4_define([gnumeric_version_major], [12]) | m4_define([gnumeric_version_major], [12]) | |||
m4_define([gnumeric_version_minor], [49]) | m4_define([gnumeric_version_minor], [50]) | |||
m4_define([gnumeric_version_extra], []) | m4_define([gnumeric_version_extra], []) | |||
m4_define([gnumeric_version_full], | m4_define([gnumeric_version_full], | |||
[gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnume ric_version_extra]) | [gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnume ric_version_extra]) | |||
dnl Emphasize some of the checks. | dnl Emphasize some of the checks. | |||
m4_define([BIG_CHECKING], [AC_MSG_CHECKING([ | m4_define([BIG_CHECKING], [AC_MSG_CHECKING([ | |||
======== $1])]) | ======== $1])]) | |||
AC_INIT([gnumeric], [gnumeric_version_full], | AC_INIT([gnumeric], [gnumeric_version_full], | |||
[https://gitlab.gnome.org/GNOME/gnumeric/issues],, | [https://gitlab.gnome.org/GNOME/gnumeric/issues],, | |||
skipping to change at line 300 | skipping to change at line 300 | |||
gda_msg=yes | gda_msg=yes | |||
gnomedb_msg=no | gnomedb_msg=no | |||
AC_ARG_WITH(gda, | AC_ARG_WITH(gda, | |||
AS_HELP_STRING([--with-gda], [Compile the Gnome Database Access plugin]), | AS_HELP_STRING([--with-gda], [Compile the Gnome Database Access plugin]), | |||
if test "x$withval" != xyes; then | if test "x$withval" != xyes; then | |||
try_gda=false | try_gda=false | |||
gda_msg="Disabled by request" | gda_msg="Disabled by request" | |||
fi | fi | |||
) | ) | |||
if test "$try_gda" = true; then | if test "$try_gda" = true; then | |||
PKG_CHECK_MODULES(GDA, [libgda-5.0 >= 5.0.0, libgda-ui-5.0 >= 5.0.0], | PKG_CHECK_MODULES(GDA, [libgda-6.0 >= 6.0.0, libgda-ui-6.0 >= 6.0.0], | |||
[gda_msg=yes], | [gda_msg=yes], | |||
[gda_msg="NO. libgda problem"]) | [gda_msg="NO. libgda problem"]) | |||
if test "$gda_msg" = yes; then | if test "$gda_msg" = yes; then | |||
PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-4.0 >= 3.99.6], | PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-4.0 >= 3.99.6], | |||
[gnomedb_msg="yes"], | [gnomedb_msg="yes"], | |||
[gnomedb_msg="NO. libgnomedb problem"]) | [gnomedb_msg="NO. libgnomedb problem"]) | |||
if test "$gnomedb_msg" = yes; then | if test "$gnomedb_msg" = yes; then | |||
AC_DEFINE(HAVE_LIBGNOMEDB, 1, [ Define if libgnomedb supp ort is compiled in]) | AC_DEFINE(HAVE_LIBGNOMEDB, 1, [ Define if libgnomedb supp ort is compiled in]) | |||
fi | fi | |||
fi | fi | |||
skipping to change at line 900 | skipping to change at line 900 | |||
if $PYTHON -c 'import gi' 2>/dev/null; then | if $PYTHON -c 'import gi' 2>/dev/null; then | |||
have_python_gi=yes | have_python_gi=yes | |||
introspection_py_msg="Yes." | introspection_py_msg="Yes." | |||
[PYTHON_GIOVERRIDESDIR=`$PYTHON -c 'import gi; import os.path; print(os.p ath.dirname(gi.__file__)+"/overrides")'`] | [PYTHON_GIOVERRIDESDIR=`$PYTHON -c 'import gi; import os.path; print(os.p ath.dirname(gi.__file__)+"/overrides")'`] | |||
fi | fi | |||
AC_MSG_RESULT($have_python_gi) | AC_MSG_RESULT($have_python_gi) | |||
fi | fi | |||
AM_CONDITIONAL(HAVE_PYTHON_GI, test "x$have_python_gi" = "xyes") | AM_CONDITIONAL(HAVE_PYTHON_GI, test "x$have_python_gi" = "xyes") | |||
if test "x$python_msg" = xyes; then | if test "x$python_msg" = xyes; then | |||
BIG_CHECKING([for python = 3.x]) | BIG_CHECKING([for python >= 3.x]) | |||
[PY_VERSION=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:3])'` | [major_ver=`$PYTHON -c 'import sys ; sys.stdout.write(str(sys.version_info[0 | |||
major_ver=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:1])'`] | ]))'`] | |||
if test "x$major_ver" = "x3"; then | if test "$major_ver" -ge 3; then | |||
AC_MSG_RESULT(yes) | AC_MSG_RESULT(yes) | |||
if test "x$with_native_win32" = xyes ; then | ||||
# 3.x on linux, 3x on win32 | ||||
PY_VERSION=`echo $PY_VERSION | sed -e 's/\\.//'` | ||||
fi | ||||
else | else | |||
AC_MSG_RESULT([no. $PYTHON is version $PY_VERSION]) | pyversion=`$PYTHON --version` | |||
AC_MSG_RESULT([no. $PYTHON is $pyversion]) | ||||
fi | fi | |||
fi | fi | |||
if test "x$python_msg" = xyes; then | if test "x$python_msg" = xyes; then | |||
if test "x$PY_PREFIX" = x; then | if test "x$PY_PREFIX" = x; then | |||
PY_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.prefix)'` | PY_PREFIX=`$PYTHON -c 'import sys ; sys.stdout.write(sys.prefix)'` | |||
fi | fi | |||
if test "x$PY_INCLUDE_DIR" = x; then | if test "x$PY_INCLUDE_DIR" = x; then | |||
if test "x$with_native_win32" = xyes ; then | if test "x$with_native_win32" = xyes ; then | |||
PY_INCLUDES="-I$PY_PREFIX/include" | PY_INCLUDES="-I$PY_PREFIX/include" | |||
skipping to change at line 953 | skipping to change at line 949 | |||
m4_define([pygobject_required_version], [3.0.0]) | m4_define([pygobject_required_version], [3.0.0]) | |||
PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0 >= pygobject_required_version,, | PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0 >= pygobject_required_version,, | |||
[python_msg="Missing pygobject"]) | [python_msg="Missing pygobject"]) | |||
fi | fi | |||
AM_CONDITIONAL(WITH_PYTHON, test "x$python_msg" = xyes) | AM_CONDITIONAL(WITH_PYTHON, test "x$python_msg" = xyes) | |||
if test "x$python_msg" = xyes; then | if test "x$python_msg" = xyes; then | |||
if test "x$PY_LIB_DIR" = x; then | if test "x$PY_LIB_DIR" = x; then | |||
if test "x$with_native_win32" = xyes ; then | if test "x$with_native_win32" = xyes ; then | |||
PY_LIB_DIR="$PY_PREFIX/libs" | PY_LIB_DIR="$PY_PREFIX/libs" | |||
PY_DASHLPYTHON=FIXME | ||||
else | else | |||
PY_LIB_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys .stdout.write(distutils.sysconfig.get_config_var("LIBPL"))'` | PY_LIB_DIR=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys .stdout.write(distutils.sysconfig.get_config_var("LIBPL"))'` | |||
PY_DASHLPYTHON=`$PYTHON -c 'import sys ; import distutils.sysconfig ; sys.stdout.write(distutils.sysconfig.get_config_var("BLDLIBRARY"))'` | ||||
fi | fi | |||
fi | fi | |||
GNM_PY_CFLAGS="$PY_INCLUDES $PYGOBJECT_CFLAGS" | GNM_PY_CFLAGS="$PY_INCLUDES $PYGOBJECT_CFLAGS" | |||
GNM_PY_LDFLAGS="-L$PY_LIB_DIR -lpython$PY_VERSION $PYGOBJECT_LIBS" | GNM_PY_LDFLAGS="-L$PY_LIB_DIR $PY_DASHLPYTHON $PYGOBJECT_LIBS" | |||
python_msg="yes (using $PYTHON)" | python_msg="yes (using $PYTHON)" | |||
elif test "x$with_python" = "xyes"; then | elif test "x$with_python" = "xyes"; then | |||
AC_MSG_ERROR([$python_msg]) | AC_MSG_ERROR([$python_msg]) | |||
fi | fi | |||
AC_SUBST(GNM_PY_CFLAGS) | AC_SUBST(GNM_PY_CFLAGS) | |||
AC_SUBST(GNM_PY_LDFLAGS) | AC_SUBST(GNM_PY_LDFLAGS) | |||
AC_SUBST(GNM_PY_LIBADD) | AC_SUBST(GNM_PY_LIBADD) | |||
YELP_HELP_INIT(no-lc-dist) | YELP_HELP_INIT(no-lc-dist) | |||
skipping to change at line 1205 | skipping to change at line 1203 | |||
icons/22x22/apps/Makefile | icons/22x22/apps/Makefile | |||
icons/24x24/Makefile | icons/24x24/Makefile | |||
icons/24x24/actions/Makefile | icons/24x24/actions/Makefile | |||
icons/24x24/apps/Makefile | icons/24x24/apps/Makefile | |||
icons/32x32/Makefile | icons/32x32/Makefile | |||
icons/32x32/actions/Makefile | icons/32x32/actions/Makefile | |||
icons/32x32/apps/Makefile | icons/32x32/apps/Makefile | |||
icons/48x48/Makefile | icons/48x48/Makefile | |||
icons/48x48/actions/Makefile | icons/48x48/actions/Makefile | |||
icons/48x48/apps/Makefile | icons/48x48/apps/Makefile | |||
icons/64x64/Makefile | ||||
icons/64x64/actions/Makefile | ||||
icons/256x256/Makefile | icons/256x256/Makefile | |||
icons/256x256/apps/Makefile | icons/256x256/apps/Makefile | |||
introspection/Makefile | introspection/Makefile | |||
src/Makefile | src/Makefile | |||
doc/Makefile | doc/Makefile | |||
plugins/Makefile | plugins/Makefile | |||
plugins/fn-christian-date/Makefile | plugins/fn-christian-date/Makefile | |||
plugins/fn-complex/Makefile | plugins/fn-complex/Makefile | |||
plugins/fn-database/Makefile | plugins/fn-database/Makefile | |||
plugins/fn-date/Makefile | plugins/fn-date/Makefile | |||
End of changes. 9 change blocks. | ||||
12 lines changed or deleted | 13 lines changed or added |