[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mozilla-patches
Subject:    Patches for Communicator 5.0 on Redhat 4.2 with Redhat CDE
From:       "Brian J. Murrell" <brian () interlinx ! bc ! ca>
Date:       1998-04-14 6:26:32
[Download RAW message or body]

*************************************************************************
* This message has been formatted as a MIME message.  If you are reading
* this, your mail reader does not support MIME.  To display the non-text
* portions of this message you will need a MIME-capable mail reader such
* as Ishmail (info@ishmail.com).
*************************************************************************


Hi Chris,


As per Terry Weissman, please find enclosed some patches I had to make
to the Communicator 5.0 release to get it to compile on my Redhat 4.2
with RedHat CDE system.




--- cmd/xfe/icons/Makefile.dist	Wed Apr  8 17:52:59 1998
+++ cmd/xfe/icons/Makefile	Sun Apr 12 10:34:08 1998
@@ -138,7 +138,7 @@
 		  $(JAVA_JMC) \
 		  $(DIST)/lib/libpng.a \
 		  $(DIST)/lib/libzlib.a \
-		  /usr/lib/libm.a  \
+		  /usr/lib/libm.so \
 		  $(DIST)/lib/libnspr.a \
 		  $(DIST)/lib/libjpeg.a \
 		  $(DIST)/lib/libutil.a \
@@ -149,7 +149,7 @@
 		  $(JAVA_JMC) \
 		  $(DIST)/lib/libpng.a \
 		  $(DIST)/lib/libzlib.a \
-		  /usr/lib/libm.a  \
+		  /usr/lib/libm.so \
 		  $(DIST)/lib/libnspr21.a \
 		  $(DIST)/lib/libjpeg.a \
 		  $(DIST)/lib/libutil.a \
--- cmd/xfe/Makefile.dist	Wed Apr  8 17:52:40 1998
+++ cmd/xfe/Makefile	Sun Apr 12 12:08:39 1998
@@ -591,17 +591,20 @@
 MOTIFLIB	= /usr/local/lib/libXm.a
 else
 
-MOTIFLIB	=\
-			$(MOTIFPATCH_LIB) \
-			/usr/X11R6/lib/libXm.a \
-			$(NS_MOTIF2_XP_LD_FLAGS)
+# bjm shouldn't this stuff come from the Linux.mk file?  If so, defining it
+# bjm here only breaks portability
+# bjm MOTIFLIB	=\
+# bjm 			$(MOTIFPATCH_LIB) \
+# bjm 			/usr/X11R6/lib/libXm.a \
+# bjm 			$(NS_MOTIF2_XP_LD_FLAGS)
+MOTIFLIB	+= $(MOTIFPATCH_LIB) $(NS_MOTIF2_XP_LD_FLAGS)
 
 endif
 else
 MOTIFLIB	= /usr/X11R6/lib/libXm.a
 endif
 
-OTHER_LIBS	= $(MOTIFLIB) $(XTOOLLIB) $(XMULIB) $(EXTENSIONLIB) $(XLIB) \
/usr/lib/libm.a -ldl +OTHER_LIBS	= -L$(MOTIF) $(MOTIFLIB) $(XTOOLLIB) $(XMULIB) \
$(EXTENSIONLIB) $(XLIB) -lm -ldl  
 #
 # This assumes there is a libXm.so on the system.  If there isn't, you'll
@@ -909,7 +912,7 @@
 $(OBJDIR)/$(XFE_PROGNAME)-motif-export: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS)
 	@$(MAKE_OBJDIR)
 	rm -f $@
-	$(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) \
$(BASIC_LIBS_2) -L/usr/X11R6/lib $(DYN_MOTIFLIB) -lXt -lSM -lICE $(XMULIB) \
$(EXTENSIONLIB) $(XLIB) /usr/lib/libm.a -ldl $(NSPR_LIB) $(DNS_LIB) -lc +	$(CCLD) -o \
$@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
-L/usr/X11R6/lib $(DYN_MOTIFLIB) -lXt -lSM -lICE $(XMULIB) $(EXTENSIONLIB) $(XLIB) \
-lm -ldl $(NSPR_LIB) $(DNS_LIB) -lc  @$(EXTRA_POST_LINK_CMD) $@
 endif
 
--- config/Linux.mk.dist	Wed Apr  8 17:53:23 1998
+++ config/Linux.mk	Sun Apr 12 12:50:15 1998
@@ -31,11 +31,11 @@
 endif
 GFX_ARCH		:= x
 
-OS_INCLUDES		=
+OS_INCLUDES		= -I$(MOTIF)/include
 G++INCLUDES		= -I/usr/include/g++
 LOC_LIB_DIR		= /usr/lib/X11
-MOTIF			=
-MOTIFLIB		=
+MOTIF			= /usr/dt/lib
+MOTIFLIB		= -lXm
 OS_LIBS			=
 
 PLATFORM_FLAGS		= -ansi -Wall -pipe -DLINUX -Dlinux
--- config/xmversion.sh.dist	Wed Apr  8 17:53:58 1998
+++ config/xmversion.sh	Sun Apr 12 03:23:20 1998
@@ -56,7 +56,7 @@
 				;;
 
 			i386|i486|i586|i686)
-				MOTIF_LIB_DIR=/usr/X11R6/lib
+				MOTIF_LIB_DIR=/usr/dt/lib
 				;;
 		esac
 		;;



Thanx,

b.



--
Brian J. Murrell                                         brian@interlinx.bc.ca
InterLinx Support Services, Inc.
North Vancouver, B.C.                                             604 983 UNIX
        Platform and Brand Independent UNIX Support - R3.2 - R4 - BSD

[prev in list] [next in list] [prev in thread] [next in thread]