[Setup-tool-hackers] Solaris Compilation Patch

[JP Rosevear <jpr ximian com>]

Does nothing about getting the tools working, but allows things to
compile.

-JP
-- 
--
=======================================================================
JP Rosevear                             jpr@ximian.com
Ximian Inc.                             http://www.ximian.com
? xml-i18n-merge
? xml-i18n-extract
? xml-i18n-update
? xst.patch
? src/shares/shares.desktop.in
Index: archiver/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/archiver/ChangeLog,v
retrieving revision 1.23
diff -u -r1.23 ChangeLog
--- archiver/ChangeLog	2001/05/13 22:28:11	1.23
+++ archiver/ChangeLog	2001/05/22 14:17:38
@@ -1,3 +1,15 @@
+2001-05-22  JP Rosevear  <jpr@ximian.com>
+
+	* config-log.c (bind_socket): use AF_UNIX for the family
+
+	* location.c (run_backend_proc): use putenv() rather than setenv()
+	for solaris
+
+	* config-log.c: define the SUN_LEN macro for those systems not
+	having it
+	(connect_socket): use the more portable domain type, PF_LOCAL
+	seems to map to PF_UNIX on linux anyhow
+
 2001-05-12  Chema Celorio  <chema@celorio.com>
 
 	* location.c (location_store_xml): add a carriage return after the
Index: archiver/config-log.c
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/archiver/config-log.c,v
retrieving revision 1.9
diff -u -r1.9 config-log.c
--- archiver/config-log.c	2001/05/04 01:28:37	1.9
+++ archiver/config-log.c	2001/05/22 14:17:38
@@ -41,6 +41,11 @@
 
 #define READ_BUF_LEN 4096
 
+#ifndef SUN_LEN
+#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
+		      + strlen ((ptr)->sun_path))
+#endif
+
 static GtkObjectClass *parent_class;
 
 enum {
@@ -1073,7 +1078,7 @@
 	config_log->p->socket_buffer = NULL;
 	config_log->p->socket_owner = check_socket_filename (config_log);
 
-	fd = socket (PF_LOCAL, SOCK_STREAM, 0);
+	fd = socket (PF_UNIX, SOCK_STREAM, 0);
 
 	if (fd < 0) {
 		g_warning ("Could not create socket: %s", g_strerror (errno));
@@ -1166,7 +1171,7 @@
 
 	/* FIXME: What if the socket filename is too long here? */
 	if (config_log->p->socket_owner || do_connect) {
-		name.sun_family = AF_LOCAL;
+		name.sun_family = AF_UNIX;
 		strncpy (name.sun_path, config_log->p->socket_filename,
 			 sizeof (name.sun_path));
 	}
Index: archiver/location.c
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/archiver/location.c,v
retrieving revision 1.15
diff -u -r1.15 location.c
--- archiver/location.c	2001/05/13 22:28:11	1.15
+++ archiver/location.c	2001/05/22 14:17:38
@@ -1479,9 +1479,9 @@
 		path = g_getenv ("PATH");
 
 		if (!strstr (path, XST_BACKEND_LOCATION)) {
-			path1 = g_strconcat (XST_BACKEND_LOCATION, ":", path,
-					     NULL);
-			setenv ("PATH", path1, TRUE);
+			path1 = g_strconcat ("PATH=", XST_BACKEND_LOCATION, 
+					     ":", path, NULL);
+			putenv (path1);
 			g_free (path1);
 		}
 
Index: src/users/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/users/ChangeLog,v
retrieving revision 1.94
diff -u -r1.94 ChangeLog
--- src/users/ChangeLog	2001/05/22 12:31:58	1.94
+++ src/users/ChangeLog	2001/05/22 14:17:38
@@ -1,3 +1,7 @@
+2001-05-22  JP Rosevear  <jpr@ximian>
+
+	* e-search-bar/Makefile.am: include gal cflags
+
 2001-05-21  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* e-table.c, profile.c: Marked to translate the ETableSpecification labels.
Index: src/users/e-search-bar/Makefile.am
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/users/e-search-bar/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- src/users/e-search-bar/Makefile.am	2001/03/14 16:54:41	1.1
+++ src/users/e-search-bar/Makefile.am	2001/05/22 14:17:38
@@ -1,6 +1,7 @@
 INCLUDES = \
 	$(GNOME_INCLUDEDIR)	\
-	$(GNOME_XML_CFLAGS)
+	$(GNOME_XML_CFLAGS)	\
+	$(GAL_CFLAGS)
 
 noinst_LIBRARIES =		\
 	libesearchbar.a