diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 22:58:07 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-09 22:58:07 +0000 |
| commit | 8d1c6fbf20552c2551662be77d7830bd8f9cd0be (patch) | |
| tree | 5c0a433366bcb50adfc53b77380e73f9abe1dd7f | |
| parent | Gtk+ 3 drawing in sp-canvas (diff) | |
| download | inkscape-8d1c6fbf20552c2551662be77d7830bd8f9cd0be.tar.gz inkscape-8d1c6fbf20552c2551662be77d7830bd8f9cd0be.zip | |
Fix build against GTK+ 3. Thorough checking for runtime errors needed :-)
Fixed bugs:
- https://launchpad.net/bugs/972797
(bzr r11483)
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1be367477..354173768 100644 --- a/configure.ac +++ b/configure.ac @@ -401,12 +401,6 @@ else fi AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes") -ink_spell_pkg= -if pkg-config --exists gtkspell-2.0; then - ink_spell_pkg=gtkspell-2.0 - AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -fi - dnl ****************************** dnl PERL checking dnl ****************************** @@ -742,6 +736,13 @@ AC_ARG_ENABLE(gtk3-experimental, with_ext_gdl="no" if test "x$enable_gtk3" = "xyes"; then + + ink_spell_pkg= + if pkg-config --exists gtkspell-3.0; then + ink_spell_pkg=gtkspell-3.0 + AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) + fi + PKG_CHECK_MODULES(INKSCAPE, gtkmm-3.0 glib-2.0 >= 2.24 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo >= 1.10 sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl glibmm-2.4 giomm-2.4, with_gtkmm_3_0=yes, with_gtkmm_3_0=no) if test "x$with_gtkmm_3_0" = "xyes"; then @@ -758,6 +759,13 @@ if test "x$enable_gtk3" = "xyes"; then AC_DEFINE(WITH_EXT_GDL,1,[Build with external GDL]) fi else + + ink_spell_pkg= + if pkg-config --exists gtkspell-2.0; then + ink_spell_pkg=gtkspell-2.0 + AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) + fi + PKG_CHECK_MODULES(INKSCAPE, glib-2.0 >= 2.24 gtk+-2.0 >= 2.20 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo >= 1.10 sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2 gsl glibmm-2.4 giomm-2.4 gdkmm-2.4 gtkmm-2.4 >= 2.10.0) # Disable deprecated symbols to make GTK+ 3 migration easier. |