version 1.18, 1997/10/06 20:21:23
|
version 1.19, 1997/10/08 08:08:45
|
Line 297 else
|
Line 297 else
|
fi |
fi |
if test "$motif_libraries" != "/usr/lib" ; then |
if test "$motif_libraries" != "/usr/lib" ; then |
MOTIF_LIBRARIES="-L$motif_libraries" |
MOTIF_LIBRARIES="-L$motif_libraries" |
|
case "${host}" in |
|
*-*sun-solaris* ) |
|
MOTIF_LIBRARIES="${MOTIF_LIBRARIES} -R$motif_libraries" |
|
;; |
|
esac |
fi |
fi |
fi |
fi |
AC_SUBST(MOTIF_INCLUDES) |
AC_SUBST(MOTIF_INCLUDES) |
Line 337 dnl Adjust the some variables depending
|
Line 342 dnl Adjust the some variables depending
|
dnl Thot NEED signed chars !!! |
dnl Thot NEED signed chars !!! |
dnl |
dnl |
|
|
default_www_access="libwww" |
|
|
|
KAFFE_ENGINE="" |
KAFFE_ENGINE="" |
if test "${CC}" = "gcc" ; then |
if test "${CC}" = "gcc" ; then |
CFLAGS="${CFLAGS} -Wall " |
CFLAGS="${CFLAGS} -Wall " |
Line 449 dnl
|
Line 452 dnl
|
dnl java is disabled by default |
dnl java is disabled by default |
dnl |
dnl |
|
|
if test "$with_java" = "" ; then |
if test "$enable_java" = "yes" ; then |
if test "default_www_access" = "libwww" ; then |
with_java="yes" |
if test "$enable_java" = "yes" ; then |
|
with_java="yes" |
|
else |
|
with_java="no" |
|
fi |
|
else |
|
if test "$enable_java" = "yes" ; then |
|
with_java="yes" |
|
else |
|
with_java="no" |
|
fi |
|
fi |
|
fi |
fi |
|
|
dnl |
dnl |
Line 499 if test "$with_ilu" = "" ; then
|
Line 490 if test "$with_ilu" = "" ; then
|
fi |
fi |
fi |
fi |
|
|
if test "$build_amaya" = "yes" ; then |
if test "$build_amaya" = "yes" ; then |
|
|
if test ! -f $srcdir/kaffe-$KAFFE_VER/Makefile.in ; then |
if test ! -f $srcdir/kaffe-$KAFFE_VER/Makefile.in ; then |
if test "$with_java" = "yes" ; then |
if test "$with_java" = "yes" ; then |
AC_MSG_WARN(kaffe-$KAFFE_VER sources not found, disabling Java !) |
AC_MSG_WARN(kaffe-$KAFFE_VER sources not found, disabling Java !) |
Line 705 make_output="Makefile Options.orig:Optio
|
Line 697 make_output="Makefile Options.orig:Optio
|
|
|
if test "$build_amaya" = "yes" ; then |
if test "$build_amaya" = "yes" ; then |
|
|
make_output="$make_output amaya/Makefile \ |
make_output="$make_output amaya/Makefile pluginlib/Makefile" |
tools/javastub/Makefile tools/dns_daemon/Makefile javalib/Makefile \ |
|
pluginlib/Makefile" |
|
|
|
EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \ |
EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \ |
$srcdir/amaya/Makefile.libwww \ |
$srcdir/amaya/Makefile.libwww \ |
$srcdir/tools/javastub/Makefile.in \ |
|
$srcdir/tools/dns_daemon/Makefile.in \ |
|
$srcdir/javalib/Makefile.in \ |
|
$srcdir/pluginlib/Makefile.in \ |
$srcdir/pluginlib/Makefile.in \ |
$srcdir/pluginlib/Makefile.plugin" |
$srcdir/pluginlib/Makefile.plugin" |
|
|
if test "$with_ilu" = "yes" ; then |
if test "$with_java" = "yes" ; then |
|
make_output="$make_output tools/javastub/Makefile \ |
make_output="$make_output ilulib/Makefile tools/ilustub/Makefile" |
tools/dns_daemon/Makefile javalib/Makefile" |
|
EXTRA_MAKEFILE_IN="$srcdir/tools/javastub/Makefile.in \ |
|
$srcdir/tools/dns_daemon/Makefile.in \ |
|
$srcdir/javalib/Makefile.in" |
|
fi |
|
|
EXTRA_MAKEFILE_IN="$srcdir/ilulib/Makefile.in \ |
if test "$with_ilu" = "yes" ; then |
|
make_output="$make_output ilulib/Makefile tools/ilustub/Makefile" |
|
EXTRA_MAKEFILE_IN="$srcdir/ilulib/Makefile.in \ |
$srcdir/ilulib/Makefile.ilu \ |
$srcdir/ilulib/Makefile.ilu \ |
$srcdir/tools/ilustub/Makefile.in" |
$srcdir/tools/ilustub/Makefile.in" |
|
fi |
fi |
|
fi |
fi |
|
|
if test "$build_thot" = "yes" ; then |
if test "$build_thot" = "yes" ; then |
|
|
make_output="$make_output thot/Makefile \ |
make_output="$make_output thot/Makefile \ |
drawlib/Makefile indexlib/Makefile" |
drawlib/Makefile indexlib/Makefile" |
|
|
EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \ |
EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \ |
$srcdir/thot/Makefile.in \ |
$srcdir/thot/Makefile.in \ |
$srcdir/drawlib/Makefile.in \ |
$srcdir/drawlib/Makefile.in \ |
Line 745 $srcdir/indexlib/Makefile.in"
|
Line 735 $srcdir/indexlib/Makefile.in"
|
$srcdir/misc/Makefile.in" |
$srcdir/misc/Makefile.in" |
|
|
if test "$build_annotations" = "yes" ; then |
if test "$build_annotations" = "yes" ; then |
|
|
make_output="$make_output misc/annotations/Makefile" |
make_output="$make_output misc/annotations/Makefile" |
EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \ |
EXTRA_MAKEFILE_IN="$EXTRA_MAKEFILE_IN \ |
$srcdir/misc/annotations/Makefile.in" |
$srcdir/misc/annotations/Makefile.in" |
|
|
fi |
fi |
|
|
if test "$build_util" = "yes" ; then |
if test "$build_util" = "yes" ; then |
|
|
make_output="$make_output misc/util/Makefile" |
make_output="$make_output misc/util/Makefile" |