some more installation bits dropped

[Matthias Klose]

Some installation changes are dropped from the current trunk; current
installation results in:

lib/classpath/libgjsmalsa.so
lib/classpath/libgjsmalsa.la
lib/classpath/libgcjwebplugin.so
lib/classpath/libgcjwebplugin.la

 -> should go into lib/gcj-4.3.0

lib/gcj-4.3.0/libgtkpeer.so.8.0.0
lib/gcj-4.3.0/libgtkpeer.so.8
lib/gcj-4.3.0/libgtkpeer.so
lib/gcj-4.3.0/libgtkpeer.la
lib/gcj-4.3.0/libjawt.so.8.0.0
lib/gcj-4.3.0/libjawt.so.8
lib/gcj-4.3.0/libjawt.so
lib/gcj-4.3.0/libjawt.la

 -> should be unversioned

lib/gcj-4.3.0/classmap.db
lib/gcj-4.3.0/libjvm.so
lib/gcj-4.3.0/libjvm.la
lib/logging.properties
lib/security/classpath.security
lib/libgcj.spec

it seems that the classpath part of r116332 was dropped; currently
checking the current missing bits:

2006-08-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* classpath/m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro.
	* classpath/resource/Makefile.am (loggingdir): Define to
	toolexeclibdir.
	(securitydir): Likewise.
	* classpath/configure.ac: Call CLASSPATH_TOOLEXECLIBDIR.
	Set default nativeexeclibdir using toolexeclibdir.


Index: classpath/m4/acinclude.m4
===================================================================
--- classpath/m4/acinclude.m4	(revision 116331)
+++ classpath/m4/acinclude.m4	(revision 116332)
@@ -458,3 +458,16 @@
     AC_PATH_PROG(ECJ, "ecj")
   fi
 ])
+
+dnl -----------------------------------------------------------
+dnl GCJ LOCAL: Calculate toolexeclibdir
+dnl -----------------------------------------------------------
+AC_DEFUN([CLASSPATH_TOOLEXECLIBDIR],
+[
+  multi_os_directory=`$CC -print-multi-os-directory`
+  case $multi_os_directory in
+    .) toolexeclibdir=${libdir} ;; # Avoid trailing /.
+    *) toolexeclibdir=${libdir}/${multi_os_directory} ;;
+  esac
+  AC_SUBST(toolexeclibdir)
+])
Index: classpath/resource/Makefile.am
===================================================================
--- classpath/resource/Makefile.am	(revision 116331)
+++ classpath/resource/Makefile.am	(revision 116332)
@@ -1,7 +1,7 @@
 ## used by automake to generate Makefile.in
 
 logging_DATA = java/util/logging/logging.properties
-loggingdir = $(prefix)/lib
+loggingdir = $(toolexeclibdir)
 
 security_DATA = java/security/classpath.security
-securitydir = $(prefix)/lib/security
+securitydir = $(toolexeclibdir)/security
Index: classpath/configure.ac
===================================================================
--- classpath/configure.ac	(revision 116331)
+++ classpath/configure.ac	(revision 116332)
@@ -222,15 +222,24 @@
 AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes)
 
 dnl -----------------------------------------------------------
+dnl GCJ LOCAL: Calculates and substitutes toolexeclibdir.  $libdir is
+dnl defined to the same value for all multilibs.  We define toolexeclibdir
+dnl so that we can refer to the multilib installation directories from
+dnl classpath's build files.
+dnl -----------------------------------------------------------
+CLASSPATH_TOOLEXECLIBDIR
+
+dnl -----------------------------------------------------------
 dnl Sets the native libraries installation dir
 dnl -----------------------------------------------------------
+dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}
 AC_ARG_WITH([native-libdir],
 	    [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
 	    [
 	     nativeexeclibdir=${withval}
 	    ],
 	    [
-	     nativeexeclibdir='${libdir}/${PACKAGE}'
+	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
 	    ])
 
 AC_SUBST(nativeexeclibdir)
Index: classpath/aclocal.m4
===================================================================
--- classpath/aclocal.m4	(revision 116331)
+++ classpath/aclocal.m4	(revision 116332)
@@ -468,27 +468,6 @@
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
@@ -894,6 +873,8 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../../config/depstand.m4])
+m4_include([../../config/lead-dot.m4])
 m4_include([../../libtool.m4])
 m4_include([m4/acattribute.m4])
 m4_include([m4/accross.m4])

+2006-08-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* classpath/m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro.
+	* classpath/resource/Makefile.am (loggingdir): Define to
+	toolexeclibdir.
+	(securitydir): Likewise.
+	* classpath/configure.ac: Call CLASSPATH_TOOLEXECLIBDIR.
+	Set default nativeexeclibdir using toolexeclibdir.