diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-07-19 16:36:30 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-07-19 16:36:30 +0000 |
| commit | db5e31a4949f00231978cdd721d5014c585cccf4 (patch) | |
| tree | c3dae830edc7179b46b9b256dd102ec21b065555 /pango-config.in | |
| parent | c85f6672f3329705ed186d8eb50f71528e1d087d (diff) | |
| download | pango-db5e31a4949f00231978cdd721d5014c585cccf4.tar.gz | |
Don't try to use the ! command, not available in all systems. Move the !
2000-07-19 Tor Lillqvist <tml@iki.fi>
* configure.in: Don't try to use the ! command, not available in all
systems. Move the ! inside the test instead.
* pango-config.in: Change order of --cflags output, so that we can
build with both GLib 1.2 and 1.3 installed.
* modules/devanagari/dev-ligatures.h: No C++ comments, thanks.
* pango/break.c: Fix gccism, non-constant initailiser.
* pango/pango-fontmap.c: Don't return value from void functions.
* pango/pango-utils.c: Must have at least empty statement after
a label.
Diffstat (limited to 'pango-config.in')
| -rw-r--r-- | pango-config.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pango-config.in b/pango-config.in index d0c88437..83a8cc1f 100644 --- a/pango-config.in +++ b/pango-config.in @@ -83,7 +83,9 @@ if test "$echo_exec_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then cflags="@UNICODE_CFLAGS@ @GLIB_CFLAGS@" - echo $includes $cflags + # Put $cflags first, in case $includes contains a + # location with GLib 1.2 headers, but we build with GLib 2.0. + echo $cflags $includes fi if test "$echo_libs" = "yes"; then libs="-lpango @FRIBIDI_LIBS@ @UNICODE_LIBS@ @GLIB_LIBS@" |