diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-10-06 15:49:00 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-10-06 15:49:00 -0400 |
| commit | e86f979e45a4343ccce2e6fe0f99b2f7ee04abdc (patch) | |
| tree | 3b390feccb54f85d16f497e8c6a45177c619e652 /configure.ac | |
| parent | fe4fdeb7ae9b7d7fb6c10bf498a2b3c5b93730ca (diff) | |
| download | gtk+-e86f979e45a4343ccce2e6fe0f99b2f7ee04abdc.tar.gz | |
Fix generation of plug/socket docs
The docs for GtkPlug/GtkSocket were not generated if any
of the win32, quartz, wayland backends were enabled. What
we really mean though, is that we want the docs to be generated
whenever GtkPlug/GtkSocket are included in the library, which
is when the x11 backend is enabled.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 73a2c479a0..40dcb045f3 100644 --- a/configure.ac +++ b/configure.ac @@ -332,6 +332,7 @@ GDK_EXTRA_CFLAGS= GDK_WINDOWING= PANGO_PACKAGES="pango pangocairo" +ENABLE_ON_X11='%' if test "$enable_x11_backend" = "yes"; then # GDK calls the xlib backend "x11," cairo calls it "xlib." Other # backend names are identical. @@ -343,7 +344,9 @@ if test "$enable_x11_backend" = "yes"; then backend_immodules="$backend_immodules,xim" GDK_WINDOWING="$GDK_WINDOWING #define GDK_WINDOWING_X11" + ENABLE_ON_X11='' fi +AC_SUBST(ENABLE_ON_X11) if test "$enable_win32_backend" = "yes"; then cairo_backends="$cairo_backends cairo-win32" @@ -409,7 +412,6 @@ if test "$enable_wayland_backend" = "maybe" ; then AC_MSG_RESULT($enable_wayland_backend) fi -DISABLE_ON_WAYLAND='' if test "$enable_wayland_backend" = "yes"; then # For the cairo image backend cairo_backends="$cairo_backends cairo" @@ -417,7 +419,6 @@ if test "$enable_wayland_backend" = "yes"; then have_gio_unix=yes GDK_WINDOWING="$GDK_WINDOWING #define GDK_WINDOWING_WAYLAND" - DISABLE_ON_WAYLAND='%' WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES" AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no]) AS_IF([test "x$WAYLAND_SCANNER" = "xno"], @@ -428,7 +429,6 @@ if test "$enable_wayland_backend" = "yes"; then else AM_CONDITIONAL(USE_WAYLAND, false) fi -AC_SUBST(DISABLE_ON_WAYLAND) # strip leading space GDK_BACKENDS=${GDK_BACKENDS#* } |