diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-07-06 16:00:57 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-07-06 16:00:57 +0000 |
| commit | 80f06e289befc1323bce6dc8f619937046fe124d (patch) | |
| tree | 71df9c3ed0af2a0c6defe4be1be1b468cad4162c /libjava/configure.ac | |
| parent | 303c8bfdb275a5074f298ddd2c7545f05ca01d36 (diff) | |
| download | gcc-80f06e289befc1323bce6dc8f619937046fe124d.zip gcc-80f06e289befc1323bce6dc8f619937046fe124d.tar.gz gcc-80f06e289befc1323bce6dc8f619937046fe124d.tar.bz2 | |
configure.ac (ac_configure_args): Add --with-native-libdir.
2006-07-06 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac (ac_configure_args): Add --with-native-libdir.
* configure: Regenerate.
* classpath/native/jni/gtk-peer/Makefile.am: Remove GCJ LOCAL
sections.
* classpath/native/jni/gtk-peer/Makefile.in: Regenerate.
* classpath/native/jawt/Makefile.am: Remove GCJ LOCAL sections.
* classpath/native/jawt/Makefile.in: Regenerate.
* classpath/native/plugin/Makefile.am: Remove GCJ LOCAL sections.
* classpath/native/plugin/Makefile.in: Regenerate.
From-SVN: r115223
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index fab0264..44340a4 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1266,11 +1266,18 @@ AC_SUBST(toolexecdir) AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexeclibdir) -# Determine where the standard .db file is found. +# Determine where the standard .db file and GNU Classpath JNI +# libraries are found. multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in - .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. - *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; + .) + dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; + *) + dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; esac AC_SUBST(dbexecdir) |