diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-12 07:16:16 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-12 07:16:16 (GMT) |
| commit | 3438dbad4d018c88b58f25e7d53e0d1dcac1d4b7 (patch) | |
| tree | 79638c8957d54820c9274edf3b9c2b513554aa96 | |
| parent | 966f7eb6242cca891b52a0fe4f52775a086c9cd9 (diff) | |
| parent | b8859a6716f2e42395ca96ca5c6af10e0d02cec8 (diff) | |
Merge pull request #570 from brodykenrick/master
Fix check_dependencies glib2 for Ubuntu 12.10
| -rwxr-xr-x | scripts/check-dependencies.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index e587198..72c4c74 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -74,7 +74,17 @@ glib2_sysver() glib2archtriplet=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null` fi glib2path=$1/lib/$glib2archtriplet/glib-2.0/include/glibconfig.h - if [ ! -e $glib2path ]; then return; fi + if [ ! -e $glib2path ]; then + #No glib found + #glib can be installed in /usr/lib/i386-linux-gnu/glib-2.0/ on arch i686-linux-gnu (sometimes?) + if [ $glib2archtriplet = "i686-linux-gnu" ]; then + glib2archtriplet=i386-linux-gnu + glib2path=$1/lib/$glib2archtriplet/glib-2.0/include/glibconfig.h + if [ ! -e $glib2path ]; then return; fi + else + return; + fi + fi glib2major=`grep "define *GLIB_MAJOR_VERSION *[0-9.]*" $glib2path | awk '{print $3}'` glib2minor=`grep "define *GLIB_MINOR_VERSION *[0-9.]*" $glib2path | awk '{print $3}'` glib2micro=`grep "define *GLIB_MICRO_VERSION *[0-9.]*" $glib2path | awk '{print $3}'` |