Index: ctalk-0.0.48/ctpp/Makefile.in
--- ctalk-0.0.48/ctpp/Makefile.in.orig	2007-09-17 23:57:31 +0200
+++ ctalk-0.0.48/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
@@ -121,7 +121,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 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.48/ctpp/builtins.c
--- ctalk-0.0.48/ctpp/builtins.c.orig	2007-09-13 04:04:24 +0200
+++ ctalk-0.0.48/ctpp/builtins.c	2007-09-18 07:49:32 +0200
@@ -80,11 +80,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 ();
 
@@ -93,9 +94,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.48/ctpp/ccompat.c
--- ctalk-0.0.48/ctpp/ccompat.c.orig	2007-09-14 21:00:05 +0200
+++ ctalk-0.0.48/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
@@ -53,8 +53,10 @@
 
 char cpp_subdir[FILENAME_MAX];
 
+#if defined(__linux__) && defined(__i386__)
 extern char *host_os;                 /* Defined in builtins.c.             */
 extern char *host_cpu;
+#endif
 
 #if defined(__DJGPP__) || defined(__CYGWIN__)
 #define GCC_BIN "gcc.exe"
@@ -338,7 +340,7 @@
 
   strcpy (gcc_target, "djgpp");
 
-#else
+#elif defined(__linux__) && defined(__i386__)
 
   /* Try to find out what the compiler target is.  It may not 
      be the same as the autoconf $host.
Index: ctalk-0.0.48/ctpp/i_opt.c
--- ctalk-0.0.48/ctpp/i_opt.c.orig	2007-09-13 04:04:24 +0200
+++ ctalk-0.0.48/ctpp/i_opt.c	2007-09-18 07:49:32 +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.48/lib/rtinfo.c
--- ctalk-0.0.48/lib/rtinfo.c.orig	2007-09-12 11:06:44 +0200
+++ ctalk-0.0.48/lib/rtinfo.c	2007-09-18 07:49:32 +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.48/libctpp/lex.c
--- ctalk-0.0.48/libctpp/lex.c.orig	2007-09-13 04:04:26 +0200
+++ ctalk-0.0.48/libctpp/lex.c	2007-09-18 07:49:32 +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.48/src/Makefile.in
--- ctalk-0.0.48/src/Makefile.in.orig	2007-09-17 23:57:31 +0200
+++ ctalk-0.0.48/src/Makefile.in	2007-09-18 07:54:46 +0200
@@ -122,7 +122,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/lib/.libs/libctalk.so
+LIBS = $(top_builddir)/lib/libctalk.la
 LIBTOOL = @LIBTOOL@
 LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
 LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctpp-1.0.29/ctpp/Makefile.in
--- ctpp-1.0.29/ctpp/Makefile.in.orig	2007-09-12 14:36:28 +0200
+++ ctpp-1.0.29/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
@@ -121,7 +121,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 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.29/ctpp/builtins.c
--- ctpp-1.0.29/ctpp/builtins.c.orig	2007-09-04 06:14:05 +0200
+++ ctpp-1.0.29/ctpp/builtins.c	2007-09-18 07:49:32 +0200
@@ -80,11 +80,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 ();
 
@@ -93,9 +94,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: ctpp-1.0.29/ctpp/ccompat.c
--- ctpp-1.0.29/ctpp/ccompat.c.orig	2007-09-04 06:14:05 +0200
+++ ctpp-1.0.29/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
@@ -53,8 +53,10 @@
 
 char cpp_subdir[FILENAME_MAX];
 
+#if defined(__linux__) && defined(__i386__)
 extern char *host_os;                 /* Defined in builtins.c.             */
 extern char *host_cpu;
+#endif
 
 #if defined(__DJGPP__) || defined(__CYGWIN__)
 #define GCC_BIN "gcc.exe"
@@ -332,7 +334,7 @@
 
   strcpy (gcc_target, "djgpp");
 
-#else
+#elif defined(__linux__) && defined(__i386__)
 
   /* Try to find out what the compiler target is.  It may not 
      be the same as the autoconf $host.
Index: ctpp-1.0.29/ctpp/i_opt.c
--- ctpp-1.0.29/ctpp/i_opt.c.orig	2007-08-27 03:18:27 +0200
+++ ctpp-1.0.29/ctpp/i_opt.c	2007-09-18 07:49:32 +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.29/libctpp/lex.c
--- ctpp-1.0.29/libctpp/lex.c.orig	2007-08-27 03:04:06 +0200
+++ ctpp-1.0.29/libctpp/lex.c	2007-09-18 07:49:32 +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"