diff options
| author | Gellule Xg <gellule.xg@gmail.com> | 2011-06-29 01:06:03 +0000 |
|---|---|---|
| committer | Gellule Xg <gellule.xg@gmail.com> | 2011-06-29 01:06:03 +0000 |
| commit | 7d55f3487f16763f2c15909bce74ec5e81dca750 (patch) | |
| tree | 335e33b9f1fc67600118b2f823f97297c63a502a | |
| parent | If GTK is built with the QUARTZ backend, there is no need to expect DISPLAY t... (diff) | |
| parent | Add -lX11 to INKSCAPE_LIBS only when gtk is compiled for X11 backend target. (diff) | |
| download | inkscape-7d55f3487f16763f2c15909bce74ec5e81dca750.tar.gz inkscape-7d55f3487f16763f2c15909bce74ec5e81dca750.zip | |
Add -lX11 to INKSCAPE_LIBS only when gtk is compiled for X11 backend target.
Fixed bugs:
- https://launchpad.net/bugs/721424
(bzr r10382)
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2dfb73e3d..0bd9ccd62 100644 --- a/configure.ac +++ b/configure.ac @@ -769,6 +769,16 @@ else 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 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) +# Check for GTK+ backend target +AC_MSG_CHECKING([for GTK+ backend target]) +gtk_backend_target=`pkg-config --variable=target gtk+-2.0` +AC_MSG_RESULT($gtk_backend_target) + +# Add X11 library if needed +if test "x$gtk_backend_target" = "xx11"; then + INKSCAPE_LIBS="$INKSCAPE_LIBS -lx11" +fi + # Check for Apple Mac OS X Carbon framework carbon_ok=no AC_MSG_CHECKING([for Mac OS X Carbon support]) @@ -793,7 +803,7 @@ if test "x$cairo_pdf" = "xyes"; then fi dnl Shouldn't we test for libpng and libz? -INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl" +INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl" if test "x$openmp_ok" = "xyes"; then INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp" fi @@ -1075,4 +1085,5 @@ Configuration: ImageMagick Magick++: ${magick_ok} Libwpg: ${with_libwpg} Doing Local Install: ${with_localinstall} + GTK+ backend target: ${gtk_backend_target} " |