diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-02 17:50:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-02 17:50:09 +0000 |
| commit | 88c1c94651750789dcad613ee8b09024df142ba2 (patch) | |
| tree | c7ee5d339304d0b75d98d79a0b9bfd25918ed25a /acinclude.m4 | |
| parent | c466752212dc8aed884aa00877c5d32ecb081f12 (diff) | |
| download | gtk+-88c1c94651750789dcad613ee8b09024df142ba2.tar.gz | |
Requires glib-2.3.0, pango-1.2.0.
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
* configure.in: Require Xft version 2,
remove code for handling older versions of pango and Xft.
Many miscellaneous improvements to X checks
* acinclude.m4: Add GTK_ADD_LIB() macro for adding
a library to a variable, avoiding dups.
* gdk/x11/gdkfont-x11.c (gdk_font_from_description_for_display):
Always load "fixed"
* gdk/x11/gdk*-x11.[ch]: Remove support for Xft1 and
for pangox.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ed6e888994..74d13bf41b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -11,6 +11,17 @@ AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP], $1 AC_DIVERT_POP()])])]) +# GTK_ADD_LIB(VAR,LIBNAME) +# --------------------------------- +# Helper macro to add a -lBlah to a variable, avoiding repeats +# Note that this needs to be quoted when used in an enclosing macro +AC_DEFUN([GTK_ADD_LIB], +[ case "$$1 " in + *-l$2[[\ \ ]]*) ;; + *) $1="-l$2 $$1" ;; + esac +]) + # Checks the location of the XML Catalog # Usage: # JH_PATH_XML_CATALOG |