diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-16 10:59:18 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-06-16 10:59:18 +0000 |
| commit | 6e6674c6548c3dff4f532cc807c47786586e9f26 (patch) | |
| tree | 9048abc786395af0f610dab14a6232854f4f2bb9 | |
| parent | Translations. Fix for Bug #837856 (Help: localized keys and mouse refs is not... (diff) | |
| download | inkscape-6e6674c6548c3dff4f532cc807c47786586e9f26.tar.gz inkscape-6e6674c6548c3dff4f532cc807c47786586e9f26.zip | |
Set GDL-3 as a fixed dependency for GTK+ 3 build.
It's unrealistic for us to support GTK+ 3 compatibility in our internal copy.
We ultimately want to get rid of it anyway.
(bzr r11501)
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index fdb0b6dfe..160c8db33 100644 --- a/configure.ac +++ b/configure.ac @@ -734,7 +734,7 @@ AC_ARG_ENABLE(gtk3-experimental, AC_HELP_STRING([--enable-gtk3-experimental], [enable compilation with GTK+3 (EXPERIMENTAL!)]), [enable_gtk3=$enableval], [enable_gtk3=no]) -with_ext_gdl="no" +with_gtkmm_3_0="no" if test "x$enable_gtk3" = "xyes"; then ink_spell_pkg= @@ -743,18 +743,12 @@ if test "x$enable_gtk3" = "xyes"; then AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) fi - PKG_CHECK_MODULES(INKSCAPE, gtkmm-3.0 gdkmm-3.0 gtk+-3.0 gdk-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) + PKG_CHECK_MODULES(INKSCAPE, gtkmm-3.0 gdkmm-3.0 gtk+-3.0 gdk-3.0 gdl-3.0 > 3.3.4 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 AC_MSG_RESULT([Using EXPERIMENTAL Gtkmm 3 build]) AC_DEFINE(WITH_GTKMM_3_0,1,[Build with Gtkmm 3.0.x or higher]) - fi - - dnl **************************** - dnl Use external gdl if possible - dnl **************************** - PKG_CHECK_MODULES(GDL, gdl-3.0 > 3.3.4, with_ext_gdl=yes, with_ext_gdl=no) - if test "x$with_ext_gdl" = "xyes"; then + AC_MSG_RESULT([Using external GDL]) AC_DEFINE(WITH_EXT_GDL,1,[Build with external GDL]) fi @@ -784,9 +778,7 @@ else # CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" fi -AC_SUBST(GDL_LIBS) -AC_SUBST(GDL_CFLAGS) -AM_CONDITIONAL(WITH_EXT_GDL, test "x$with_ext_gdl" = "xyes") +AM_CONDITIONAL(WITH_EXT_GDL, test "x$with_gtkmm_3_0" = "xyes") dnl *********************************** dnl Checks for specific series of Gtkmm |