diff options
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 7 | ||||
-rw-r--r-- | libjava/acinclude.m4 | 2 | ||||
-rw-r--r-- | libjava/aclocal.m4 | 2 | ||||
-rwxr-xr-x | libjava/configure | 20 | ||||
-rw-r--r-- | libjava/configure.in | 18 |
5 files changed, 28 insertions, 21 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bbdd782..b89f37f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-05-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * acinclude.m4: Allow for PWDCMD to override hardcoded pwd. + * configure.in: Likewise. + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2002-05-13 Tom Tromey <tromey@redhat.com> * java/lang/natRuntime.cc: Don't include sys/time.h and time.h. diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index fe06406..d205aa0 100644 --- a/libjava/acinclude.m4 +++ b/libjava/acinclude.m4 @@ -68,7 +68,7 @@ if :; then :; else fi # This works around an automake problem. -mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs" +mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" AC_SUBST(mkinstalldirs) AC_CANONICAL_SYSTEM diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 4ddb184..fc85cbd 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -80,7 +80,7 @@ if :; then :; else fi # This works around an automake problem. -mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs" +mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" AC_SUBST(mkinstalldirs) AC_CANONICAL_SYSTEM diff --git a/libjava/configure b/libjava/configure index cb6dc27..be85b03 100755 --- a/libjava/configure +++ b/libjava/configure @@ -922,7 +922,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. fi # This works around an automake problem. -mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs" +mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" @@ -1706,7 +1706,7 @@ EOF # Sigh. Libtool's macro doesn't do the right thing. INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL" # FIXME: this is a hack. - sub_auxdir="`cd $ac_aux_dir && pwd`" + sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`" ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" fi @@ -3093,7 +3093,7 @@ case "${host}" in esac -LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs" +LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" # Check whether --with-system-zlib or --without-system-zlib was given. @@ -3133,7 +3133,7 @@ case "$GC" in GCLIBS=../boehm-gc/libgcjgc_convenience.la GCINCS='-I$(top_srcdir)/../boehm-gc/include' JC1GCSPEC='-fuse-boehm-gc' - GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" + GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" GCOBJS=boehm.lo @@ -5412,12 +5412,12 @@ fi fi if test -x "${builddotdot}/../../gcc/gcj"; then - dir="`cd ${builddotdot}/../../gcc && pwd`" - GCJ="$dir/gcj -B`pwd`/ -B$dir/" + dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" + GCJ="$dir/gcj -B`${PWDCMD-pwd}`/ -B$dir/" else CANADIAN=yes NULL_TARGET=yes - GCJ="gcj -B`pwd`/" + GCJ="gcj -B`${PWDCMD-pwd}`/" fi fi @@ -5427,7 +5427,7 @@ test -f libgcj.spec || touch libgcj.spec # We must search the source tree for java.lang, since we still don't # have libgcj.jar nor java/lang/*.class GCJ_SAVE_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I`pwd` -I`cd $srcdir && pwd`" +CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`" # Since some classes depend on this one, we need its source available # before we can do any GCJ compilation test :-( @@ -7414,7 +7414,7 @@ else fi -here=`pwd` +here=`${PWDCMD-pwd}` # We get this from the environment. @@ -7953,7 +7953,7 @@ esac # Make subdirectories and `.d' files. Look in both srcdir and # builddir for the .java files. -h=`pwd` +h=`${PWDCMD-pwd}` : > deps.mk ( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' \) -print) ; find . \( -name '*.java' -o -name '*.cc' \) -print) | \ diff --git a/libjava/configure.in b/libjava/configure.in index 24ba89c..70b333d 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -29,7 +29,7 @@ if test -z "${with_cross_host}"; then # Sigh. Libtool's macro doesn't do the right thing. INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL" # FIXME: this is a hack. - sub_auxdir="`cd $ac_aux_dir && pwd`" + sub_auxdir="`cd $ac_aux_dir && ${PWDCMD-pwd}`" ac_configure_args="$ac_configure_args --with-auxdir=$sub_auxdir" fi AC_SUBST(INCLTDL) @@ -273,7 +273,7 @@ case "${host}" in esac AC_SUBST(SYSTEMSPEC) -LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs" +LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" AC_SUBST(LIBGCJTESTSPEC) AC_ARG_WITH(system-zlib, @@ -307,7 +307,7 @@ case "$GC" in GCLIBS=../boehm-gc/libgcjgc_convenience.la GCINCS='-I$(top_srcdir)/../boehm-gc/include' JC1GCSPEC='-fuse-boehm-gc' - GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" + GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" dnl We also want to pick up some cpp flags required when including dnl boehm-config.h. Yuck. @@ -710,12 +710,12 @@ changequote(<<,>>) changequote([,]) fi if test -x "${builddotdot}/../../gcc/gcj"; then - dir="`cd ${builddotdot}/../../gcc && pwd`" - GCJ="$dir/gcj -B`pwd`/ -B$dir/" + dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" + GCJ="$dir/gcj -B`${PWDCMD-pwd}`/ -B$dir/" else CANADIAN=yes NULL_TARGET=yes - GCJ="gcj -B`pwd`/" + GCJ="gcj -B`${PWDCMD-pwd}`/" fi fi @@ -725,7 +725,7 @@ test -f libgcj.spec || touch libgcj.spec # We must search the source tree for java.lang, since we still don't # have libgcj.jar nor java/lang/*.class GCJ_SAVE_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I`pwd` -I`cd $srcdir && pwd`" +CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`" # Since some classes depend on this one, we need its source available # before we can do any GCJ compilation test :-( @@ -960,7 +960,7 @@ AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) -here=`pwd` +here=`${PWDCMD-pwd}` AC_SUBST(here) # We get this from the environment. @@ -977,7 +977,7 @@ esac # Make subdirectories and `.d' files. Look in both srcdir and # builddir for the .java files. -h=`pwd` +h=`${PWDCMD-pwd}` : > deps.mk ( (cd $srcdir && find . \( -name '*.java' -o -name '*.cc' \) -print) ; find . \( -name '*.java' -o -name '*.cc' \) -print) | \ |