diff options
| author | Olivier Andrieu <oandrieu@gmail.com> | 2011-09-11 17:04:50 +0200 |
|---|---|---|
| committer | Olivier Andrieu <oandrieu@gmail.com> | 2011-09-11 17:04:50 +0200 |
| commit | 50a9421c6c351de2e6298d2843b2879d5f00bc8f (patch) | |
| tree | e080128400e9b8762c2035c7fa506e2f93984f08 | |
| parent | 4d202785ffebdc19d4564b2bc79e805f135dfc32 (diff) | |
configure: fix for the case where no lablgtk is present
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6c8c4e9..3775043 100644 --- a/configure.ac +++ b/configure.ac @@ -18,10 +18,11 @@ if test $use_gtk = yes ; then # Check for LablGTK AC_CHECK_OCAML_MODULE(lablgtk, LABLGTKDIR, Gobject, +lablgtk2 +lablgtk) - if test "$LABLGTKDIR" ; then + if test "$lablgtk" != no ; then # Check for gdk-pixbuf PKG_CHECK_MODULES(GDK, cairo gdk-2.0 >= 2.8 gdk-pixbuf-2.0, :, use_gtk=no) else + unset LABLGTKDIR use_gtk=no fi fi @@ -30,7 +31,11 @@ fi PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no) # Optional pango-cairo support -PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no) +if test "$use_gtk" != no ; then + PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no) +else + use_libpangocairo=no +fi echo echo " GTK+ support: $use_gtk" |