Index: ctalk-0.0.94/ctpp/Makefile.in
--- ctalk-0.0.94/ctpp/Makefile.in.orig	2008-06-29 21:26:10 +0200
+++ ctalk-0.0.94/ctpp/Makefile.in	2008-07-05 10:03:08 +0200
@@ -119,7 +119,7 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libctpp/.libs/libctpp$(LIBEXT)
+LIBS = $(top_builddir)/libctpp/libctpp.la
 LIBTOOL = @LIBTOOL@
 LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
 LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctalk-0.0.94/ctpp/builtins.c
--- ctalk-0.0.94/ctpp/builtins.c.orig	2008-06-20 18:38:31 +0200
+++ ctalk-0.0.94/ctpp/builtins.c	2008-07-05 10:03:08 +0200
@@ -102,11 +102,12 @@
    *  config file included above.  See the comments in 
    *  config/linux-gnu-x86.c
    */
+#if defined(__linux__) && defined(__i386__)
   for (i = 0; builtins[i]; i+=2) {
     sprintf (s, "#define %s %s\n", builtins[i], builtins[i+1]);
     tokenize_define (s);
   }
-
+#endif
 
   if (gcc_macros_opt) gcc_builtins ();
 
@@ -115,9 +116,11 @@
 
 int is_builtin_symbol (char *name) {
   int i;
+#if defined(__linux__) && defined(__i386__)
   for (i = 0; builtins[i]; i+=2) {
     if (!strcmp (name, builtins[i]))
       return TRUE;
   }
+#endif
   return FALSE;
 }
Index: ctalk-0.0.94/ctpp/ccompat.c
--- ctalk-0.0.94/ctpp/ccompat.c.orig	2008-06-20 18:38:31 +0200
+++ ctalk-0.0.94/ctpp/ccompat.c	2008-07-05 10:03:08 +0200
@@ -55,8 +55,10 @@
 
 char cpp_subdir[FILENAME_MAX];
 
+#if defined(__linux__) && defined(__i386__)
 extern char *host_os;                 /* Defined in builtins.c.             */
 extern char *host_cpu;
+#endif
 
 char gcc_prefix[FILENAME_MAX];
 
@@ -154,7 +156,7 @@
   sol10_compat_defines ();
 #endif
 
-#else
+#elif defined(__linux__) && defined(__i386__)
 
   strcpy (cc_path, which ("cc"));
   cc_include_paths[1] = strdup ("/usr/include");
Index: ctalk-0.0.94/ctpp/i_opt.c
--- ctalk-0.0.94/ctpp/i_opt.c.orig	2008-06-20 18:38:32 +0200
+++ ctalk-0.0.94/ctpp/i_opt.c	2008-07-05 10:03:08 +0200
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "ctpp.h"
 
 extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
Index: ctalk-0.0.94/lib/rtinfo.c
--- ctalk-0.0.94/lib/rtinfo.c.orig	2008-06-12 22:03:40 +0200
+++ ctalk-0.0.94/lib/rtinfo.c	2008-07-05 10:03:08 +0200
@@ -32,7 +32,7 @@
 #include "parser.h"
 
 extern char *tzname[2];
-long int timezone;
+long int ctalk_timezone;
 extern int daylight;
 
 RT_INFO rtinfo;
Index: ctalk-0.0.94/libctpp/lex.c
--- ctalk-0.0.94/libctpp/lex.c.orig	2008-06-20 18:38:37 +0200
+++ ctalk-0.0.94/libctpp/lex.c	2008-07-05 10:03:08 +0200
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "ctpp.h"
 #include "typeof.h"
 #include "prtinfo.h"
Index: ctalk-0.0.94/src/Makefile.in
--- ctalk-0.0.94/src/Makefile.in.orig	2008-06-29 21:26:11 +0200
+++ ctalk-0.0.94/src/Makefile.in	2008-07-05 10:03:08 +0200
@@ -126,7 +126,7 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/lib/.libs/libctalk$(LIBEXT)
+LIBS = $(top_builddir)/lib/libctalk.la
 LIBTOOL = @LIBTOOL@
 LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
 LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctpp-1.0.49/ctpp/Makefile.in
--- ctpp-1.0.49/ctpp/Makefile.in.orig	2008-07-05 01:30:15 +0200
+++ ctpp-1.0.49/ctpp/Makefile.in	2008-07-05 10:03:08 +0200
@@ -119,7 +119,7 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libctpp/.libs/libctpp$(LIBEXT)
+LIBS = $(top_builddir)/libctpp/libctpp.la
 LIBTOOL = @LIBTOOL@
 LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
 LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctpp-1.0.49/ctpp/builtins.c
--- ctpp-1.0.49/ctpp/builtins.c.orig	2008-07-05 00:53:40 +0200
+++ ctpp-1.0.49/ctpp/builtins.c	2008-07-05 10:03:08 +0200
@@ -108,11 +108,12 @@
    *  config file included above.  See the comments in 
    *  config/linux-gnu-x86.c
    */
+#if defined(__linux__) && defined(__i386__)
   for (i = 0; builtins[i]; i+=2) {
     sprintf (s, "#define %s %s\n", builtins[i], builtins[i+1]);
     tokenize_define (s);
   }
-
+#endif
 
   if (gcc_macros_opt) gcc_builtins ();
 
@@ -121,10 +122,12 @@
 
 int is_builtin_symbol (char *name) {
   int i;
+#if defined(__linux__) && defined(__i386__)
   for (i = 0; builtins[i]; i+=2) {
     if (!strcmp (name, builtins[i]))
       return TRUE;
   }
+#endif
   return FALSE;
 }
 
Index: ctpp-1.0.49/ctpp/ccompat.c
--- ctpp-1.0.49/ctpp/ccompat.c.orig	2008-05-23 00:23:11 +0200
+++ ctpp-1.0.49/ctpp/ccompat.c	2008-07-05 10:03:08 +0200
@@ -55,8 +55,10 @@
 
 char cpp_subdir[FILENAME_MAX];
 
+#if defined(__linux__) && defined(__i386__)
 extern char *host_os;                 /* Defined in builtins.c.             */
 extern char *host_cpu;
+#endif
 
 char gcc_prefix[FILENAME_MAX];
 
@@ -154,7 +156,7 @@
   sol10_compat_defines ();
 #endif
 
-#else
+#elif defined(__linux__) && defined(__i386__)
 
   strcpy (cc_path, which ("cc"));
   cc_include_paths[1] = strdup ("/usr/include");
Index: ctpp-1.0.49/ctpp/i_opt.c
--- ctpp-1.0.49/ctpp/i_opt.c.orig	2008-04-26 08:20:51 +0200
+++ ctpp-1.0.49/ctpp/i_opt.c	2008-07-05 10:03:08 +0200
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "ctpp.h"
 
 extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
Index: ctpp-1.0.49/libctpp/lex.c
--- ctpp-1.0.49/libctpp/lex.c.orig	2008-06-19 15:38:02 +0200
+++ ctpp-1.0.49/libctpp/lex.c	2008-07-05 10:03:08 +0200
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "ctpp.h"
 #include "typeof.h"
 #include "prtinfo.h"