Commit 559fcc2c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

explicitly disable guile, psiconv, and bonobo for now.

2002-01-24  Jody Goldberg <jody@gnome.org>

	* configure.in : explicitly disable guile, psiconv, and bonobo for now.
parent 910b25ae
2002-01-24 Jody Goldberg <jody@gnome.org> 2002-01-24 Jody Goldberg <jody@gnome.org>
* configure.in : explicitly disable guile, psiconv, and bonobo for now.
* src/Makefile.am : Apparently the sources list is order dependent. * src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top. Put the built sources at the top.
......
2002-01-24 Jody Goldberg <jody@gnome.org> 2002-01-24 Jody Goldberg <jody@gnome.org>
* configure.in : explicitly disable guile, psiconv, and bonobo for now.
* src/Makefile.am : Apparently the sources list is order dependent. * src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top. Put the built sources at the top.
......
2002-01-24 Jody Goldberg <jody@gnome.org> 2002-01-24 Jody Goldberg <jody@gnome.org>
* configure.in : explicitly disable guile, psiconv, and bonobo for now.
* src/Makefile.am : Apparently the sources list is order dependent. * src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top. Put the built sources at the top.
......
2002-01-24 Jody Goldberg <jody@gnome.org> 2002-01-24 Jody Goldberg <jody@gnome.org>
* configure.in : explicitly disable guile, psiconv, and bonobo for now.
* src/Makefile.am : Apparently the sources list is order dependent. * src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top. Put the built sources at the top.
......
...@@ -84,58 +84,55 @@ fi ...@@ -84,58 +84,55 @@ fi
AC_SUBST(GUILE_LIBS) AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE_INCS) AC_SUBST(GUILE_INCS)
guile_msg='not requested'
#check for guile 1.5 #check for guile 1.5
try_guile=true try_guile=false
guile_msg="no" guile_msg="temporarily disabled in gnome2 branch"
with_guile=false enable_guile=false
AC_ARG_WITH(guile, AC_ARG_WITH(guile,
[--{with,without}-guile Compile with Guile support or without it], [--{with,without}-guile Compile with Guile support or without it],
if test x$withval = xno; then if test x$withval = xyes; then
try_guile=false try_guile=true
fi fi
) )
if $try_guile; then dnl if $try_guile; then
AC_MSG_CHECKING(for guile >= 1.5) dnl AC_MSG_CHECKING(for guile >= 1.5)
if test "`guile -c '(display (string>=? (version) "1.4.1"))'`" != "#t"; then dnl if test "`guile -c '(display (string>=? (version) "1.4.1"))'`" != "#t"; then
AC_MSG_RESULT([Your Guile is too old. You need Guile 1.5 or later.]) dnl AC_MSG_RESULT([Your Guile is too old. You need Guile 1.5 or later.])
else dnl else
AC_MSG_RESULT(found) dnl AC_MSG_RESULT(found)
guile_msg="yes" dnl guile_msg="yes"
with_guile=true dnl enable_guile=true
fi dnl fi
dnl
fi dnl fi
dnl if $enable_guile; then
AM_CONDITIONAL(WITH_GUILE, $with_guile) dnl GNOME_CHECK_GUILE
dnl fi
if $with_guile; then AM_CONDITIONAL(WITH_GUILE, $enable_guile)
GNOME_CHECK_GUILE
fi
dnl ************************************************** dnl **************************************************
dnl * psiconv support dnl * psiconv support
dnl ************************************************** dnl **************************************************
PSICONV_INIT() dnl PSICONV_INIT()
if test "$want_psiconv" = "yes"; then dnl if test "$want_psiconv" = "yes"; then
ac_save_CFLAGS="$CFLAGS" dnl ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" dnl ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $psiconv_cflags" dnl CFLAGS="$CFLAGS $psiconv_cflags"
LIBS="$LIBS $psiconv_libs" dnl LIBS="$LIBS $psiconv_libs"
AC_CHECK_LIB(psiconv,psiconv_parse_sheet_file,want_psiconv=yes,want_psiconv=no) dnl AC_CHECK_LIB(psiconv,psiconv_parse_sheet_file,want_psiconv=yes,want_psiconv=no)
CFLAGS="$ac_save_CFLAGS" dnl CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" dnl LIBS="$ac_save_LIBS"
dnl
if test "$want_psiconv" = "no"; then dnl if test "$want_psiconv" = "no"; then
PSICONV_LIBS="" dnl PSICONV_LIBS=""
PSICONV_CFLAGS="" dnl PSICONV_CFLAGS=""
with_psiconv=false dnl enable_psiconv=false
fi dnl fi
dnl fi
AM_CONDITIONAL(WITH_PSICONV,$with_psiconv) enable_psiconv=false
fi AM_CONDITIONAL(WITH_PSICONV,$enable_psiconv)
dnl ************************************************** dnl **************************************************
dnl stolen from gtk+ dnl stolen from gtk+
...@@ -314,7 +311,7 @@ else ...@@ -314,7 +311,7 @@ else
fi fi
enable_bonobo=true enable_bonobo=true
bonobo_msg=yes bonobo_msg='temporarily disabled in gnome2'
AC_ARG_WITH(bonobo, AC_ARG_WITH(bonobo,
[--{with,without}-bonobo Use the bonobo UI routines], [--{with,without}-bonobo Use the bonobo UI routines],
if test "x$withval" = xno; then if test "x$withval" = xno; then
...@@ -322,7 +319,8 @@ AC_ARG_WITH(bonobo, ...@@ -322,7 +319,8 @@ AC_ARG_WITH(bonobo,
bonobo_msg=disabled bonobo_msg=disabled
fi fi
) )
gnumeric_bonobo_enabled=$enable_bonobo dnl gnumeric_bonobo_enabled=$enable_bonobo
gnumeric_bonobo_enabled=false
AM_CONDITIONAL(WITH_BONOBO, $enable_bonobo) AM_CONDITIONAL(WITH_BONOBO, $enable_bonobo)
dnl ************************************************** dnl **************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment