Make sure mozilla-export builds even if only one of static/dynamic motif is

present on the system.

cmd/unixfe/config/motif.mk

@@ -0,0 +1,71 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+##########################################################################
+#
+# Name:			motif.mk
+#
+# Description:	Motif Makefile hackery shared across unix and unik-like 
+#               Mozilla front ends.
+#
+#               Currently this file is only used for linux, but eventually
+#               it should be used for other platforms as well.
+#
+# Author:		Ramiro Estrugo <ramiro@netscape.com>
+#
+##########################################################################
+
+ifeq ($(OS_ARCH),Linux)
+
+##########################################################################
+#
+# MOZILLA_XFE_MOTIF_FLAGS
+#
+# This macro will contain the default flags needed to link 'mozilla-export' 
+#
+# The actual value will depend on whether static and/or dynamic motif 
+# libraries are found in the system.
+#
+# The following two macros are used to determine the above value:
+#
+# MOZILLA_XFE_MOTIF_HAVE_STATIC_LIB
+# MOZILLA_XFE_MOTIF_HAVE_DYNAMIC_LIB
+#
+# These are defined in the system specific generated detect makefile.  
+# See mozilla/config/mkdetect for details.
+#
+##########################################################################
+ifdef MOZILLA_XFE_MOTIF_HAVE_STATIC_LIB
+
+MOZILLA_XFE_MOTIF_FLAGS = $(MOZILLA_XFE_MOTIF_STATIC_FLAGS)
+
+else
+
+ifdef MOZILLA_XFE_MOTIF_HAVE_DYNAMIC_LIB
+
+MOZILLA_XFE_MOTIF_FLAGS = $(MOZILLA_XFE_MOTIF_DYNAMIC_FLAGS)
+
+else
+
+error	"Motif library (static or dynamic) required"
+
+endif
+
+endif
+##########################################################################
+
+endif # OS_ARCH == Linux

cmd/xfe/Makefile

@@ -63,6 +63,7 @@ MICROLINE_LIB	= $(DIST)/lib/libXmL.a
 
 include $(DEPTH)/config/config.mk
 include $(DEPTH)/cmd/unixfe/config/unixfe.mk
+include $(DEPTH)/cmd/unixfe/config/motif.mk
 
 DIRS		= \
 		  $(XFE2_DIR) \
@@ -881,7 +882,7 @@ endif
 
 XFE_MOTIF_LDFLAGS	= \
 			$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
-			$(MOZILLA_XFE_MOTIF_STATIC_FLAGS) \
+			$(MOZILLA_XFE_MOTIF_FLAGS) \
 			$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
 
 XFE_X11_LDFLAGS		= \

cmd/xfe/Makefile.in

@@ -68,6 +68,7 @@ MICROLINE_LIB	= $(DIST)/lib/libXmL.a
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/cmd/unixfe/config/unixfe.mk
+include $(topsrcdir)/cmd/unixfe/config/motif.mk
 
 DIRS		= \
 		  $(XFE2_DIR) \
@@ -908,7 +909,7 @@ endif
 
 XFE_MOTIF_LDFLAGS	=\
 					$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
-					$(MOZILLA_XFE_MOTIF_STATIC_FLAGS) \
+					$(MOZILLA_XFE_MOTIF_FLAGS) \
 					$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
 
 XFE_X11_LDFLAGS		=\