# HG changeset patch
# User ben
# Date 1130478127 0
# Node ID fe94f59a2773e7786769db71a20d9a9ed2f7ccbc
# Parent  cb09b67a605a621902c9cded52443eb0ae19e032
[xemacs-hg @ 2005-10-28 05:42:07 by ben]
patches for bignum, xemacs.mak

xemacs.mak: Set default values for BUILD_BIGNUM_MINGW_SHARED,
	BUILD_BIGNUM_NATIVE_SHARED to 0 to avoid make problems.
xemacs.mak: Don't look in gmp-dynamic, gmp-static; the include file doesn't vary.

diff -r cb09b67a605a -r fe94f59a2773 nt/ChangeLog
--- a/nt/ChangeLog	Thu Oct 27 21:51:04 2005 +0000
+++ b/nt/ChangeLog	Fri Oct 28 05:42:07 2005 +0000
@@ -1,3 +1,11 @@
+2005-10-28  Ben Wing  <ben@xemacs.org>
+
+	* xemacs.mak (HAVE_BIGNUM):
+	Set default values for BUILD_BIGNUM_MINGW_SHARED,
+	BUILD_BIGNUM_NATIVE_SHARED to 0 to avoid make problems.
+	* xemacs.mak (OPT_INCLUDES):
+	Don't look in gmp-dynamic, gmp-static; the include file doesn't vary.
+
 2005-10-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.23 "daikon" is released.
diff -r cb09b67a605a -r fe94f59a2773 nt/xemacs.mak
--- a/nt/xemacs.mak	Thu Oct 27 21:51:04 2005 +0000
+++ b/nt/xemacs.mak	Fri Oct 28 05:42:07 2005 +0000
@@ -171,6 +171,12 @@
 !if !defined(HAVE_BIGNUM)
 HAVE_BIGNUM=0
 !endif
+!if !defined(BUILD_BIGNUM_MINGW_SHARED)
+BUILD_BIGNUM_MINGW_SHARED=0
+!endif
+!if !defined(BUILD_BIGNUM_NATIVE_SHARED)
+BUILD_BIGNUM_NATIVE_SHARED=0
+!endif
 !if !defined(OPTIMIZED_BUILD)
 OPTIMIZED_BUILD=1
 !endif
@@ -564,10 +570,10 @@
 !else
 !if $(BUILD_BIGNUM_NATIVE_SHARED)
 OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-dynamic\gmp.lib"
-OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-dynamic"
+OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)"
 !else
 OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-static\gmp.lib"
-OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-static"
+OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)"
 !endif
 !endif
 OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\number-gmp.obj $(OUTDIR)\number.obj