Hi, please review attached patch. It removes bash-isms from configure script, allowing it to build on obscure systems where /bin/sh != bash, like BSD systems...
I'd love to see it included, as reducing local patches is always good.
--
Pav Lucistnik <[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
--- configure.in.orig Fri Nov 28 07:15:33 2003
+++ configure.in Wed Dec 3 17:27:28 2003
@@ -10,11 +10,11 @@
AC_HEADER_STDC
EVO_VER=`evolution --version | sed -e 's/.nome .volution //g'`
-EVO_MAJVER=${EVO_VER:0:1}
-EVO_MINVER=${EVO_VER:2:1}
+EVO_MAJVER=`echo ${EVO_VER} | awk -F . '{print $1}'`
+EVO_MINVER=`echo ${EVO_VER} | awk -F . '{print $2}'`
pkg_modules="gtk+-2.0 glib libbonobo-2.0"
-if (( EVO_MAJVER > 1 || ( EVO_MAJVER==1 && EVO_MINVER >= 4))); then
+if ( [ ${EVO_MAJVER} -gt 1 ] || ( [ ${EVO_MAJVER} = 1 ] && [ ${EVO_MINVER} -ge 4 ])); then
pkg_modules="${pkgmodules} evolution-addressbook evolution-calendar libgnomeui-2.0"
else
AC_MSG_ERROR(This version of the Evolution plugin (and MultiSync) does only work with Evolution >= 1.4.)
@@ -45,8 +45,8 @@
if test "x${HAVE_EVOLUTION}" = "xno"; then
AC_MSG_ERROR(Evolution must be installed.)
fi
-AC_DEFINE_UNQUOTED(EVOLUTION_VERSION,"${EVO_VER:0:5}","The compiled Evolution version")
-echo Detected evolution ${EVO_VER:0:5}.
+AC_DEFINE_UNQUOTED(EVOLUTION_VERSION,"${EVO_VER}","The compiled Evolution version")
+echo Detected evolution ${EVO_VER}.
EVO_LIBS=
EVO_DFLAGS=
rm -rf liblinks &> /dev/null
@@ -54,13 +54,13 @@
for evolib in ebook camel cal-client cal-util eame eutil ical-evolution\
wombat ename; do
EVOLIB=`find ${EVO_LIB_PATH} -name "lib${evolib}.so" 2>/dev/null | sed -e 'q'`
-if test "x${EVOLIB:0:1}" != "x/"; then
+if test "x`echo ${EVOLIB} | cut -c 1,1`" != "x/"; then
EVOLIB=`find ${EVO_LIB_PATH} -name "lib${evolib}.so*" 2>/dev/null | sed -e 'q'`
EVO_CREATE_SO="yes"
else
EVO_CREATE_SO="no"
fi
-if test "x${EVOLIB:0:1}" = "x/"; then
+if test "x`echo ${EVOLIB} | cut -c 1,1`" = "x/"; then
echo Found ${evolib}.
EVOLIBDIR=`dirname ${EVOLIB}`
if test ${EVOLIBDIR} != "/usr/lib"; then
signature.asc
Description: Toto je =?iso-8859-2?Q?digit=E1ln=EC?= =?ISO-8859-1?Q?_podepsan=E1?= =?iso-8859-2?Q?_=E8=E1st?= =?ISO-8859-1?Q?_zpr=E1vy?=
