diff -x configure -ur orig/pilot-link.0.5.7/Makefile.in pilot-link.0.5.7/Makefile.in
--- orig/pilot-link.0.5.7/Makefile.in	Sun Apr 20 16:36:26 1997
+++ pilot-link.0.5.7/Makefile.in	Tue Apr 22 19:28:11 1997
@@ -21,11 +21,12 @@
 includedir = @includedir@
 mandir = @mandir@
 srcdir = @srcdir@
+VPATH = @srcdir@
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @CWFLAG@ -DLIBDIR=\"$(libdir)\" -I./include
+CFLAGS = @CFLAGS@ @CWFLAG@ -DLIBDIR=\"$(libdir)\" -I./include -I$(srcdir)/include
 # -DDEBUG
-LIBS =
+LIBS = @LIBS@
 # -lefence
 
 INSTALL = @INSTALL@
@@ -68,10 +69,10 @@
 		$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
 		$(STRIP) $(bindir)/$$p; \
 	done
-	for h in include/*.h; do \
+	for h in include/*.h $(srcdir)/include/*.h; do \
 		$(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
 	done
-	for p in pix/*.gif pix/*.xbm; do \
+	for p in $(srcdir)/pix/*.gif $(srcdir)/pix/*.xbm; do \
 		$(INSTALL_DATA) $$p $(pixdir)/`basename $$p`; \
 	done
 	$(INSTALL_DATA) libpisock.a $(libdir)/libpisock.a
diff -x configure -ur orig/pilot-link.0.5.7/configure.in pilot-link.0.5.7/configure.in
--- orig/pilot-link.0.5.7/configure.in	Thu Apr 17 22:22:28 1997
+++ pilot-link.0.5.7/configure.in	Wed Apr 23 23:07:27 1997
@@ -15,7 +15,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h malloc.h sys/ioctl.h sys/time.h sys/ioctl_compat.h memory.h string.h strings.h unistd.h stdlib.h netinet/in.h dirent.h sys/ndir.h sys/dir.h ndir.h)
+AC_CHECK_HEADERS(fcntl.h malloc.h sys/ioctl.h sys/time.h sys/ioctl_compat.h memory.h string.h strings.h unistd.h stdlib.h netinet/in.h dirent.h sys/ndir.h sys/dir.h ndir.h sys/select.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -40,6 +40,7 @@
 AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(atexit strchr memcpy memmove strtoul cfmakeraw cfsetspeed cfsetispeed cfsetospeed sigaction dup2)
+AC_REPLACE_FUNCS(strdup)
 
 AC_CACHE_CHECK([for cispeed and cospeed members of struct termios],
   ac_cv_termios_cspeed,
diff -x configure -ur orig/pilot-link.0.5.7/debugsh.c pilot-link.0.5.7/debugsh.c
--- orig/pilot-link.0.5.7/debugsh.c	Tue Apr  1 23:31:19 1997
+++ pilot-link.0.5.7/debugsh.c	Wed Apr 23 22:27:24 1997
@@ -14,6 +14,9 @@
 #include "pi-socket.h"
 #include "pi-dlp.h"
 #include "pi-syspkt.h"
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif /* aix needs sys/select.h for fd_set */
 
 #ifdef OS2
 #include <sys/select.h>
diff -x configure -ur orig/pilot-link.0.5.7/dlpsh.c pilot-link.0.5.7/dlpsh.c
--- orig/pilot-link.0.5.7/dlpsh.c	Wed Apr  2 17:17:45 1997
+++ pilot-link.0.5.7/dlpsh.c	Wed Apr 23 21:38:41 1997
@@ -68,7 +68,7 @@
   char fl_name = 0, fl_uid = 0, fl_vid = 0, fl_pid = 0;
   int c, ret;
 
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
@@ -160,7 +160,7 @@
   int cardno, flags, start;
   int rom_flag = 0;
 
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/getrom.c pilot-link.0.5.7/getrom.c
--- orig/pilot-link.0.5.7/getrom.c	Wed Apr  2 00:13:16 1997
+++ pilot-link.0.5.7/getrom.c	Wed Apr 23 21:39:04 1997
@@ -29,7 +29,7 @@
   int i;
   unsigned char check;
   struct pi_socket ps;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/include/pi-config.h.in pilot-link.0.5.7/include/pi-config.h.in
--- orig/pilot-link.0.5.7/include/pi-config.h.in	Thu Apr 17 22:23:01 1997
+++ pilot-link.0.5.7/include/pi-config.h.in	Wed Apr 23 22:11:21 1997
@@ -94,6 +94,9 @@
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
 #ifdef NeXT
 # include <libc.h>
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/lib/Makefile.in pilot-link.0.5.7/lib/Makefile.in
--- orig/pilot-link.0.5.7/lib/Makefile.in	Sun Apr 20 16:36:44 1997
+++ pilot-link.0.5.7/lib/Makefile.in	Wed Apr 23 23:07:51 1997
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
 SOCKOBJS = socket.o serial.o slp.o padp.o \
        dlp.o cmp.o syspkt.o pi-file.o\
 
