Skip to content

Commit

Permalink
- Configure now handles libqwt5.so (from arch AUR)
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12504 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Aug 13, 2012
1 parent 585ce8e commit a3419d1
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions configure.in
Expand Up @@ -495,9 +495,20 @@ if test -n "$QMAKE"; then
for f in {/usr,/opt,$PREFIX}/include/{qwt5,qwt,qwt-qt4}/; do
test -f "$f/qwt.h" && with_qwt="$f" || with_qwt_checked="$with_qwt_checked $f"
done
echo $with_qwt | grep -q -- -qt4 && with_qwt_suffix="-qt4"
if grep -q 'QWT_VERSION *0x05@<:@0-9@:>@\{4\}$' "$with_qwt/qwt_global.h"; then
# Arch Linux AUR qwt5 package uses library name=qwt5 for both include and lib
for f in {/usr,/opt,/usr/local,$PREFIX}/lib/libqwt5.so; do
test -e "$f" && with_qwt_suffix="5"
done
# Look for QWT_VERSION 5 or 6 since we support both
elif grep -q 'QWT_VERSION *0x0@<:@5-6@:>@@<:@0-9@:>@\{4\}$' "$with_qwt/qwt_global.h"; then
true
else
with_qwt="bad"
fi
with_qwt_res=$with_qwt
grep -q 'QWT_VERSION *0x0@<:@5-6@:>@@<:@0-9@:>@\{4\}$' "$with_qwt/qwt_global.h" || with_qwt="bad"
echo $with_qwt | grep -q -- -qt4 && with_qwt_suffix="-qt4"
echo with_qwt_suffix=$with_qwt_suffix
fi

if test x"$with_qwt" = "xno"; then
Expand Down

0 comments on commit a3419d1

Please sign in to comment.