Update with changes made to source tree and configure options.

svn path=/trunk/yasm/; revision=304

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index ba96818d3b33b5c780d518c81498cf5ead807c7b..08a2c9b6f41309822297ac62a72fd762d2a3f9e8 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -27,6 +27,7 @@ SRC_OBJS= \
  src/parser.o \
  src/intnum.o \
  src/floatnum.o \
+ src/mergesort.o \
  src/ternary.o \
  src/bitvect.o \
  src/xmalloc.o \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 9313daee9bec9e95a7393aff2023b21f63925a3b..bc5b9017b804611c39ea823d862c356a87b2853b 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -36,6 +36,7 @@ SRC_OBJS= \
  src/parser.o \
  src/intnum.o \
  src/floatnum.o \
+ src/mergesort.o \
  src/ternary.o \
  src/bitvect.o \
  src/xmalloc.o \

diff --git a/Mkfiles/Makefile.vc b/Mkfiles/Makefile.vc
index 0f8650ba3223649e8d4fcccff109444aed0c85cd..1b4cee15f1c47e2008bc3d47946ea5dcb0698423 100644 (file)
--- a/Mkfiles/Makefile.vc
+++ b/Mkfiles/Makefile.vc
@@ -27,6 +27,7 @@ SRC_OBJS= \
  src\parser.obj \\r
  src\intnum.obj \\r
  src\floatnum.obj \\r
+ src\mergesort.obj \\r
  src\ternary.obj \\r
  src\bitvect.obj \\r
  src\xmalloc.obj \\r

diff --git a/Mkfiles/config.h.dj b/Mkfiles/config.h.dj
index f0c1a877ac7e3cca728966220b47ae026ee38978..97475766078ba2c9446cf2e697bd340e0b3b4789 100644 (file)
--- a/Mkfiles/config.h.dj
+++ b/Mkfiles/config.h.dj
@@ -101,6 +101,9 @@
 /* Define if you have the memcpy function.  */
 #define HAVE_MEMCPY
 
+/* Define if you have the mergesort function.  */
+/* #undef HAVE_MERGESORT */
+
 /* Define if you have the msgctl function.  */
 /* #undef HAVE_MSGCTL */
 
@@ -161,6 +164,9 @@
 /* Define if you have the <argz.h> header file.  */
 /* #undef HAVE_ARGZ_H */
 
+/* Define if you have the <dmalloc.h> header file.  */
+/* #undef HAVE_DMALLOC_H */
+
 /* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H
 
@@ -197,6 +203,9 @@
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H
 
+/* Define if you have the dmalloc library (-ldmalloc).  */
+/* #undef HAVE_LIBDMALLOC */
+
 /* Define if you have the i library (-li).  */
 /* #undef HAVE_LIBI */
 

diff --git a/Mkfiles/config.h.vc b/Mkfiles/config.h.vc
index 1af0e9413949761db9f41a375d59e6441a8dba4d..9ad37616ec824baa98aba55dc76df8c3328ab8d1 100644 (file)
--- a/Mkfiles/config.h.vc
+++ b/Mkfiles/config.h.vc
@@ -101,6 +101,9 @@
 /* Define if you have the memcpy function.  */\r
 #define HAVE_MEMCPY\r
 \r
+/* Define if you have the mergesort function.  */\r
+/* #undef HAVE_MERGESORT */\r
+\r
 /* Define if you have the msgctl function.  */\r
 /* #undef HAVE_MSGCTL */\r
 \r
@@ -166,6 +169,9 @@
 /* Define if you have the <argz.h> header file.  */\r
 /* #undef HAVE_ARGZ_H */\r
 \r
+/* Define if you have the <dmalloc.h> header file.  */\r
+/* #undef HAVE_DMALLOC_H */\r
+\r
 /* Define if you have the <limits.h> header file.  */\r
 #define HAVE_LIMITS_H\r
 \r
@@ -202,6 +208,9 @@
 /* Define if you have the <unistd.h> header file.  */\r
 /* #undef HAVE_UNISTD_H */\r
 \r
+/* Define if you have the dmalloc library (-ldmalloc).  */\r
+/* #undef HAVE_LIBDMALLOC */\r
+\r
 /* Define if you have the i library (-li).  */\r
 /* #undef HAVE_LIBI */\r
 \r