Index: configure
--- configure.orig	2007-07-05 21:26:25 +0200
+++ configure	2007-07-06 09:13:40 +0200
@@ -29700,6 +29700,9 @@
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
+case "$host_os" in
+  solaris* ) LIBS="$LIBS -lsocket -lnsl" ;;
+esac
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
Index: epan/dissectors/Makefile.in
--- epan/dissectors/Makefile.in.orig	2007-07-05 21:26:07 +0200
+++ epan/dissectors/Makefile.in	2007-07-06 09:15:29 +0200
@@ -7264,13 +7264,13 @@
 #
 register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) $(top_srcdir)/tools/make-dissector-reg \
     $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n $(PYTHON); then \
+	@if test -n "$(PYTHON)"; then \
 		echo Making register.c with python ; \
 		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
 		    dissectors $(ALL_DISSECTORS_SRC) ; \
 	else \
 		echo Making register.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
+		$(SHELL) $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
 		   dissectors $(plugin_src) $(ALL_DISSECTORS_SRC) ; \
 	fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: gtk/Makefile.in
--- gtk/Makefile.in.orig	2007-07-05 21:26:08 +0200
+++ gtk/Makefile.in	2007-07-06 09:13:40 +0200
@@ -1102,7 +1102,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: $(LIBRARIES) $(HEADERS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
Index: gtk/main.c
--- gtk/main.c.orig	2007-07-05 21:22:28 +0200
+++ gtk/main.c	2007-07-06 09:13:40 +0200
@@ -35,10 +35,7 @@
 
 #include <string.h>
 #include <ctype.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #ifdef NEED_STRERROR_H
 #include "strerror.h"