From 63d5da4bf2cab9f8796e0c64253ef1ac2f85a52c Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 21 Nov 1998 01:00:00 +0000 Subject: [PATCH] Linux shouldn't need the mkdetect scripts any longer. Get rid of bogus motif dependency as well. --- config/config.mk | 2 +- config/mkdetect/Makefile.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/config.mk b/config/config.mk index ae0f204a36a..7b8c9301131 100644 --- a/config/config.mk +++ b/config/config.mk @@ -357,6 +357,7 @@ endif # # Need to define these before include the $ARCH.mk makefile # +ifndef USE_AUTOCONF ifneq (,$(filter Linux,$(OS_ARCH))) MOZILLA_DETECT = 1 MOZILLA_DETECT_DIR = $(DEPTH)/config/mkdetect @@ -373,7 +374,6 @@ MOZILLA_DETECT_NAME = detect_$(MOZILLA_DETECT_UNIQ_IDENT)_gen.mk MOZILLA_DETECT_GEN = $(MOZILLA_DETECT_DIR)/$(MOZILLA_DETECT_NAME) endif -ifndef USE_AUTOCONF # # Now include the platform-specific stuff. # diff --git a/config/mkdetect/Makefile.in b/config/mkdetect/Makefile.in index 72f19be01b1..91465167b00 100644 --- a/config/mkdetect/Makefile.in +++ b/config/mkdetect/Makefile.in @@ -40,11 +40,13 @@ DETECT_NAME = detect_$(DETECT_UNIQ_IDENT)_gen.mk DETECT_GLIBC = $(DETECT_DIR)/detect_glibc.sh -o $(DETECT_UNIQ_IDENT) \ -cc $(CC) +ifeq (motif, $(MOZ_TOOLKIT)) # The motif detection script DETECT_MOTIF =\ $(DETECT_DIR)/detect_motif.sh -o $(DETECT_UNIQ_IDENT) \ -xif $(X11_INCLUDE_FLAGS) \ -cc $(CC) +endif # The X11 detection script DETECT_X11 = $(DETECT_DIR)/detect_x11.sh -o $(DETECT_UNIQ_IDENT) \