--- TeXmacs-1.0.5.11-src/src/makefile.in.ori	2005-11-05 00:14:01.000000000 +0100
+++ TeXmacs-1.0.5.11-src/src/makefile.in	2005-11-05 00:14:36.000000000 +0100
@@ -118,7 +118,7 @@
 deps_incl = $(call incl_flags,System System/Boot System/Classes System/Files System/Link System/Misc Classes/Abstract Classes/Atomic Classes/Compound Data/Drd Data/String Data/Tree Data/Convert Resource Plugins Window Typeset Edit Texmacs Guile)
 
 deps_flags = $(deps_incl)\
- $(CPPFLAGS) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) $(CXXGUILE) \
+ $(CPPFLAGS) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) $(CXXGUILE) \
  -I$(tmsrc)/include $(CXXXWINDOW)
 # we should use -I- to separate local includes from system includes, but
 # headers of guile 1.6.0 use includes in quotes with names relative to the
@@ -171,7 +171,7 @@
 %.o: %.cpp # Disable implicit compilation rule
 
 cxx_flags    = $(strip $(CXX) $(1) -c $< -o $@)
-cxx_incl     = $(call cxx_flags,$(1) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) \
+cxx_incl     = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
   $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS)) 
 
 $(system_obj): Objects/%.o: %.cpp
@@ -251,8 +251,8 @@
 TEXMACS_objects := $(strip $(call uses,system classes data resource plugins\
  window typeset edit glue texmacs))
 
-link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDXWINDOW) \
-  $(LDGUILE) $(LDIMLIB2) $(LDFREETYPE) $(LDICONV) $(LDDL)
+link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDFREETYPE) $(LDXWINDOW) \
+  $(LDGUILE) $(LDIMLIB2) $(LDICONV) $(LDDL)
 
 $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
 	$(CP) $^ $@
--- TeXmacs-1.0.6-src/plugins/shell/src/tm_shell.cpp	2005-12-02 19:08:07.000000000 +0100
+++ TeXmacs-1.0.6-src.corr/plugins/shell/src/tm_shell.cpp	2005-12-23 19:04:18.000000000 +0100
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
 using namespace std;
 
 typedef char* charp;
@@ -158,8 +159,10 @@
   setenv ("PS1", "tmshell$ ", true);
   cout << DATA_BEGIN << "verbatim:";
   cout << "Shell session inside TeXmacs";
-  pipe (tochild);
-  pipe (fromchild);
+//  pipe (tochild);
+//  pipe (fromchild);
+  socketpair (AF_UNIX, SOCK_STREAM, PF_UNSPEC, tochild);
+  socketpair (AF_UNIX, SOCK_STREAM, PF_UNSPEC, fromchild);
   pid= fork ();
   if (pid==0) { // the child
     dup2 (tochild [IN], STDIN);