diff --git a/ChangeLog b/ChangeLog index 4fe05e8323..e9810a0851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4fe05e8323..e9810a0851 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4fe05e8323..e9810a0851 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/configure.in b/configure.in index 175f81949f..760c4d0369 100644 --- a/configure.in +++ b/configure.in @@ -1076,7 +1076,7 @@ if test "x$gdktarget" = "xx11"; then if test $pango_omitted_x_deps = yes ; then # Old versions of Xft didn't necessarily include -lX11 in the output - x_libs="`pkg-config --libs xft` -lX11 $X_EXTRA_LIBS" + x_libs="`$PKG_CONFIG --libs xft` -lX11 $X_EXTRA_LIBS" fi ## Strip the .la files