diff --git a/ChangeLog b/ChangeLog index 4fddbc86c8..98ebdd80fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-06 Matthias Clasen + * configure.in: Use $PKG_CONFIG consistently. (#348740, + Jeremy Lainé) + * gtk/gtknotebook.c (gtk_notebook_drag_motion): Don't allow dragging a notebook tab to one of its children. (#348626, Benjamin Otte) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4fddbc86c8..98ebdd80fe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-08-06 Matthias Clasen + * configure.in: Use $PKG_CONFIG consistently. (#348740, + Jeremy Lainé) + * gtk/gtknotebook.c (gtk_notebook_drag_motion): Don't allow dragging a notebook tab to one of its children. (#348626, Benjamin Otte) diff --git a/configure.in b/configure.in index 104f5b9f50..e6d2e8e314 100644 --- a/configure.in +++ b/configure.in @@ -1092,8 +1092,8 @@ if test "x$gdktarget" = "xx11"; then if $PKG_CONFIG --exists x11 xext xrender; then have_base_x_pc=true X_PACKAGES="$X_PACKAGES x11 xext xrender" - x_libs="`pkg-config --libs x11 xext xrender`" - X_CFLAGS="`pkg-config --cflags x11 xext xrender`" + x_libs="`$PKG_CONFIG --libs x11 xext xrender`" + X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" # Strip out any .la files that pkg-config might give us (this happens # with -uninstalled.pc files)