Patch provided by Lee Iverson <leei@ai.sri.com> unlabeled-1.3.2.1.4
authorcls%seawood.org
Tue, 21 Sep 1999 19:55:01 +0000
branchunlabeled-1.3.2.1.4
changeset 829 0821edaae8f291ee104573ea6b85f683b7609ce1
parent 797 232d7388d6cbac140e0268b5925af8732941dd0d
push idunknown
push userunknown
push dateunknown
Patch provided by Lee Iverson <leei@ai.sri.com> Ensure that unmodified include files & symlinks are not modified. Added --disable-shared option. Resurrect use of OS_LIBS & EXTRA_LIBS. Add check for -ldl. Added nsprincl.sh & nsprincl.mk to build.
pr/tests/Makefile.in
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -176,16 +176,18 @@ TARGETS = $(PROGS)
 INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
 # Setting the variables LDOPTS and LIBPR.  We first initialize
 # them to the default values, then adjust them for some platforms.
 LDOPTS = -L$(DIST)/lib
 LIBPR = -lnspr$(MOD_VERSION)
 LIBPLC = -lplc$(MOD_VERSION)
 
+ifndef USE_AUTOCONF
+
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
 else
 ifeq ($(OS_TARGET), OS2)
 ifdef XP_OS2_VACPP
   LDOPTS =
@@ -405,24 +407,36 @@ else
       else
       LIBPTHREAD = -lpthread
       endif
     endif
   endif
 endif
 endif
 
+endif # !USE_AUTOCONF
+
 #####################################################
 #
 # The rules
 #
 #####################################################
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef USE_AUTOCONF
+
+# Cancel this rule (force implicit)
+%: %.c
+
+%: %.$(OBJ_SUFFIX)
+	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
+
+else # !USE_AUTOCONF
+
 AIX_PRE_4_2 = 0
 ifeq ($(OS_ARCH),AIX)
 ifeq ($(OS_RELEASE),4.1)
 ifneq ($(USE_PTHREADS), 1)
 #AIX_PRE_4_2 = 1
 endif
 endif
 endif
@@ -474,16 +488,18 @@ else
 endif
 endif
 else
 	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
 endif
 
 endif
 
+endif # !USE_AUTOCONF
+
 export:: $(TARGETS)
 install:: export
 clean::
 	rm -f $(TARGETS)
 
 # The prpoll test calls BSD socket functions, so it needs to link
 # with -lsocket on some platforms.
 ifeq ($(OS_ARCH),SunOS)