93ecc5f
--- chemtool-1.6.11/Makefile.in.compile	2007-08-26 13:53:59.000000000 +0200
93ecc5f
+++ chemtool-1.6.11/Makefile.in	2007-08-26 20:37:00.000000000 +0200
93ecc5f
@@ -230,7 +230,7 @@ chemtool_SOURCES = main.c draw.c graph.c
93ecc5f
 AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
93ecc5f
 
93ecc5f
 # Link time dependencies.
93ecc5f
-LDADD = @LIBINTL@ @GTK_LIBS@
93ecc5f
+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
93ecc5f
 
93ecc5f
 # Additional files to be distributed.
93ecc5f
 EXTRA_DIST = autogen.sh autoclean.sh
93ecc5f
--- chemtool-1.6.11/src-cht/cht-2.5.c.compile	2007-08-26 13:49:26.000000000 +0200
93ecc5f
+++ chemtool-1.6.11/src-cht/cht-2.5.c	2007-08-26 20:30:25.000000000 +0200
5af5e47
@@ -121,11 +121,6 @@
5af5e47
 #define LACK_MEMMOVE
5af5e47
 #define LACK_MEMCPY
5af5e47
 
5af5e47
-#else
5af5e47
-
5af5e47
-#define LACK_LABS       /* Undefine these if your library has these */
5af5e47
-#define LACK_MEMMOVE
5af5e47
-
5af5e47
 #endif
5af5e47
 #endif
5af5e47
 
93ecc5f
@@ -593,13 +588,15 @@ char **argv;
5af5e47
 
5af5e47
 /* In case your system lacks these... */
5af5e47
 
5af5e47
+#ifdef LACK_LABS
5af5e47
 long my_labs(x)
5af5e47
 long x;
5af5e47
 {
5af5e47
     return((x > 0) ? x : -x);
5af5e47
 }
5af5e47
+#endif /* LACK_LABS */
5af5e47
 
5af5e47
-
5af5e47
+#ifdef LACK_MEMMOVE
5af5e47
 #ifdef __STDC__
5af5e47
 Anyptr my_memmove(Anyptr d, Const Anyptr s, size_t n)
5af5e47
 #else
93ecc5f
@@ -623,8 +620,9 @@ register int n;
5af5e47
     }
5af5e47
     return d;
5af5e47
 }
5af5e47
+#endif /* LACK_MEMMOVE */
5af5e47
 
5af5e47
-
5af5e47
+#ifdef LACK_MEMCPY
5af5e47
 #ifdef __STDC__
5af5e47
 Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
5af5e47
 #else
93ecc5f
@@ -638,7 +636,9 @@ register int n;
5af5e47
 	*dd++ = *ss++;
5af5e47
     return d;
5af5e47
 }
5af5e47
+#endif /* LACK_MEMCPY */
5af5e47
 
5af5e47
+#ifdef LACK_MEMCMP
5af5e47
 #ifdef __STDC__
5af5e47
 int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
5af5e47
 #else
93ecc5f
@@ -654,7 +654,9 @@ register int n;
5af5e47
 	    return i;
5af5e47
     return 0;
5af5e47
 }
5af5e47
+#endif /* LACK_MEMCMP */
5af5e47
 
5af5e47
+#ifdef LACK_MEMSET
5af5e47
 #ifdef __STDC__
5af5e47
 Anyptr my_memset(Anyptr d, int c, size_t n)
5af5e47
 #else
93ecc5f
@@ -669,7 +671,7 @@ register int n;
5af5e47
 	*dd++ = c;
5af5e47
     return d;
5af5e47
 }
5af5e47
-
5af5e47
+#endif /* LACK_MEMSET */
5af5e47
 
5af5e47
 int my_toupper(c)
5af5e47
 int c;
93ecc5f
--- chemtool-1.6.11/inout.c.compile	2007-08-26 13:49:26.000000000 +0200
93ecc5f
+++ chemtool-1.6.11/inout.c	2007-08-26 20:30:25.000000000 +0200
5af5e47
@@ -13,7 +13,7 @@
5af5e47
 #include "gdk/gdkprivate.h"
5af5e47
 #include <locale.h>
5af5e47
 #ifdef EMF
5af5e47
-#include <emf.h>
5af5e47
+#include <libEMF/emf.h>
5af5e47
 #endif
93ecc5f
 #ifdef DISABLE_NLS
93ecc5f
 #define _(Text) Text