[PATCH] check QT only if needed

Roman Zippel (zippel@linux-m68k.org)
Thu, 31 Oct 2002 10:36:42 +0100 (CET)


Hi,

On Wed, 30 Oct 2002, Aaron Lehmann wrote:

> Now running 'make oldconfig' or 'make menuconfig' requires a Qt
> installation. I believe that this is a bug because these still work
> fine without Qt when the -k flag is passed to make.

Yes, it's a bug. The patch below fixes this without breaking xconfig.
Linus, please apply.

bye, Roman

# Only check for the qt installation if a qconf build is requested

--- linux-2.5/scripts/kconfig/Makefile.org 2002-10-28 00:15:29.000000000 +0100
+++ linux-2.5/scripts/kconfig/Makefile 2002-10-31 10:23:07.000000000 +0100
@@ -34,6 +34,7 @@

$(obj)/qconf.o: $(obj)/.tmp_qtcheck

+ifeq ($(MAKECMDGOALS),$(obj)/qconf)
-include $(obj)/.tmp_qtcheck

# QT needs some extra effort...
@@ -52,6 +53,7 @@
LIB=qt; \
if [ -f $$DIR/lib/libqt-mt.so ]; then LIB=qt-mt; fi; \
echo "QTDIR=$$DIR" > $@; echo "QTLIB=$$LIB" >> $@
+endif

$(obj)/zconf.tab.o: $(obj)/lex.zconf.c

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/