bug#8642: 24.0.50; cannot build on Solaris 10

bug#8642: 24.0.50; cannot build on Solaris 10

[NAKAJI Hiroyuki]

There are three problems in building on Solaris 10.

1. In Solaris 10's /bin/sh, builtin test command does not have "-e"
2. /bin/sh does not have $(command) syntax, neither
3. Solaris's cc does not allow the combination of C99 option and
   _XOPEN_SOURCE=500, for example, fakemail.c fails.

cc -xc99=all    -DHAVE_CONFIG_H -I. -I../src -I../lib -I/export/home/nakaji/emacs/lib-src -I/export/home/nakaji/emacs/lib-src/../src -I/export/home/nakaji/emacs/lib-src/../lib  -m64 -L/usr/pkg/lib -R/usr/pkg/lib -L/usr/openwin/lib -I/usr/pkg/include -m64 -I/usr/pkg/include /export/home/nakaji/emacs/lib-src/fakemail.c ../lib/libgnu.a -lsocket -lnsl -o fakemail
"/usr/include/sys/feature_tests.h", line 332: #error: "Compiler or options invalid for pre-UNIX 03 X/Open applications  and pre-2001 POSIX applications"
cc: acomp failed for /export/home/nakaji/emacs/lib-src/fakemail.c

Here is a patch. Thanks.

=== modified file 'Makefile.in'
--- Makefile.in	2011-05-06 06:30:56 +0000
+++ Makefile.in	2011-05-09 11:21:39 +0000
@@ -373,7 +373,7 @@
 	      LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \
 	fi;
 	if [ -r .bzr/checkout/dirstate ]; then 			\
-	    vcswitness="$$(pwd)/.bzr/checkout/dirstate"; 	\
+	    vcswitness="`pwd`/.bzr/checkout/dirstate"; 	\
 	fi; 							\
 	cd $@; $(MAKE) all $(MFLAGS)                           \
 	  CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
@@ -829,7 +829,7 @@
 	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
-	[ ! -e config.log ] || mv -f config.log config.log~
+	[ ! -f config.log ] || mv -f config.log config.log~
 	${top_bootclean}
 ## configure; make bootstrap replaces the real config.log from configure
 ## with the truncated one from config.status.  The former is more useful.

=== modified file 'lib-src/fakemail.c'
--- lib-src/fakemail.c	2011-04-16 21:13:07 +0000
+++ lib-src/fakemail.c	2011-05-09 04:26:15 +0000
@@ -20,7 +20,7 @@
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#define _XOPEN_SOURCE 500	/* for cuserid */
+#define _XOPEN_SOURCE 600	/* for cuserid */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

I'm afraid the fix for fakemail.c is correct or not.
-- 
NAKAJI Hiroyuki

bug#8642: 24.0.50; cannot build on Solaris 10

[Glenn Morris]

NAKAJI Hiroyuki wrote:

> 1. In Solaris 10's /bin/sh, builtin test command does not have "-e"
> 2. /bin/sh does not have $(command) syntax, neither
> 3. Solaris's cc does not allow the combination of C99 option and
>    _XOPEN_SOURCE=500, for example, fakemail.c fails.

Thanks. I fixed 1 and 2. I wouldn't know what to do about 3.

bug#8642: 24.0.50; cannot build on Solaris 10

[Glenn Morris]

Version: 24.1

>> 3. Solaris's cc does not allow the combination of C99 option and
>>    _XOPEN_SOURCE=500, for example, fakemail.c fails.

After looking into this a little bit, I think your change to 600 may be
correct. But fakemail.c was removed, so it's no longer necessary.
If that file comes back, please send a reminder about this. Thanks.