Only the big chunk of x11 checks is left further down in the file,
but that depends on variables and checks above it, so we'll leave that in
place for now.
+GDK_EXTRA_LIBS=
+GDK_EXTRA_CFLAGS=
+GDK_WINDOWING=
+GIO_PACKAGE=gio-2.0
+PANGO_PACKAGES="pango pangocairo"
if test "x$enable_x11_backend" == xyes; then
# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
if test "x$enable_x11_backend" == xyes; then
# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
# Pull in gio-unix for GDesktopAppInfo usage, see at least
# gdkapplaunchcontext-x11.c
GIO_PACKAGE=gio-unix-2.0
# Pull in gio-unix for GDesktopAppInfo usage, see at least
# gdkapplaunchcontext-x11.c
GIO_PACKAGE=gio-unix-2.0
+ backend_immodules="$backend_immodules,xim"
+ GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_X11"
fi
if test "x$enable_win32_backend" == xyes; then
cairo_backends="$cairo_backends cairo-win32"
GDK_BACKENDS="$GDK_BACKENDS win32"
fi
if test "x$enable_win32_backend" == xyes; then
cairo_backends="$cairo_backends cairo-win32"
GDK_BACKENDS="$GDK_BACKENDS win32"
+ backend_immodules="$backend_immodules,ime"
+ GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_NATIVE_WINDOW_POINTER
+#define GDK_WINDOWING_WIN32"
+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
+ AM_CONDITIONAL(USE_WIN32, true)
+ PANGO_PACKAGES="pangowin32 pangocairo"
+else
+ AM_CONDITIONAL(USE_WIN32, false)
fi
if test "x$enable_quartz_backend" == xyes; then
cairo_backends="$cairo_backends cairo-quartz"
GDK_BACKENDS="$GDK_BACKENDS quartz"
fi
if test "x$enable_quartz_backend" == xyes; then
cairo_backends="$cairo_backends cairo-quartz"
GDK_BACKENDS="$GDK_BACKENDS quartz"
+ GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_QUARTZ"
+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
+ AM_CONDITIONAL(USE_QUARTZ, true)
+else
+ AM_CONDITIONAL(USE_QUARTZ, false)
AC_SUBST(GDK_BACKENDS)
if test -z "$GDK_BACKENDS"; then
AC_SUBST(GDK_BACKENDS)
if test -z "$GDK_BACKENDS"; then
-all_immodules="am-et,cedilla,cyrillic-translit"
-if test "x$enable_win32_backend" == xyes; then
- all_immodules="${all_immodules},ime"
-fi
-all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
-if test "x$enable_x11_backend" == xyes; then
- all_immodules="${all_immodules},xim"
-fi
+all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules"
included_immodules=""
# If the switch specified without listing any specific ones, include all
included_immodules=""
# If the switch specified without listing any specific ones, include all
# Windowing system checks
########################################
# Windowing system checks
########################################
-GDK_EXTRA_LIBS=
-GDK_EXTRA_CFLAGS=
-
# GTK+ uses some X calls, so needs to link against X directly
GTK_DEP_PACKAGES_FOR_X=
GTK_DEP_LIBS_FOR_X=
# GTK+ uses some X calls, so needs to link against X directly
GTK_DEP_PACKAGES_FOR_X=
GTK_DEP_LIBS_FOR_X=
AM_CONDITIONAL(HAVE_X11R6, false)
fi
AM_CONDITIONAL(HAVE_X11R6, false)
fi
-
-if test "x$enable_win32_backend" == xyes; then
- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
- AM_CONDITIONAL(USE_WIN32, true)
-else
- AM_CONDITIONAL(USE_WIN32, false)
-fi
-
-if test "x$enable_quartz_backend" == xyes; then
- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
- AM_CONDITIONAL(USE_QUARTZ, true)
-else
- AM_CONDITIONAL(USE_QUARTZ, false)
-fi
-
-if test "x$enable_win32_backend" == xyes; then
- PANGO_PACKAGES="pangowin32 pangocairo"
-else
- PANGO_PACKAGES="pango pangocairo"
-fi
-
AC_MSG_CHECKING(Pango flags)
if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
AC_MSG_CHECKING(Pango flags)
if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
mv $outfile gdk/gdkconfig.h
fi
],[
mv $outfile gdk/gdkconfig.h
fi
],[
-gdk_windowing=''
-if test "x$enable_x11_backend" == xyes; then
- gdk_windowing="\$gdk_windowing
-#define GDK_WINDOWING_X11"
-fi
-if test "x$enable_win32_backend" == xyes; then
- gdk_windowing="\$gdk_windowing
-#define GDK_NATIVE_WINDOW_POINTER
-#define GDK_WINDOWING_WIN32"
-fi
-if test "x$enable_quartz_backend" == xyes; then
- gdk_windowing="\$gdk_windowing
-#define GDK_WINDOWING_QUARTZ"
-fi
+gdk_windowing='$GDK_WINDOWING'