Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  gconfig: fix build failure on fedora 13

diff --combined scripts/kconfig/Makefile
index 7cdae39b8f09fbb05c73c39424d7bb2f344a8360,25a518310038a3b029e645b1bb379e5b4a929e29..7ea649da19400252ba751bfdb8bea5e7a5dba426
--- 1/scripts/kconfig/Makefile
--- 2/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -23,9 -23,6 +23,9 @@@ menuconfig: $(obj)/mcon
  config: $(obj)/conf
        $< $(Kconfig)
  
 +nconfig: $(obj)/nconf
 +      $< $(Kconfig)
 +
  oldconfig: $(obj)/conf
        $< -o $(Kconfig)
  
@@@ -33,17 -30,8 +33,17 @@@ silentoldconfig: $(obj)/con
        $(Q)mkdir -p include/generated
        $< -s $(Kconfig)
  
 +# if no path is given, then use src directory to find file
 +ifdef LSMOD
 +LSMOD_F := $(LSMOD)
 +ifeq ($(findstring /,$(LSMOD)),)
 +  LSMOD_F := $(objtree)/$(LSMOD)
 +endif
 +endif
 +
  localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 -      $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
 +      $(Q)mkdir -p include/generated
 +      $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
        $(Q)if [ -f .config ]; then                             \
                        cmp -s .tmp.config .config ||           \
                        (mv -f .config .config.old.1;           \
@@@ -57,8 -45,7 +57,8 @@@
        $(Q)rm -f .tmp.config
  
  localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 -      $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
 +      $(Q)mkdir -p include/generated
 +      $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
        $(Q)sed -i s/=m/=y/ .tmp.config
        $(Q)if [ -f .config ]; then                             \
                        cmp -s .tmp.config .config ||           \
@@@ -123,7 -110,6 +123,7 @@@ endi
  # Help text used by make help
  help:
        @echo  '  config          - Update current config utilising a line-oriented program'
 +      @echo  '  nconfig         - Update current config utilising a ncurses menu based program'
        @echo  '  menuconfig      - Update current config utilising a menu based program'
        @echo  '  xconfig         - Update current config utilising a QT based front-end'
        @echo  '  gconfig         - Update current config utilising a GTK based front-end'
@@@ -151,8 -137,6 +151,8 @@@ HOST_EXTRACFLAGS += -DLOCAL
  # ===========================================================================
  # Shared Makefile for the various kconfig executables:
  # conf:         Used for defconfig, oldconfig and related targets
 +# nconf:  Used for the nconfig target.
 +#         Utilizes ncurses
  # mconf:  Used for the menuconfig target
  #         Utilizes the lxdialog package
  # qconf:  Used for the xconfig target
@@@ -165,16 -149,11 +165,16 @@@ lxdialog := lxdialog/checklist.o lxdial
  lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
  
  conf-objs     := conf.o  zconf.tab.o
 -mconf-objs    := mconf.o zconf.tab.o $(lxdialog)
 +mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 +nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
  kxgettext-objs        := kxgettext.o zconf.tab.o
  
  hostprogs-y := conf qconf gconf kxgettext
  
 +ifeq ($(MAKECMDGOALS),nconfig)
 +      hostprogs-y += nconf
 +endif
 +
  ifeq ($(MAKECMDGOALS),menuconfig)
        hostprogs-y += mconf
  endif
@@@ -198,7 -177,7 +198,7 @@@ endi
  
  clean-files   := lkc_defs.h qconf.moc .tmp_qtcheck \
                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 -clean-files     += mconf qconf gconf
 +clean-files     += mconf qconf gconf nconf
  clean-files     += config.pot linux.pot
  
  # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
@@@ -219,11 -198,10 +219,11 @@@ HOSTCFLAGS_zconf.tab.o  := -I$(src
  HOSTLOADLIBES_qconf   = $(KC_QT_LIBS) -ldl
  HOSTCXXFLAGS_qconf.o  = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
  
- HOSTLOADLIBES_gconf   = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+ HOSTLOADLIBES_gconf   = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
  HOSTCFLAGS_gconf.o    = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
                            -D LKC_DIRECT_LINK
  
 +HOSTLOADLIBES_nconf   = -lmenu -lpanel -lncurses
  $(obj)/qconf.o: $(obj)/.tmp_qtcheck
  
  ifeq ($(qconf-target),1)