Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

diff --git a/Makefile b/Makefile
index 79601320ac3e371666593abcca5820efdbae5caf..2dac8010c14296bf71b20da92d7256d6a5b41f22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,8 @@ AFLAGS_KERNEL       =
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -Iinclude \
-                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
+                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+                  -imacros include/linux/autoconf.h
 
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
@@ -1249,11 +1250,6 @@ tags: FORCE
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------
 
-configcheck:
-       find * $(RCS_FIND_IGNORE) \
-               -name '*.[hcS]' -type f -print | sort \
-               | xargs $(PERL) -w scripts/checkconfig.pl
-
 includecheck:
        find * $(RCS_FIND_IGNORE) \
                -name '*.[hcS]' -type f -print | sort \

diff --git a/include/linux/config.h b/include/linux/config.h
index 9d1c14f7ad6dda45a6a185d95c54bffb2aed29e8..a91f5e55b525cf33557f05ac9a95ddd743ed2089 100644 (file)
--- a/include/linux/config.h
+++ b/include/linux/config.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_CONFIG_H
 #define _LINUX_CONFIG_H
-
+/* This file is no longer in use and kept only for backward compatibility.
+ * autoconf.h is now included via -imacros on the commandline
+ */
 #include <linux/autoconf.h>
 
 #endif

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 0dd96919de3e859894281454ebef491b296dc877..455aeabd95dd59a441566e2de9e2f80f1961fa26 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -129,7 +129,7 @@ endif
 HOSTCFLAGS_lex.zconf.o := -I$(src)
 HOSTCFLAGS_zconf.tab.o := -I$(src)
 
-HOSTLOADLIBES_qconf    = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl
+HOSTLOADLIBES_qconf    = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(LIBS_QT) -ldl
 HOSTCXXFLAGS_qconf.o   = -I$(QTDIR)/include -D LKC_DIRECT_LINK
 
 HOSTLOADLIBES_gconf    = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
@@ -163,11 +163,16 @@ $(obj)/.tmp_qtcheck:
          false; \
        fi; \
        LIBPATH=$$DIR/lib; LIB=qt; \
-       $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-         LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
-       if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
+       if [ -f $$QTLIB/libqt-mt.so ] ; then \
+               LIB=qt-mt; \
+               LIBPATH=$$QTLIB; \
+       else \
+               $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
+               LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
+               if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
+       fi; \
        echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
-       echo "QTLIB=$$LIB" >> $@; \
+       echo "LIBS_QT=$$LIB" >> $@; \
        if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \
          echo "*"; \
          echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \