diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:37:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:37:21 -0400 |
| commit | c1518f12bab97a6d409a25aaccb02dc8895800f3 (patch) | |
| tree | 3ab9b4f232588fd11feda8705cc87597a2bcb72d | |
| parent | a094c0afc3515aaf962dd0793f3b23fe67e6b192 (diff) | |
| parent | cbab05f041a4cff6ca15856bdd35238b282b64eb (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
gconfig: fix build failure on fedora 13
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7cdae39b8f09..7ea649da1940 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -219,7 +219,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) | |||
| 219 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl | 219 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl |
| 220 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK | 220 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK |
| 221 | 221 | ||
| 222 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` | 222 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl |
| 223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
| 224 | -D LKC_DIRECT_LINK | 224 | -D LKC_DIRECT_LINK |
| 225 | 225 | ||