projects
/
claws.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible resource leak
[claws.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index 0b8ff3cca4057404ac934f87f5cf83248f5d0386..f2f62c93d10437f9055c16a2e80a638f1933c81a 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-12,9
+12,9
@@
if [ "$bisonver" = "" ]; then
fi
if [ "$LEX" != "" ]; then
fi
if [ "$LEX" != "" ]; then
- flexver=`$LEX --version|
sed "s/.* //"
`
+ flexver=`$LEX --version|
awk '{print $2}'
`
else
else
- flexver=`flex --version|
sed "s/.* //"
`
+ flexver=`flex --version|
awk '{print $2}'
`
fi
if [ "$flexver" = "" ]; then
fi
if [ "$flexver" = "" ]; then
@@
-24,14
+24,33
@@
else
flex_major=`echo $flexver|sed "s/\..*//"`
flex_minor=`echo $flexver|sed "s/$flex_major\.\(.*\)\..*/\1/"`
flex_micro=`echo $flexver|sed "s/$flex_major\.$flex_minor\.\(.*\)/\1/"`
flex_major=`echo $flexver|sed "s/\..*//"`
flex_minor=`echo $flexver|sed "s/$flex_major\.\(.*\)\..*/\1/"`
flex_micro=`echo $flexver|sed "s/$flex_major\.$flex_minor\.\(.*\)/\1/"`
- if [ $flex_major -lt 2 -o $flex_minor -lt 5 -o $flex_micro -lt 31 ]; then
+
+ flex_numversion=$(expr \
+ $flex_major \* 10000 + \
+ $flex_minor \* 100 + \
+ $flex_micro)
+
+ if [ $flex_numversion -lt 20531 ]; then
echo Flex 2.5.31 or greater is needed to compile Claws Mail git
exit 1
fi
fi
echo Flex 2.5.31 or greater is needed to compile Claws Mail git
exit 1
fi
fi
+case `uname` in
+ Darwin*)
+ if [ "`glibtoolize --version`" = "" ]; then
+ echo MacOS requires glibtool from either Macport or brew
+ exit 1
+ fi
+ LIBTOOL="glibtoolize --force --copy"
+ ;;
+ *)
+ LIBTOOL="libtoolize --force --copy"
+ ;;
+esac
+
aclocal -I m4 \
aclocal -I m4 \
- &&
libtoolize --force --copy
\
+ &&
${LIBTOOL}
\
&& autoheader \
&& automake --add-missing --foreign --copy \
&& autoconf
&& autoheader \
&& automake --add-missing --foreign --copy \
&& autoconf