1997-11-24 22:37:52 +00:00
|
|
|
# Process this file with autoconf to produce a configure script.
|
2010-10-07 11:47:58 +00:00
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
# Making releases:
|
|
|
|
# GTK_MICRO_VERSION += 1;
|
|
|
|
# GTK_INTERFACE_AGE += 1;
|
|
|
|
# GTK_BINARY_AGE += 1;
|
|
|
|
# if any functions have been added, set GTK_INTERFACE_AGE to 0.
|
|
|
|
# if backwards compatibility has been broken,
|
|
|
|
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
|
|
|
|
|
2011-02-10 19:41:02 +00:00
|
|
|
m4_define([gtk_major_version], [3])
|
2013-09-23 19:08:50 +00:00
|
|
|
m4_define([gtk_minor_version], [11])
|
2014-02-18 13:31:32 +00:00
|
|
|
m4_define([gtk_micro_version], [7])
|
2012-10-23 00:44:24 +00:00
|
|
|
m4_define([gtk_interface_age], [0])
|
2004-02-25 00:45:35 +00:00
|
|
|
m4_define([gtk_binary_age],
|
|
|
|
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
|
2007-11-19 09:41:05 +00:00
|
|
|
m4_define([gtk_version],
|
|
|
|
[gtk_major_version.gtk_minor_version.gtk_micro_version])
|
2003-05-06 21:55:41 +00:00
|
|
|
# This is the X.Y used in -lgtk-FOO-X.Y
|
2010-05-08 05:18:53 +00:00
|
|
|
m4_define([gtk_api_version], [3.0])
|
2003-05-06 21:55:41 +00:00
|
|
|
|
2010-12-06 16:27:57 +00:00
|
|
|
AC_PREREQ([2.62])
|
2010-11-19 08:01:39 +00:00
|
|
|
AC_INIT([gtk+], [gtk_version],
|
|
|
|
[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
|
|
|
|
[gtk+])
|
|
|
|
|
2013-01-07 14:59:59 +00:00
|
|
|
AC_CONFIG_HEADERS([config.h])
|
2010-11-19 08:01:39 +00:00
|
|
|
AC_CONFIG_SRCDIR([gdk/gdktypes.h])
|
|
|
|
AC_CONFIG_MACRO_DIR([m4])
|
2011-06-13 02:06:04 +00:00
|
|
|
AC_CONFIG_AUX_DIR([build-aux])
|
2010-11-19 08:01:39 +00:00
|
|
|
|
2013-01-07 12:49:27 +00:00
|
|
|
AC_CANONICAL_HOST
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
# Define a string for the earliest version that this release has
|
2005-02-04 17:45:15 +00:00
|
|
|
# backwards binary compatibility with for all interfaces a module
|
|
|
|
# might. Unless we add module-only API with lower stability
|
|
|
|
# guarantees, this should be unchanged until we break binary compat
|
|
|
|
# for GTK+.
|
2003-05-06 21:55:41 +00:00
|
|
|
#
|
|
|
|
#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
|
2010-05-08 05:18:53 +00:00
|
|
|
m4_define([gtk_binary_version], [3.0.0])
|
2003-05-06 21:55:41 +00:00
|
|
|
|
|
|
|
# required versions of other packages
|
2014-02-06 22:44:24 +00:00
|
|
|
m4_define([glib_required_version], [2.39.5])
|
2012-12-06 18:50:47 +00:00
|
|
|
m4_define([pango_required_version], [1.32.4])
|
2013-02-05 18:36:48 +00:00
|
|
|
m4_define([atk_required_version], [2.7.5])
|
2013-08-02 08:58:52 +00:00
|
|
|
m4_define([cairo_required_version], [1.12.0])
|
2013-01-30 15:24:39 +00:00
|
|
|
m4_define([gdk_pixbuf_required_version], [2.27.1])
|
2013-11-21 20:16:58 +00:00
|
|
|
m4_define([introspection_required_version], [1.39.0])
|
2014-01-23 23:26:07 +00:00
|
|
|
m4_define([wayland_required_version], [1.3.90])
|
2010-09-23 15:22:13 +00:00
|
|
|
GLIB_REQUIRED_VERSION=glib_required_version
|
|
|
|
PANGO_REQUIRED_VERSION=pango_required_version
|
|
|
|
ATK_REQUIRED_VERSION=atk_required_version
|
|
|
|
CAIRO_REQUIRED_VERSION=cairo_required_version
|
|
|
|
GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version
|
2011-02-08 23:40:08 +00:00
|
|
|
INTROSPECTION_REQUIRED_VERSION=introspection_required_version
|
|
|
|
|
2010-09-23 15:22:13 +00:00
|
|
|
AC_SUBST(GLIB_REQUIRED_VERSION)
|
|
|
|
AC_SUBST(PANGO_REQUIRED_VERSION)
|
|
|
|
AC_SUBST(ATK_REQUIRED_VERSION)
|
|
|
|
AC_SUBST(CAIRO_REQUIRED_VERSION)
|
|
|
|
AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
|
2011-02-08 23:40:08 +00:00
|
|
|
AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
|
2003-05-06 21:55:41 +00:00
|
|
|
|
|
|
|
# Save this value here, since automake will set cflags later
|
|
|
|
cflags_set=${CFLAGS+set}
|
|
|
|
|
2011-07-06 20:36:50 +00:00
|
|
|
AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
|
2010-05-12 16:28:25 +00:00
|
|
|
AM_MAINTAINER_MODE([enable])
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2011-06-20 10:38:03 +00:00
|
|
|
# Support silent build rules. Disable
|
2010-11-29 20:31:35 +00:00
|
|
|
# by either passing --disable-silent-rules to configure or passing V=1
|
2009-08-17 15:55:09 +00:00
|
|
|
# to make
|
2011-06-20 10:38:03 +00:00
|
|
|
AM_SILENT_RULES([yes])
|
2009-08-17 15:55:09 +00:00
|
|
|
|
1999-02-01 23:17:39 +00:00
|
|
|
#
|
2001-05-03 20:11:14 +00:00
|
|
|
# For each of the libraries we build, we define the following
|
|
|
|
# substituted variables:
|
|
|
|
#
|
|
|
|
# foo_PACKAGES: pkg-config packages this library requires
|
|
|
|
# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config
|
|
|
|
# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config
|
|
|
|
# foo_DEP_LIBS: All libraries this module requires
|
|
|
|
# foo_DEP_CFLAGS: All cflags this module requires
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
GTK_MAJOR_VERSION=gtk_major_version
|
|
|
|
GTK_MINOR_VERSION=gtk_minor_version
|
|
|
|
GTK_MICRO_VERSION=gtk_micro_version
|
|
|
|
GTK_INTERFACE_AGE=gtk_interface_age
|
|
|
|
GTK_BINARY_AGE=gtk_binary_age
|
|
|
|
GTK_VERSION=gtk_version
|
|
|
|
GTK_API_VERSION=gtk_api_version
|
|
|
|
GTK_BINARY_VERSION=gtk_binary_version
|
1998-05-09 01:17:03 +00:00
|
|
|
AC_SUBST(GTK_MAJOR_VERSION)
|
|
|
|
AC_SUBST(GTK_MINOR_VERSION)
|
|
|
|
AC_SUBST(GTK_MICRO_VERSION)
|
1998-07-19 19:09:27 +00:00
|
|
|
AC_SUBST(GTK_INTERFACE_AGE)
|
|
|
|
AC_SUBST(GTK_BINARY_AGE)
|
2002-03-05 21:04:09 +00:00
|
|
|
AC_SUBST(GTK_API_VERSION)
|
1998-05-07 04:04:15 +00:00
|
|
|
AC_SUBST(GTK_VERSION)
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_SUBST(GTK_BINARY_VERSION)
|
1998-05-07 04:04:15 +00:00
|
|
|
|
|
|
|
# libtool versioning
|
2002-05-06 18:01:39 +00:00
|
|
|
#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
|
|
|
|
#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
|
|
|
|
#LT_REVISION=$GTK_INTERFACE_AGE
|
|
|
|
#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
|
|
|
|
#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
|
|
|
|
m4_define([lt_revision], [gtk_interface_age])
|
|
|
|
m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)])
|
|
|
|
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
|
|
|
|
LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
|
|
|
|
AC_SUBST(LT_VERSION_INFO)
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
AC_SUBST(LT_CURRENT_MINUS_AGE)
|
1998-05-07 04:04:15 +00:00
|
|
|
|
2010-05-11 19:21:17 +00:00
|
|
|
m4_define([gail_lt_current],[0])
|
|
|
|
m4_define([gail_lt_revision],[0])
|
2007-12-20 14:31:01 +00:00
|
|
|
m4_define([gail_lt_age],[0])
|
|
|
|
m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
|
|
|
|
m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
|
|
|
|
AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
|
|
|
|
AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
|
2001-09-11 20:24:40 +00:00
|
|
|
|
2014-01-02 17:00:10 +00:00
|
|
|
# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive
|
|
|
|
if test "$cross_compiling" = "no"; then
|
|
|
|
if test -n "$CFLAGS"; then
|
|
|
|
CFLAGS_FOR_BUILD=$CFLAGS
|
|
|
|
fi
|
|
|
|
if test -n "$CPPFLAGS"; then
|
|
|
|
CPPFLAGS_FOR_BUILD=$CPPFLAGS
|
|
|
|
fi
|
|
|
|
if test -n "$LDFLAGS"; then
|
|
|
|
LDFLAGS_FOR_BUILD=$LDFLAGS
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2010-05-12 16:28:25 +00:00
|
|
|
# Checks for programs.
|
|
|
|
AC_PROG_CC
|
2013-01-07 12:49:27 +00:00
|
|
|
AX_PROG_CC_FOR_BUILD
|
2010-05-12 16:28:25 +00:00
|
|
|
AC_PROG_CC_C_O
|
2012-06-07 14:35:12 +00:00
|
|
|
AC_PROG_MKDIR_P
|
2010-05-12 16:28:25 +00:00
|
|
|
AC_PROG_INSTALL
|
|
|
|
AC_PROG_MAKE_SET
|
|
|
|
|
|
|
|
|
2010-05-10 14:47:47 +00:00
|
|
|
GETTEXT_PACKAGE=gtk30
|
2000-07-14 20:08:10 +00:00
|
|
|
AC_SUBST(GETTEXT_PACKAGE)
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
|
|
|
|
[The prefix for our gettext translation domains.])
|
2000-07-14 20:08:10 +00:00
|
|
|
|
2004-03-05 23:28:39 +00:00
|
|
|
MATH_LIB=-lm
|
|
|
|
AC_MSG_CHECKING([for native Win32])
|
2008-08-03 23:47:10 +00:00
|
|
|
LIB_EXE_MACHINE_FLAG=X86
|
2010-02-08 08:41:51 +00:00
|
|
|
EXE_MANIFEST_ARCHITECTURE=X86
|
2012-05-12 16:37:56 +00:00
|
|
|
DISABLE_ON_W32=''
|
2004-03-05 23:28:39 +00:00
|
|
|
case "$host" in
|
|
|
|
*-*-mingw*)
|
2012-05-12 16:37:56 +00:00
|
|
|
dnl Comment-out certain gtk3.types.in lines
|
|
|
|
DISABLE_ON_W32='%'
|
2004-03-05 23:28:39 +00:00
|
|
|
os_win32=yes
|
2008-08-03 23:09:28 +00:00
|
|
|
gio_can_sniff=no
|
2004-03-05 23:28:39 +00:00
|
|
|
MATH_LIB=
|
2008-08-03 23:47:10 +00:00
|
|
|
case "$host" in
|
|
|
|
x86_64-*-*)
|
|
|
|
LIB_EXE_MACHINE_FLAG=X64
|
2010-02-08 08:41:51 +00:00
|
|
|
EXE_MANIFEST_ARCHITECTURE=AMD64
|
2008-08-03 23:47:10 +00:00
|
|
|
;;
|
|
|
|
esac
|
2004-03-05 23:28:39 +00:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
os_win32=no
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT([$os_win32])
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2012-05-12 16:37:56 +00:00
|
|
|
AC_SUBST(DISABLE_ON_W32)
|
2008-08-03 23:47:10 +00:00
|
|
|
AC_SUBST(LIB_EXE_MACHINE_FLAG)
|
2010-02-08 08:41:51 +00:00
|
|
|
AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
|
2008-08-03 23:47:10 +00:00
|
|
|
|
2005-01-13 15:19:27 +00:00
|
|
|
case $host in
|
|
|
|
*-*-linux*)
|
|
|
|
os_linux=yes
|
|
|
|
;;
|
|
|
|
esac
|
2008-08-03 23:47:10 +00:00
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
dnl
|
2007-06-26 14:24:13 +00:00
|
|
|
dnl Check for a working C++ compiler, but do not bail out, if none is found.
|
|
|
|
dnl We use this for an automated test for C++ header correctness.
|
2010-05-07 07:53:03 +00:00
|
|
|
dnl
|
2008-05-25 20:18:16 +00:00
|
|
|
AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
|
2010-05-12 16:28:25 +00:00
|
|
|
AC_LANG_PUSH([C++])
|
2007-06-26 14:24:27 +00:00
|
|
|
|
2011-02-06 01:35:42 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
|
|
|
|
[[class a { int b; } c;]])],
|
|
|
|
[],[CXX=])
|
2007-06-26 14:24:13 +00:00
|
|
|
AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
|
2007-06-26 14:24:27 +00:00
|
|
|
|
|
|
|
gtk_save_cxxflags="$CXXFLAGS"
|
|
|
|
CXXFLAGS="$CXXFLAGS -x objective-c++"
|
2011-02-06 01:35:42 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]],
|
|
|
|
[[]])],
|
|
|
|
[OBJC=yes],[OBJC=no])
|
2008-03-02 18:08:50 +00:00
|
|
|
AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
|
2007-06-26 14:24:27 +00:00
|
|
|
CXXFLAGS="$gtk_save_cxxflags"
|
2010-05-12 16:28:25 +00:00
|
|
|
AC_LANG_POP([C++])
|
2007-06-26 14:24:13 +00:00
|
|
|
|
2004-03-05 23:29:41 +00:00
|
|
|
if test "$os_win32" = "yes"; then
|
2004-03-05 23:28:39 +00:00
|
|
|
if test x$enable_static = xyes -o x$enable_static = x; then
|
|
|
|
AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
|
|
|
enable_static=no
|
|
|
|
fi
|
|
|
|
if test x$enable_shared = xno; then
|
|
|
|
AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
|
|
|
fi
|
|
|
|
enable_shared=yes
|
|
|
|
fi
|
|
|
|
|
2010-05-12 16:28:25 +00:00
|
|
|
dnl Initialize libtool
|
|
|
|
LT_PREREQ([2.2.6])
|
|
|
|
LT_INIT([disable-static win32-dll])
|
|
|
|
# Create libtool early, because it's used in configure
|
|
|
|
LT_OUTPUT
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2004-03-06 03:38:59 +00:00
|
|
|
# Make sure we use 64-bit versions of various file stuff.
|
|
|
|
AC_SYS_LARGEFILE
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AM_PROG_AS
|
2005-04-29 17:59:07 +00:00
|
|
|
AC_PATH_PROG(NM, nm, nm)
|
2001-10-11 02:44:17 +00:00
|
|
|
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
AC_MSG_CHECKING([for some Win32 platform])
|
|
|
|
case "$host" in
|
|
|
|
*-*-mingw*|*-*-cygwin*)
|
|
|
|
platform_win32=yes
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
platform_win32=no
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT([$platform_win32])
|
|
|
|
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
|
|
|
|
|
|
|
|
AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
|
2003-10-23 04:22:32 +00:00
|
|
|
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
|
2005-01-13 15:19:27 +00:00
|
|
|
AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
|
|
|
|
if test "$os_win32" = "yes"; then
|
2005-07-09 00:10:12 +00:00
|
|
|
AC_CHECK_TOOL(WINDRES, windres, no)
|
|
|
|
if test "$WINDRES" = no; then
|
|
|
|
AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
|
|
|
|
fi
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
m4_define([debug_default],
|
|
|
|
m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum]))
|
1999-02-15 06:51:28 +00:00
|
|
|
|
|
|
|
dnl declare --enable-* args and collect ac_help strings
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_ARG_ENABLE(debug,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
|
|
|
|
[turn on debugging @<:@default=debug_default@:>@])],,
|
|
|
|
[enable_debug=debug_default])
|
2011-01-03 16:27:19 +00:00
|
|
|
|
2013-05-09 16:38:08 +00:00
|
|
|
AC_ARG_ENABLE(installed_tests,
|
|
|
|
AS_HELP_STRING([--enable-installed-tests],
|
|
|
|
[Install test programs (default: no)]),,
|
|
|
|
[enable_installed_tests=no])
|
|
|
|
AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
|
2011-01-03 16:27:19 +00:00
|
|
|
|
2011-01-15 01:01:05 +00:00
|
|
|
AC_ARG_ENABLE(gtk2-dependency,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-gtk2-dependency],
|
|
|
|
[Do not build gtk-update-icon-cache and other shared tools])],,
|
2011-01-15 01:01:05 +00:00
|
|
|
[enable_gtk2_dependency=no])
|
|
|
|
|
|
|
|
AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_ARG_ENABLE(xkb,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xkb],
|
2011-01-03 16:27:19 +00:00
|
|
|
[support XKB extension [default=maybe]])],,
|
2003-05-06 21:55:41 +00:00
|
|
|
[enable_xkb="maybe"])
|
2007-06-03 04:54:15 +00:00
|
|
|
AC_ARG_ENABLE(xinerama,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xinerama],
|
2011-11-10 03:18:39 +00:00
|
|
|
[support Xinerama extension [default=maybe]])],,
|
2011-01-05 02:57:21 +00:00
|
|
|
[enable_xinerama="maybe"])
|
2011-01-07 01:30:11 +00:00
|
|
|
AC_ARG_ENABLE(xrandr,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xrandr],
|
2011-11-10 03:18:39 +00:00
|
|
|
[support XRandR extension [default=maybe]])],,
|
2011-01-07 01:30:11 +00:00
|
|
|
[enable_xrandr="maybe"])
|
|
|
|
AC_ARG_ENABLE(xfixes,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xfixes],
|
2011-11-10 03:18:39 +00:00
|
|
|
[support XFixes extension [default=maybe]])],,
|
2011-01-07 01:30:11 +00:00
|
|
|
[enable_xfixes="maybe"])
|
|
|
|
AC_ARG_ENABLE(xcomposite,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xcomposite],
|
2011-11-10 03:18:39 +00:00
|
|
|
[support X Composite extension [default=maybe]])],,
|
2011-01-07 01:30:11 +00:00
|
|
|
[enable_xcomposite="maybe"])
|
|
|
|
AC_ARG_ENABLE(xdamage,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-xdamage],
|
2011-11-10 03:18:39 +00:00
|
|
|
[support X Damage extension [default=maybe]])],,
|
2011-01-07 01:30:11 +00:00
|
|
|
[enable_xdamage="maybe"])
|
2003-05-06 21:55:41 +00:00
|
|
|
|
2011-01-03 15:45:37 +00:00
|
|
|
AC_ARG_ENABLE(x11-backend,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-x11-backend],
|
2011-01-03 15:45:37 +00:00
|
|
|
[enable the X11 gdk backend])],
|
|
|
|
[backend_set=yes])
|
|
|
|
AC_ARG_ENABLE(win32-backend,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-win32-backend],
|
2011-01-03 15:45:37 +00:00
|
|
|
[enable the Win32 gdk backend])],
|
|
|
|
[backend_set=yes])
|
|
|
|
AC_ARG_ENABLE(quartz-backend,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-quartz-backend],
|
2011-01-03 15:45:37 +00:00
|
|
|
[enable the quartz gdk backend])],
|
|
|
|
[backend_set=yes])
|
2011-01-19 18:52:00 +00:00
|
|
|
AC_ARG_ENABLE(broadway-backend,
|
2011-05-16 11:28:56 +00:00
|
|
|
[AS_HELP_STRING([--enable-broadway-backend],
|
2011-01-19 18:52:00 +00:00
|
|
|
[enable the broadway (HTML5) gdk backend])],
|
|
|
|
[backend_set=yes])
|
2010-12-18 20:38:49 +00:00
|
|
|
AC_ARG_ENABLE(wayland-backend,
|
2011-05-16 11:28:56 +00:00
|
|
|
[AS_HELP_STRING([--enable-wayland-backend],
|
2010-12-18 20:38:49 +00:00
|
|
|
[enable the wayland gdk backend])],
|
|
|
|
[backend_set=yes])
|
2011-01-03 15:45:37 +00:00
|
|
|
|
|
|
|
if test -z "$backend_set"; then
|
|
|
|
if test "$platform_win32" = yes; then
|
|
|
|
enable_win32_backend=yes
|
|
|
|
else
|
|
|
|
enable_x11_backend=yes
|
2013-10-06 19:13:48 +00:00
|
|
|
enable_wayland_backend=maybe
|
2011-01-03 15:45:37 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-09-11 23:45:06 +00:00
|
|
|
AC_ARG_ENABLE(quartz-relocation,
|
|
|
|
[AS_HELP_STRING([--enable-quartz-relocation],
|
|
|
|
[enable bundle-based relocation functions])],
|
|
|
|
[quartz_relocation=yes])
|
|
|
|
|
2011-01-03 15:45:37 +00:00
|
|
|
cairo_backends=
|
2011-01-03 16:29:25 +00:00
|
|
|
backend_immodules=
|
2012-04-11 14:22:57 +00:00
|
|
|
have_gio_unix=no
|
2011-01-03 15:45:37 +00:00
|
|
|
GDK_BACKENDS=
|
2011-01-03 16:29:25 +00:00
|
|
|
GDK_EXTRA_LIBS=
|
|
|
|
GDK_EXTRA_CFLAGS=
|
|
|
|
GDK_WINDOWING=
|
|
|
|
PANGO_PACKAGES="pango pangocairo"
|
2011-01-03 15:45:37 +00:00
|
|
|
|
2013-10-06 19:49:00 +00:00
|
|
|
ENABLE_ON_X11='%'
|
2011-09-05 20:35:25 +00:00
|
|
|
if test "$enable_x11_backend" = "yes"; then
|
2011-01-03 15:45:37 +00:00
|
|
|
# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
|
|
|
|
# backend names are identical.
|
|
|
|
cairo_backends="$cairo_backends cairo-xlib"
|
|
|
|
GDK_BACKENDS="$GDK_BACKENDS x11"
|
|
|
|
# Pull in gio-unix for GDesktopAppInfo usage, see at least
|
|
|
|
# gdkapplaunchcontext-x11.c
|
2012-04-11 14:22:57 +00:00
|
|
|
have_gio_unix=yes
|
2011-01-03 16:29:25 +00:00
|
|
|
backend_immodules="$backend_immodules,xim"
|
|
|
|
GDK_WINDOWING="$GDK_WINDOWING
|
|
|
|
#define GDK_WINDOWING_X11"
|
2013-10-06 19:49:00 +00:00
|
|
|
ENABLE_ON_X11=''
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
fi
|
2013-10-06 19:49:00 +00:00
|
|
|
AC_SUBST(ENABLE_ON_X11)
|
2003-05-06 21:55:41 +00:00
|
|
|
|
2011-09-05 20:35:25 +00:00
|
|
|
if test "$enable_win32_backend" = "yes"; then
|
2011-01-03 15:45:37 +00:00
|
|
|
cairo_backends="$cairo_backends cairo-win32"
|
|
|
|
GDK_BACKENDS="$GDK_BACKENDS win32"
|
2011-01-03 16:29:25 +00:00
|
|
|
backend_immodules="$backend_immodules,ime"
|
|
|
|
GDK_WINDOWING="$GDK_WINDOWING
|
|
|
|
#define GDK_WINDOWING_WIN32"
|
2013-03-21 21:26:02 +00:00
|
|
|
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
|
2011-01-03 16:29:25 +00:00
|
|
|
AM_CONDITIONAL(USE_WIN32, true)
|
|
|
|
PANGO_PACKAGES="pangowin32 pangocairo"
|
|
|
|
else
|
|
|
|
AM_CONDITIONAL(USE_WIN32, false)
|
2011-01-03 15:45:37 +00:00
|
|
|
fi
|
2003-05-06 21:55:41 +00:00
|
|
|
|
2012-05-18 20:58:24 +00:00
|
|
|
DISABLE_ON_QUARTZ=''
|
2011-03-21 14:32:49 +00:00
|
|
|
if test "x$enable_quartz_backend" = xyes; then
|
2011-01-03 15:45:37 +00:00
|
|
|
cairo_backends="$cairo_backends cairo-quartz"
|
|
|
|
GDK_BACKENDS="$GDK_BACKENDS quartz"
|
2013-05-20 17:48:32 +00:00
|
|
|
backend_immodules="$backend_immodules,quartz"
|
2011-01-03 16:29:25 +00:00
|
|
|
GDK_WINDOWING="$GDK_WINDOWING
|
|
|
|
#define GDK_WINDOWING_QUARTZ"
|
|
|
|
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
|
2012-05-18 20:58:24 +00:00
|
|
|
DISABLE_ON_QUARTZ='%'
|
2011-01-03 16:29:25 +00:00
|
|
|
AM_CONDITIONAL(USE_QUARTZ, true)
|
2011-09-11 23:45:06 +00:00
|
|
|
if test "x$quartz_relocation" = xyes; then
|
|
|
|
AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
|
|
|
|
fi
|
2012-06-24 11:36:51 +00:00
|
|
|
# Pull in gio-unix for GDesktopAppInfo usage, see at least
|
|
|
|
# gdkapplaunchcontext-x11.c
|
|
|
|
have_gio_unix=yes
|
2011-09-11 23:45:06 +00:00
|
|
|
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
else
|
2011-01-03 16:29:25 +00:00
|
|
|
AM_CONDITIONAL(USE_QUARTZ, false)
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
fi
|
2012-05-18 20:58:24 +00:00
|
|
|
AC_SUBST(DISABLE_ON_QUARTZ)
|
2011-04-12 13:52:44 +00:00
|
|
|
|
2012-10-10 23:09:14 +00:00
|
|
|
if test "x$enable_broadway_backend" = xyes; then
|
2011-01-19 18:52:00 +00:00
|
|
|
GDK_BACKENDS="$GDK_BACKENDS broadway"
|
2011-01-06 22:36:44 +00:00
|
|
|
cairo_backends="$cairo_backends cairo"
|
2013-11-13 11:20:07 +00:00
|
|
|
backend_immodules="$backend_immodules,broadway"
|
2013-11-25 03:47:51 +00:00
|
|
|
if test "$os_win32" != "yes"; then
|
2013-06-13 16:15:10 +00:00
|
|
|
have_gio_unix=yes
|
|
|
|
fi
|
2011-01-19 18:52:00 +00:00
|
|
|
GDK_WINDOWING="$GDK_WINDOWING
|
|
|
|
#define GDK_WINDOWING_BROADWAY"
|
|
|
|
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
|
|
|
|
AM_CONDITIONAL(USE_BROADWAY, true)
|
|
|
|
else
|
|
|
|
AM_CONDITIONAL(USE_BROADWAY, false)
|
|
|
|
fi
|
2000-06-07 16:44:29 +00:00
|
|
|
|
2013-10-06 19:13:48 +00:00
|
|
|
PKG_PROG_PKG_CONFIG
|
|
|
|
|
2014-01-23 23:26:07 +00:00
|
|
|
WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version"
|
2013-10-06 19:13:48 +00:00
|
|
|
if test "$enable_wayland_backend" = "maybe" ; then
|
|
|
|
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
|
|
|
|
PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
|
|
|
|
AC_MSG_CHECKING([for WAYLAND_DEPENDENCIES])
|
|
|
|
if test "$WAYLAND_SCANNER" = "no" -o "$have_wayland_deps" = "no" ; then
|
|
|
|
enable_wayland_backend=no
|
|
|
|
else
|
|
|
|
enable_wayland_backend=yes
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_wayland_backend)
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$enable_wayland_backend" = "yes"; then
|
2013-01-17 16:05:25 +00:00
|
|
|
# For the cairo image backend
|
|
|
|
cairo_backends="$cairo_backends cairo"
|
2010-12-18 20:38:49 +00:00
|
|
|
GDK_BACKENDS="$GDK_BACKENDS wayland"
|
2012-04-11 14:22:57 +00:00
|
|
|
have_gio_unix=yes
|
2010-12-18 20:38:49 +00:00
|
|
|
GDK_WINDOWING="$GDK_WINDOWING
|
|
|
|
#define GDK_WINDOWING_WAYLAND"
|
2013-10-06 19:13:48 +00:00
|
|
|
WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
|
2013-10-06 19:32:18 +00:00
|
|
|
AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
|
2013-08-30 11:55:37 +00:00
|
|
|
AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
|
|
|
|
AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
|
|
|
|
AC_SUBST([WAYLAND_SCANNER])
|
|
|
|
|
2010-12-18 20:38:49 +00:00
|
|
|
AM_CONDITIONAL(USE_WAYLAND, true)
|
|
|
|
else
|
|
|
|
AM_CONDITIONAL(USE_WAYLAND, false)
|
|
|
|
fi
|
|
|
|
|
2011-01-05 02:57:21 +00:00
|
|
|
# strip leading space
|
2011-03-21 14:32:49 +00:00
|
|
|
GDK_BACKENDS=${GDK_BACKENDS#* }
|
2000-06-07 16:44:29 +00:00
|
|
|
|
2011-01-03 15:45:37 +00:00
|
|
|
AC_SUBST(GDK_BACKENDS)
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
|
2011-01-03 15:45:37 +00:00
|
|
|
if test -z "$GDK_BACKENDS"; then
|
|
|
|
AC_MSG_ERROR([No GDK backends selected.])
|
|
|
|
fi
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
|
1998-02-19 06:21:27 +00:00
|
|
|
if test "x$enable_debug" = "xyes"; then
|
1998-05-11 08:31:16 +00:00
|
|
|
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
|
2011-11-10 03:11:04 +00:00
|
|
|
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
1998-02-19 06:21:27 +00:00
|
|
|
if test "x$enable_debug" = "xno"; then
|
2001-01-03 10:53:14 +00:00
|
|
|
GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
|
1998-02-19 06:21:27 +00:00
|
|
|
else
|
2012-05-01 23:46:02 +00:00
|
|
|
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
|
1998-02-19 06:21:27 +00:00
|
|
|
fi
|
1997-11-24 22:37:52 +00:00
|
|
|
fi
|
|
|
|
|
2007-04-29 03:41:53 +00:00
|
|
|
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
|
|
|
|
[Define if debugging is enabled])
|
1998-06-10 23:44:55 +00:00
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
# Build time sanity check...
|
|
|
|
AM_SANITY_CHECK
|
|
|
|
|
1998-11-01 01:44:05 +00:00
|
|
|
changequote(,)dnl
|
1997-12-11 17:06:25 +00:00
|
|
|
if test "x$GCC" = "xyes"; then
|
1998-11-01 01:44:05 +00:00
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-Wall[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -Wall" ;;
|
|
|
|
esac
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1997-12-11 17:06:25 +00:00
|
|
|
if test "x$enable_ansi" = "xyes"; then
|
1998-11-01 01:44:05 +00:00
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-ansi[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -ansi" ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
case " $CFLAGS " in
|
|
|
|
*[\ \ ]-pedantic[\ \ ]*) ;;
|
|
|
|
*) CFLAGS="$CFLAGS -pedantic" ;;
|
|
|
|
esac
|
1997-11-24 22:37:52 +00:00
|
|
|
fi
|
2002-09-29 00:36:29 +00:00
|
|
|
fi
|
|
|
|
changequote([,])dnl
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
|
2002-09-29 00:36:29 +00:00
|
|
|
# Ensure MSVC-compatible struct packing convention is used when
|
|
|
|
# compiling for Win32 with gcc.
|
|
|
|
# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
|
|
|
|
# gcc2 uses "-fnative-struct".
|
|
|
|
if test x"$os_win32" = xyes; then
|
|
|
|
if test x"$GCC" = xyes; then
|
|
|
|
msnative_struct=''
|
|
|
|
AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
|
|
|
|
if test -z "$ac_cv_prog_CC"; then
|
|
|
|
our_gcc="$CC"
|
|
|
|
else
|
|
|
|
our_gcc="$ac_cv_prog_CC"
|
|
|
|
fi
|
|
|
|
case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
|
|
|
|
2.)
|
|
|
|
if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
|
|
|
|
msnative_struct='-fnative-struct'
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
|
|
|
|
msnative_struct='-mms-bitfields'
|
|
|
|
fi
|
|
|
|
;;
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
esac
|
2002-09-29 00:36:29 +00:00
|
|
|
if test x"$msnative_struct" = x ; then
|
|
|
|
AC_MSG_RESULT([no way])
|
|
|
|
AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
|
|
|
|
else
|
|
|
|
CFLAGS="$CFLAGS $msnative_struct"
|
|
|
|
AC_MSG_RESULT([${msnative_struct}])
|
|
|
|
fi
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
fi
|
1997-11-24 22:37:52 +00:00
|
|
|
fi
|
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
## Initial sanity check, done here so that users get told they
|
2001-09-21 14:23:15 +00:00
|
|
|
## have the wrong dependencies as early in the process as possible.
|
|
|
|
## Later on we actually use the cflags/libs from separate pkg-config
|
2010-05-07 07:53:03 +00:00
|
|
|
## calls. Oh, also the later pkg-config calls don't include
|
|
|
|
## the version requirements since those make the module lists
|
2001-09-21 14:23:15 +00:00
|
|
|
## annoying to construct
|
2003-05-06 21:55:41 +00:00
|
|
|
PKG_CHECK_MODULES(BASE_DEPENDENCIES,
|
|
|
|
[glib-2.0 >= glib_required_version dnl
|
|
|
|
atk >= atk_required_version dnl
|
2005-07-13 13:30:24 +00:00
|
|
|
pango >= pango_required_version dnl
|
2010-06-26 05:06:30 +00:00
|
|
|
cairo >= cairo_required_version dnl
|
2010-09-01 17:57:01 +00:00
|
|
|
cairo-gobject >= cairo_required_version dnl
|
2010-06-26 05:06:30 +00:00
|
|
|
gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
|
2001-09-21 14:23:15 +00:00
|
|
|
|
2011-01-03 15:45:37 +00:00
|
|
|
PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
|
2009-05-30 13:45:21 +00:00
|
|
|
|
2011-11-24 15:31:47 +00:00
|
|
|
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
|
|
|
|
|
2002-03-02 23:29:02 +00:00
|
|
|
dnl ******************************************************
|
|
|
|
dnl * See whether to include shared library dependencies *
|
|
|
|
dnl ******************************************************
|
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
AC_ARG_ENABLE(explicit-deps,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
|
2003-05-06 21:55:41 +00:00
|
|
|
[use explicit dependencies in .pc files [default=auto]])],,
|
|
|
|
[enable_explicit_deps=auto])
|
2002-03-02 23:29:02 +00:00
|
|
|
|
2013-10-06 19:13:48 +00:00
|
|
|
AC_MSG_CHECKING([whether to write dependencies into .pc files])
|
2002-03-02 23:29:02 +00:00
|
|
|
case $enable_explicit_deps in
|
|
|
|
auto)
|
2007-01-03 17:55:33 +00:00
|
|
|
export SED
|
2008-09-17 15:10:30 +00:00
|
|
|
deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
|
2011-03-21 14:32:49 +00:00
|
|
|
if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then
|
2010-05-07 07:53:03 +00:00
|
|
|
enable_explicit_deps=yes
|
2002-03-02 23:29:02 +00:00
|
|
|
else
|
2010-05-07 07:53:03 +00:00
|
|
|
enable_explicit_deps=no
|
2002-03-02 23:29:02 +00:00
|
|
|
fi
|
|
|
|
;;
|
2010-05-07 07:53:03 +00:00
|
|
|
yes|no)
|
2002-03-02 23:29:02 +00:00
|
|
|
;;
|
|
|
|
*) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT($enable_explicit_deps)
|
|
|
|
|
|
|
|
AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
|
|
|
|
|
Adapt cast macros to standard.
Fri Nov 19 10:34:41 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkgamma.h: Adapt cast macros to standard.
[ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_path):
If translation does not include a '/', use entire
translation instead of crashing.
Sun Oct 31 22:21:11 1999 Tim Janik <timj@gtk.org>
* docs/gtk_tut.sgml:
s/gtk_accel_group_attach/gtk_window_add_accel_group/.
Sat Oct 30 09:09:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.c (gtk_target_list_remove): Use
g_list_remove_link, not g_list_remove.
[ From Geert Bevin <gbevin@thunderstorms.org> ]
Sun Oct 24 07:41:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c (real_undo_selection): commented out g_print()
statement upon unselection (how the heck did that slip in?).
Sat Oct 23 03:03:08 1999 Tim Janik <timj@gtk.org>
* gtk/gtktext.c (gtk_text_freeze):
(gtk_text_thaw): undraw/draw cursor here to avoid unnecessary scrolling
in frozen state (and aparently crashes). patch provided by Anders
Melchiorsen <and@kampsax.dtu.dk>.
Sat Oct 23 02:53:20 1999 Tim Janik <timj@gtk.org>
* fix insensitive default/focus widget activation,
reported by Matt Goodall <mgg@isotek.co.uk>.
* gtk/gtkwindow.c (gtk_window_key_press_event):
(gtk_window_activate_default):
(gtk_window_activate_focus):
return handled=FALSE for actiavtion of insensitive default
widgets. return handled=TRUE for activation of insensitive
focus widgets. don't activate in either case.
Tue Oct 19 09:55:08 1999 Owen Taylor <otaylor@redhat.com>
* gtk-config.in (lib_gtk): Switch order of @x_cflags@
and $glib_cflags to match library order and in the
theory that an old version of GLib is more likely to
be in the include directory for X then vice-versa.
(Bug #2776)
Tue Oct 19 09:46:49 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE
to determine the locale for fontsets, not LC_MESSAGES;
the user may want English messages with a handling
for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
will still be broken) (Bug #2891)
Tue Oct 19 20:36:42 1999 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* gtk/gtkrc.ko: Fixed the wrong number of "*"'s.
Tue Oct 19 12:15:13 1999 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* gtk/gtkrc.ko: Changed the Korean default fontset.
Fri Oct 8 02:32:47 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_adjustment_changed): Fix bug
where when scrolling to the left or top double exposes
were done, causing major slowdowns.
Thu Oct 7 18:31:55 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_init): Always normalize codeset
names to lowercase and alphanumeric, before looking
them up.
* gtk/Makefile.am: Install codeset variant gtkrc files
with normalized names.
Thu Oct 7 22:52:42 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_popup_with_data): even
popup menus when the menu is already visible, but its parent
is still hidden, (happens after tornoff window got hidden).
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (install-data-local): Fix
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
deleted, causing error messages on install.
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
the handle as well, since we now sometimes ignore
exposes on the handle while resizing.
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
extra g_free introduced in one of the last one or two
commits.
Wed Oct 6 16:38:36 1999 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am gtk/gtkrc*: Make naming of gtkrc files
consistent, put each style that a gtkrc.* file creates
in a unique namespace, remove old files before installing.
Wed Oct 6 14:31:16 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_init): Avoid leaking memory when
gtk_rc_init is called multiple times. (Yes, people who
do that have bugs in their code.)
Tue Oct 5 11:36:57 PDT 1999 Manish Singh <yosh@gimp.org>
* gtk/Makefile.am: listing gtkrc in gtkconf_DATA seems to barf.
Remove it since it's generated by the Makefile anyway
Tue Oct 5 02:43:41 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkinputcommon.h (gdk_input_device_new): Free
device->info.axes for core pointer.
Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (destroy_idle_test): Rename idle to
idle_id, to deal with obsolete, broken C libraries.
Mon Sep 27 02:50:15 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkvscale.c (gtk_vscale_draw): Don't add in
allocation->x/y twice!
* gtk/gtkhscale.c: Make usage of gtk_hscale_pos_trough()
consistent with gtk_vscale_pos_trough().
Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcontainer.c (gtk_container_queue_resize): We may
be queueing a resize on a toplevel container between
the time we show it and when we map it. So, we need
to test GTK_WIDGET_VISIBLE() for toplevels, and only
use GTK_WIDGET_DRAWABLE() for child windows.
Thu Sep 23 16:41:03 1999 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (LDADDS): Add GDK_WLIBS to LDADDS
(fixes bug #2144)
Fri Sep 24 00:51:45 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (gtk_container_queue_resize): check for
container DRAWABLE (instead of VISIBLE), so we don't queue
resizes on non-toplevel containers.
Sun Sep 19 18:13:31 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch]: Make the data argument
const guchar *.
Sat Sep 18 21:27:40 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c: Try to behave sensibly if
the focus widget is the window itself. (Should
we allow this at all?)
Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_set_sensitive):
* gtk/gtknotebook.c (gtk_notebook_set_scrollable):
* gtk/gtknotebook.c (gtk_notebook_set_show_border):
* gtk/gtkclist.c (gtk_notebook_set_show_border): make gboolean args
in prototypes and implementations consistent (Tomas Ogren).
* gtk/gtklayout.c (gtk_layout_remove): unset GTK_IS_OFFSCREEN flag
before the widget is unparented (reported by damon).
* gtk/gtkdnd.c: make the cursor and icon data _unsigned_ char,
since we provide unsigned data anyways.
Thu Sep 16 21:32:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktooltips.c (gtk_tooltips_set_tip): Delay
the call to gtk_tooltips_layout_text() until later.
* gtk/gtktooltips.c (gtk_tooltips_draw_tips):
Call gtk_widget_ensure_style() before using the style.
Wed Sep 15 02:52:19 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_event): Added workaround
for old widgets that don't propagate draws to all
children. (Namely gnome-dock for gnome-libs <= 1.0.16)
Tue Sep 14 19:22:19 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_queue_resize): don't queue the parent
for a redraw but just the widget that requested the resize.
Tue Sep 14 18:29:47 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: added new widget level method
gtk_container_set_reallocate_redraws() and a GtkContainer flag
reallocate_redraws : 1 to reflect the setting, exported this through
the argument system as a boolean ::reallocate_redraws.
* gtk/gtkwidget.c (gtk_widget_size_allocate): when queueing redraws
on the widget because the allocation changes, do so as well for
widget->parent if the parent has reallocate_redraws set to TRUE.
with that containers requesting reallocation redraws get automatically
redrawn if their children changed allocation (this unfortunately
affects also other children that didn't change allocation, but we
cannot work around that before 1.3).
Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_idle_draw): only emit ::draw if width
_and_ height are >0 (not _or_).
* gtk/gtktable.c (gtk_table_remove): use gtk_widget_queue_resize()
instead of gtk_container_queue_resize(), which is a core gtk internal
function (must have been on crack when i queued that).
* gtk/gtkprivate.h: added new private flag GTK_FULLDRAW_PENDING, so
we can check more reliably if we want to discard expose events.
* gtk/gtkwidget.c: added setting/unsetting of the GTK_FULLDRAW_PENDING
flag.
* gtk/gtkwidget.c (gtk_widget_event): don't discard synthesized exposes,
we simply trust these events. for deciding whether to discard exposes,
check GTK_FULLDRAW_PENDING instead of RESIZE_PENDING.
Mon Sep 13 15:01:21 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): Ignore
queues of areas that are completely off screen.
* gtk/gtkwidget.c (gtk_widget_idle_draw): Fix broken
logic for handleboxes.
* gtk/gtkwidget.c (gtk_widget_queue_draw_data): Add santity
check on width/height.
Mon Sep 13 02:22:47 1999 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: backed out Raja's recent VPATH build "improvements",
we are fine with using $@ the way we do (if we actually encounter
brokeness with $@ in VPATH builds because of additional path prefixes,
we need to use $(@F) actually).
Mon Sep 13 01:34:53 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c: renamed two variables, hopefully didn't introduce
short lived bugs, that would allow language bindings to do surgeries
to our guts.
Fri Sep 10 15:22:50 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_size_allocate): Fix typo
where comparison was being done against an uninitialized
value causing intermittant results depending on
compiler flags. Also make it clearer that we aren't
ever initializing the child as 0x0 (though this will
be caught in gtk_widget_size_allocate())
Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_transient_for): Move
gtk_window_unset_transient_for() call after we do checks
involving the old transient parent.
[ From Lance Capser <lmc@cyberhighway.net> ]
1999-09-07 Raja R Harinath <harinath@cs.umn.edu>
* gtk/Makefile.am (gtk.defs): Go back to using `touch' to create
an empty file.
Mon Sep 6 00:11:56 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (gtk_ctree_is_ancestor): return FALSE if node has
no children. (Reported by: Chris Rogers <gandalf@pobox.com>)
1999-09-03 Raja R Harinath <harinath@cs.umn.edu>
* gtk/Makefile.am (gen_sources): Improve VPATH builds.
`$@' is valid only in the build dir, not after we've done
`cd $srcdir'. Also use `test -f' instead of less portable
`test -e'.
Fri Sep 3 15:59:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (correct_cache_insert): Rewrite
for simplicity, and hopefully correctness.
(Fixes bug #1322, which was a segfault when
on some insertions with the properties around
the insertion set up just wrong.)
* gtk/gtktext.c (gtk_text_adjustment): When we receive
a "changed" signal, clamp the new value to the adjustment
bounds to avoid segfaulting if someone tries to change
the adjustment to a bogus value. (Bug #1795)
Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Ignore unexpected destroy notifies
for children, for toplevel windows handle them
like delete_event.
* gtk/gtkplug.c: Add an unrealize handler so that
we unref plug->socket_window when we are done
with it.
Fri Sep 3 14:52:54 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c (clear_area): Fix stupid signedness
problem that was causing background to sometimes
be misaligned.
Fri Sep 3 12:26:33 1999 Owen Taylor <otaylor@redhat.com>
[ Fixes pointed out by Ettore Perazzoli <ettore@comm2000.it> ]
* gtk/gtkmenu.c (gtk_menu_position): Make
sure we never position menus with negative x, y,
since gtk_widget_set_uposition() can't handle that.
* gtk/gtkmenuitem.c (gtk_menu_item_position_menu):
Modify the positioning code a bit so that we always
put the top-left corner onscreen. (This is for
UI reasons, gtk_menu_position() now takes care of
gtk_widet_set_uposition() brokeness.)
Fri Sep 3 03:06:30 1999 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: fixed up things for -jx, x > 1.
Sun Sep 5 08:48:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_style): Ref the
RC style that is passed in. The lack of the ref
before was a bug. If people worked around this
bug, this will introduce a slight memory leak
in their code. The code should typically look like:
rc_style = gtk_rc_style_new ();
[...]
gtk_widget_modify_style (widget, rc_style);
gtk_rc_style_unref (rc_style);
* gtk/gtkwidget.c (gtk_widget_modify_style): Reset
the style if it was already set.
* gtk/gtkwidget.c (gtk_widget_set_name): Only set the
style if it was set before.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (main): Add a check to see if we
are being run from the correct directory and
to quit nicely if we are not.
* gtk/gtkrc.c (gtk_rc_slist_remove_all): Make function
static.
Thu Sep 2 23:00:03 1999 Tim Janik <timj@gtk.org>
* gtk/gtkenums.h (GtkWindowPosition): added GTK_WIN_POS_CENTER_ALWAYS.
* gtk/gtkwindow.c:
queue resizes unconditionally (gtk_widget_queue_resize will figure
what to do if the window is not realized).
(gtk_window_move_resize): only recenter the window
for GTK_WIN_POS_CENTER_ALWAYS.
(gtk_window_compute_reposition): handle GTK_WIN_POS_CENTER_ALWAYS in
the same way as GTK_WIN_POS_CENTER.
Thu Sep 2 22:39:27 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_reposition): check for the last position
with (!(info->last_flags & GDK_HINT_POS)) instead of
(!info->last_flags & GDK_HINT_POS).
* gtk/gtkwindow.c (gtk_window_move_resize): constrain new_width and
new_height unconditionally, because we use these values even if
!default_size_changed && !hints_changed.
comented the (default_size_changed || hints_changed) case with
respect to resize rejects from the window manager.
* gtk/gtkwindow.c (gtk_window_move_resize): save info->last values
in the zvt condition hack, since this includes the window hints, set
the hints after the handling_resize case.
* gtk/gtkwindow.c (gtk_window_show): constrain the default size that a
window is initially shown with to the geometry.
Thu Sep 2 07:38:56 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_move_resize):
s/size_changed/default_size_changed/g so i know what's
really going on (frying brain on smaller flame now).
Thu Sep 2 05:47:47 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_move_resize): queue a new resize if
we have size_changed upon handling_resize. this is a gross
workaround for the broken zvt widget and should be removed in
1.3 again (search for FIXME).
Owen provided an accurate comment for this:
/* We could be here for two reasons
* 1) We coincidentally got a resize while handling
* another resize.
* 2) Our computation of size_changed was completely
* screwed up, probably because one of our children
* is broken. It's probably a zvt widget.
*
* For 1), we could just go ahead and ask for the
* new size right now, but doing that for 2)
* might well be fighting the user (and can even
* trigger a loop). Since we really don't want to
* do that, we requeue a resize in hopes that
* by the time it gets handled, the child has seen
* the light and is willing to go along with the
* new size. (this happens for the zvt widget, since
* the size_allocate() above will have stored the
* requisition corresponding to the new size in the
* zvt widget)
*
* This doesn't buy us anything for 1), but it shouldn't
* hurt us too badly, since it is what would have
* happened if we had gotten the configure event before
* the new size had been set.
*/
Wed Sep 1 20:46:11 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c: deal properly with the fact that RC
style lists may include rc styles more than once.
* gtk/gtkrc.c (gtk_rc_append_pixmap_path): Removed
unused static function.
* gtk/gtkrc.c (gtk_rc_find_pixmap_in_path): Keep a
stack of directories of RC files currently being
parsed and implicitely add them to pixmap path.
This fixes a bug where the directory would get
appended then overwritten by pixmap_path declarations.
(bug #1462, from Peter Wainright <prw@wainpr.demon.co.uk>)
* gtk/gtkthemes.c (gtk_theme_engine_unref): Call
theme's exit function. (Patch from Peter Wainwright,
bug #1454)
* gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy):
Add a destroy() handler to take care of removing
group for menu item. (Fixes bug #1197)
* gtk/gtkwidget.c (gtk_widget_size_request): Fixed thinko
in warning message.
Wed Sep 1 21:27:42 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_move_resize): don't require a server
roundtrip to figure window's width and height, since we know that
anyways from widget->allocation.
Wed Sep 1 12:37:44 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Compute
the hints after we request the new size.
Wed Sep 1 10:38:37 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_compute_hints): Removed
GTK_WIDGET_REALIZED() assertion - we can compute the
hints before we are realized.
* gtk/gtkwindow.c (gtk_window_move_resize): Reorder
hint changing so that we have a value of hints_changed
when we decide whether to constrain the window size.
* gtk/gtkwindow.c (gtk_window_move_resize): Spelling fix.
* gtk/gtkwindow.c (gtk_window_constrain_size): cleanups,
change back to G_MAXINT.
Wed Sep 1 06:54:59 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c (gtk_window_get_geometry_info): zero initialize
new GtkWindowGeometryInfo, so fields like GdkGeometry geometry
contain uncluttered values.
(gtk_window_compute_hints): simply assert that window is realized
and that geometry_info is valid, since we rely on this anyways.
(gtk_window_constrain_size): major cleanups to the code.
if (flags & GDK_HINT_BASE_SIZE) use geometry's base width and height
for the base size, instead of the minimums. use 32767 as max width
and height (like in gtkwindow.c) instead of G_MAXINT.
Wed Sep 1 04:41:25 1999 Tim Janik <timj@gtk.org>
* cleaned up the GtkContainer.need_resize flag handling mess, we
only need to force resize requests when we were prematurely
realized, or our widget tree was modified when we were temporarily
hidden. handling these cases directly upon showing the window (i.e.
while the GdkWindow is still unmapped) avoids the need to wait for
a configure event response and therefore makes the GUI more snappier
and avoids blank windows during the roundtrip.
* gtk/gtkwidget.c:
(gtk_widget_hide):
(gtk_widget_show): don't queue resizes on toplevels, they know how
to deal with matters.
* gtk/gtkcontainer.c (gtk_container_queue_resize): set the ->need_resize
flag directly for not visible resize containers and spare us unecessary
signal emissions.
* gtk/gtkwindow.c:
(gtk_window_realize): if we need to enforce premature size allocation,
queue a container resize so we are correctly resized later on.
(gtk_window_init):
(gtk_window_size_request):
don't freak around with the ->need_resize flag,
gtk_container_queue_resize() will care about that.
(gtk_window_show):
handle initial resizing issues here, we can handle matters better in
this place, especially since we know that our GdkWindow is still
unmapped.
(gtk_window_move_resize):
don't care about ->need_resize at all.
handle size changes properly that occoured while we waited for a
configure event.
Tue Aug 31 15:58:46 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_set_uposition):
* gtk/gtkwindow.[hc] (gtk_window_reposition):
Move the hint setting code from gtk_widget_set_uposition
to here; set the hints so that we respect any previously
set geometry hints.
* gtk/gtkwindow.c (gtk_window_compute_reposition): Don't
change the window hints here or move the window here,
let that happen in gtk_window_move_resize().
Tue Aug 31 06:58:52 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_event): when discarding exposes due
to already queued resizes (and therefore redraws) on a widget, check
its anchestry as well.
* gtk/gtkcontainer.c:
(gtk_container_queue_resize): clear resize widgets for resize
containers before aborting prematurely. this is especially important
for toplevels which may need imemdiate processing or their resize
handler to be queued.
(gtk_container_dequeue_resize_handler): added new internal function for
gtkwindow.c.
* gtk/gtkwindow.c (gtk_window_move_resize): if we are resizing due to a
configure event, take possible changes in window position into account
as well.
if we request a new window size, queue up a resize handler that will
last until the configure event response arrives.
combined the ->need_resize case (initial show) with the general size
(hints) changed case and added even more comments.
if !auto_shrink, only revert to the old allocation if the new size
is smaller than the current allocation.
Tue Aug 31 11:55:20 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_arg, gtk_window_set_policy,
gtk_window_set_geometry_hints
gtk_window_set_default_size):
When hints are set, queue a resize so that the hints will
be eventually reset on the toplevel.
* gtk/gtkwindow.c (gtk_window_show): Use
gtk_window_compute_default_size(). Clear the need_resize flag
on the initail map so that we don't unnecessarily trigger the
resize code.
* gtk/gtkwindow.c (gtk_window_move_resize): Split apart
into separate functions. Compare the hints we are setting
with what we set last time so that we can accurately
tell when we need to reset the hints.
* gtk/gtkwindow.c (gtk_window_compute_default_size): New
function to figure out the size from requisition
and default_size.
* gtk/gtkwindow.c (gtk_window_constrain_size): Function
from fvwm to constrain a size to the geometry hints.
* gtk/gtkwindow.c (gtk_window_compare_hints): New function
to compare two sets of geometry hints.
* gtk/gtkwindow.c (gtk_window_compute_hints): Renamed
from gtk_window_set_hints(), just compute the hints,
don't set them.
* gtk/gtkwindow.c (gtk_window_compute_reposition): Move
code from gtk_window_move_resize() to separate function,
rationalize a bit.
Tue Aug 31 13:05:03 1999 Owen Taylor <otaylor@redhat.com>
* gtkrc.h: Move the ref_count member out of the GtkRcStyle
structure into a new private structure.
* gtkrc.c: Split GtkRcStyle into public/private.
In the private part, add a list of pointers to the
RcStyle lists this RcStyle participates in.
* gtkrc.c: When a RcStyle is free, remove all
lists referencing it from the
realized_style_ht hash, and free those lists.
* gtk/gtkrc.c (gtk_rc_clear_styles): Don't call
gtk_rc_init(), since that adds the default styles
to the list of parsed RC files again.
* gtk/gtkrc.c: Use gtk_rc_style_find() consistently.
Thu Aug 26 14:14:42 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): reactivated the sanity
checks that ensure that a widget's allocation is at least 1 in width
and height. (GNOME note: this doesn't affect old panel code anymore,
because GtkSocket will request width and height of at least 1 since
Fri Jul 23).
* gtk/gtkwindow.c (gtk_window_realize): if the widget hasn't been
allocated yet (happens if the user realizes the window prematurely),
size request and allocate it.
(gtk_window_size_allocate): guard against guint underflows.
Wed Aug 25 19:01:36 1999 Lars Hamann <lars@gtk.org>
* gtk/Makefile.am (gtk_built_sources): reordered stamp-gtk.defs
in gtk_built_sources, so gtk.defs gets built prior to all other
sources.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* gtk/Makefile.am:
invoke indent on gtkmarshal.*.
rewrote source generation rules, use COPYING as oldest source tag for
a piggyback rule to generate all sources from (don't touch it ;).
major cleanups, strip spaces on build rules for GNU Make.
* gtk/genmarshal.pl: don't operate on hardcoded filenames but take
source and target files from commandline arguments. don't invoke indent.
Sat Aug 21 14:07:36 1999 Lars Hamann <lars@gtk.org>
* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
notebook after switch to avoid drawing problems.
(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
(gtk_notebook_pages_allocate): don't map not visible tab_labels,
show them instead.
(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
Sat Aug 21 14:07:36 1999 Lars Hamann <lars@gtk.org>
* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
notebook after switch to avoid drawing problems.
(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
(gtk_notebook_pages_allocate): don't map not visible tab_labels,
show them instead.
(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
Wed Aug 18 09:20:10 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c:
we use window->need_resize from configure_event now, to indicate that
the gtkwindow should keep its allocation (e.g. because the user resized
the window through window manager handles). resize_count is now reliably
used to figure whether we got the allocation we requested from the
window manager.
configure events get queued as resizes now, the real stuff (size
computation and allocation) now only goes on in gtk_window_move_resize().
GtkWindow's requisition now contains its *real* requisition (like all
other widgets), *not* taking usize into account.
geometry_info->last_{width|height} is now updated from set_hints() only
so it always contains the last hints we set for the window manager.
made some event handlers return TRUE instead of FALSE.
the overall code should be much more straight forward now, and the
significant code portions are accompanied by comments now.
(gtk_window_set_hints):
removed requisition argument and made it
fetch the requisition through gtk_widget_get_child_requisition.
we also don't move the gdkwindow here anymore, gtk_window_move_resize()
does that now.
(gtk_window_show):
ensure that the widget is realized before calling
gtk_container_check_resize() (and thus gtk_window_move_resize()), also
ensure that we got properly size requested and allocated before
realization.
(gtk_window_configure_event):
ignore plain window moves, or reallocate the widget tree through the
resize queue otherwise.
(gtk_window_move_resize):
mostly rewrote this function to figure window manager hints more
reliably, coalesce window moves and resizes to reduce configure events
and do actuall size allocations.
Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_event): discard expose events for widgets
that have a resize pending, because a redraw is already queued for them.
* gtk/gtkcontainer.c: removed ugly connect_to ::size_allocate signal
hack to clear resize_widgets.
* gtk/gtkwidget.c (gtk_widget_size_allocate): call clear_resize_widgets
for resize containers prior to size allocation. (this is also a bit
ugly, but avoids side effects for stopped emissions and is thus more
reliable).
(gtk_widget_unparent): removed disconnect call for clear_resize_widgets.
* gtk/gtktooltips.c (gtk_tooltips_paint_window): renamed this
function from gtk_tooltips_expose, as we connect to ::expose_event
*and* ::draw now.
1999-08-18 Federico Mena Quintero <federico@redhat.com>
* gtk/gtkselection.c (gtk_target_list_ref): Added missing sanity
checks.
(gtk_target_list_unref): Likewise.
* gtk/gtkthemes.c (gtk_theme_engine_unref): Likewise.
Tue Aug 17 15:47:07 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c (gtk_color_selection_draw_value_bar):
guard against division by zero. (Fixes bug #1339)
Tue Aug 17 10:56:49 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_move_{forward,backward}_word):
Prevent the trivial leak of information of allowing
word motion when the entry is not visible.
Tue Aug 17 10:28:52 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_fileop_error): Propagate
modality to error dialog as well as confirmation dialogs.
(Bug #1803, reported by Rosanna Wing Sze Yuen)
Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
tree->view_lines.
(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
* gtk/Makefile.am (install-data-local): Solaris apparently
has various troubles with ln -f; use rm first instead.
(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
1999-07-30 Raja R Harinath <harinath@cs.umn.edu>
* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
use `cp' followed by `rm' (the `rm' was already there).
July 30, 1999 Elliot Lee <sopwith@redhat.com>
* configure.in: Fix autoconf warnings about cross compilation by
trying to provide sane defaults for AC_TRY_RUN.
* gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir),
put them into $(srcdir) when generated. Also add a dependency of
gtksignal.h on gtkmarshal.h for -j builds.
* gtk/gtk(dnd,style,gamma).c: Minor warning fixes.
Wed Jul 28 09:29:19 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_iteration_do): Added missing
GDK_THREADS_{LEAVE,ENTER} pair.
(From Paul Fisher <pnfisher@redhat.com>)
Fri Jul 23 01:00:15 1999 Tim Janik <timj@gtk.org>
* gtk/gtksocket.c (gtk_socket_size_request): asure that the requested
width and height are always >0 (owen).
Fri Jul 23 00:00:47 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent
change that assured that a widget's allocated with and height are
always >1, since this breaks *buggy* panel code. unfortunately this
back-breaks the gimp's color selector.
* gtk/gtkdrawingarea.c (gtk_drawing_area_size_allocate): asure that our
allocation is always >0 in width and height, before sending the
configure event; this is a *gross* hack to get the gimp back to work.
* marked both cases with TODO-1.3
Wed Jul 21 15:47:39 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext.c: Don't display wrap indicators when
text is not editable and word wrap is on.
Wed Jul 21 08:21:40 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): special case
option menus here as they are not derived from menu shell, assure that
the option menu has a menu we can add items to.
Tue Jul 20 23:29:48 1999 Tim Janik <timj@gtk.org>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): convert allocation->
width/height to (gint) before calculations and check against < 0 to
avoid guint wraparounds.
Sun Jul 18 00:35:49 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): ensure that the allocated
width and height is never zero. sanity check both dimensions against
32767 and issue a warning if the allocation is greater than that.
Wed Jul 7 15:03:30 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_events_pending): Unlock around call
to g_main_pending() as well.
Wed Jul 7 14:59:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main_iteration): Unlock around
call to g_main_iteration() - since that will regrab
GTK+ lock to process events.
Thu Jul 1 15:01:55 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c
- Regularize with the rest of GTK+ by making widget->requisition
not reflect the set_usize()
- Always recompute geometry hints, then check if they
changed before sending them to the X server. The
previous checks for changes would fail in a number
of circumstances.
Thu Jul 1 11:55:59 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c: Include <stdlib.h> for strcmp().
Wed Jun 30 19:26:36 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c:
- Code cleanups
- Instantaneously update on modifier key presses
- Allow cancellation of the drag with Escape.
Tue Jun 29 17:04:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_handle_box): Set the policy
to auto_shrink - otherwise the appearance is rather
strange when flipping between horizontal and vertical.
Mon Jun 28 09:29:52 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
(gtk_window_set_default_size): don't change a value if it's < 0.
queue a resize.
Sun Jun 27 11:00:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtktext.c (gtk_text_insert): don't segfault on NULL inserts.
Mon Jun 28 12:08:25 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (cmpl_completion_fullname): Don't
add an extra "/" when concating "/" + filename.
(From Matt Grossman <mattg@oz.net>)
Mon Jun 28 10:57:12 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c (draw_cell_pixmap): Reset clip mask
for fg_gc if we set it for drawing pixmap.
Tue Jun 15 12:45:12 1999 Owen Taylor <otaylor@redhat.com>
Fixes from Peter Wainwright <prw@wainpr.demon.co.uk>
* gtk/gtkrc.c (gtk_rc_parse_engine): If rc_style->engine is
already set, call old engine's destroy function and
unref the old engine.
Thu Jun 10 17:59:38 1999 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.c (gtk_drawing_area_size): queue a resize.
Wed Jun 9 15:13:16 1999 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h: mark certain functions as internal.
Wed Jun 9 13:48:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtkpreview.c (gtk_preview_set_expand): queue a resize if the
expand behaviour changed.
* gtk/gtklabel.c (gtk_label_set_pattern):
(gtk_label_set_justify):
(gtk_label_set_line_wrap):
don't bother invoking queue_clear, the reallocation does
that for us, always free_words so the upcoming resize will
relayout the label's contents.
Wed Jun 9 12:50:48 1999 Tim Janik <timj@gtk.org>
* applied argument implementation patches from Elena Devdariani
<elena@cogent.ca>.
* gtk/gtktoolbar.c: ::orientation, ::toolbar_style, ::space_size,
::space_style, ::relief
* gtk/gtkruler.c: ::lower, ::upper, ::position, ::max_size
* gtk/gtkpreview.c: ::expand
* gtk/gtkpaned.c: ::handle_size, ::gutter_size
* gtk/gtknotebook.c: ::homogeneous
* gtk/gtklabel.c: ::wrap
* gtk/gtklist.c: ::selection_mode
* gtk/gtkhandlebox.c: ::handle_position, ::snap_edge
* gtk/gtkcurve.c: ::curve_type, ::min_x, ::max_x, ::min_y, ::max_y
* gtk/gtkcolorsel.c: ::update_policy, ::use_opacity
* gtk/gtkclist.c: ::sort_type
* gtk/gtkcheckmenuitem.c: ::active, ::show_toggle
* gtk/gtkaspectframe.c: ::xalign, ::yalign, ::ratio, ::obey_child
Tue Jun 1 23:38:38 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c: Removed ill-thought-out part of last
comment.
Tue Jun 1 23:30:09 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_attach): Get the reference
counting right when we have to attach a new style
for a different visual. (Chi-Deok Hwang <cdhwang@sr.hei.co.kr>)
* gtk/gtkstyle.c: Documented the refcounting
peculularities of gtk_style_attach.
1999-06-01 Tim Janik <timj@dhcpd7.redhat.com>
* gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid
window types.
* examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead
of GTK_TOPLEVEL for creating the window.
1999-06-01 Tim Janik <timj@dhcpd7.redhat.com>
* gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is
the last argument (reported by Per Winkvist).
Tue May 25 13:13:12 1999 Owen Taylor <otaylor@redhat.com>
Fixes for invisible XOR lines (Frank Loemker
<floemker@TechFak.Uni-Bielefeld.DE>)
* gtk/gtkclist.c (gtk_clist_realize): Always use
a non-zero pixel for GDK_XOR.
* gtk/gtkvpaned.c gtk/gtkhpaned.c:
Use GDK_INVERT instead of GDK_XOR.
Wed May 12 21:56:40 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (adjust_adjustments): signal emit value_changed
signals if h/voffsets differ from adjustment values.
Reportet by Jerome Bolliet <bolliet@in2p3.fr>
Mon May 10 04:20:41 1999 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_activate_item): propagate
::selection-done emissions up to the topmost menu shell.
Fri May 7 10:15:14 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_set_scrollable): Unset
the user data on the window before destroying it.
* gtk/gtknotebook.c (gtk_notebook_unrealize): Add an
unrealize handler to take care of destroying
notebook->panel properly.
(Bug #1198 - Morten Welinder <terra@diku.dk>)
* gtk/gtktext.c (expand_scratch_buffer): Fix reversal
of g_new and g_realloc to stop memory leak. (Actually,
we could just use g_realloc(), but I'm not 100% sure
that is portable).
(Bug #1196 - Morten Welinder <terra@diku.dk>)
Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkplug.h: Removed stray GtkPlugButton declaration.
* gdk/gdkfont.c (gdk_text_measure): Fix the return value
for fontsets.
* gtk/gtkbutton.c (gtkbutton_expose): Fix warning
with bin/button confusion.
Thu May 6 04:53:26 1999 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: in the ItemFactory test, link radio items together,
and show how preselection of radio items is done.
Sun May 2 13:31:14 1999 Tim Janik <timj@gtk.org>
* gtk/gtktreeitem.c (gtk_tree_item_set_subtree):
* gtk/gtktree.c (gtk_tree_add) (gtk_tree_insert):
* gtk/gtktoolbar.c (gtk_toolbar_insert_element):
* gtk/gtkpaned.c (gtk_paned_pack2) (gtk_paned_pack1):
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_add):
* gtk/gtktable.c (gtk_table_attach):
* gtk/gtklist.c (gtk_list_insert_items):
* gtk/gtkmenushell.c (gtk_menu_shell_insert):
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu):
* gtk/gtkpacker.c (gtk_packer_add_defaults) (gtk_packer_add):
* gtk/gtkbin.c (gtk_bin_add):
* gtk/gtkbox.c (gtk_box_pack_start) (gtk_box_pack_end):
* gtk/gtkfixed.c (gtk_fixed_put):
* gtk/gtklayout.c (gtk_layout_put):
general fixups to container_add logic. always realize child if
child->parent is realized, only map the child and queue a resize
if child and child->parent are both visible.
Fri Apr 30 09:02:28 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_real_unrealize): use gtk_container_forall
instead of gtk_container_foreach to walk and unrealize children, so
composite children get also unrealized.
(gtk_widget_real_show): don't call gtk_widget_map() if we don't need to.
(gtk_widget_map): assert that the widget is visible (basic constrain).
(gtk_widget_real_map): assert that the widget is realized (basic
constrain).
Fri Apr 29 00:53:20 1999 Tim Janik <timj@gtk.org>
* gtk/gtkbindings.c (gtk_pattern_spec_init): plugged a memory leak.
Tue May 4 09:32:08 1999 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
file for iso-8859-2 locales.
* configure.in (ALL_LINGUAS): ALL_LINGUAS update.
Tue Apr 27 16:38:32 1999 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Fix typo of static_sources for static_SOURCES.
(Pointed out by andy@rz.uni-karlsruhe.de and others).
Remove some suspicious and useless lines.
Tue May 4 08:44:08 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (gtk_clist_draw, draw_rows): Use
width,height = 0, 0 to mean - here to edge of window,
instead of -1, -1, since the former is all we support.
Tue May 4 08:34:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c (gtk_main): Correctly free list nodes
when removing from quit_functions list.
Tue Apr 27 14:17:16 1999 Tim Janik <timj@gtk.org>
* gtk/gtkpacker.c (gtk_packer_size_request): remove unused variable.
Tue Apr 27 18:23:35 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable):
When redrawing characters on non-visible entry, use appropriate
'*' character. (Bug #1130 - Jean-Marc Jacquet <jm@littleigloo.org>)
Tue Apr 27 01:31:40 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (drag_dest_cell): compute destination cell
from drag coordinates.
(gtk_clist_drag_data_received) (gtk_clist_drag_motion):
use drag_dest_cell.
* gtk/gtktree (drag_dest_cell)
(gtk_ctree_drag_data_received) (gtk_ctree_drag_motion): likewise.
(Bug #1129)
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
translate_* fields.
(gtk_item_factory_finalize): invoke translate_notify independant from
translate_data.
(gtk_item_factory_set_translate_func): likewise.
(gtk_item_factory_destroy): only remove ifactory pointer from those
widgets that belong to us (stupid me).
Mon Apr 19 12:05:31 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c (gtk_rc_style_init): Fixed leak of
rc_style list when lookup succeeeds.
Thu Apr 15 01:11:24 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkctree.c (resync_selection):
* gtk/gtkclist.c (resync_selection): fixed undo_selection bug.
* gtk/gtkclist.c (gtk_clist_button_release): fixed resync_selection
bug.
Fri Apr 9 19:22:19 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorsel.c gtk/gtkdnd.c gtk/gtkmenuitem.c:
Add some missing GDK_THREADS_ENTER()/LEAVE around
timeouts. (Patches from Sebastian Wilhelmi <wilhelmi@ira.uka.de>)
Thu Apr 8 20:10:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtkentry.c (gtk_entry_key_press): use gtk_widget_activate()
rather than emit_by_name.
* gtk/gtkeditable.c (gtk_editable_insert_text): keep a reference
on the widget across multiple signal emissions.
(gtk_editable_delete_text): same here.
(gtk_editable_class_init): set widget_class->activate_signal after
editable_signals[ACTIVATE] has been created.
Wed Apr 7 22:59:47 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.c (gtk_paned_set_position): Don't clamp
position here prematurely -- we might not have the
right ->min_position and ->max_position yet.
Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.c gdk/gdkselection.c: (gtk_selection_request):
Add error traps so if the other end of the connection
dies, we survive.
* gtk/gtkselection.c (gtk_selection_notify): Clean
up properly when selection property retrieval fails.
* gtk/gtkselection.c (gtk_selection_request): Correctly
reject SelectionRequest notifies where the handler
returns no data.
Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_dest_leave): Only unhighlight
when we've previously highlighted.
* gtk/gtkdnd.c (gtk_drag_dest_handle_event): Don't
emit two "drag_leave" signals for Motif drops.
* gtk/gtkdnd.c (gtk_drag_source_handle_event): Send
back the correct status messages when dropping from
Motif onto a proxy window that is rejecting the
drop.
Sat Mar 27 23:32:13 1999 Tim Janik <timj@gtk.org>
* gtk/gtkarg.[hc]: added functions from GLE, gtk_arg_reset() to free
the value and reset type to GTK_TYPE_INVALID, and gtk_arg_values_equal()
to compare two argument values. added gtk_arg_to_valueloc() to set a
variable from an arg through its location (pointer).
* gtk/gtkobject.[hc]: implemented gtk_object_get() in terms of
gtk_object_arg_get() and gtk_arg_to_valueloc(), floats are collected
as gfloat*, uchars are collected as guchar*, ints are collected as
gint*, etc...
Mon Mar 29 17:45:47 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccelgroup.c gtk/gtkgtkbindings.c:
Include <string.h> instead of <strings.h>.
* gtk/gtkstyle.c: Fix double include of gtkthemes.h
(actually, a lot more duplicate includes occur if
you trace through the sequence of #include's)
gtk-jbb-990320-0: John Bley, jbb6@acpub.duke.edu
Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com>
Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>
gtk-a-higuti-990322-[0-3]
* configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS
that was causing -DX_LOCALE not to work.
* gtk/gtkrc.c (gtk_rc_init):
X_LOCALE will never have LC_MESSAGES defined
Thu Mar 25 12:38:31 1999 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_append_default_module_path): get $HOME from
g_get_home_dir() (gtk-pmc-990123-0.patch.gz).
* gtk/gtkwindow.c (gtk_window_key_press_event): feature keypad up/down/
left/right as well (gtk-michael-980726-0.patch.gz).
* gtk/gtklabel.[hc]: bunch of miscellaneous cleanups, such as s/0/NULL/
for pointer values, use gchar instead of char. fixed uline allocation
leaks, changed the allocation pattern so we use G_ALLOC_AND_FREE mem
chunks instead of G_ALLOC_ONLY.
(gtk_label_size_request): always alter requisition as passed and leave
widget->requisition alone.
(gtk_label_set_text): allow NULL strings.
(gtk_label_new): likewise.
Wed Mar 24 09:24:03 1999 Tim Janik <timj@gtk.org>
* gtk/gtkdrawingarea.[hc]: type/macro fixups.
Mon Mar 22 05:51:34 1999 Tim Janik <timj@gtk.org>
* gtk/gtkbin.c (gtk_bin_draw): only redraw children that are visible
*and* mapped (i.e. drawable).
(gtk_bin_expose): only send exposes to drawable children.
* gtk/gtkbox.c (gtk_box_draw): only redraw children that are drawable.
(gtk_box_expose): only send exposes to drawable children.
* gtk/gtkhscale.c (gtk_hscale_draw):
* gtk/gtkvscale.c (gtk_vscale_draw):
hm, this is an ugly one. we first compute the size of our trough area
here (window relative) and then check intersection with the draw_area
which is parent relative because we're a NO_WINDOW widget, so we need
to offset the trough area by allocation.x and allocation.y before the
check. (this must not be done for the background area though, since
that's already computed parent relative).
Mon Mar 22 00:41:39 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
unrealize title buttons.
Fri Mar 19 00:00:22 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (gtk_clist_column_title_passive)
(gtk_clist_column_title_active):
only connect/disconnect to GtkWidgetClass::event to block mouse events.
* gtk/gtkclist.c (vertical_timeout) (horizontal_timeout):
zero initialize event, removed superfluous gdk_window_get_pointer call
* gtk/gtklist.c (gtk_list_vertical_timeout)
(gtk_list_horizontal_timeout): removed superfluous
gdk_window_get_pointer call
Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org>
* plugging problems reported by "Bruce Mitchener, Jr."
<bruce@puremagic.com> due to a purify session.
* gtk/gtkstyle.c:
(gtk_style_ref):
(gtk_style_unref): assert ref_count to be > 0.
* gtk/gtkclist.c (gtk_clist_set_cell_style): { 0 } initilaize
the requisition.
(gtk_clist_set_shift): likewise.
* gtk/gtklayout.c: introduce gtk_layout_finalize() to unref the
adjustments.
* gtk/gtklist.c (gtk_list_horizontal_timeout): zero initialize the
event before sending it and set send_event to TRUE (which needs to
be done for *all* synthesized events).
(gtk_list_vertical_timeout): likewise.
* gtk/gtktipsquery.c (gtk_tips_query_destroy): plug small memory
leaks.
* gtk/gtkdrawingarea.c (gtk_drawing_area_send_configure): set send_event
to TRUE when synthesizing events.
[ *** end of merges from 1.2 *** ]
1999-11-22 21:52:50 +00:00
|
|
|
# define a MAINT-like variable REBUILD which is set if Perl
|
1998-09-17 15:40:22 +00:00
|
|
|
# and awk are found, so autogenerated sources can be rebuilt
|
|
|
|
|
2002-05-14 23:57:40 +00:00
|
|
|
AC_PATH_PROGS(PERL, perl5 perl)
|
1998-09-17 15:40:22 +00:00
|
|
|
|
2013-01-29 13:08:47 +00:00
|
|
|
AC_CHECK_FUNCS(lstat mkstemp)
|
2007-06-26 20:37:44 +00:00
|
|
|
AC_CHECK_FUNCS(localtime_r)
|
2005-01-14 13:43:54 +00:00
|
|
|
|
|
|
|
# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
|
|
|
|
AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
|
2011-02-06 22:10:21 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
[[char c;
|
|
|
|
c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));]])],
|
|
|
|
[gtk_ok=yes], [gtk_ok=no])
|
2005-01-14 13:43:54 +00:00
|
|
|
AC_MSG_RESULT($gtk_ok)
|
|
|
|
if test "$gtk_ok" = "yes"; then
|
|
|
|
AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
|
|
|
|
[Define if _NL_TIME_FIRST_WEEKDAY is available])
|
|
|
|
fi
|
2001-11-05 01:39:22 +00:00
|
|
|
|
2006-04-21 15:09:32 +00:00
|
|
|
# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
|
|
|
|
AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
|
2011-02-06 22:10:21 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
[[char c;
|
|
|
|
c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));]])],
|
|
|
|
[gtk_ok=yes], [gtk_ok=no])
|
2006-04-21 15:09:32 +00:00
|
|
|
AC_MSG_RESULT($gtk_ok)
|
|
|
|
if test "$gtk_ok" = "yes"; then
|
|
|
|
AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
|
|
|
|
[Define if _NL_MEASUREMENT_MEASUREMENT is available])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# _NL_PAPER_HEIGHT is an enum and not a define
|
|
|
|
AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
|
2011-02-06 22:10:21 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
[[char c;
|
|
|
|
c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT));]])],
|
|
|
|
[gtk_ok=yes], [gtk_ok=no])
|
2006-04-21 15:09:32 +00:00
|
|
|
AC_MSG_RESULT($gtk_ok)
|
|
|
|
if test "$gtk_ok" = "yes"; then
|
|
|
|
AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
|
|
|
|
[Define if _NL_PAPER_HEIGHT is available])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# _NL_PAPER_WIDTH is an enum and not a define
|
|
|
|
AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
|
2011-02-06 22:10:21 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
[[char c;
|
|
|
|
c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH));]])],
|
|
|
|
[gtk_ok=yes], [gtk_ok=no])
|
2006-04-21 15:09:32 +00:00
|
|
|
AC_MSG_RESULT($gtk_ok)
|
|
|
|
if test "$gtk_ok" = "yes"; then
|
|
|
|
AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
|
|
|
|
[Define if _NL_PAPER_WIDTH is available])
|
|
|
|
fi
|
2010-05-07 07:53:03 +00:00
|
|
|
|
1998-12-14 17:39:58 +00:00
|
|
|
# i18n stuff
|
2008-08-02 04:23:13 +00:00
|
|
|
ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
|
2001-05-18 18:30:59 +00:00
|
|
|
AM_GLIB_GNU_GETTEXT
|
[ Merges from gtk-1-2 ]
Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org>
* configure.in: fixed "GNU Make" check to pass with new make version
3.77.95.
Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org>
* gtk-config.in (--version): don't echo @GTK_VERSION@, but
@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the
AM_PATH_GTK() macros don't get confused by the -pre1.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (REBUILD): Change check for perl5
to check explicitely for v >= 5.002. (5.001
does not work with our scripts.)
Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $PERL for the perl version check. added
--disable-rebuilds to give the user an option to completely disable
any source autogeneration rules.
Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $ac_make when checking for GNU Make.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* docs/Makefile.am: added generation.txt.
* Makefile.am: require automake 1.4, build README from README.in and
INSTALL from INSTALL.in in dist-hook.
* README.in:
* INSTALL.in: new files to autogenerate README and INSTALL from.
* configure.in: figure whether we have GNU Make
* docs/generation.txt: minor additions/corrections.
Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: FAQ Update
July 30, 1999 Elliot Lee <sopwith@redhat.com>
* configure.in: Fix autoconf warnings about cross compilation by
trying to provide sane defaults for AC_TRY_RUN.
Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org>
* ltconfig
* ltmain.sh: upgrade to libtool 1.3.3
Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com>
* INSTALL: Indicate that the --with-glib= configure
time flag is unsupported.
Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com>
* docs/generation.txt: Added a file that gives
documenation about the autogeneration process for
various autogenerated files.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com>
* docs/gtk_tut.sgml: Removed references to
code examples in my directory on gtk.org as
they should all be in the tutorial now.
* docs/gtk_tut.sgml: Added sources for dial-test
and scribble-xinput programs that were previously
missing.
Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com>
* TODO: Added entry about menu keyboard navigation, removed
some finished items.
Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com>
* acinclude.m4: Standardize on func_dgettext
not func_gettext, so that the checks for dgettext
actually are paid attention to.
Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Add $INTLLIBS into $LIBS
directly, rather than repeating the checks for
gettext.
* INSTALL: Added information about gettext and
NLS support.
* acinclude.m4 (LIBM): Check for dgettext, not
just gettext. This should hopefully fix things wrt
systems with old versions of GNU gettext installed.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* autogen.sh: add --enable-maintainer-mode
* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* docs/gtk-config.1.in:
docs/Makefile.am:
configure.in: gtk-config is now generated.
* docs/gtk-config.1: Removed, now generated.
Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't
handle CreateNotify itself, still put out a debuging message for
--gdk-debug=events. made the ReparentNotify debugging message more
verbose.
wrap xcoords translation for ConfigureEvents into an error trap,
a destroy event may already be pending, and in that case, the
actuall coordinate values are not at all critical.
Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcc.c: Stop leaking the color_hash all over
the place. Simplify and improve the logic.
Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean)
for prototypes and function implementations consistent (reported
by Tomas Ogren).
Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): tell if expose events have
send_event set in debugging output.
(gdk_compress_exposures): default initialize the event so we don't
operate on bogus values (namely send_event).
Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: When we receive an unexpected
destroy notify on one of our windows, don't just
warn about it, also mark our windows as destroyed.
Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_font_hash_insert): Add
name => font and name => fontset hashes. The
name => fontset hash is a _big_ win since we
weren't previously caching fontsets at all and loading
fontsets is expensive. The name => font hash
is less of a win, but it does save us from doing
repeated XQueryFont calls on the same font.
* gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names
list so we can remove font/fontset from hash.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
and slightly confusing test. [ XInternAtom (,,TRUE)
will never return None ].
Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints)
gdk/gdkwindow.c (gdk_window_set_hints):
Don't omit setting the properties if flags == 0 -
there may be an existing set of properties there
already. (Very old bug. Would it be better to
delete the property instead?)
* gdk/gdkselection.c (gdk_selection_property_get): Fix
spelling error in comment.
Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push()
to avoid stomping over gdk_error_warnings.
* gdk/gdkimage.c (gdk_image_new): compute image->bpp
as (bits_per_pixel + 7) / 8. This gives the same
result as before for multiples of 8, but actually
a "reasonable" value for 1bit or 4bit displays.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* gdk/Makefile.am: minor cleanups, strip spaces on build rules for
GNU Make.
Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): give a debugging note when
discarding configure events.
1999-08-18 Federico Mena Quintero <federico@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the
refcount is greater than zero.
* gdk/gdkwindow.c (gdk_window_unref): Likewise.
* gdk/gdkfont.c (gdk_font_unref): Likewise.
* gdk/gdkgc.c (gdk_gc_unref): Likewise.
* gdk/gdkdnd.c (gdk_drag_context_unref): Likewise.
Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_property_get): Fix assumption
that format 32 => sizeof(item) == 4. It really is
sizeof(long).
Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't
core dump at all on X IO errors, only core dump
if --enable-debug for X errors.
Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for
unknown window:" message. disabled ConfigureNotify discarding code,
because it led to events being processed out of order.
Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org>
* gdk/gdkglobals.c: preinitialize gdk_error_code to 0.
* gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since
we export this function, supress error warnings and don't reset the
error code in the first half of this function.
* gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error
code (instead of just -1) so gdk_error_trap_pop() reveals something
actually informative about the error that happened.
* gdk/*.c:
don't rely on gdk_error_code being -1 if an error occoured, but just
gdk_error_code != 0.
Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list
pointer *before* invoking the filter function, so we at least don't
crash if a filter is removed that is currently executed. window filters
*really* need to be made truely reentrant at some point.
Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): print the atom name in the
PropertyNotify debug messages.
Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com>
Patch from Sung-Hyun Nam <namsh@lgic.co.kr>
* gdk/gdkim.c: Fix cut-and-paste errors for
x/y and PreeditAttributes/StatusAttributes.
Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change
G_MAXINT to 2^16 to alleviate overflow problems in
various window managers.
Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_measure): Fix the return value
for fontsets.
Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints):
Initialize size_hints.x and size_hints.y because kwm
brokenly pays attention to them.
(Bug #1181 - Lars Heete <hel@admin.de>)
Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the
return value of gdk_list_visuals().
(Bug #1193 - Morten Welinder <terra@diku.dk>)
Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkim.c (gdk_im_real_open): cast the return value of
XSetIMValues to (void *) when comparing to NULL, to workaround
the problem of some compilers barfing since older X headers don't
have the prototype for it.
Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak
for pseudocolor where colormap->colors was double
allocated.
* gdk/gdkcolor.c (gdk_colormap_alloc1): Store the
color value in the hash table with the pixel filled
in so when we do later hash table lookups, the color
value is correct.
Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before
making the call
Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak
pointed out by Morten Welinder <terra@diku.dk>.
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines
* gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use
g_strdup_printf instead of calcing the length separately
Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG
that we don't do in many other places. (Fixing duplicate
#include of config.h)
* gdk/gdkevents.c: include gdkinput.h _after_ config.h.
Otherwise, #ifndef XINPUT_NONE check in the latter
doesn't work. (Bug #546)
Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
"None" case insensitive.
Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkselection.c:
Add error traps so if the other end of the connection
dies, we survive.
Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (gdk_drag_motion): Separate out the
dest_xid field into two fields - one for the window
to send in messages, one to indicate the last looked
up window for caching purposes. This is needed, so
that Leave messages get the correct window.
Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_event_check, gdk_event_prepare):
Fix warning created by people mucking around
with the gsource API.
* gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full):
Change mapping between GIOCondition and GdkInputCondition
to match the way the Linux kernel does it. This should
fix problems where closed pipes were no longer signalling
GDK_INPUT_READ on systems with a native poll().
Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check
explicitly for the string "None" - it is in the XPM
spec and some servers treat unknown colors in odd ways
(like asking the user!)
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c: made "->" into a "." of previous change so
it compiles
Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_compress_exposures): Set the
window field of the event structure before calling
user filters.
1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdk/gdk.c (gdk_init_check): Use False as the last argument to
XInternAtom() here. This is a particularly Old And Nasty(tm) bug.
Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkim.c (gdk_mbstowcs): Free the value of the
intermediate text property - prevents major memory
leak when gdk_use_mb.
gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se>
Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com>
Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>
gtk-a-higuti-990322-[0-3]
* gdk/gdkfont.c (gdk_text_extents_wc): Make work when
sizeof(wchar_t) != sizeof (GdkWChar)
* configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS
that was causing -DX_LOCALE not to work.
* gtk/gtkrc.c (gtk_rc_init):
X_LOCALE will never have LC_MESSAGES defined
* gdk/gdk.c (gdk_init_check):
Remove --xim-preedit and --xim-status from argv properly.
* gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so
that the client window is present on the X server
before we pass it to the input method.
Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (motif_find_drag_window): Fix bug where
if --display is specified on the command line, than
the drag window will not be created on that display.
Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where
lookups with only_if_exists == TRUE were inserting
bogus values into the atom cache.
Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org>
* gdk/gdkselection.c (gdk_selection_property_get): first XFree(t),
then reset it to NULL.
* gdk/gdkcolor.c:
(gdk_colors_free):
(gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the
key for g_hash_table_remove() in both functions, this prevents us
from accessing possibly uninitialized portions of a GdkColor structure
where we are only interested in its pixel value.
Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org>
* gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our
font hash table, if we have a GdkFontPrivate entry for this font
already, simply increment its reference count, provided by Olaf Dietsche
<olaf.dietsche+list.gtk@netcologne.de>.
1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
|
|
|
LIBS="$LIBS $INTLLIBS"
|
2011-02-06 22:36:58 +00:00
|
|
|
AC_CONFIG_COMMANDS([po-properties],
|
|
|
|
[[case "$CONFIG_FILES" in *po-properties/Makefile.in*)
|
|
|
|
sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
|
|
|
|
esac]],
|
|
|
|
[[]])
|
[ Merges from gtk-1-2 ]
Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org>
* configure.in: fixed "GNU Make" check to pass with new make version
3.77.95.
Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org>
* gtk-config.in (--version): don't echo @GTK_VERSION@, but
@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the
AM_PATH_GTK() macros don't get confused by the -pre1.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (REBUILD): Change check for perl5
to check explicitely for v >= 5.002. (5.001
does not work with our scripts.)
Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $PERL for the perl version check. added
--disable-rebuilds to give the user an option to completely disable
any source autogeneration rules.
Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org>
* configure.in: evaluate $ac_make when checking for GNU Make.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* docs/Makefile.am: added generation.txt.
* Makefile.am: require automake 1.4, build README from README.in and
INSTALL from INSTALL.in in dist-hook.
* README.in:
* INSTALL.in: new files to autogenerate README and INSTALL from.
* configure.in: figure whether we have GNU Make
* docs/generation.txt: minor additions/corrections.
Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: FAQ Update
July 30, 1999 Elliot Lee <sopwith@redhat.com>
* configure.in: Fix autoconf warnings about cross compilation by
trying to provide sane defaults for AC_TRY_RUN.
Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org>
* ltconfig
* ltmain.sh: upgrade to libtool 1.3.3
Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com>
* INSTALL: Indicate that the --with-glib= configure
time flag is unsupported.
Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com>
* docs/generation.txt: Added a file that gives
documenation about the autogeneration process for
various autogenerated files.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com>
* docs/gtk_tut.sgml: Removed references to
code examples in my directory on gtk.org as
they should all be in the tutorial now.
* docs/gtk_tut.sgml: Added sources for dial-test
and scribble-xinput programs that were previously
missing.
Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com>
* TODO: Added entry about menu keyboard navigation, removed
some finished items.
Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com>
* acinclude.m4: Standardize on func_dgettext
not func_gettext, so that the checks for dgettext
actually are paid attention to.
Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Add $INTLLIBS into $LIBS
directly, rather than repeating the checks for
gettext.
* INSTALL: Added information about gettext and
NLS support.
* acinclude.m4 (LIBM): Check for dgettext, not
just gettext. This should hopefully fix things wrt
systems with old versions of GNU gettext installed.
Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com>
* configure.in (LIBS): Look for libgmodule in the
right location.
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* autogen.sh: add --enable-maintainer-mode
* configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org>
* docs/gtk-config.1.in:
docs/Makefile.am:
configure.in: gtk-config is now generated.
* docs/gtk-config.1: Removed, now generated.
Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't
handle CreateNotify itself, still put out a debuging message for
--gdk-debug=events. made the ReparentNotify debugging message more
verbose.
wrap xcoords translation for ConfigureEvents into an error trap,
a destroy event may already be pending, and in that case, the
actuall coordinate values are not at all critical.
Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcc.c: Stop leaking the color_hash all over
the place. Simplify and improve the logic.
Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean)
for prototypes and function implementations consistent (reported
by Tomas Ogren).
Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): tell if expose events have
send_event set in debugging output.
(gdk_compress_exposures): default initialize the event so we don't
operate on bogus values (namely send_event).
Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: When we receive an unexpected
destroy notify on one of our windows, don't just
warn about it, also mark our windows as destroyed.
Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_font_hash_insert): Add
name => font and name => fontset hashes. The
name => fontset hash is a _big_ win since we
weren't previously caching fontsets at all and loading
fontsets is expensive. The name => font hash
is less of a win, but it does save us from doing
repeated XQueryFont calls on the same font.
* gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names
list so we can remove font/fontset from hash.
Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Remove useless
and slightly confusing test. [ XInternAtom (,,TRUE)
will never return None ].
Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints)
gdk/gdkwindow.c (gdk_window_set_hints):
Don't omit setting the properties if flags == 0 -
there may be an existing set of properties there
already. (Very old bug. Would it be better to
delete the property instead?)
* gdk/gdkselection.c (gdk_selection_property_get): Fix
spelling error in comment.
Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push()
to avoid stomping over gdk_error_warnings.
* gdk/gdkimage.c (gdk_image_new): compute image->bpp
as (bits_per_pixel + 7) / 8. This gives the same
result as before for multiples of 8, but actually
a "reasonable" value for 1bit or 4bit displays.
Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org>
* gdk/Makefile.am: minor cleanups, strip spaces on build rules for
GNU Make.
Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): give a debugging note when
discarding configure events.
1999-08-18 Federico Mena Quintero <federico@redhat.com>
* gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the
refcount is greater than zero.
* gdk/gdkwindow.c (gdk_window_unref): Likewise.
* gdk/gdkfont.c (gdk_font_unref): Likewise.
* gdk/gdkgc.c (gdk_gc_unref): Likewise.
* gdk/gdkdnd.c (gdk_drag_context_unref): Likewise.
Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_property_get): Fix assumption
that format 32 => sizeof(item) == 4. It really is
sizeof(long).
Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't
core dump at all on X IO errors, only core dump
if --enable-debug for X errors.
Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for
unknown window:" message. disabled ConfigureNotify discarding code,
because it led to events being processed out of order.
Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org>
* gdk/gdkglobals.c: preinitialize gdk_error_code to 0.
* gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since
we export this function, supress error warnings and don't reset the
error code in the first half of this function.
* gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error
code (instead of just -1) so gdk_error_trap_pop() reveals something
actually informative about the error that happened.
* gdk/*.c:
don't rely on gdk_error_code being -1 if an error occoured, but just
gdk_error_code != 0.
Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list
pointer *before* invoking the filter function, so we at least don't
crash if a filter is removed that is currently executed. window filters
*really* need to be made truely reentrant at some point.
Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_translate): print the atom name in the
PropertyNotify debug messages.
Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com>
Patch from Sung-Hyun Nam <namsh@lgic.co.kr>
* gdk/gdkim.c: Fix cut-and-paste errors for
x/y and PreeditAttributes/StatusAttributes.
Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change
G_MAXINT to 2^16 to alleviate overflow problems in
various window managers.
Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.c (gdk_text_measure): Fix the return value
for fontsets.
Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_set_geometry_hints):
Initialize size_hints.x and size_hints.y because kwm
brokenly pays attention to them.
(Bug #1181 - Lars Heete <hel@admin.de>)
Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the
return value of gdk_list_visuals().
(Bug #1193 - Morten Welinder <terra@diku.dk>)
Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkim.c (gdk_im_real_open): cast the return value of
XSetIMValues to (void *) when comparing to NULL, to workaround
the problem of some compilers barfing since older X headers don't
have the prototype for it.
Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak
for pseudocolor where colormap->colors was double
allocated.
* gdk/gdkcolor.c (gdk_colormap_alloc1): Store the
color value in the hash table with the pixel filled
in so when we do later hash table lookups, the color
value is correct.
Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before
making the call
Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak
pointed out by Morten Welinder <terra@diku.dk>.
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
default filter from the list
Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines
* gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use
g_strdup_printf instead of calcing the length separately
Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG
that we don't do in many other places. (Fixing duplicate
#include of config.h)
* gdk/gdkevents.c: include gdkinput.h _after_ config.h.
Otherwise, #ifndef XINPUT_NONE check in the latter
doesn't work. (Bug #546)
Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color
"None" case insensitive.
Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkselection.c:
Add error traps so if the other end of the connection
dies, we survive.
Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (gdk_drag_motion): Separate out the
dest_xid field into two fields - one for the window
to send in messages, one to indicate the last looked
up window for caching purposes. This is needed, so
that Leave messages get the correct window.
Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_event_check, gdk_event_prepare):
Fix warning created by people mucking around
with the gsource API.
* gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full):
Change mapping between GIOCondition and GdkInputCondition
to match the way the Linux kernel does it. This should
fix problems where closed pipes were no longer signalling
GDK_INPUT_READ on systems with a native poll().
Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check
explicitly for the string "None" - it is in the XPM
spec and some servers treat unknown colors in odd ways
(like asking the user!)
Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org>
* gdk/gdkevents.c: made "->" into a "." of previous change so
it compiles
Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkevents.c (gdk_compress_exposures): Set the
window field of the event structure before calling
user filters.
1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdk/gdk.c (gdk_init_check): Use False as the last argument to
XInternAtom() here. This is a particularly Old And Nasty(tm) bug.
Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkim.c (gdk_mbstowcs): Free the value of the
intermediate text property - prevents major memory
leak when gdk_use_mb.
gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se>
Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com>
Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>
gtk-a-higuti-990322-[0-3]
* gdk/gdkfont.c (gdk_text_extents_wc): Make work when
sizeof(wchar_t) != sizeof (GdkWChar)
* configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS
that was causing -DX_LOCALE not to work.
* gtk/gtkrc.c (gtk_rc_init):
X_LOCALE will never have LC_MESSAGES defined
* gdk/gdk.c (gdk_init_check):
Remove --xim-preedit and --xim-status from argv properly.
* gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so
that the client window is present on the X server
before we pass it to the input method.
Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdnd.c (motif_find_drag_window): Fix bug where
if --display is specified on the command line, than
the drag window will not be created on that display.
Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where
lookups with only_if_exists == TRUE were inserting
bogus values into the atom cache.
Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org>
* gdk/gdkselection.c (gdk_selection_property_get): first XFree(t),
then reset it to NULL.
* gdk/gdkcolor.c:
(gdk_colors_free):
(gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the
key for g_hash_table_remove() in both functions, this prevents us
from accessing possibly uninitialized portions of a GdkColor structure
where we are only interested in its pixel value.
Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org>
* gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our
font hash table, if we have a GdkFontPrivate entry for this font
already, simply increment its reference count, provided by Olaf Dietsche
<olaf.dietsche+list.gtk@netcologne.de>.
1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
|
|
|
|
2009-03-01 07:24:28 +00:00
|
|
|
dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
|
|
|
|
dnl po-properties/POTFILES during configure; see GNOME #573515.
|
|
|
|
dnl
|
|
|
|
dnl Generate list of files to be processed by xgettext which will
|
|
|
|
dnl be included in po-properties/Makefile.
|
|
|
|
test -d po-properties || mkdir po-properties
|
|
|
|
if test "x$srcdir" != "x."; then
|
|
|
|
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
|
|
|
popropsrcprefix="$srcdir/"
|
|
|
|
else
|
|
|
|
popropsrcprefix="../$srcdir/"
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
popropsrcprefix="../"
|
|
|
|
fi
|
|
|
|
rm -f po-properties/POTFILES
|
|
|
|
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
|
|
|
< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
|
|
|
|
dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
|
|
|
|
|
2002-12-11 21:28:22 +00:00
|
|
|
AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
|
1998-12-14 17:39:58 +00:00
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
dnl The DU4 header files don't provide library prototypes unless
|
1998-09-17 15:40:22 +00:00
|
|
|
dnl -std1 is given to the native cc.
|
1998-09-07 02:16:41 +00:00
|
|
|
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
|
1998-09-17 15:40:22 +00:00
|
|
|
|
1998-09-08 03:09:54 +00:00
|
|
|
gtk_save_LIBS=$LIBS
|
1998-05-10 02:46:20 +00:00
|
|
|
LIBS="$LIBS -lm"
|
2011-02-06 22:19:23 +00:00
|
|
|
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
|
|
|
|
int main (void) { return (log(1) != log(1.)); }]])],
|
|
|
|
[AC_MSG_RESULT(none needed)],
|
|
|
|
[gtk_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS -std1"
|
|
|
|
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
|
|
|
|
int main (void) { return (log(1) != log(1.)); }]])],
|
|
|
|
[AC_MSG_RESULT(-std1)],
|
|
|
|
[AC_MSG_RESULT()
|
|
|
|
CFLAGS="$gtk_save_CFLAGS"
|
|
|
|
AC_MSG_WARN([No ANSI prototypes found in library. (-std1 did not work.)])],
|
|
|
|
[true])],
|
|
|
|
[AC_MSG_RESULT(none needed)])
|
|
|
|
|
1998-05-10 02:46:20 +00:00
|
|
|
LIBS=$gtk_save_LIBS
|
|
|
|
|
1999-05-12 08:06:07 +00:00
|
|
|
AC_MSG_CHECKING(for the BeOS)
|
|
|
|
case $host in
|
|
|
|
*-*-beos*)
|
1999-10-04 19:03:05 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
1999-05-12 08:06:07 +00:00
|
|
|
MATH_LIB=
|
|
|
|
;;
|
1999-10-04 19:03:05 +00:00
|
|
|
*)
|
|
|
|
AC_MSG_RESULT(no)
|
1999-05-12 08:06:07 +00:00
|
|
|
;;
|
|
|
|
esac
|
2005-07-08 03:57:39 +00:00
|
|
|
|
2009-12-19 17:37:39 +00:00
|
|
|
AC_SUBST(MATH_LIB)
|
2005-07-08 03:57:39 +00:00
|
|
|
#
|
|
|
|
# see bug 162979
|
|
|
|
#
|
|
|
|
AC_MSG_CHECKING(for HP-UX)
|
|
|
|
case $host_os in
|
|
|
|
hpux9* | hpux10* | hpux11*)
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
;;
|
|
|
|
esac
|
1999-05-12 08:06:07 +00:00
|
|
|
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
#
|
2001-04-03 18:48:46 +00:00
|
|
|
# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
|
2010-05-07 07:53:03 +00:00
|
|
|
#
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AM_PATH_GLIB_2_0(glib_required_version, :,
|
1998-06-10 23:44:55 +00:00
|
|
|
AC_MSG_ERROR([
|
2010-05-07 07:53:03 +00:00
|
|
|
*** GLIB glib_required_version or better is required. The latest version of
|
2003-05-06 21:55:41 +00:00
|
|
|
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
|
2011-12-16 04:35:06 +00:00
|
|
|
gobject gmodule-no-export)
|
1998-06-10 23:44:55 +00:00
|
|
|
|
2013-05-11 14:57:39 +00:00
|
|
|
PKG_PROG_PKG_CONFIG_FOR_BUILD
|
|
|
|
GLIB_CFLAGS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --cflags glib-2.0 gobject-2.0 gmodule-no-export-2.0`
|
|
|
|
GLIB_LIBS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --libs glib-2.0 gobject-2.0 gmodule-no-export-2.0`
|
|
|
|
AC_SUBST(GLIB_CFLAGS_FOR_BUILD)
|
|
|
|
AC_SUBST(GLIB_LIBS_FOR_BUILD)
|
|
|
|
|
2002-03-08 19:28:50 +00:00
|
|
|
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
|
|
|
|
dnl
|
|
|
|
gtk_save_LIBS=$LIBS
|
|
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
|
|
AC_CHECK_FUNCS(bind_textdomain_codeset)
|
|
|
|
LIBS=$gtk_save_LIBS
|
|
|
|
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_CHECK_HEADERS(pwd.h,
|
|
|
|
AC_DEFINE(HAVE_PWD_H, 1,
|
|
|
|
[Define to 1 if pwd.h is available]))
|
2013-06-13 15:58:53 +00:00
|
|
|
AC_CHECK_HEADERS(sys/mman.h,
|
|
|
|
AC_DEFINE(HAVE_SYS_MMAN_H, 1,
|
2013-07-01 12:46:25 +00:00
|
|
|
[Define to 1 if mman.h is available]))
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_CHECK_HEADERS(sys/time.h,
|
|
|
|
AC_DEFINE(HAVE_SYS_TIME_H, 1,
|
|
|
|
[Define to 1 if time.h is available]))
|
|
|
|
AC_CHECK_HEADERS(unistd.h,
|
|
|
|
AC_DEFINE(HAVE_UNISTD_H, 1,
|
|
|
|
[Define to 1 if unistd.h is available]))
|
|
|
|
AC_CHECK_HEADERS(ftw.h,
|
|
|
|
AC_DEFINE(HAVE_FTW_H, 1,
|
|
|
|
[Define to 1 if ftw.h is available]))
|
2001-11-08 20:57:18 +00:00
|
|
|
|
2007-05-14 15:35:37 +00:00
|
|
|
AC_MSG_CHECKING([for GNU ftw extensions])
|
2011-02-06 01:35:42 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
#include <ftw.h>]],
|
|
|
|
[[int flags = FTW_ACTIONRETVAL;]])],
|
|
|
|
[gtk_ok=yes],[gtk_ok=no])
|
2007-05-14 15:35:37 +00:00
|
|
|
if test $gtk_ok = yes; then
|
|
|
|
AC_MSG_RESULT([yes])
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
|
2007-05-14 15:35:37 +00:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT([no])
|
|
|
|
fi
|
|
|
|
|
2012-11-06 19:50:09 +00:00
|
|
|
#
|
|
|
|
# Disable deprecation checks for all libraries we depend on on stable branches.
|
|
|
|
# This is so newer versions of those libraries don't cause more warnings with
|
|
|
|
# a stable GTK version.
|
|
|
|
# We don't ever want to turn off deprecation warnings for master however, because
|
|
|
|
# that's where we get rid of deprecated API we use.
|
|
|
|
#
|
|
|
|
if test m4_eval(gtk_minor_version % 2) = 0 ; then
|
|
|
|
AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
|
|
|
|
[Disable deprecation warnings from glib])
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl
|
2000-06-08 22:52:21 +00:00
|
|
|
saved_cflags="$CFLAGS"
|
|
|
|
saved_ldflags="$LDFLAGS"
|
|
|
|
|
1998-05-24 02:48:09 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
# Checks for library functions.
|
|
|
|
AC_FUNC_MMAP
|
1998-05-03 22:41:32 +00:00
|
|
|
|
2004-09-21 18:03:57 +00:00
|
|
|
AC_CHECK_FUNCS(mallinfo)
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_CHECK_FUNCS(getresuid)
|
|
|
|
AC_TYPE_UID_T
|
1998-05-03 22:41:32 +00:00
|
|
|
|
2012-04-05 10:15:45 +00:00
|
|
|
# Check for round(), rint(), isnan(), isinf() and nearbyint()
|
|
|
|
AC_CHECK_LIB(m,round,,)
|
2012-05-15 11:09:24 +00:00
|
|
|
AC_CHECK_FUNCS(round rint nearbyint)
|
|
|
|
AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
|
2011-08-19 07:38:47 +00:00
|
|
|
|
2006-12-10 19:34:19 +00:00
|
|
|
# Checks for gdkspawn
|
|
|
|
AC_CHECK_HEADERS(crt_externs.h)
|
|
|
|
AC_CHECK_FUNCS(_NSGetEnviron)
|
|
|
|
|
2010-06-28 16:36:33 +00:00
|
|
|
AC_MSG_CHECKING(whether to build dynamic modules)
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_ARG_ENABLE(modules,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--disable-modules],
|
2003-05-06 21:55:41 +00:00
|
|
|
[disable dynamic module loading])])
|
1999-01-28 03:38:58 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
dynworks=false
|
2011-01-05 02:57:21 +00:00
|
|
|
build_dynamic_modules=no
|
2001-05-03 20:11:14 +00:00
|
|
|
deps=
|
2003-01-27 21:15:01 +00:00
|
|
|
if test x$enable_modules = xno; then
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
AC_MSG_CHECKING(whether dynamic modules work)
|
2010-05-07 07:53:03 +00:00
|
|
|
## for loop is to strip newline
|
2004-11-17 04:54:32 +00:00
|
|
|
tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
|
2001-06-07 16:40:01 +00:00
|
|
|
for I in $tmp; do
|
|
|
|
dynworks=$I
|
|
|
|
done
|
2000-06-07 16:44:29 +00:00
|
|
|
|
2002-03-06 01:07:44 +00:00
|
|
|
dnl Now we check to see if our libtool supports shared lib deps
|
|
|
|
dnl (in a rather ugly way even)
|
|
|
|
if $dynworks; then
|
2010-06-26 05:06:30 +00:00
|
|
|
module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
|
|
|
module_deplibs_check=`$module_libtool_config | \
|
2002-03-06 01:07:44 +00:00
|
|
|
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
|
|
|
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
2010-06-26 05:06:30 +00:00
|
|
|
if test "x$module_deplibs_check" = "xnone" || \
|
|
|
|
test "x$module_deplibs_check" = "xunknown" || \
|
|
|
|
test "x$module_deplibs_check" = "x"; then
|
2002-03-06 01:07:44 +00:00
|
|
|
dynworks=false
|
|
|
|
fi
|
|
|
|
fi
|
1999-01-28 03:38:58 +00:00
|
|
|
|
2002-03-06 01:07:44 +00:00
|
|
|
if $dynworks; then
|
2011-01-05 02:57:21 +00:00
|
|
|
build_dynamic_modules=yes
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE(USE_GMODULE, 1,
|
|
|
|
[Define to 1 if gmodule works and should be used])
|
2002-03-06 01:07:44 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
2011-01-05 02:57:21 +00:00
|
|
|
build_dynamic_modules=no
|
2002-03-06 01:07:44 +00:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
2001-05-03 20:11:14 +00:00
|
|
|
fi
|
2000-12-06 05:31:30 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
|
1998-12-09 18:13:52 +00:00
|
|
|
|
2008-03-17 23:53:18 +00:00
|
|
|
#
|
|
|
|
# Allow building some or all immodules included
|
|
|
|
#
|
|
|
|
AC_MSG_CHECKING(immodules to build)
|
|
|
|
|
|
|
|
AC_ARG_WITH(included_immodules,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
|
|
|
|
[build the specified input methods into gtk])])
|
2008-03-17 23:53:18 +00:00
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
if $dynworks; then
|
2008-03-17 23:53:18 +00:00
|
|
|
:
|
|
|
|
else
|
|
|
|
## if the option was specified, leave it; otherwise disable included immodules
|
|
|
|
if test x$with_included_immodules = xno; then
|
|
|
|
with_included_immodules=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-01-03 16:29:25 +00:00
|
|
|
all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules"
|
2008-03-17 23:53:18 +00:00
|
|
|
|
|
|
|
included_immodules=""
|
|
|
|
# If the switch specified without listing any specific ones, include all
|
|
|
|
if test "x$with_included_immodules" = xyes ; then
|
|
|
|
included_immodules="$all_immodules"
|
|
|
|
else
|
|
|
|
included_immodules="$with_included_immodules"
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_RESULT($included_immodules)
|
|
|
|
AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x)
|
|
|
|
|
|
|
|
INCLUDED_IMMODULE_OBJ=
|
|
|
|
INCLUDED_IMMODULE_DEFINE=
|
|
|
|
|
|
|
|
IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
|
|
|
|
for immodule in $included_immodules; do
|
|
|
|
immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
|
|
|
|
if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([the specified input method $immodule does not exist])
|
|
|
|
fi
|
|
|
|
|
|
|
|
INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
|
|
|
|
INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
|
|
|
|
eval INCLUDE_$immodule_underscores=yes
|
|
|
|
done
|
|
|
|
IFS="$gtk_save_ifs"
|
|
|
|
AC_SUBST(INCLUDED_IMMODULE_OBJ)
|
|
|
|
AC_SUBST(INCLUDED_IMMODULE_DEFINE)
|
|
|
|
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
|
2013-05-20 17:48:32 +00:00
|
|
|
AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
|
2013-11-13 11:20:07 +00:00
|
|
|
AM_CONDITIONAL(INCLUDE_IM_BROADWAY, [test x"$INCLUDE_broadway" = xyes])
|
2008-03-17 23:53:18 +00:00
|
|
|
AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
|
|
|
|
AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
|
|
|
|
|
Add Sun mediaLib support so that hardware acceleration via mediaLib is
2007-05-16 Brian Cameron <brian.cameron@sun.com>
* acconfig.h, configure.in, gdk/Makefile.am, gdkprivate.h, gdkrgb.c,
gdkdraw.c, gdk-pixbuf/gdk-pixbuf-scale.c,
gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/pixops/pixops.[ch],
gdk-pixbuf/pixops/timescale.c: Add Sun mediaLib support so that
hardware acceleration via mediaLib is enabled if mediaLib is
detected via configure. Enhancement request #344813. I was given
permission to commit in the bug report by Matthias Clasen.
* gdk/medialib.[ch]: New files added for mediaLib support.
* docs/reference/gdk-pixbuf/tmpl/scaling.sgml,
docs/reference/gdk/tmpl/rgb.sgml, gdk/gdkdraw.c: Add docs for
mediaLib support.
svn path=/trunk/; revision=17855
2007-05-16 01:35:51 +00:00
|
|
|
# Checks to see whether we should include mediaLib
|
|
|
|
# support.
|
|
|
|
#
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_CHECK_HEADER(sys/systeminfo.h,
|
2010-05-07 07:53:03 +00:00
|
|
|
AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
|
2008-03-12 14:05:23 +00:00
|
|
|
[Define to 1 if sys/systeminfo.h is available]))
|
|
|
|
AC_CHECK_HEADER(sys/sysinfo.h,
|
|
|
|
AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
|
|
|
|
[Define to 1 if sys/sysinfo.h is available]))
|
Add Sun mediaLib support so that hardware acceleration via mediaLib is
2007-05-16 Brian Cameron <brian.cameron@sun.com>
* acconfig.h, configure.in, gdk/Makefile.am, gdkprivate.h, gdkrgb.c,
gdkdraw.c, gdk-pixbuf/gdk-pixbuf-scale.c,
gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/pixops/pixops.[ch],
gdk-pixbuf/pixops/timescale.c: Add Sun mediaLib support so that
hardware acceleration via mediaLib is enabled if mediaLib is
detected via configure. Enhancement request #344813. I was given
permission to commit in the bug report by Matthias Clasen.
* gdk/medialib.[ch]: New files added for mediaLib support.
* docs/reference/gdk-pixbuf/tmpl/scaling.sgml,
docs/reference/gdk/tmpl/rgb.sgml, gdk/gdkdraw.c: Add docs for
mediaLib support.
svn path=/trunk/; revision=17855
2007-05-16 01:35:51 +00:00
|
|
|
|
2002-05-07 15:53:08 +00:00
|
|
|
dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
|
|
|
|
|
2002-05-08 15:26:28 +00:00
|
|
|
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
|
2002-05-07 15:53:08 +00:00
|
|
|
|
2013-01-07 12:49:27 +00:00
|
|
|
AS_IF([test "x$enable_gtk2_dependency" = xyes],
|
|
|
|
[AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
|
|
|
|
if test x$GTK_UPDATE_ICON_CACHE = xno; then
|
|
|
|
REBUILD_PNGS=#
|
|
|
|
fi],
|
|
|
|
|
|
|
|
[test "x$cross_compiling" = xyes],
|
|
|
|
[# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
|
|
|
|
# pkg.m4 blocks all variable starting with PKG, so allow this one
|
|
|
|
m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
|
|
|
|
|
|
|
|
AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
|
|
|
|
[AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for native gdk-pixbuf])
|
|
|
|
AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
|
|
|
|
[AC_MSG_RESULT([yes])],
|
|
|
|
[AC_MSG_ERROR([native gdk-pixbuf not found])])
|
|
|
|
|
|
|
|
NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
|
|
|
|
NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
|
|
|
|
AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
|
|
|
|
AC_SUBST(NATIVE_GDKPIXBUF_LIBS)]
|
|
|
|
)
|
Adapt to uscore-ification of gtktextiterprivate
2001-01-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c: Adapt to uscore-ification of gtktextiterprivate
* gtk/gtktextdisplay.c (gtk_text_layout_draw): remove use
of private functions; remove inclusion of private headers.
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_at_line): Add this
function, so we don't need private functions in gtktextdisplay.c
* gtk/gtktextiterprivate.h: underscore-ification
* gtk/gtkwidget.c: Clean up a bunch of docs that said "INTERNAL"
to instead say "only useful to implement widgets"
* gtk/gtkenums.h (GtkMovementStep): Rename GTK_MOVEMENT_CHARS,
GTK_MOVEMENT_POSITIONS to GTK_MOVEMENT_LOGICAL_POSITIONS,
GTK_MOVEMENT_VISUAL_POSITIONS. Resolves bug 40249.
* gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_set_colormap):
This function was completely broken
* gtk/testtext.c (line_numbers_expose): use gtk_paint_layout
* gtk/gtkvscale.c (gtk_vscale_draw_value): use gtk_paint_layout
* gtk/gtkvruler.c (gtk_vruler_draw_ticks): use gtk_paint_layout
* gtk/gtklabel.c (gtk_label_expose): use gtk_paint_layout
* gtk/gtkhscale.c (gtk_hscale_draw_value): use gtk_paint_layout
* gtk/gtkhruler.c (gtk_hruler_draw_ticks): use gtk_paint_layout
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render): use
gtk_paint_layout
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): use
gtk_paint_layout
* gtk/gtkstyle.h: Add draw/paint expander to draw tree expanders.
Progress on bug 40103. Add draw_layout to draw a PangoLayout.
(struct _GtkStyleClass): Remove draw_cross, draw_oval, draw_ramp,
which were not implemented.
* gtk/gtktextbuffer.h (struct _GtkTextBufferClass): Add
insert_pixbuf signal. Rename delete_text to delete_range since it
also deletes pixbufs and child anchors. This almost closes bug
40245 (still need to deal with child anchors)
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add
insert_pixbuf, change signal names as appropriate, change types of
signals taking marks/tags to have the specific type, not just
G_TYPE_OBJECT
* gtk/gtkmain.c (gtk_get_current_event_state): Add this function;
closes bug 40051
* gtk/gtkoptionmenu.c (gtk_option_menu_set_history): clean up
unnecessary remove_contents() call
(gtk_option_menu_class_init): add a "changed" signal, closes
bug 40039
(gtk_option_menu_update_contents): emit "changed" if the
active menu item changes
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): fix bad
cast to GtkObject, reported by Jonas Borgstrom
(gdk_pixbuf_loader_finalize): don't close the loader on finalize;
we can't do stuff with side effects in finalize. Instead, spew a
warning if the loader isn't closed.
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_finalize): free
colormap in here, non-X ports probably need to sync to this change
* gdk/x11/gdkdrawable-x11.c (gdk_x11_set_colormap): remove
assertion that colormap != NULL, you can set the colormap to NULL
if you like.
* Makefile.am: remove gtk-config-2.0
* configure.in: Use pkg-config to locate GLib. Remove
separated-out GMODULE_LIBS, GMODULE_CFLAGS; these were not used,
and the gmodule libs/cflags were in GLIB_LIBS GLIB_CFLAGS anyhow.
Use pkg-config to locate Pango. Output correct Pango libs to
gdk-2.0.pc.in. Fix test for FREETYPE_CONFIG (typo fix).
* Makefile.am (pkgconfig_DATA): install only target-specific pc
files
(install-data-local): symlink gtk+-2.0.pc and gdk-2.0.pc to the
X11 pc files
* gtk+-2.0.pc.in (Requires): require the GDK for the current target
unref from here
2001-01-04 17:48:43 +00:00
|
|
|
|
2013-01-07 12:49:27 +00:00
|
|
|
AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
|
2011-01-15 01:01:05 +00:00
|
|
|
|
2010-06-26 05:06:30 +00:00
|
|
|
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
|
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
|
2003-08-18 15:19:32 +00:00
|
|
|
test "x$REBUILD_PNGS" = "x#" ; then
|
|
|
|
AC_MSG_ERROR([
|
2005-11-07 14:30:35 +00:00
|
|
|
*** gtkbuiltincache.h is not in the tree, and cannot be built
|
2010-05-07 07:53:03 +00:00
|
|
|
*** because you don't have libpng, or (when cross-compiling) you
|
2007-01-04 15:05:07 +00:00
|
|
|
*** don't have a prebuilt gtk-update-icon-cache on the build system.])
|
2003-08-18 15:19:32 +00:00
|
|
|
fi
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
########################################
|
|
|
|
# Windowing system checks
|
|
|
|
########################################
|
Remove all references to offscreen flag which was no longer used.
Thu Jun 1 23:05:13 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Remove all references to
offscreen flag which was no longer used.
* gtk/gtkprivate.h (enum): Remove unused flags and compress.
* gtk/gtkframe.c (gtk_frame_set_label_widget): Check
for non-null label_widget->parent.
* gtk/gtkentry.c: Get rid of code to deal with PangoAttribute
which no longer was used.
* gdk/gdkpango.c (gdk_pango_context_get_info): make static.
* gdk/gdkpango.c (gdk_draw_layout[_line]): Add checks
for null arguments.
* gdk/x11/gdkgeometry-x11.c (gdk_window_scroll): add
check for destroyed windows.
Thu Jun 1 13:48:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimmulticontext.c: Add a finalize method and unref
the slave context there.
* gtk/gtkinvisible.[ch]: Make reference counting behavior
identical to GtkWindow.
Thu Jun 1 01:54:11 2000 Owen Taylor <otaylor@redhat.com>
* Makefile.am gdk/gdkpango.c: Copy the layout render function from
pangox to here, so we can write them independent of rendering
system, using GDK primitives.
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c
gdk/x11/gdkdrawable-x11.c: Remove draw_layout() from the vtable,
since we have a rendering-system independent implementation in
terms of draw_glyphs().
* gdk/gdkpango.c gdkdrawable.h (gdk_draw_layout_line): New
function to render a single line.
* gdk/x11/gdkpango.c: Move the guts of this file mostly
into ../gdkpango.c, which simplifies things, since we
don't have to deal with raw X gc's.
Fri May 19 04:28:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch]: Add get_log_attrs() function to
get the logical attributes for a given GtkTextLine.
Tue May 30 16:05:39 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track
g_locale_get_codeset() to g_get_codeset() change.
Tue May 30 15:03:19 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testcalendar.c (calendar_font_selection_ok): Use font
descriptions.
* gtk/gtkentry.c (gtk_entry_draw_text): Center text within
the entry.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
redoing (vastly simplifying) for Pango. Still needs quite
a bit of work. (Size selection is currently poor. List of
predefined sizes is not a good idea, since all of these
sizes won't necessarily be distinct.)
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
CODESET results for LANG=C.
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
which takes a stringized pango font description;
ignore the older 'font' and 'fontset' declarations.
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
field with a GdkFont derived via gdk_font_from_description(),
for compatibility. (Should we just remove it entirely?
Probably too much compatibility breakage, but people
should be migrating to the new Pango stuff as quickly
as possible.)
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
redoing; there are some bugs in size allocation right
now, the semi-existant distinction between header / day
fonts was removed, but, with Pango, could actually
be made functional in a nice way.
* gtk/testcalender: Move calender from examples into this
directory as a test program. (We really need to restrcture
testgtk into a whole directory full of tests for every
widget or functionality group, separated into multiple .c
files.)
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (file_exists): Fix stupid typo that
was keeping RC file from being loaded.
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
RC file font code.
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
Add function to load a GdkFont from a PangoFontDescription.
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
to have any widget for the label, use a GtkLabel widget
to display the text. (Based partially on a patch from
Anders Carlson.)
(Quite a bit of code reorganization - strip 90% of the
guts out of gtkaspectframe and add a single virtual
func to GtkFrameClass - compute_child_allocation.)
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
(Removed clist->row_center_offset field because caching
it wasn't saving time or code, added private function
_gtk_clist_create_cell_layout()).
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c: Pangoized.
* gtk/[hv]ruler.c: Pangoized
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_init):
Use gtk_clist_set_column_auto_resize() to remove need
need for manual column width computations.
Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktooltips.[ch]: Replace custom drawing with a GtkLabel,
ensuring Pango correctness, and considerably simplifying the
code.
* gtk/gtklabel.c gtk[hv]scale.c: 1000 => PANGO_SCALE.
* gtk/gtklabel.c (gtk_label_size_request): Fixed incorrect
getting of numbers of lines.
* gtk/gtklabel.c (gtk_label_size_request): Set the requisition
to the actual requested width of the lable, not to the wrap
width we set.
* gtk/gtktextchild.h: Remove extraneous include of gtk/gtk.h.
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
* gtk/gtktextview.c: Fix structure inheritance.
* gtk/gtkprogressbar.c: Pangoize.
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextview.c (gtk_text_view_get_first_para_iter): Encapsulate
in a function.
* gtk/gtktextlayout.c (find_display_line_above): Fixed
bug with computing line tops.
* gtk/gtktextview.c (changed_handler): Fix < , <= confusion.
Thu May 18 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix up the x_offset
and y_offset coordinates to do what we need now. (The offset between
buffer and layout coordinates has been reintroduced, but is a
bit different than before.)
* gtk/gtktextview.[ch]: No longer inherit from GtkLayout; instead
handle the adjustments ourselves, and scroll as necessary using
the new gdk_window_scroll().
The advantage of this is that when we are incrementally revalidating,
we are essentially rearranging things around the visible portion
of the screen. With the old setup, the visible portion of the
screen was moved around in the layout, so scrolling and redrawing
to track that caused jumping of the display. Since we now
control the scrolling ourselves, we can suppress this and
only redraw when things actually change.
Thu May 18 18:47:25 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (redisplay_mark): We need to invalidate
the region not just redisplay it after-all, since we store the
cursors in the LineDisplay. (Ugly interactions here between
GtkLayout and GtkTextBTree here.)
* gtk/gtktextbtree.c (redisplay_region): Fixed reversed comparison.
Thu May 18 18:43:21 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.h gdk/x11/gdkgeometry-x11.c (gdk_window_scroll):
Added function to scroll contents of a window while keeping the
window constant. Works by XCopyArea or guffaw-scrolling depending
on the details of how the window is set up. (guffaw-scrolling
still needs to be filled in.)
Wed May 17 22:36:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextiter.c gtk/gtkmain.c: Add a debug key for the text widget,
move the debugging that was tied to a global variable
to that.
* gtk/gtkmarshal.list: Add NONE:INT,INT,INT
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.c: Keep a separate
validated flag, in line data instead of setting height/width to
-1. This allows us to perform operations with partially invalid
buffer (using the old size for invalid lines) and thus to do
incremental vaidation. Keep height/width aggregates up to date
when deleting text and rebalancing the tree.
* gtk/gtktextbtree.[ch]: Add functions validate a line
(gtk_text_btree_validate_line), and to validate up
to a number of pixels (gtk_text_btree_validate).
* gtk/gtktextlayout.[ch]: Add an ::invalidated signal
that indicates that something is changed and a revalidation
pass is needed. Change ::need_repaint to ::changed, and
make it take old and new yranges instead of a rectangle.
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.[ch]: Move
the line_data_destroy() function from
gtk_text_btree_add_view() to a virtual function in
GtkTextLayout
* gtk/gtktextbtree.[ch]: Remove gtk_text_btree_get_damage_range(),
since we are handling partial repaints in a different fashion
now.
* gtk/gtktextbtree.[ch]: Only repaint the changed portion
of the selection instead of queueing a repaint on the
entire widget.
* gtk/gtktextbuffer.[ch] gtk/gtktextbtree.[ch]: Move
get_selection_bounds() down to btree, make the function
in buffer a wrapper around the btree function.
* gtk/gtktextlayout.[ch]: Add functions to check if the
layout is valid and to recompute either a range of pixels
aroudn a line or a certain total number of pixels.
* gtk/gtktextlayout.[ch]: Cache a single line display;
now that we only redraw the needed portions, the hit rate
for this cache is quite high.
* gtk/gtktextview.[ch]: Keep track of the first paragraph
on the screen so that when re-laying-out the buffer, we can
keep the same place. This requires connecting to ::value_changed
on the adjustments
* gtk/gtktextview.[ch]: Add idle functions to revalidate
the buffer after we receive an ::invalidated signal.
Wed May 17 22:10:47 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_size_allocate): Set upper
to max of allocation and layout size, not just to the
layout size.
* gtk/gtk[hv]scrollbar.c (gtk_[hv]scrollbar_calc_slider_size):
Invalidate window so it gets redrawn properly.
* gdk/gdkwindow.c (gdk_window_invalidate_rect): Allow rect == NULL
to mean the entire window.
* gdk/gdkevents.h: Move definition for GDK_PRIORITY_REDRAW
into public header.
Mon May 15 14:51:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextmark.c (gtk_text_mark_get_name): Add function
to get the name of a mark.
* gtk/gtktextlayout.c (gtk_text_layout_get_line_at_y): Add a function
to find the paragraph from a y position.
Thu May 11 12:57:20 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_invalidate_upward): Valid
nodes have width/height >= 0, not > 0.
Tue May 9 21:29:06 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c (gtk_text_layout_get_line_display):
Add a size_only flag, so when we only need the size, we don't create
useless appearance attributes.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Remove
duplicate setting of font description.
* gtk/gtkscale.c: Use PANGO_SCALE instead of 1000
Wed Apr 26 01:53:23 2000 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (EXTRA_DIST): Add OLD_STAMP into
EXTRA_DIST. It does not work well when the file that
everything depends on is not in the tarball.
Wed Apr 26 00:56:14 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c: Some hacks and fixes so that it basically
works when not sitting in the GTK+ build tree.
2000-05-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_line_next_could_contain_tag):
Properly determine the ordering of the tag root and the current
line within the tree. Previous algorithm only worked if the tag
root's immediate parent was the common root of both the current
line and the tag root.
Wed Apr 26 00:43:00 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (set_para_values): Fix some bugs in
alignment.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Track
the widget text directional dynamically.
* gtk/gtktextview.[ch]: Added functions to get and set default
wrap mode.
Tue Apr 25 23:47:38 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_location): Fix bug
in cursor location computation.
Tue Apr 25 23:22:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_set_size): Clamp hadjustment/
vadjusment values properly when layout gets smaller.
* gtk/gtktextview.c (need_repaint_handler): Areas being
passed in are far completely inaccurate, and sometimes
too small, so, for now, just queue a redraw on the
whole visible region.
2000-04-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (summary_destroy): new function to
destroy tag summary nodes
(gtk_text_line_next_could_contain_tag): this function was
totally broken if the line passed in wasn't below the tag
root. Fix it.
(gtk_text_btree_first_could_contain_tag): In the tag == NULL
"wildcard" case, we have to do a linear scan. Blah.
(gtk_text_btree_last_could_contain_tag): In tag == NULL case,
we have to do the linear scan
(tag_removed_cb): When a tag is removed from the tag table,
remove the GtkTextTagInfo node from the btree.
(gtk_text_btree_spew): Implement the spew function, for
our debugging pleasure.
Tue Apr 25 19:40:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
a problem with referring to the wrong buffer.
* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
font description to gtk_style_new() - otherwise things
don't work without a .gtkrc file.
* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
tags table if we create it ourself, too.
* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
it was conflicting with XKB modifiers.
* gtk/gtktextview.[ch]: Add simple support for
GtkIMContext.
Mon Apr 24 19:34:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
with deletion from last commit.
Mon Apr 24 19:29:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_create_pango_context): Set the language
in the context from the current locale.
* gtk/gtkentry.c (gtk_entry_size_request): Use language from the
context, not hardcoded value.
* gtk/gtkentry.c (gtk_entry_move_cursor): Make character movement visual,
not logical.
Sun Apr 23 23:39:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtktextdisplay.c: Don't handle selections as
attributes - that doesn't handle partial-glyph selection
properly. Instead use new pango_layout_line_get_x_ranges()
functionality to draw the selection.
* gtk/gtkentry.c: Simplify code since pango_layout_line_index_to_x()
now properly handles out-of-range coordinates.
* gtk/gtktextbuffer.c: Emit "mark_set" when the cursor is moved.
* gtk/gtktextiter.h gtk/gtktextiterprivate.h: Make gtk_text_iter_get_line_byte()
public.
* gtk/gtktextlayout.[ch]: Properly set the direction in the PangoContext
for paragraphs opposite to the base direction of the widget.
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c: Fixes for alignment.
* gtk/gtktextlayout.c: Don't split segments on marks, since that
causes Arabic words to reshape as you cursor through.
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Implement virtual
cursor position when moving vertically with the arrow keys and
scrolling with page-up/page-down. (Arrow keys save only the X,
scrolling saves both X and Y.)
This means you can line-up / line-down or page-up / page-down
without losing your place, and also that moving vertically
with the cursor keys keeps the same X position, not the same
character count:
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Make vertical
arrow keys move by display lines, not paragraphs.
Tue Apr 18 14:16:50 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c: Make sure that the bin window is at least
as big as the allocation. (Should we also make sure that the
bin window is big enough to completely cover widget->window?)
* gtk/gtktextview.c (gtk_text_view_get_visible_rect): Add
function to get the onscreen rectangle.
* gdk/x11/gdkwindow-x11.c (gdk_window_get_pointer): Correctly account
for offsets in window coordinates.
Sun Apr 16 16:13:27 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_get_cursor_locations): Fix index/offset
confusion.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Set the default direction
from the widget direction.
* gtk/gtktexttag.c gtk/gtktexttagprivate.h (gtk_text_tag_set_arg):
Add a "direction" attribute.
* gtk/gtktextview.c: global s/tkxt/text_view/.
* gtk/testtext.c: Added long block of text in Arabic, to test out
the direction attributes. (Some problems with the shaping system
for arabic become obvious - like the fact the cursor splits words
into unjoined pieces.)
Fri Apr 14 12:54:34 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (render_layout): Add overstrike handling.
* gtk/gtktextlayout.c: Fix up alignment.
* gtk/testtext.c: Add some tests for centering, wrapping.
Fri Apr 14 09:26:22 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add a draw_glyphs() operation to the drawable vtable and gdk_draw_glyphs().
If we wrote GTK+-specific layout-render function this could just replace
the draw_layout() operation in the vtable.
* gtk/gtkentry.c: Move guts of gtk_entry_get_cursor_locations to
pango_layout_get_cursor_pos() and use that function.
* gtk/gtktextchild.[ch]: add gtk_ onto pixmap_segment_new(), since it
is a non-static symbol.
* gtk/gtktextbtree.[ch]: Replace gtk_text_btree_find_line_data_by_y()
with gtk_text_btree_find_line_by_y()
* gtk/gtktextdisplay.c: Rewrote for Pango - uses a custom layout
renderer that handles GtkTextAppearance attributes.
* gtk/gtktexttag.[ch] gtk/gtktexttagprivate.h:
- Move the values in the style that don't affect geometry into a
GtkTextAppearance structure.
- Change underline to take a PangoUnderline and "font" a string
representation of a font description
- Add a "font_desc" attribute which takes a FontDescription structure.
* gtk/gtktextlayout.[ch]:
- Get rid of the display-line list per each line. Instead, we
generate, on demand, a GtkTextLineDisplay structure which]
contains a PangoLayout * and other necesary information
(offsets, cursor locations) for displaying a paragraph.
- Get rid of the code to wrap lines, create display chunks,
etc. Instead, we just go through a paragraph and convert
it into the necessary inputs to a PangoLayout.
- Implement a new attribute type, GtkTextAttrAppearance. This
holds a GtkTextAppearance, and is used to pass colors,
stipple, etc, through from the layout to the display without
having to use lots and lots of individual attributes.
- Reimplement gtk_layout_get_iter_at_pixel() gtk_layout_get_iter_pos()
in terms of PangoLayout functions.
* gtk/gtktextview.c:
- Handle passing the necessary PangoContext to the layout
- Some fixups in painting to deal with the automatic backing store
and offsetting of GTK+-1.4
- Add a style_set handler so that the default style reacts
properly to theme changes.
* gtk/gtktext?*.[ch]: Random code-style fixes.
* gtk/testtext.c: Substitute in languages that Pango handles now for Thai
Mon Apr 10 10:33:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext?*.[ch]: Check in Havoc's port of the Tk text widget,
in original form preparatory to Pango-ization and gdkimcontext-ization.
Thu Apr 6 19:25:39 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.c: Move default implementations to real_* vfuncs,
so that we can derive from gtkimcontext in language bindings properly.
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.
Wed Apr 5 16:27:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.[ch]: Base class for new input context system
* gtk/gtkimmulticontext.[ch]: Proxy input context that allows
the real input context implementation to be loaded from modules
and switched on the fly.
* gtk/gtkcontextsimple.[ch]: Simple implementation of an input
context that just does direct keysymbol => unicode translation.
* gtk/gtkentry.[ch]: Start switching editing over to using
GtkInputContext. (No handling of preedit yet.)
Wed Apr 5 15:48:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktypeutils.h (GTK_CHECK_GET_CLASS): Fix problem with one too
many substitutions. (klass should not be subsituted.)
Wed Apr 5 00:18:14 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Pango
* configure.in docs/Makefile.am: Add test for sgml2html
and allow 'make dist' without building html, but print out
warnings in that case. (For making snapshots)
* gdk/Makefile.am gdk/x11/Makefile.am gtk/Makefile.am:
Add Pango libraries and C flags
* gdk/gdkdraw.c gdk/gdkdrawable.h gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add function (gdk_draw_layout) to draw a pango layout.
* gdk/gdkpango.h gdk/x11/gdkpango-x11.c: New file with functions
for getting Pango contexts for GDK.
* gtk/gtkeditable.c: Get rid of dead code gtk_editable_parent_set()
* gtk/gtkentry.[ch]: Complete rewrite to use Pango, add bidirectional
editing.
* gtk/gtkentry.c: Hack in simple Hebrew input with direct
keysym => unicode translations. More languages can be added
here, but real input-method support is needed.
* docs/Changes-1.4.txt: Added note about entry behavior.
* gtk/gtkenums.h gtk/gtkwidget.[ch] testgtk.c gtkprivate.h: Add functions
to set the reading direction for a widget and the global direction.
Add test which allows toggling the global direction. Two private
flags are used to store the direction. (GTK_DIRECTION_SET + GTK_DIRECTION_LTR)
* gtk/gtkcheckbutton.c gtk/gtkframe.c gtk/gtkhbbox.c gtk/gtkhbox.c
gtk/gtkradiobutton.c gtk/gtkspinbutton.c gtk/gtktable.c
* gtk/gtk[hv]scale.c gtk/gtkscale.[ch]: Draw numbers using Pango
* gtk/gtklabel.[ch]: Moved to Pango and considerably rewritten. Line breaking,
underlining now handled by Pango.
* gtk/gtkstyle.[ch] gtk/gtkrc.[ch]: Add a PangoFontDescription
to RCStyle and Style. (Having both this and the old font name and GdkFont
is temporary.)
* gtk/gtkwidget.[ch] (gtk_widget_create_pango_{context,layout}): Added
convenience functions for creating contexts and layouts for widgets.
* gtk/testgtk.c: Enhance label tests with multilingual labels.
2000-06-02 03:14:07 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# GTK+ uses some X calls, so needs to link against X directly
|
|
|
|
GTK_DEP_PACKAGES_FOR_X=
|
|
|
|
GTK_DEP_LIBS_FOR_X=
|
2011-01-05 02:57:21 +00:00
|
|
|
X_EXTENSIONS=
|
2002-03-02 23:29:02 +00:00
|
|
|
|
2011-03-21 14:32:49 +00:00
|
|
|
if test "x$enable_x11_backend" = xyes; then
|
2009-08-02 07:32:47 +00:00
|
|
|
X_PACKAGES=fontconfig
|
|
|
|
|
2005-08-15 19:04:55 +00:00
|
|
|
#
|
|
|
|
# We use fontconfig very peripherally when decoding the default
|
|
|
|
# settings.
|
|
|
|
#
|
|
|
|
if $PKG_CONFIG --exists fontconfig; then : ; else
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
|
|
|
|
fi
|
|
|
|
|
2002-03-02 23:29:02 +00:00
|
|
|
#
|
2005-08-10 02:31:51 +00:00
|
|
|
# Check for basic X packages; we use pkg-config if available
|
2002-03-02 23:29:02 +00:00
|
|
|
#
|
2010-08-05 14:10:45 +00:00
|
|
|
if $PKG_CONFIG --exists x11 xext; then
|
2005-08-10 02:31:51 +00:00
|
|
|
have_base_x_pc=true
|
2010-08-05 14:10:45 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES x11 xext"
|
|
|
|
x_libs="`$PKG_CONFIG --libs x11 xext`"
|
2012-03-11 04:10:55 +00:00
|
|
|
X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# Strip out any .la files that pkg-config might give us (this happens
|
|
|
|
# with -uninstalled.pc files)
|
|
|
|
x_libs_for_checks=
|
|
|
|
for I in $x_libs ; do
|
2010-05-07 07:53:03 +00:00
|
|
|
case $I in
|
2005-08-10 02:31:51 +00:00
|
|
|
*.la) ;;
|
|
|
|
*) x_libs_for_checks="$x_libs_for_checks $I" ;;
|
|
|
|
esac
|
|
|
|
done
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
GTK_PACKAGES_FOR_X="x11"
|
|
|
|
else
|
|
|
|
have_base_x_pc=false
|
|
|
|
AC_PATH_XTRA
|
|
|
|
if test x$no_x = xyes ; then
|
|
|
|
AC_MSG_ERROR([X development libraries not found])
|
|
|
|
fi
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
x_cflags="$X_CFLAGS"
|
2010-08-05 14:10:45 +00:00
|
|
|
x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-05 14:10:45 +00:00
|
|
|
GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
|
2003-08-15 16:50:57 +00:00
|
|
|
fi
|
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
|
|
|
|
x_extra_libs=
|
2002-04-30 16:29:49 +00:00
|
|
|
|
2002-09-05 20:05:23 +00:00
|
|
|
gtk_save_cppflags="$CPPFLAGS"
|
2005-08-10 02:31:51 +00:00
|
|
|
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
2002-04-30 16:29:49 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
gtk_save_LIBS=$LIBS
|
|
|
|
LIBS="$x_libs_for_checks $LIBS"
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# Sanity check for the X11 and Xext libraries. While everything we need from
|
|
|
|
# Xext is optional, the chances a system has *none* of these things is so
|
|
|
|
# small that we just unconditionally require it.
|
|
|
|
AC_CHECK_FUNC(XOpenDisplay, :,
|
2012-04-16 13:34:30 +00:00
|
|
|
AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
|
2005-08-10 02:31:51 +00:00
|
|
|
AC_CHECK_FUNC(XextFindDisplay, :,
|
2012-04-16 13:34:30 +00:00
|
|
|
AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
|
2002-09-05 20:05:23 +00:00
|
|
|
|
2004-11-12 19:48:43 +00:00
|
|
|
# Check for xReply
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
|
2011-02-06 01:35:42 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
|
2012-08-10 18:12:39 +00:00
|
|
|
[[xReply *rep = NULL;
|
|
|
|
rep = rep;]])],
|
2011-02-06 01:35:42 +00:00
|
|
|
[AC_MSG_RESULT([no])],
|
|
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
|
|
|
|
#include <X11/Xlibint.h>]],
|
2012-08-10 18:12:39 +00:00
|
|
|
[[xReply *rep = NULL;
|
|
|
|
rep = rep;]])],
|
2011-02-06 01:35:42 +00:00
|
|
|
[AC_MSG_RESULT([yes])
|
|
|
|
AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1],
|
|
|
|
[Define if <X11/extensions/XIproto.h> needed for xReply])],
|
|
|
|
[AC_MSG_RESULT([unknown])
|
|
|
|
AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
|
2004-11-12 19:48:43 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
# Check for XKB support.
|
|
|
|
|
|
|
|
if test "x$enable_xkb" = "xyes"; then
|
2011-01-05 02:57:21 +00:00
|
|
|
AC_CHECK_FUNC(XkbQueryExtension,
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XKB"
|
|
|
|
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]),
|
|
|
|
AC_MSG_ERROR([*** XKB extension not found. Check 'config.log' for more details.]))
|
2001-05-03 20:11:14 +00:00
|
|
|
elif test "x$enable_xkb" = "xmaybe"; then
|
2005-08-10 02:31:51 +00:00
|
|
|
AC_CHECK_FUNC(XkbQueryExtension,
|
2011-01-05 02:57:21 +00:00
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XKB"
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
|
2001-05-03 20:11:14 +00:00
|
|
|
else
|
|
|
|
AC_MSG_WARN(XKB support explicitly disabled)
|
|
|
|
fi
|
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# Check for shaped window extension
|
2002-10-04 15:58:19 +00:00
|
|
|
|
2009-06-06 03:06:12 +00:00
|
|
|
AC_CHECK_FUNC(XShapeCombineMask, :,
|
|
|
|
[AC_MSG_ERROR([Shape extension not found, check your development headers])])
|
2004-05-06 13:38:02 +00:00
|
|
|
|
2004-07-11 13:26:57 +00:00
|
|
|
# X SYNC check
|
2006-07-17 02:57:44 +00:00
|
|
|
gtk_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS $x_cflags"
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
AC_CHECK_FUNC(XSyncQueryExtension,
|
|
|
|
[AC_CHECK_HEADER(X11/extensions/sync.h,
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
|
2005-08-10 02:31:51 +00:00
|
|
|
:, [#include <X11/Xlib.h>])])
|
2004-05-06 13:38:02 +00:00
|
|
|
|
2006-07-17 02:57:44 +00:00
|
|
|
CFLAGS="$gtk_save_CFLAGS"
|
|
|
|
|
2011-01-05 02:57:21 +00:00
|
|
|
if test "x$enable_xinerama" != "xno"; then
|
2007-06-03 04:54:15 +00:00
|
|
|
# Check for Xinerama extension (Solaris impl or Xfree impl)
|
2011-01-05 02:57:21 +00:00
|
|
|
have_xfree_xinerama=false
|
|
|
|
have_solaris_xinerama=false
|
|
|
|
|
2007-06-03 04:54:15 +00:00
|
|
|
gtk_save_cppflags="$CPPFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS $x_cflags"
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2009-06-05 05:42:01 +00:00
|
|
|
# Check for XFree
|
2011-01-05 02:57:21 +00:00
|
|
|
AC_MSG_CHECKING(for Xinerama packages)
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2009-06-05 05:42:01 +00:00
|
|
|
if $PKG_CONFIG --exists xinerama ; then
|
2011-01-05 02:57:21 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
2009-06-05 05:42:01 +00:00
|
|
|
have_xfree_xinerama=true
|
|
|
|
X_PACKAGES="$X_PACKAGES xinerama"
|
2010-05-07 07:53:03 +00:00
|
|
|
else
|
2011-01-05 02:57:21 +00:00
|
|
|
AC_MSG_RESULT(no)
|
2009-06-05 05:42:01 +00:00
|
|
|
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
|
2010-05-07 07:53:03 +00:00
|
|
|
[AC_CHECK_HEADER(X11/extensions/Xinerama.h,
|
2009-06-05 05:42:01 +00:00
|
|
|
[GTK_ADD_LIB(x_extra_libs,Xinerama)
|
|
|
|
have_xfree_xinerama=true], :,
|
|
|
|
[#include <X11/Xlib.h>])])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if $have_xfree_xinerama ; then
|
2011-01-05 02:57:21 +00:00
|
|
|
X_EXTENSIONS="$X_EXTENSIONS Xinerama"
|
2009-06-05 05:42:01 +00:00
|
|
|
AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
|
|
|
|
[Define to 1 if XFree Xinerama is available])
|
|
|
|
AC_DEFINE(HAVE_XINERAMA, 1,
|
|
|
|
[Define to 1 is Xinerama is available])
|
|
|
|
else
|
|
|
|
case "$host" in
|
|
|
|
*-*-solaris*)
|
|
|
|
# Check for solaris
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2009-06-05 05:42:01 +00:00
|
|
|
have_solaris_xinerama=false
|
|
|
|
AC_CHECK_FUNC(XineramaGetInfo,
|
|
|
|
[AC_CHECK_HEADER(X11/extensions/xinerama.h,
|
2010-05-07 07:53:03 +00:00
|
|
|
[have_solaris_xinerama=true], :,
|
2009-06-05 05:42:01 +00:00
|
|
|
[#include <X11/Xlib.h>])])
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2013-09-28 23:18:38 +00:00
|
|
|
AC_MSG_CHECKING(for Xinerama support on Solaris)
|
|
|
|
|
2009-06-05 05:42:01 +00:00
|
|
|
if $have_solaris_xinerama ; then
|
2011-01-05 02:57:21 +00:00
|
|
|
X_EXTENSIONS="$X_EXTENSIONS Xinerama"
|
2009-06-05 05:42:01 +00:00
|
|
|
AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
|
|
|
|
[Define to 1 if solaris xinerama is available])
|
|
|
|
AC_DEFINE(HAVE_XINERAMA, 1,
|
|
|
|
[Define to 1 if xinerama is available])
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
2007-06-03 04:54:15 +00:00
|
|
|
fi
|
2011-01-05 02:57:21 +00:00
|
|
|
if test "x$enable_xinerama" = "xyes" ; then
|
|
|
|
if test "x$have_xfree_xinerama" != "xtrue" -a "x$have_solaris_xinerama" != "xtrue" ; then
|
|
|
|
AC_MSG_ERROR([*** Xinerama extension not found. Check 'config.log' for more details.])
|
|
|
|
fi
|
|
|
|
fi
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2011-05-20 20:21:59 +00:00
|
|
|
# Check for XGetEventData for GenericEvents
|
|
|
|
AC_CHECK_FUNC(XGetEventData,
|
|
|
|
AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
|
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# set up things for XInput
|
2012-03-02 12:52:12 +00:00
|
|
|
if $PKG_CONFIG --exists "xi" ; then
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2010-05-25 22:38:44 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES xi"
|
2011-12-16 04:35:06 +00:00
|
|
|
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
|
2010-05-25 22:38:44 +00:00
|
|
|
|
|
|
|
AC_CHECK_HEADER(X11/extensions/XInput2.h,
|
2011-01-05 02:57:21 +00:00
|
|
|
have_xinput2=yes
|
2012-03-02 12:52:12 +00:00
|
|
|
AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
|
2011-01-05 02:57:21 +00:00
|
|
|
|
2011-02-28 19:43:03 +00:00
|
|
|
gtk_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -lXi"
|
2012-03-06 12:45:04 +00:00
|
|
|
|
|
|
|
# Note that we also check that the XIScrollClassInfo struct is defined,
|
|
|
|
# because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct.
|
|
|
|
AC_CHECK_FUNC([XIAllowTouchEvents],
|
|
|
|
[AC_CHECK_MEMBER([XIScrollClassInfo.number],
|
|
|
|
have_xinput2_2=yes
|
|
|
|
AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]),
|
|
|
|
have_xinput2_2=no,
|
|
|
|
[[#include <X11/extensions/XInput2.h>]])])
|
2011-02-28 19:43:03 +00:00
|
|
|
LIBS="$gtk_save_LIBS"
|
2012-03-06 12:45:04 +00:00
|
|
|
|
|
|
|
if test "x$have_xinput2_2" = "xyes"; then
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XI2.2"
|
|
|
|
else
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XI2"
|
|
|
|
fi
|
2002-03-02 23:29:02 +00:00
|
|
|
fi
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2012-03-02 12:52:12 +00:00
|
|
|
AS_IF([test "x$have_xinput2" != "xyes"],
|
|
|
|
[AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
|
2005-08-10 02:31:51 +00:00
|
|
|
|
|
|
|
# Check for the RANDR extension
|
2011-01-07 01:30:11 +00:00
|
|
|
if test x"$enable_xrandr" != xno; then
|
|
|
|
if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
|
|
|
|
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
|
|
|
|
|
|
|
|
X_PACKAGES="$X_PACKAGES xrandr"
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XRANDR"
|
|
|
|
elif test x"$enable_xrandr" = xyes; then
|
|
|
|
AC_MSG_ERROR([RANDR support requested but xrandr not found])
|
|
|
|
fi
|
2005-08-10 02:31:51 +00:00
|
|
|
fi
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
# Checks for Xcursor library
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
if $PKG_CONFIG --exists xcursor ; then
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2005-08-10 02:31:51 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES xcursor"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Checks for XFixes extension
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
if test x"$enable_xfixes" != xno; then
|
|
|
|
if $PKG_CONFIG --exists xfixes ; then
|
|
|
|
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
|
2010-05-07 07:53:03 +00:00
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES xfixes"
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS XFIXES"
|
|
|
|
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
|
|
|
|
elif test x"$enable_xfixes" = xyes; then
|
|
|
|
AC_MSG_ERROR([XFixes support requested but xfixes not found])
|
|
|
|
fi
|
2005-08-10 02:31:51 +00:00
|
|
|
fi
|
|
|
|
|
2007-04-29 03:31:03 +00:00
|
|
|
# Checks for Xcomposite extension
|
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
if test x"$enable_xcomposite" != xno; then
|
|
|
|
if $PKG_CONFIG --exists xcomposite ; then
|
|
|
|
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
|
2007-04-29 03:31:03 +00:00
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES xcomposite"
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS Composite"
|
|
|
|
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
|
|
|
|
elif test x"$enable_xcomposite" = xyes; then
|
|
|
|
AC_MSG_ERROR([Xcomposite support requested but xcomposite not found])
|
|
|
|
fi
|
2007-04-29 03:31:03 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Checks for Xdamage extension
|
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
if test x"$enable_xdamage" != xno; then
|
|
|
|
if $PKG_CONFIG --exists xdamage ; then
|
|
|
|
AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
|
2007-04-29 03:31:03 +00:00
|
|
|
|
2011-01-07 01:30:11 +00:00
|
|
|
X_PACKAGES="$X_PACKAGES xdamage"
|
|
|
|
X_EXTENSIONS="$X_EXTENSIONS DAMAGE"
|
|
|
|
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
|
|
|
|
elif test x"$enable_xdamage" = xyes; then
|
|
|
|
AC_MSG_ERROR([Xdamage support requested but xdamage not found])
|
|
|
|
fi
|
2007-04-29 03:31:03 +00:00
|
|
|
fi
|
|
|
|
|
2005-08-15 19:04:55 +00:00
|
|
|
if $have_base_x_pc ; then
|
2005-08-10 02:31:51 +00:00
|
|
|
GDK_EXTRA_LIBS="$x_extra_libs"
|
|
|
|
else
|
2005-08-15 21:26:19 +00:00
|
|
|
GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS"
|
2005-08-10 02:31:51 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
CPPFLAGS="$gtk_save_cppflags"
|
|
|
|
LIBS="$gtk_save_libs"
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AM_CONDITIONAL(USE_X11, true)
|
2011-01-05 02:57:21 +00:00
|
|
|
|
|
|
|
# strip leading space
|
2011-03-21 14:32:49 +00:00
|
|
|
X_EXTENSIONS=${X_EXTENSIONS#* }
|
2011-01-05 02:57:21 +00:00
|
|
|
|
2000-06-21 20:47:22 +00:00
|
|
|
else
|
2009-08-02 07:32:47 +00:00
|
|
|
XPACKAGES=
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AM_CONDITIONAL(USE_X11, false)
|
2000-06-21 20:47:22 +00:00
|
|
|
fi
|
|
|
|
|
2012-04-11 14:22:57 +00:00
|
|
|
# Check for gio-unix
|
|
|
|
if test "$have_gio_unix" = "yes"; then
|
2014-01-23 23:26:07 +00:00
|
|
|
GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
|
2012-04-11 14:22:57 +00:00
|
|
|
AC_DEFINE([HAVE_GIO_UNIX], [1],
|
|
|
|
[Define if gio-unix is available])
|
|
|
|
else
|
2014-01-23 23:26:07 +00:00
|
|
|
GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version"
|
2012-04-11 14:22:57 +00:00
|
|
|
fi
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
# Check for Pango flags
|
2001-01-09 09:53:28 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_MSG_CHECKING(Pango flags)
|
|
|
|
if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
|
|
|
|
PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
|
|
|
|
PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
|
2001-01-09 09:53:28 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([
|
2005-02-03 23:29:02 +00:00
|
|
|
*** Pango not found. Pango built with Cairo support is required
|
|
|
|
*** to build GTK+. See http://www.pango.org for Pango information.
|
2001-05-03 20:11:14 +00:00
|
|
|
])
|
|
|
|
fi
|
2001-01-09 09:53:28 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
CFLAGS="$CFLAGS $PANGO_CFLAGS"
|
2001-01-09 09:53:28 +00:00
|
|
|
|
2001-06-07 16:40:01 +00:00
|
|
|
if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
|
|
|
|
:
|
|
|
|
else
|
2002-12-17 03:25:21 +00:00
|
|
|
gtk_save_LIBS="$LIBS"
|
|
|
|
LIBS="$PANGO_LIBS $LIBS"
|
|
|
|
AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
|
2001-05-03 20:11:14 +00:00
|
|
|
*** Can't link to Pango. Pango is required to build
|
2002-12-17 03:25:21 +00:00
|
|
|
*** GTK+. For more information see http://www.pango.org]))
|
|
|
|
LIBS="$gtk_save_LIBS"
|
2001-06-07 16:40:01 +00:00
|
|
|
fi
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2013-06-04 08:39:32 +00:00
|
|
|
# Check for cairo_set_device_scale, as we don't want to depend hard on
|
|
|
|
# this until there is a stable release with it
|
|
|
|
CAIRO_CFLAGS=`$PKG_CONFIG --cflags cairo`
|
|
|
|
CAIRO_LIBS=`$PKG_CONFIG --libs cairo`
|
|
|
|
CFLAGS="$CFLAGS $CAIRO_CFLAGS"
|
|
|
|
gtk_save_LIBS="$LIBS"
|
|
|
|
LIBS="$CAIRO_LIBS $LIBS"
|
|
|
|
AC_CHECK_FUNCS(cairo_surface_set_device_scale)
|
|
|
|
LIBS="$gtk_save_LIBS"
|
|
|
|
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
CFLAGS="$saved_cflags"
|
|
|
|
LDFLAGS="$saved_ldflags"
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2014-01-23 23:26:07 +00:00
|
|
|
GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
|
2012-04-11 14:22:57 +00:00
|
|
|
GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
|
2011-12-06 01:56:02 +00:00
|
|
|
if test "x$enable_x11_backend" = xyes; then
|
|
|
|
GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
|
|
|
|
fi
|
2010-04-01 14:07:11 +00:00
|
|
|
|
2012-05-07 01:14:35 +00:00
|
|
|
PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
|
|
|
|
GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
|
|
|
|
GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS"
|
2002-03-02 23:29:02 +00:00
|
|
|
#
|
|
|
|
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
|
|
|
|
# into the pkg-config files
|
|
|
|
#
|
|
|
|
if test $enable_explicit_deps != yes ; then
|
|
|
|
GDK_EXTRA_LIBS=
|
|
|
|
fi
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_SUBST(GDK_PACKAGES)
|
2011-12-06 01:56:02 +00:00
|
|
|
AC_SUBST(GDK_PRIVATE_PACKAGES)
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_SUBST(GDK_EXTRA_LIBS)
|
|
|
|
AC_SUBST(GDK_EXTRA_CFLAGS)
|
|
|
|
AC_SUBST(GDK_DEP_LIBS)
|
|
|
|
AC_SUBST(GDK_DEP_CFLAGS)
|
2000-06-21 20:47:22 +00:00
|
|
|
|
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
########################################
|
|
|
|
# Check for Accessibility Toolkit flags
|
|
|
|
########################################
|
2000-10-09 17:22:20 +00:00
|
|
|
|
2012-06-26 13:41:33 +00:00
|
|
|
if test x$enable_x11_backend = xyes; then
|
2012-06-22 17:29:03 +00:00
|
|
|
ATK_PACKAGES="atk atk-bridge-2.0"
|
|
|
|
else
|
|
|
|
ATK_PACKAGES="atk"
|
|
|
|
fi
|
|
|
|
|
2012-05-07 01:14:35 +00:00
|
|
|
PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
|
2000-09-05 14:07:55 +00:00
|
|
|
|
2014-01-23 23:26:07 +00:00
|
|
|
GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
|
2012-06-22 17:29:03 +00:00
|
|
|
GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
|
2011-03-21 14:32:49 +00:00
|
|
|
if test "x$enable_x11_backend" = xyes; then
|
2011-11-22 14:42:31 +00:00
|
|
|
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
|
2008-06-06 16:39:37 +00:00
|
|
|
fi
|
2012-04-11 14:24:04 +00:00
|
|
|
if test "$have_gio_unix" = "yes"; then
|
2014-01-23 23:26:07 +00:00
|
|
|
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
|
2012-04-11 14:24:04 +00:00
|
|
|
fi
|
2001-05-03 20:11:14 +00:00
|
|
|
GTK_EXTRA_LIBS=
|
2011-07-08 00:24:32 +00:00
|
|
|
|
2010-05-07 07:53:03 +00:00
|
|
|
GTK_EXTRA_CFLAGS=
|
2012-05-07 01:14:35 +00:00
|
|
|
PKG_CHECK_MODULES(GTK_DEP, $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES)
|
|
|
|
GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GTK_DEP_LIBS $GTK_EXTRA_LIBS $MATH_LIB"
|
|
|
|
GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
|
2001-05-03 20:11:14 +00:00
|
|
|
|
2005-03-24 15:14:12 +00:00
|
|
|
if test x"$os_win32" = xyes; then
|
|
|
|
GTK_EXTRA_CFLAGS="$msnative_struct"
|
|
|
|
fi
|
|
|
|
|
2007-02-14 21:54:09 +00:00
|
|
|
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
|
|
|
|
ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
|
|
|
|
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
|
2010-05-17 23:00:02 +00:00
|
|
|
CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
|
2007-02-14 21:54:09 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_SUBST(GTK_PACKAGES)
|
2011-11-22 14:42:31 +00:00
|
|
|
AC_SUBST(GTK_PRIVATE_PACKAGES)
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_SUBST(GTK_EXTRA_LIBS)
|
|
|
|
AC_SUBST(GTK_EXTRA_CFLAGS)
|
|
|
|
AC_SUBST(GTK_DEP_LIBS)
|
|
|
|
AC_SUBST(GTK_DEP_CFLAGS)
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2007-02-14 21:54:09 +00:00
|
|
|
AC_SUBST(GLIB_PREFIX)
|
|
|
|
AC_SUBST(ATK_PREFIX)
|
|
|
|
AC_SUBST(PANGO_PREFIX)
|
|
|
|
AC_SUBST(CAIRO_PREFIX)
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2001-05-03 20:11:14 +00:00
|
|
|
AC_SUBST(GTK_DEBUG_FLAGS)
|
|
|
|
AC_SUBST(GTK_XIM_FLAGS)
|
2000-06-21 20:47:22 +00:00
|
|
|
|
2010-06-26 05:06:30 +00:00
|
|
|
GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
|
|
|
|
AC_SUBST(GDK_PIXBUF_LIBS)
|
|
|
|
|
2007-12-18 13:51:12 +00:00
|
|
|
########################
|
|
|
|
# Checks needed for gail
|
|
|
|
########################
|
|
|
|
|
|
|
|
old_LIBS="$LIBS"
|
|
|
|
dnl Checks for inet libraries:
|
|
|
|
AC_SEARCH_LIBS(gethostent, nsl)
|
|
|
|
AC_SEARCH_LIBS(setsockopt, socket)
|
|
|
|
AC_SEARCH_LIBS(connect, inet)
|
|
|
|
|
|
|
|
dnl check for the sockaddr_un.sun_len member
|
|
|
|
AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
|
|
|
|
[struct_sockaddr_un_sun_len=true],
|
|
|
|
[struct_sockaddr_un_suin_len=false],
|
|
|
|
[#include <sys/types.h>
|
|
|
|
#include <sys/un.h>]
|
|
|
|
)
|
2010-05-07 07:53:03 +00:00
|
|
|
case $struct_sockaddr_un_sun_len in
|
2007-12-18 13:51:12 +00:00
|
|
|
true)
|
2008-03-12 14:05:23 +00:00
|
|
|
AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
|
|
|
|
[Have the sockaddr_un.sun_len member])
|
2007-12-18 13:51:12 +00:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
GAIL_INET_LIBS="$LIBS"
|
|
|
|
AC_SUBST([GAIL_INET_LIBS])
|
|
|
|
|
|
|
|
LIBS="$old_LIBS"
|
|
|
|
|
2006-04-21 15:09:32 +00:00
|
|
|
################################################################
|
|
|
|
# Printing system checks
|
|
|
|
################################################################
|
|
|
|
|
2011-01-05 02:57:21 +00:00
|
|
|
PRINT_BACKENDS="file lpr"
|
|
|
|
|
2008-03-05 16:43:10 +00:00
|
|
|
AC_ARG_ENABLE(cups,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--disable-cups],
|
2008-03-05 16:43:10 +00:00
|
|
|
[disable cups print backend])],,
|
|
|
|
[enable_cups=auto])
|
|
|
|
|
2009-08-30 00:21:21 +00:00
|
|
|
if test "x$enable_cups" = "xno"; then
|
|
|
|
AM_CONDITIONAL(HAVE_CUPS, false)
|
|
|
|
else
|
2008-03-05 16:43:10 +00:00
|
|
|
AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
|
2009-08-30 00:21:21 +00:00
|
|
|
if test "x$CUPS_CONFIG" = "xno"; then
|
|
|
|
if test "x$enable_cups" = "xauto"; then
|
|
|
|
AM_CONDITIONAL(HAVE_CUPS, false)
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
*** cups not found.
|
|
|
|
])
|
|
|
|
fi
|
|
|
|
else
|
2008-03-05 16:43:10 +00:00
|
|
|
CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
|
|
|
|
CUPS_LIBS=`$CUPS_CONFIG --libs`
|
|
|
|
|
|
|
|
CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
|
|
|
|
CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
|
|
|
|
CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
|
|
|
|
|
|
|
|
if test $CUPS_API_MAJOR -gt 1 -o \
|
2012-03-16 12:54:40 +00:00
|
|
|
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
|
|
|
|
AC_MSG_ERROR([CUPS >= 1.2 not found])
|
2008-03-05 16:43:10 +00:00
|
|
|
fi
|
2012-02-18 22:16:27 +00:00
|
|
|
if test $CUPS_API_MAJOR -gt 1 -o \
|
|
|
|
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
|
|
|
|
AC_DEFINE(HAVE_CUPS_API_1_6, 1,
|
|
|
|
[Define to 1 if CUPS 1.6 API is available])
|
2013-03-04 13:29:24 +00:00
|
|
|
have_cups_api_1_6=yes
|
2012-02-18 22:16:27 +00:00
|
|
|
fi
|
2006-06-21 18:16:58 +00:00
|
|
|
|
2008-03-05 16:43:10 +00:00
|
|
|
AC_SUBST(CUPS_API_MAJOR)
|
|
|
|
AC_SUBST(CUPS_API_MINOR)
|
|
|
|
AC_SUBST(CUPS_CFLAGS)
|
|
|
|
AC_SUBST(CUPS_LIBS)
|
2007-09-07 03:59:33 +00:00
|
|
|
|
2008-03-05 16:43:10 +00:00
|
|
|
AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
|
2009-08-30 00:21:21 +00:00
|
|
|
|
2011-01-05 02:57:21 +00:00
|
|
|
PRINT_BACKENDS="$PRINT_BACKENDS cups"
|
2009-09-01 03:59:44 +00:00
|
|
|
AM_CONDITIONAL(HAVE_CUPS, true)
|
2006-04-21 15:09:32 +00:00
|
|
|
|
2009-09-01 03:59:44 +00:00
|
|
|
gtk_save_cflags="$CFLAGS"
|
|
|
|
CFLAGS="$CUPS_CFLAGS"
|
2011-02-06 01:35:42 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cups/http.h>]],
|
|
|
|
[[http_t http; char *s = http.authstring;]])],
|
|
|
|
[AC_DEFINE([HAVE_HTTP_AUTHSTRING], [],
|
|
|
|
[Define if cups http_t authstring field is accessible])],
|
|
|
|
[])
|
2009-09-01 03:59:44 +00:00
|
|
|
CFLAGS="$gtk_save_cflags"
|
2007-07-23 17:02:04 +00:00
|
|
|
|
2009-09-01 03:59:44 +00:00
|
|
|
AC_SUBST(HAVE_HTTP_AUTHSTRING)
|
2007-07-23 17:02:04 +00:00
|
|
|
|
2009-09-01 03:59:44 +00:00
|
|
|
gtk_save_libs="$LIBS"
|
|
|
|
LIBS="$CUPS_LIBS"
|
|
|
|
AC_CHECK_FUNCS(httpGetAuthString)
|
|
|
|
LIBS="$gtk_save_libs"
|
|
|
|
fi
|
2008-03-05 16:43:10 +00:00
|
|
|
fi
|
2007-09-07 18:32:36 +00:00
|
|
|
|
2009-05-11 17:33:08 +00:00
|
|
|
# Checks to see if we should compile with PAPI backend for GTK+
|
|
|
|
#
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(papi,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--disable-papi],
|
2009-05-11 17:33:08 +00:00
|
|
|
[disable papi print backend])],,
|
2011-02-06 00:52:37 +00:00
|
|
|
[enable_papi=auto])
|
2009-05-11 17:33:08 +00:00
|
|
|
|
2009-08-30 00:21:21 +00:00
|
|
|
if test "x$enable_papi" = "xno"; then
|
|
|
|
AM_CONDITIONAL(HAVE_PAPI, false)
|
|
|
|
else
|
2009-05-11 17:33:08 +00:00
|
|
|
AC_MSG_CHECKING(libpapi)
|
|
|
|
AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
|
|
|
|
if test $have_papi = yes; then
|
2011-01-05 02:57:21 +00:00
|
|
|
PRINT_BACKENDS="$PRINT_BACKENDS papi"
|
2009-05-11 17:33:08 +00:00
|
|
|
AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available])
|
|
|
|
fi
|
|
|
|
AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
|
2009-08-30 00:21:21 +00:00
|
|
|
if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
|
|
|
|
AC_MSG_ERROR([
|
|
|
|
*** papi not found.
|
|
|
|
])
|
|
|
|
fi
|
2009-05-11 17:33:08 +00:00
|
|
|
fi
|
|
|
|
|
2009-08-30 00:21:21 +00:00
|
|
|
AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")
|
2009-05-11 17:33:08 +00:00
|
|
|
|
2006-04-24 07:34:11 +00:00
|
|
|
gtk_save_cppflags="$CPPFLAGS"
|
2009-08-02 07:32:47 +00:00
|
|
|
CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
|
|
|
|
|
2006-04-24 07:34:11 +00:00
|
|
|
AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
|
|
|
|
*** Can't find cairo-pdf.h. You must build Cairo with the pdf
|
|
|
|
*** backend enabled.]))
|
|
|
|
|
|
|
|
if test "$os_win32" != "yes"; then
|
|
|
|
AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
|
2010-05-07 07:53:03 +00:00
|
|
|
*** Can't find cairo-ps.h. You must build Cairo with the
|
2006-04-24 07:34:11 +00:00
|
|
|
*** postscript backend enabled.]))
|
2009-11-06 04:47:15 +00:00
|
|
|
|
|
|
|
AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
|
2011-01-03 16:27:19 +00:00
|
|
|
*** Cannot find cairo-svg.h. You must build Cairo with the
|
2009-11-06 04:47:15 +00:00
|
|
|
*** svg backend enabled.]))
|
2010-05-07 07:53:03 +00:00
|
|
|
fi
|
2006-04-24 07:34:11 +00:00
|
|
|
|
|
|
|
CPPFLAGS="$gtk_save_cppflags"
|
2010-05-07 07:53:03 +00:00
|
|
|
|
|
|
|
|
2007-04-29 03:41:53 +00:00
|
|
|
AC_ARG_ENABLE(test-print-backend,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-test-print-backend],
|
2007-04-29 03:41:53 +00:00
|
|
|
[build test print backend])],,
|
|
|
|
[enable_test_print_backend=no])
|
2011-01-05 02:57:21 +00:00
|
|
|
if test "x$enable_test_print_backend" != "xno" ; then
|
|
|
|
PRINT_BACKENDS="$PRINT_BACKENDS test"
|
|
|
|
fi
|
2007-04-29 03:41:53 +00:00
|
|
|
AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
|
|
|
|
|
2011-10-28 07:10:40 +00:00
|
|
|
if test "$os_win32" = "yes"; then
|
|
|
|
AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
|
|
|
|
fi
|
2007-04-29 03:41:53 +00:00
|
|
|
|
2004-03-03 21:26:31 +00:00
|
|
|
################################################################
|
|
|
|
# Strip -export-dynamic from the link lines of various libraries
|
|
|
|
################################################################
|
|
|
|
|
|
|
|
#
|
|
|
|
# pkg-config --libs gmodule includes the "export_dynamic" flag,
|
|
|
|
# but this flag is only meaningful for executables. For libraries
|
|
|
|
# the effect is undefined; what it causes on Linux is that the
|
|
|
|
# export list from -export-symbols-regex is ignored and everything
|
|
|
|
# is exported
|
2004-11-17 04:54:32 +00:00
|
|
|
#
|
|
|
|
# We are using gmodule-no-export now, but I'm leaving the stripping
|
|
|
|
# code in place for now, since pango and atk still require gmodule.
|
2007-01-03 17:55:33 +00:00
|
|
|
export SED
|
2004-03-03 21:26:31 +00:00
|
|
|
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
|
|
|
if test -n "$export_dynamic"; then
|
|
|
|
GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
|
|
|
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
|
|
|
fi
|
|
|
|
|
2010-09-28 20:56:02 +00:00
|
|
|
#############
|
|
|
|
# GSettings #
|
|
|
|
#############
|
|
|
|
|
|
|
|
GLIB_GSETTINGS
|
|
|
|
|
2009-08-18 18:34:21 +00:00
|
|
|
##################################################
|
|
|
|
# GObject introspection
|
|
|
|
##################################################
|
|
|
|
|
2011-02-08 23:40:08 +00:00
|
|
|
GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
|
2004-03-03 21:26:31 +00:00
|
|
|
|
2011-06-03 13:25:54 +00:00
|
|
|
##################################################
|
|
|
|
# colord module
|
|
|
|
#################################################
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(colord,
|
2011-06-10 12:03:47 +00:00
|
|
|
[AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@],
|
|
|
|
[build colord support code [default=auto]])],
|
|
|
|
[enable_colord="$enableval"],
|
|
|
|
[enable_colord=auto])
|
2011-09-05 20:35:25 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether to use colord])
|
2011-06-10 12:03:47 +00:00
|
|
|
if test "$enable_colord" = "auto"; then
|
|
|
|
if test "$os_win32" = "yes"; then
|
|
|
|
enable_colord=no
|
|
|
|
fi
|
|
|
|
fi
|
2011-09-05 20:35:25 +00:00
|
|
|
if test "$enable_colord" != "no"; then
|
|
|
|
AC_MSG_RESULT([yes])
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT([no])
|
|
|
|
fi
|
2011-06-03 13:25:54 +00:00
|
|
|
|
|
|
|
have_colord=no
|
2011-09-05 20:35:25 +00:00
|
|
|
if test "$enable_colord" != "no"; then
|
2011-06-10 12:03:47 +00:00
|
|
|
if test "$os_win32" != "yes"; then
|
2011-06-10 11:34:40 +00:00
|
|
|
PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
|
|
|
|
have_colord=yes, have_colord=no)
|
2011-09-01 14:34:57 +00:00
|
|
|
if test "$enable_colord" = "yes"; then
|
|
|
|
if test "$have_colord" = "no"; then
|
2011-06-10 11:34:40 +00:00
|
|
|
AC_MSG_ERROR([--enable-colord specified, but not available])
|
|
|
|
fi
|
|
|
|
fi
|
2011-06-03 13:25:54 +00:00
|
|
|
else
|
|
|
|
AC_MSG_ERROR([colord support is not available on win32])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-09-01 14:34:57 +00:00
|
|
|
if test "$have_colord" = "yes"; then
|
2011-06-10 11:34:40 +00:00
|
|
|
AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
|
|
|
|
fi
|
2011-06-03 13:25:54 +00:00
|
|
|
AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
|
|
|
|
|
2000-06-21 20:47:22 +00:00
|
|
|
##################################################
|
2000-07-06 21:09:25 +00:00
|
|
|
# Checks for gtk-doc and docbook-tools
|
2000-06-21 20:47:22 +00:00
|
|
|
##################################################
|
|
|
|
|
2014-02-17 21:55:16 +00:00
|
|
|
GTK_DOC_CHECK([1.20],[--flavour no-tmpl])
|
2001-02-13 04:56:07 +00:00
|
|
|
|
2003-06-17 00:37:28 +00:00
|
|
|
AC_ARG_ENABLE(man,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--enable-man],
|
2012-08-02 23:58:01 +00:00
|
|
|
[generate man pages [default=auto]])],,
|
|
|
|
enable_man=maybe)
|
|
|
|
|
|
|
|
if test "$enable_man" != no; then
|
2004-02-13 22:58:26 +00:00
|
|
|
AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
|
|
if test -z "$XSLTPROC"; then
|
2012-08-02 23:58:01 +00:00
|
|
|
if test "$enable_man" = yes ; then
|
|
|
|
AC_MSG_ERROR([xsltproc is required for --enable-man])
|
|
|
|
fi
|
2004-02-13 22:58:26 +00:00
|
|
|
enable_man=no
|
|
|
|
fi
|
2012-08-02 23:58:01 +00:00
|
|
|
fi
|
2004-02-13 22:58:26 +00:00
|
|
|
|
2012-08-02 23:58:01 +00:00
|
|
|
if test "$enable_man" != no; then
|
|
|
|
dnl check for DocBook DTD in the local catalog
|
2004-02-13 22:58:26 +00:00
|
|
|
JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
|
2012-08-02 23:58:01 +00:00
|
|
|
[DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
|
|
|
|
if test "$have_docbook_dtd" != yes; then
|
|
|
|
if test "$enable_man" = yes ; then
|
|
|
|
AC_MSG_ERROR([DocBook DTD is required for --enable-man])
|
|
|
|
fi
|
|
|
|
enable_man=no
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$enable_man" != no; then
|
|
|
|
dnl check for DocBook XSL stylesheets in the local catalog
|
2004-02-13 22:58:26 +00:00
|
|
|
JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
|
2012-08-02 23:58:01 +00:00
|
|
|
[DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
|
|
|
|
if test "$have_docbook_dtd" != yes; then
|
|
|
|
if test "$enable_man" = yes ; then
|
|
|
|
AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
|
|
|
|
fi
|
|
|
|
enable_man=no
|
|
|
|
fi
|
2003-06-17 00:37:28 +00:00
|
|
|
fi
|
|
|
|
|
2012-08-02 23:58:01 +00:00
|
|
|
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
|
2003-06-17 00:37:28 +00:00
|
|
|
|
2012-08-02 23:58:01 +00:00
|
|
|
AC_MSG_CHECKING([whether to generate man pages])
|
|
|
|
if test "$enable_man" != no; then
|
|
|
|
AC_MSG_RESULT([yes])
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT([no])
|
|
|
|
fi
|
2004-12-27 06:13:07 +00:00
|
|
|
|
2000-06-21 20:47:22 +00:00
|
|
|
##################################################
|
2013-03-15 10:35:30 +00:00
|
|
|
# Visibility handling
|
|
|
|
##################################################
|
|
|
|
|
|
|
|
GDK_HIDDEN_VISIBILITY_CFLAGS=""
|
|
|
|
case "$host" in
|
|
|
|
*-*-mingw*)
|
|
|
|
dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
|
|
|
|
AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
|
|
|
|
[defines how to decorate public symbols while building])
|
|
|
|
CFLAGS="${CFLAGS} -fvisibility=hidden"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
dnl on other compilers, check if we can do -fvisibility=hidden
|
|
|
|
SAVED_CFLAGS="${CFLAGS}"
|
|
|
|
CFLAGS="-fvisibility=hidden"
|
|
|
|
AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
|
|
|
|
AC_TRY_COMPILE([], [int main (void) { return 0; }],
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
enable_fvisibility_hidden=yes,
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
enable_fvisibility_hidden=no)
|
|
|
|
CFLAGS="${SAVED_CFLAGS}"
|
|
|
|
|
|
|
|
AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
|
|
|
|
AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) extern],
|
|
|
|
[defines how to decorate public symbols while building])
|
|
|
|
GDK_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
|
|
|
|
])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)
|
|
|
|
|
|
|
|
##################################################
|
2000-06-21 20:47:22 +00:00
|
|
|
# Output commands
|
|
|
|
##################################################
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
|
1999-03-13 16:40:24 +00:00
|
|
|
outfile=gdkconfig.h-tmp
|
|
|
|
cat > $outfile <<\_______EOF
|
|
|
|
/* gdkconfig.h
|
|
|
|
*
|
2010-05-07 07:53:03 +00:00
|
|
|
* This is a generated file. Please modify `configure.ac'
|
1999-03-13 16:40:24 +00:00
|
|
|
*/
|
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
#ifndef __GDKCONFIG_H__
|
|
|
|
#define __GDKCONFIG_H__
|
1999-03-13 16:40:24 +00:00
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
|
|
|
|
#error "Only <gdk/gdk.h> can be included directly."
|
|
|
|
#endif
|
1999-03-13 16:40:24 +00:00
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
#include <glib.h>
|
1999-03-13 16:40:24 +00:00
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
G_BEGIN_DECLS
|
2008-06-20 10:48:22 +00:00
|
|
|
|
1999-03-13 16:40:24 +00:00
|
|
|
_______EOF
|
|
|
|
|
|
|
|
cat >>$outfile <<_______EOF
|
|
|
|
$gdk_windowing
|
|
|
|
_______EOF
|
|
|
|
|
|
|
|
cat >>$outfile <<_______EOF
|
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
G_END_DECLS
|
1999-03-13 16:40:24 +00:00
|
|
|
|
2010-12-09 04:07:00 +00:00
|
|
|
#endif /* __GDKCONFIG_H__ */
|
1999-03-13 16:40:24 +00:00
|
|
|
_______EOF
|
|
|
|
|
|
|
|
|
|
|
|
if cmp -s $outfile gdk/gdkconfig.h; then
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged])
|
1999-03-13 16:40:24 +00:00
|
|
|
rm -f $outfile
|
|
|
|
else
|
|
|
|
mv $outfile gdk/gdkconfig.h
|
2003-05-06 21:55:41 +00:00
|
|
|
fi
|
1999-03-13 16:40:24 +00:00
|
|
|
],[
|
2011-01-03 16:29:25 +00:00
|
|
|
gdk_windowing='$GDK_WINDOWING'
|
1999-03-13 16:40:24 +00:00
|
|
|
])
|
|
|
|
|
2010-07-08 14:18:48 +00:00
|
|
|
dnl
|
|
|
|
dnl Check for -Bsymbolic-functions linker flag used to avoid
|
|
|
|
dnl intra-library PLT jumps, if available.
|
|
|
|
dnl
|
|
|
|
AC_ARG_ENABLE(Bsymbolic,
|
2011-02-06 00:52:37 +00:00
|
|
|
[AS_HELP_STRING([--disable-Bsymbolic],
|
2010-07-08 14:18:48 +00:00
|
|
|
[avoid linking with -Bsymbolic])],,
|
|
|
|
[SAVED_LDFLAGS="${LDFLAGS}"
|
|
|
|
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
|
|
|
|
LDFLAGS=-Wl,-Bsymbolic-functions
|
2011-02-06 22:10:21 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
|
|
|
|
[[int main (void) { return 0; }]])],
|
|
|
|
[AC_MSG_RESULT(yes)
|
|
|
|
enable_Bsymbolic=yes],
|
|
|
|
[AC_MSG_RESULT(no)
|
|
|
|
enable_Bsymbolic=no])
|
2010-07-08 14:18:48 +00:00
|
|
|
LDFLAGS="${SAVED_LDFLAGS}"])
|
|
|
|
|
2010-12-28 00:24:05 +00:00
|
|
|
if test "x${enable_Bsymbolic}" = "xyes" ; then
|
2010-07-08 14:18:48 +00:00
|
|
|
GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
|
|
|
|
fi
|
|
|
|
AC_SUBST(GTK_LINK_FLAGS)
|
|
|
|
|
2003-05-06 21:55:41 +00:00
|
|
|
AC_CONFIG_FILES([
|
2001-01-17 22:26:19 +00:00
|
|
|
config.h.win32
|
Updates.
2001-10-29 Tor Lillqvist <tml@iki.fi>
* README.win32: Updates.
* gtk-zip.sh.in: New file, used to build distribution package for
Windows.
* gdk/gdkglobals.c: Mark gdk_threads_mutex for DLL export when
applicable with GDKVAR.
* gtk/gtk.def: Update.
* gtk/gtkfilesel.c: Include <winsock.h> (if available) for
gethostname().
* gtk/gtkmain.c
* gtk/gtkrc.c: (Win32) Save actual DLL name for later use in DLL
entry function. Avoid hardcoded paths GTK_LIBDIR, GTK_SYSCONFDIR,
GTK_DATA_PREFIX and GTK_LOCALEDIR, instead add functions that call
g_win32_get_package_installation_subdirectory() with the actual
DLL name saved above. Redefine above directory name macros to call
these functions. Remove some ifdefs.
* gtk/maketypes.awk: Output GTKTYPEBUILTINS_VAR (that marks
variable for export on Win32) also to the _vars file.
Changes for autoconfiscated build on Win32, and addition of Win32
backend to the related files:
* configure.in: Like in GLib, set LT_CURRENT_MINUS_AGE for use
when forming DLL name in some files. Set MS_LIB_AVAILABLE is
lib.exe is available. Call AC_LIBTOOL_WIN32_DLL. Set
PLATFORM_WIN32, OS_WIN32 and USE_WIN32 automake conditionals. Add
win32 target, using pangowin32. Don't use the
-export-symbols-regex option on Win32, we use .def files to list
exported symbols. Check <winsock.h> (for gethostname() in
gtkfilesel.c). Enclose nested AC_CHECK_* macros in brackets to
prevent premature m4 expansion.
* acconfig.h: Add HAVE_WINTAB.
* gdk/Makefile.am: Add libgdk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gdk.def file. If
MS_LIB_AVAILABLE, build MS import library. Install the import
libraries. If HAVE_WINTAB, link with the Wintab library.
* gtk/Makefile.am: Add libgtk-win32-1.3.la target and associated
macros and rules. Use -no-undefined on Win32. Use gtk-win32.def
file. Install import libraries.
2001-10-29 07:06:37 +00:00
|
|
|
gtk-zip.sh
|
1998-05-09 01:17:03 +00:00
|
|
|
Makefile
|
2010-05-08 05:18:53 +00:00
|
|
|
gdk-3.0.pc
|
|
|
|
gtk+-3.0.pc
|
|
|
|
gtk+-unix-print-3.0.pc
|
2010-05-10 21:02:48 +00:00
|
|
|
gail-3.0.pc
|
2001-06-07 19:00:41 +00:00
|
|
|
m4macros/Makefile
|
1998-12-14 17:39:58 +00:00
|
|
|
po/Makefile.in
|
2004-01-17 22:15:58 +00:00
|
|
|
po-properties/Makefile.in
|
2000-06-21 20:47:22 +00:00
|
|
|
demos/Makefile
|
2000-11-13 04:36:38 +00:00
|
|
|
demos/gtk-demo/Makefile
|
2002-05-14 23:57:40 +00:00
|
|
|
demos/gtk-demo/geninclude.pl
|
2011-05-26 12:57:21 +00:00
|
|
|
demos/pixbuf-demo/Makefile
|
2012-02-09 13:45:40 +00:00
|
|
|
demos/widget-factory/Makefile
|
2010-10-15 16:37:21 +00:00
|
|
|
examples/Makefile
|
Add a new example app
Add a new example to the getting started part of the docs. The focus
of this example is on 'new stuff': GtkApplication, templates, settings,
gmenu, gaction, GtkStack, GtkHeaderBar, GtkSearchBar, GtkRevealer,
GtkListBox, GtkMenuButton, etc.
It is being developed in several steps. Each step is put in a separate
directory below examples/: application1, ..., application8. This is a
little repetitive, but lets us use the code of all examples in the
documentation.
2013-07-20 04:21:48 +00:00
|
|
|
examples/application1/Makefile
|
|
|
|
examples/application2/Makefile
|
|
|
|
examples/application3/Makefile
|
|
|
|
examples/application4/Makefile
|
|
|
|
examples/application5/Makefile
|
|
|
|
examples/application6/Makefile
|
|
|
|
examples/application7/Makefile
|
|
|
|
examples/application8/Makefile
|
2013-07-24 05:13:06 +00:00
|
|
|
examples/application9/Makefile
|
2013-11-16 21:09:56 +00:00
|
|
|
examples/application10/Makefile
|
2000-12-21 01:53:39 +00:00
|
|
|
tests/Makefile
|
2012-01-12 22:03:54 +00:00
|
|
|
tests/visuals/Makefile
|
2013-05-14 14:13:16 +00:00
|
|
|
testsuite/Makefile
|
2013-05-15 00:00:11 +00:00
|
|
|
testsuite/a11y/Makefile
|
2013-05-15 12:36:56 +00:00
|
|
|
testsuite/css/Makefile
|
|
|
|
testsuite/css/parser/Makefile
|
2013-05-14 14:13:16 +00:00
|
|
|
testsuite/gdk/Makefile
|
2013-05-14 23:48:18 +00:00
|
|
|
testsuite/gtk/Makefile
|
2013-05-15 13:28:06 +00:00
|
|
|
testsuite/reftests/Makefile
|
1998-05-09 01:17:03 +00:00
|
|
|
docs/Makefile
|
2000-06-21 18:18:00 +00:00
|
|
|
docs/reference/Makefile
|
2000-09-07 18:17:06 +00:00
|
|
|
docs/reference/gdk/Makefile
|
2002-11-21 20:19:01 +00:00
|
|
|
docs/reference/gdk/version.xml
|
2000-09-07 18:17:06 +00:00
|
|
|
docs/reference/gtk/Makefile
|
2012-05-12 16:37:56 +00:00
|
|
|
docs/reference/gtk/gtk3.types
|
2002-11-21 20:19:01 +00:00
|
|
|
docs/reference/gtk/version.xml
|
2007-12-18 13:51:12 +00:00
|
|
|
docs/reference/libgail-util/Makefile
|
2011-01-05 15:12:16 +00:00
|
|
|
docs/reference/libgail-util/version.xml
|
2004-08-23 21:22:55 +00:00
|
|
|
docs/tools/Makefile
|
2010-03-21 16:24:24 +00:00
|
|
|
build/Makefile
|
|
|
|
build/win32/Makefile
|
2013-07-01 12:52:45 +00:00
|
|
|
build/win32/crypt/Makefile
|
2010-03-21 16:24:24 +00:00
|
|
|
build/win32/vs9/Makefile
|
2011-04-26 16:46:52 +00:00
|
|
|
build/win32/vs10/Makefile
|
1998-05-09 01:17:03 +00:00
|
|
|
gdk/Makefile
|
2010-11-12 12:18:58 +00:00
|
|
|
gdk/broadway/Makefile
|
1999-10-03 18:10:43 +00:00
|
|
|
gdk/x11/Makefile
|
2000-01-15 16:04:54 +00:00
|
|
|
gdk/win32/Makefile
|
2000-11-14 22:16:24 +00:00
|
|
|
gdk/win32/rc/Makefile
|
|
|
|
gdk/win32/rc/gdk.rc
|
2005-11-22 10:03:32 +00:00
|
|
|
gdk/quartz/Makefile
|
2010-12-18 20:38:49 +00:00
|
|
|
gdk/wayland/Makefile
|
2012-02-27 12:04:30 +00:00
|
|
|
gdk/gdkversionmacros.h
|
1998-05-09 01:17:03 +00:00
|
|
|
gtk/Makefile
|
2000-10-22 16:01:20 +00:00
|
|
|
gtk/makefile.msc
|
2001-08-23 15:26:49 +00:00
|
|
|
gtk/gtkversion.h
|
2000-11-14 23:07:33 +00:00
|
|
|
gtk/gtk-win32.rc
|
2011-06-14 15:54:27 +00:00
|
|
|
gtk/a11y/Makefile
|
2013-01-07 12:49:27 +00:00
|
|
|
gtk/native/Makefile
|
2011-06-14 20:08:55 +00:00
|
|
|
libgail-util/Makefile
|
2000-06-20 20:22:05 +00:00
|
|
|
modules/Makefile
|
2004-08-30 14:20:00 +00:00
|
|
|
modules/engines/Makefile
|
2004-11-16 01:20:47 +00:00
|
|
|
modules/engines/pixbuf/Makefile
|
2007-12-18 13:51:12 +00:00
|
|
|
modules/input/Makefile
|
2006-04-21 15:09:32 +00:00
|
|
|
modules/printbackends/Makefile
|
|
|
|
modules/printbackends/cups/Makefile
|
|
|
|
modules/printbackends/lpr/Makefile
|
2006-06-20 18:42:46 +00:00
|
|
|
modules/printbackends/file/Makefile
|
2009-05-11 17:33:08 +00:00
|
|
|
modules/printbackends/papi/Makefile
|
2007-04-29 03:31:03 +00:00
|
|
|
modules/printbackends/test/Makefile
|
2001-01-19 22:39:19 +00:00
|
|
|
])
|
2003-05-06 21:55:41 +00:00
|
|
|
|
|
|
|
AC_OUTPUT
|
2004-12-27 06:13:07 +00:00
|
|
|
|
2011-01-05 02:57:21 +00:00
|
|
|
# beautify the immodule list a bit
|
2011-03-21 14:32:49 +00:00
|
|
|
included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g')
|
|
|
|
if test -z "${included_immodules}"; then included_immodules="none"; fi
|
2011-01-05 02:57:21 +00:00
|
|
|
|
2011-01-30 07:21:16 +00:00
|
|
|
echo ""
|
|
|
|
echo " GTK+ $GTK_VERSION"
|
|
|
|
echo " ==========="
|
|
|
|
echo ""
|
2011-01-05 02:57:21 +00:00
|
|
|
echo " GDK backends: $GDK_BACKENDS"
|
2011-09-05 20:35:25 +00:00
|
|
|
if test "$enable_x11_backend" = "yes"; then
|
2011-01-05 02:57:21 +00:00
|
|
|
echo " X11 extensions: $X_EXTENSIONS"
|
|
|
|
fi
|
|
|
|
echo " Print backends: $PRINT_BACKENDS"
|
|
|
|
echo " Dynamic modules: $build_dynamic_modules"
|
|
|
|
echo " Included immodules: $included_immodules"
|
2011-06-03 13:25:54 +00:00
|
|
|
echo " colord support: $have_colord"
|
2011-01-05 02:57:21 +00:00
|
|
|
echo " Introspection: $found_introspection"
|
|
|
|
echo " Debugging: $enable_debug"
|
|
|
|
echo " Documentation: $enable_gtk_doc"
|