mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Add upper bounds checking on the versions of guile and g-wrap.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7162 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton
@@ -1,3 +1,9 @@
|
||||
2002-08-11 David Hampton <hampton@employees.org>
|
||||
|
||||
* acinclude.m4:
|
||||
* configure.in: Add upper bounds checking on the versions of
|
||||
guile and g-wrap.
|
||||
|
||||
2002-08-11 Christian Stimming <stimming@tuhh.de>
|
||||
|
||||
* src/import-export/hbci/dialog-pass.h: Added dialogs for password
|
||||
|
||||
109
acinclude.m4
109
acinclude.m4
@@ -3937,10 +3937,10 @@ AC_DEFUN(AC_GWRAP_CHECK_GUILE,
|
||||
fi
|
||||
])
|
||||
|
||||
dnl AM_PATH_GWRAP ([MINIMUM-VERSION, [ACTION-IF-FOUND.
|
||||
dnl AM_PATH_GWRAP ([MINIMUM-VERSION, MAXIMUM-VERSION, [ACTION-IF-FOUND.
|
||||
dnl [ACTION-IF-NOT-FOUND]]])
|
||||
|
||||
dnl tests for minimum version of g-wrap.
|
||||
dnl tests for minimum and maximum versions of g-wrap.
|
||||
dnl sets G_WRAP_CONFIG and GWRAP_OLD_GUILE_SMOB if needed.
|
||||
|
||||
AC_DEFUN(AM_PATH_GWRAP,
|
||||
@@ -3950,7 +3950,9 @@ dnl
|
||||
AC_ARG_WITH(g-wrap-prefix,[ --with-g-wrap-prefix=PFX Prefix where g-wrap is installed (optional)],
|
||||
gwrap_prefix="$withval", g_wrap_prefix="")
|
||||
|
||||
min_gwrap_version=ifelse([$1], , 0.9.1,$1)
|
||||
version_ok=
|
||||
min_gwrap_version=ifelse([$1], , 1.3.2,$1)
|
||||
max_gwrap_version=ifelse([$2], , 99.99.99,$2)
|
||||
|
||||
if test x${GUILE} = x ; then
|
||||
AC_PATH_PROG(GUILE, guile, no)
|
||||
@@ -3970,7 +3972,7 @@ else
|
||||
fi
|
||||
|
||||
if test x$CHECK_VERSION != xno ; then
|
||||
AC_MSG_CHECKING(for g-wrap - version >= ${min_gwrap_version})
|
||||
AC_MSG_CHECKING(for g-wrap - ${min_gwrap_version} <= version < ${max_gwrap_version})
|
||||
|
||||
gwrap_major_version=`${G_WRAP_CONFIG} --version | \
|
||||
sed 's/g-wrap-config \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
@@ -3979,7 +3981,6 @@ gwrap_minor_version=`${G_WRAP_CONFIG} --version | \
|
||||
gwrap_micro_version=`${G_WRAP_CONFIG} --version | \
|
||||
sed 's/g-wrap-config \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
|
||||
major_required=`echo ${min_gwrap_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
minor_required=`echo ${min_gwrap_version} |\
|
||||
@@ -3987,23 +3988,115 @@ minor_required=`echo ${min_gwrap_version} |\
|
||||
micro_required=`echo ${min_gwrap_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
major_prohibited=`echo ${max_gwrap_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
minor_prohibited=`echo ${max_gwrap_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
micro_prohibited=`echo ${max_gwrap_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
|
||||
if ${GUILE} -c "(cond ((> ${gwrap_major_version} ${major_required}) (exit 0))\
|
||||
((< ${gwrap_major_version} ${major_required}) (exit 1))\
|
||||
((> ${gwrap_minor_version} ${minor_required}) (exit 0))\
|
||||
((< ${gwrap_minor_version} ${minor_required}) (exit 1))\
|
||||
((< ${gwrap_micro_version} ${micro_required}) (exit 1))\
|
||||
(else (exit 0)))" ; then
|
||||
if ${GUILE} -c "(cond ((> ${gwrap_major_version} ${major_prohibited}) (exit 1))\
|
||||
((< ${gwrap_major_version} ${major_prohibited}) (exit 0))\
|
||||
((> ${gwrap_minor_version} ${minor_prohibited}) (exit 1))\
|
||||
((< ${gwrap_minor_version} ${minor_prohibited}) (exit 0))\
|
||||
((< ${gwrap_micro_version} ${micro_prohibited}) (exit 0))\
|
||||
(else (exit 1)))" ; then
|
||||
version_ok=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$version_ok"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , true, [$2])
|
||||
ifelse([$3], , true, [$4])
|
||||
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$3], , true , [AC_MSG_WARN(guile check failed)
|
||||
$3])
|
||||
ifelse([$4], , true , [AC_MSG_WARN(gwrap check failed)
|
||||
$4])
|
||||
fi
|
||||
dnl check version
|
||||
fi])
|
||||
|
||||
|
||||
|
||||
dnl AM_GUILE_VERSION_CHECK ([MINIMUM-VERSION, MAXIMUM-VERSION, [ACTION-IF-FOUND.
|
||||
dnl [ACTION-IF-NOT-FOUND]]])
|
||||
|
||||
dnl tests for minimum and maximum versions of guile.
|
||||
|
||||
AC_DEFUN(AM_GUILE_VERSION_CHECK,
|
||||
[
|
||||
dnl
|
||||
dnl
|
||||
|
||||
if test x${GUILE} = x ; then
|
||||
AC_PATH_PROG(GUILE, guile, no)
|
||||
fi
|
||||
|
||||
version_ok=
|
||||
min_guile_version=ifelse([$1], , 1.3,$1)
|
||||
max_guile_version=ifelse([$2], , 99.99.99,$2)
|
||||
|
||||
AC_MSG_CHECKING(for guile - ${min_guile_version} <= version < ${max_guile_version})
|
||||
|
||||
guile_version=`guile-config --version 2>&1`
|
||||
guile_version="$guile_version.0"
|
||||
guile_major_version=`echo $guile_version | \
|
||||
sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
|
||||
guile_minor_version=`echo $guile_version | \
|
||||
sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
|
||||
guile_micro_version=`echo $guile_version | \
|
||||
sed 's/.*Guile version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
|
||||
|
||||
major_required=`echo ${min_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
minor_required=`echo ${min_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
micro_required=`echo ${min_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
major_prohibited=`echo ${max_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
minor_prohibited=`echo ${max_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
micro_prohibited=`echo ${max_guile_version} |\
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
|
||||
|
||||
if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_required}) (exit 0))\
|
||||
((< ${guile_major_version} ${major_required}) (exit 1))\
|
||||
((> ${guile_minor_version} ${minor_required}) (exit 0))\
|
||||
((< ${guile_minor_version} ${minor_required}) (exit 1))\
|
||||
((< ${guile_micro_version} ${micro_required}) (exit 1))\
|
||||
(else (exit 0)))" ; then
|
||||
if ${GUILE} -c "(cond ((> ${guile_major_version} ${major_prohibited}) (exit 1))\
|
||||
((< ${guile_major_version} ${major_prohibited}) (exit 0))\
|
||||
((> ${guile_minor_version} ${minor_prohibited}) (exit 1))\
|
||||
((< ${guile_minor_version} ${minor_prohibited}) (exit 0))\
|
||||
((< ${guile_micro_version} ${micro_prohibited}) (exit 0))\
|
||||
(else (exit 1)))" ; then
|
||||
version_ok=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$version_ok"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$3], , true, [$4])
|
||||
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$4], , true , [AC_MSG_WARN(guile version check failed)
|
||||
$4])
|
||||
fi])
|
||||
|
||||
|
||||
dnl ##############################
|
||||
|
||||
# Configure paths for libguppi
|
||||
|
||||
@@ -116,10 +116,17 @@ GNOME_CHECK_GUILE
|
||||
G_WRAP_COMPILE_ARGS=""
|
||||
G_WRAP_LINK_ARGS=""
|
||||
|
||||
AM_GUILE_VERSION_CHECK(1.3.4, 1.5.0, , [AC_MSG_ERROR([
|
||||
|
||||
guile does not appear to be installed correctly, or is not in the
|
||||
correct version range. Right now gnucash requires at least version
|
||||
1.3.4 to build, but does not work with 1.5 or greater.
|
||||
])])
|
||||
|
||||
AM_PATH_GWRAP(1.3.2, , [AC_MSG_ERROR([
|
||||
|
||||
g-wrap does not appear to be installed correctly, or is not new
|
||||
enough. Right now gnucash requires at least version 1.3.2 to build.
|
||||
enough. Right now gnucash requires at least version 1.3.2 to build
|
||||
as there were major changes between version 1.3.1 and 1.3.2
|
||||
If you need to install g-wrap, you can find it at
|
||||
http://www.gnucash.org/pub/g-wrap.
|
||||
|
||||
Reference in New Issue
Block a user