@@ -6,11 +8,12 @@
 APPOBJS = datebook.o memo.o address.o todo.o expense.o mail.o sync.o
 
 UTILOBJS = utils.o
+LIBOBJS = @LIBOBJS@
 
-OBJS = $(SOCKOBJS) $(FILEOBJS) $(APPOBJS) $(UTILOBJS)
+OBJS = $(SOCKOBJS) $(FILEOBJS) $(APPOBJS) $(UTILOBJS) $(LIBOBJS)
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @CWFLAG@ -I../include
+CFLAGS = @CFLAGS@ @CWFLAG@ -I../include -I$(srcdir)/../include
 # -DPADP_TRACE
 # -DNO_DLP_TRACE
 # -DNO_SERIAL_TRACE
diff -x configure -ur orig/pilot-link.0.5.7/lib/serial.c pilot-link.0.5.7/lib/serial.c
--- orig/pilot-link.0.5.7/lib/serial.c	Sun Apr 20 16:18:20 1997
+++ pilot-link.0.5.7/lib/serial.c	Wed Apr 23 22:17:35 1997
@@ -12,6 +12,9 @@
 #include "pi-socket.h"
 #include "pi-serial.h"
 #include "pi-slp.h"
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif /* aix needs sys/select.h for fd_set */
 
 /* if this is running on a NeXT system... */
 #ifdef NeXT
Only in pilot-link.0.5.7/lib: strdup.c
diff -x configure -ur orig/pilot-link.0.5.7/pilot-addresses.c pilot-link.0.5.7/pilot-addresses.c
--- orig/pilot-link.0.5.7/pilot-addresses.c	Mon Apr  7 02:49:37 1997
+++ pilot-link.0.5.7/pilot-addresses.c	Wed Apr 23 21:39:17 1997
@@ -316,7 +316,7 @@
   char * deletecategory = 0;
   int mode = 0;
   int c;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/pilot-dedupe.c pilot-link.0.5.7/pilot-dedupe.c
--- orig/pilot-link.0.5.7/pilot-dedupe.c	Fri Apr 11 00:59:48 1997
+++ pilot-link.0.5.7/pilot-dedupe.c	Wed Apr 23 21:39:26 1997
@@ -40,7 +40,7 @@
   char buf[0xffff];
   int i;
   struct record * r;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/pilot-file.c pilot-link.0.5.7/pilot-file.c
--- orig/pilot-link.0.5.7/pilot-file.c	Fri Feb  7 13:21:23 1997
+++ pilot-link.0.5.7/pilot-file.c	Wed Apr 23 21:39:43 1997
@@ -17,7 +17,7 @@
 #include "pi-dlp.h"
 #include "pi-file.h"
 
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/pilot-mail.c pilot-link.0.5.7/pilot-mail.c
--- orig/pilot-link.0.5.7/pilot-mail.c	Fri Apr 18 11:58:29 1997
+++ pilot-link.0.5.7/pilot-mail.c	Wed Apr 23 21:40:08 1997
@@ -251,7 +251,7 @@
   "";
 #endif
 
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/pilot-schlep.c pilot-link.0.5.7/pilot-schlep.c
--- orig/pilot-link.0.5.7/pilot-schlep.c	Tue Apr  1 00:32:01 1997
+++ pilot-link.0.5.7/pilot-schlep.c	Wed Apr 23 22:56:31 1997
@@ -7,9 +7,7 @@
  */
 
 #include <stdio.h>
-#ifdef __EMX__
 #include <sys/types.h>
-#endif
 #include <sys/stat.h>
 #include <signal.h>
 #include "pi-source.h"
@@ -175,7 +173,7 @@
 int main(int argc, char *argv[])
 {
   int c;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/pilot-xfer.c pilot-link.0.5.7/pilot-xfer.c
--- orig/pilot-link.0.5.7/pilot-xfer.c	Fri Apr  4 15:03:08 1997
+++ pilot-link.0.5.7/pilot-xfer.c	Wed Apr 23 23:08:15 1997
@@ -7,9 +7,7 @@
  */
 
 #include <stdio.h>
-#ifdef __EMX__
 #include <sys/types.h>
-#endif
 #include <sys/stat.h>
 #include <signal.h>
 #include "pi-source.h"
@@ -26,6 +24,7 @@
 char * exclude[100];
 int numexclude = 0;
 
+
 RETSIGTYPE SigHandler(int signal);
 
 void MakeExcludeList(char *efile) {
@@ -491,7 +490,7 @@
 int main(int argc, char *argv[])
 {
   int c;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.5.7/sync-memodir.c pilot-link.0.5.7/sync-memodir.c
--- orig/pilot-link.0.5.7/sync-memodir.c	Wed Apr  2 17:17:02 1997
+++ pilot-link.0.5.7/sync-memodir.c	Wed Apr 23 23:28:21 1997
@@ -28,9 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef __EMX__
 #include <sys/types.h>
-#endif
 #include <sys/stat.h>
 
 #include "pi-source.h"