[cp-patches] FYI: Build fixes

Sun, 13 May 2007 15:38:38 -0700 

This fixes a few build issues I spotted this weekend.
Firstly, we need to link against nsl on Solaris in order
to detect inet_pton.  Secondly, the scripts for invoking the tools
are broken by spaces around datarootdir.

Changelog:

2007-05-13  Andrew John Hughes  <[EMAIL PROTECTED]>

        * configure.ac:
        Check if nsl library is needed for inet_pton.
        * tools/gappletviewer.in,
        * tools/gjar.in,
        * tools/gjarsigner.in,
        * tools/gjavah.in,
        * tools/gkeytool.in,
        * tools/gnative2ascii.in,
        * tools/gorbd.in,
        * tools/grmic.in,
        * tools/grmid.in,
        * tools/grmiregistry.in,
        * tools/gserialver.in,
        * tools/gtnameserv.in:
        Remove spaces around '=' in setting of datarootdir.

-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.208
diff -u -3 -p -u -r1.208 configure.ac
--- configure.ac	17 Apr 2007 15:52:38 -0000	1.208
+++ configure.ac	13 May 2007 20:37:35 -0000
@@ -368,6 +368,7 @@ if test "x${COMPILE_JNI}" = xyes; then
   AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
   AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
 
+  AC_SEARCH_LIBS([inet_pton],[nsl]) 
   AC_CHECK_FUNCS([ftruncate fsync select \
 		  gethostname socket strerror fork pipe execve open close \
 		  lseek fstat read readv write writev htonl memset htons connect \
Index: tools/gappletviewer.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gappletviewer.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gappletviewer.in
--- tools/gappletviewer.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gappletviewer.in	13 May 2007 20:37:44 -0000
@@ -40,7 +40,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gjar.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gjar.in,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 gjar.in
--- tools/gjar.in	19 Apr 2007 13:42:47 -0000	1.2
+++ tools/gjar.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gjarsigner.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gjarsigner.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gjarsigner.in
--- tools/gjarsigner.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gjarsigner.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gjavah.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gjavah.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gjavah.in
--- tools/gjavah.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gjavah.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gkeytool.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gkeytool.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gkeytool.in
--- tools/gkeytool.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gkeytool.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gnative2ascii.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnative2ascii.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gnative2ascii.in
--- tools/gnative2ascii.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gnative2ascii.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gorbd.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gorbd.in,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 gorbd.in
--- tools/gorbd.in	19 Apr 2007 13:42:47 -0000	1.2
+++ tools/gorbd.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/grmic.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/grmic.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 grmic.in
--- tools/grmic.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/grmic.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/grmid.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/grmid.in,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 grmid.in
--- tools/grmid.in	19 Apr 2007 13:42:47 -0000	1.2
+++ tools/grmid.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/grmiregistry.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/grmiregistry.in,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 grmiregistry.in
--- tools/grmiregistry.in	19 Apr 2007 13:42:47 -0000	1.2
+++ tools/grmiregistry.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gserialver.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gserialver.in,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 gserialver.in
--- tools/gserialver.in	19 Apr 2007 13:42:47 -0000	1.3
+++ tools/gserialver.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
Index: tools/gtnameserv.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gtnameserv.in,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 gtnameserv.in
--- tools/gtnameserv.in	19 Apr 2007 13:42:47 -0000	1.2
+++ tools/gtnameserv.in	13 May 2007 20:37:44 -0000
@@ -41,7 +41,7 @@
 ##
 
 [EMAIL PROTECTED]@
-datarootdir = @datarootdir@
[EMAIL PROTECTED]@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip

Attachment: signature.asc
Description: Digital signature

Reply via email to