Commit 078247d3 authored by Stepan Kasal's avatar Stepan Kasal

Fix autoconfigury and po-functions handling.

parent 903265b8
2005-03-16 Stepan Kasal <kasal@ucw.cz>
* autogen.sh: require intltool >= 0.29; fix IFS handling;
create po*/Makefile.in.in and po-functions/POTFILES.*.
* acinclude.m4: Nuked, it shouldn't be needed.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
* configure.in: Do AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS);
don't show --with-guile in the help.
* src/pixmaps/Makefile.am (STRIP_BEGIN, STRIP_END, STRIP_DUMMY):
Remove these, I see no need for them; the cosmetic advantage
can be achieved with one echo.
* configure.in (STRIP_BEGIN, STRIP_END, STRIP_DUMMY): Don't detect.
* plugins/Makefile.am (SUBDIRS): Simplify the conditional assignments.
In many files, fix the typo contraint --> constraint.
2005-03-15 Jon K Hellan <hellan@acm.org>
* src/gui-clipboard.c (image_write): New. Write an object as image
......
......@@ -15,9 +15,6 @@ change_logs = ChangeLog \
OChangeLog-2000-02-23 OChangeLog-2000-10-10 \
OChangeLog-2001-06-26
# Gnome autogen.sh uses ACLOCAL_FLAGS; inherit it here.
ACLOCAL_AMFLAGS = @ACLOCAL_FLAGS@
@INTLTOOL_DESKTOP_RULE@
Applicationsdir = $(datadir)/applications/
......
......@@ -27,6 +27,10 @@ Jon K
* Receive drag/drop images.
* Paste images from clipboard.
Kasal:
* Modified the way generated files are handled by Automake.
* Some configure hacks to support po-functions.
Morten:
* Work around Pango bug causing XL save crash. [#166532]
* Fix Save-As GUI problem causing CRITICALs.
......@@ -240,7 +244,7 @@ Jody:
* Fix perl and python tests in configure
* Fix creation of slow sheet objects when there are frozen panes
* Fix the solver and several related reports
* Make the solver dialog's contraint page more usable
* Make the solver dialog's constraint page more usable
Kasal:
* More cleanup in configure
......
......@@ -9447,7 +9447,7 @@
2002-04-29 Jody Goldberg <jody@gnome.org>
* src/gnumeric-pane.c (gnumeric_pane_header_init) : set a
non-contraining scrollregion here in case something scrolls before we
non-constraining scrollregion here in case something scrolls before we
are realized and a real region is assigned.
* src/sheet-object.c (sheet_object_clone_sheet) : range == NULL is legal
......
2005-03-16 Stepan Kasal <kasal@ucw.cz>
* autogen.sh: require intltool >= 0.29; fix IFS handling;
create po*/Makefile.in.in and po-functions/POTFILES.*.
* acinclude.m4: Nuked, it shouldn't be needed.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
* configure.in: Do AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS);
don't show --with-guile in the help.
* src/pixmaps/Makefile.am (STRIP_BEGIN, STRIP_END, STRIP_DUMMY):
Remove these, I see no need for them; the cosmetic advantage
can be achieved with one echo.
* configure.in (STRIP_BEGIN, STRIP_END, STRIP_DUMMY): Don't detect.
* plugins/Makefile.am (SUBDIRS): Simplify the conditional assignments.
In many files, fix the typo contraint --> constraint.
2005-03-15 Jon K Hellan <hellan@acm.org>
* src/gui-clipboard.c (image_write): New. Write an object as image
......
######################################################################
# progtest.m4 from gettext 0.32
######################################################################
# Search path for a program which passes the given test.
# Ulrich Drepper <drepper@cygnus.com>, 1996.
#
# This file file be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
# serial 1
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN(AM_PATH_PROG_WITH_TEST,
[# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
AC_CACHE_VAL(ac_cv_path_$1,
[case "[$]$1" in
/*)
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in ifelse([$5], , $PATH, [$5]); do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
dnl If no 4th arg is given, leave the cache variable unset,
dnl so AC_PATH_PROGS will keep looking.
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
])dnl
;;
esac])dnl
$1="$ac_cv_path_$1"
if test -n "[$]$1"; then
AC_MSG_RESULT([$]$1)
else
AC_MSG_RESULT(no)
fi
AC_SUBST($1)dnl
])
######################################################################
# lcmessage.m4 from gettext 0.32
######################################################################
# Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
# This file file be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
# serial 1
AC_DEFUN(AM_LC_MESSAGES,
[if test $ac_cv_header_locale_h = yes; then
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
if test $am_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES)
fi
fi])
######################################################################
# gettext.m4 from gettext 0.32
######################################################################
# Macro to add for using GNU gettext.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
# This file file be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
# serial 3
AC_DEFUN(AM_WITH_NLS,
[AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
AC_ARG_ENABLE(nls,
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS)
USE_INCLUDED_LIBINTL=no
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
AC_DEFINE(ENABLE_NLS)
AC_MSG_CHECKING([whether included gettext is requested])
AC_ARG_WITH(included-gettext,
[ --with-included-gettext use the GNU gettext library included here],
nls_cv_force_use_gnu_gettext=$withval,
nls_cv_force_use_gnu_gettext=no)
AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
dnl User does not insist on using GNU NLS library. Figure out what
dnl to use. If gettext or catgets are available (in this order) we
dnl use this. Else we have to fall back to GNU NLS library.
dnl catgets is only used if permitted by option --with-catgets.
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE
AC_CHECK_HEADER(libintl.h,
[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
[AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
[AC_CACHE_CHECK([for gettext in libintl],
gt_cv_func_gettext_libintl,
[AC_TRY_LINK([], [return (int) gettext ("")],
gt_cv_func_gettext_libintl=yes,
gt_cv_func_gettext_libintl=no)])])
fi
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
if test "$MSGFMT" != "no"; then
AC_CHECK_FUNCS(dcgettext)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr],
[CATOBJEXT=.gmo
DATADIRNAME=share],
[CATOBJEXT=.mo
DATADIRNAME=lib])
INSTOBJEXT=.mo
fi
fi
])
if test "$CATOBJEXT" = "NONE"; then
AC_MSG_CHECKING([whether catgets can be used])
AC_ARG_WITH(catgets,
[ --with-catgets use catgets functions if available],
nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
AC_MSG_RESULT($nls_cv_use_catgets)
if test "$nls_cv_use_catgets" = "yes"; then
dnl No gettext in C library. Try catgets next.
AC_CHECK_LIB(i, main)
AC_CHECK_FUNC(catgets,
[AC_DEFINE(HAVE_CATGETS)
INTLOBJS="\$(CATOBJS)"
AC_PATH_PROG(GENCAT, gencat, no)dnl
if test "$GENCAT" != "no"; then
AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
if test "$GMSGFMT" = "no"; then
AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
fi
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
DATADIRNAME=lib
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi])
fi
fi
if test "$CATOBJEXT" = "NONE"; then
dnl Neither gettext nor catgets in included in the C library.
dnl Fall back on GNU gettext library.
nls_cv_use_gnu_gettext=yes
fi
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions used to generate GNU NLS library.
INTLOBJS="\$(GETTOBJS)"
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_SUBST(MSGFMT)
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INSTOBJEXT=.mo
DATADIRNAME=share
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
dnl Test whether we really found GNU xgettext.
if test "$XGETTEXT" != ":"; then
dnl If it is no GNU xgettext we define it as : so that the
dnl Makefiles still can work.
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
AC_MSG_RESULT(
[found xgettext programs is not GNU xgettext; ignore it])
XGETTEXT=":"
fi
fi
# We need to process the po/ directory.
POSUB=po
else
DATADIRNAME=share
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
# If this is used in GNU gettext we have to set USE_NLS to `yes'
# because some of the sources are only built for this goal.
if test "$PACKAGE" = gettext; then
USE_NLS=yes
USE_INCLUDED_LIBINTL=yes
fi
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
dnl in configure.in.
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
done
dnl Make all variables we use known to autoconf.
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT)
AC_SUBST(DATADIRNAME)
AC_SUBST(GMOFILES)
AC_SUBST(INSTOBJEXT)
AC_SUBST(INTLDEPS)
AC_SUBST(INTLLIBS)
AC_SUBST(INTLOBJS)
AC_SUBST(POFILES)
AC_SUBST(POSUB)
])
AC_DEFUN(AM_GNU_GETTEXT,
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_C_INLINE])dnl
AC_REQUIRE([AC_TYPE_OFF_T])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h values.h sys/param.h])
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
__argz_count __argz_stringify __argz_next])
if test "${ac_cv_func_stpcpy+set}" != "set"; then
AC_CHECK_FUNCS(stpcpy)
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
AC_DEFINE(HAVE_STPCPY)
fi
AM_LC_MESSAGES
AM_WITH_NLS
if test "x$CATOBJEXT" != "x"; then
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
AC_MSG_CHECKING(for catalogs to be installed)
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
esac
done
LINGUAS=$NEW_LINGUAS
AC_MSG_RESULT($LINGUAS)
fi
dnl Construct list of names of catalog files to be constructed.
if test -n "$LINGUAS"; then
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
fi
fi
dnl The reference to <locale.h> in the installed <libintl.h> file
dnl must be resolved because we cannot expect the users of this
dnl to define HAVE_LOCALE_H.
if test $ac_cv_header_locale_h = yes; then
INCLUDE_LOCALE_H="#include <locale.h>"
else
INCLUDE_LOCALE_H="\
/* The system does not provide the header <locale.h>. Take care yourself. */"
fi
AC_SUBST(INCLUDE_LOCALE_H)
dnl Determine which catalog format we have (if any is needed)
dnl For now we know about two different formats:
dnl Linux libc-5 and the normal X/Open format
test -d intl || mkdir intl
if test "$CATOBJEXT" = ".cat"; then
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
dnl Transform the SED scripts while copying because some dumb SEDs
dnl cannot handle comments.
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
fi
dnl po2tbl.sed is always needed.
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
dnl In the intl/Makefile.in we have a special dependency which makes
dnl only sense for gettext. We comment this out for non-gettext
dnl packages.
if test "$PACKAGE" = "gettext"; then
GT_NO="#NO#"
GT_YES=
else
GT_NO=
GT_YES="#YES#"
fi
AC_SUBST(GT_NO)
AC_SUBST(GT_YES)
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
dnl Try to locate is.
MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
if test -z "$MKINSTALLDIRS"; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
AC_SUBST(MKINSTALLDIRS)
dnl *** For now the libtool support in intl/Makefile is not for real.
l=
AC_SUBST(l)
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
else
posrcprefix="../"
fi
rm -f po/POTFILES
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
])
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="Gnumeric"
REQUIRED_AUTOMAKE_VERSION=1.7.2
REQUIRED_LIBTOOL_VERSION=1.4.3
# We use the XGETTEXT_KEYWORDS variable, thus we require:
REQUIRED_INTLTOOL_VERSION=0.29
# ... well, to be true, we need 0.34, but it's too early to require it.
# See below for details.
USE_GNOME2_MACROS=1
USE_COMMON_DOC_BUILD=yes
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
(test -f $srcdir/configure.in \
&& test -d $srcdir/src \
&& test -f $srcdir/src/gnumeric.h) || {
......@@ -17,6 +27,7 @@ REQUIRED_LIBTOOL_VERSION=1.4.3
ifs_save="$IFS"; IFS=":"
for dir in $PATH ; do
IFS="$ifs_save"
test -z "$dir" && dir=.
if test -f $dir/gnome-autogen.sh ; then
gnome_autogen="$dir/gnome-autogen.sh"
......@@ -24,7 +35,6 @@ for dir in $PATH ; do
break
fi
done
IFS="$ifs_save"
if test -z "$gnome_autogen" ; then
echo "You need to install the gnome-common module and make"
......@@ -32,4 +42,47 @@ if test -z "$gnome_autogen" ; then
exit 1
fi
REQUIRED_AUTOMAKE_VERSION=1.7.2 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . $gnome_autogen
GNOME_DATADIR="$gnome_datadir"
# Dont't run configure yet, ...
GNM_NOCONFIGURE=$NOCONFIGURE
NOCONFIGURE=1
. $gnome_autogen
# We want intltool 0.34.
# intltoolize 0.34 brings its own copy of Makefile.in.in, instead of the
# complicated system of patches. And it doesn't have "po/" hardwired in
# the .po.pox rule.
# In the meantime, we will force our own copy:
#
printbold "Creating po/Makefile.in.in."
rm -f $srcdir/po/Makefile.in.in $srcdir/po-functions/Makefile.in.in
cp $srcdir/po/Makefile.in.in.own $srcdir/po/Makefile.in.in
printbold "Creating po-functions/Makefile.in.in."
rm -f $srcdir/po-functions/Makefile.in.in
sed '/^\(GETTEXT_PACKAGE\|subdir\) =/s/[ ]*$/-functions/
/^GETTEXT_PACKAGE =/a\
XGETTEXT_KEYWORDS = --keyword --keyword=F_
' $srcdir/po/Makefile.in.in >$srcdir/po-functions/Makefile.in.in
printbold "Creating po-functions/POTFILES.{in,skip}."
rm -f $srcdir/po-functions/POTFILES.in $srcdir/po-functions/POTFILES.skip
for file in POTFILES.in POTFILES.skip; do
echo "# Generated by configure; do not edit." >$srcdir/po-functions/$file
done
test -f $srcdir/po/POTFILES.skip && \
sed <$srcdir/po/POTFILES.skip -e '/^#/d' >>$srcdir/po-functions/POTFILES.skip
awk '
/^[^#]/ {
skip = (/^((schemas|templates)\/.*|[^\/]*)\.in$/ || /\.(glade|xml)(\.in)?$/)
print >>("'$srcdir'/po-functions/POTFILES." (skip ? "skip" : "in"))
}
' $srcdir/po/POTFILES.in
# ... and then proceed.
if test "x$GNM_NOCONFIGURE" = x; then
printbold Running $srcdir/configure $conf_flags "$@" ...
$srcdir/configure $conf_flags "$@" \
&& echo Now type \`make\' to compile $PKG_NAME || exit 1
fi
......@@ -6,7 +6,7 @@ m4_define([gnumeric_version_major], [5])
m4_define([gnumeric_version_minor], [1])
m4_define([gnumeric_version_extra], [])
m4_define([gnumeric_full_version],
[gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor()gnumeric_version_extra])
[gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnumeric_version_extra])
dnl Emphasize some of the checks.
m4_define([BIG_CHECKING], [AC_MSG_CHECKING([
......@@ -24,8 +24,8 @@ AM_MAINTAINER_MODE
# Make --disable-static the default
AC_DISABLE_STATIC
# We need intltool >= 0.27.2 to extract the UTF-8 chars from source code
AC_PROG_INTLTOOL([0.27.2])
# We use the XGETTEXT_KEYWORDS variable, thus we need intltool >= 0.29:
AC_PROG_INTLTOOL([0.29])
AC_ISC_POSIX
AC_PROG_CC
......@@ -35,7 +35,8 @@ AC_PROG_LN_S
AM_PROG_LIBTOOL
AC_STDC_HEADERS
AC_SUBST(ACLOCAL_FLAGS)
dnl Propagate Gnome-specific variable ACLOCAL_FLAGS to Makefile.
AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
if test "$GCC" = "yes"; then
gcc_check=`$CC -v 2>&1 | grep '^gcc version 2\.96'`
......@@ -405,31 +406,32 @@ fi
AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE_INCS)
#check for guile 1.5
dnl check for guile 1.5
try_guile=false
guile_msg="disabled pending some guile developer interest"
enable_guile=false
dnl Comment out this block:
ifelse([
AC_ARG_WITH(guile,
[--{with,without}-guile Compile with Guile support or without it],
if test "x$withval" = xyes; then
try_guile=true
fi
)
dnl if $try_guile; then
dnl AC_MSG_CHECKING(for guile >= 1.5)
dnl if test "`guile -c '(display (string>=? (version) "1.4.1"))'`" != "#t"; then
dnl AC_MSG_RESULT([Your Guile is too old. You need Guile 1.5 or later.])
dnl else
dnl AC_MSG_RESULT(found)
dnl guile_msg="yes"
dnl enable_guile=true
dnl fi
dnl
dnl fi
dnl if $enable_guile; then
dnl GNOME_CHECK_GUILE
dnl fi
if $try_guile; then
AC_MSG_CHECKING(for guile >= 1.5)
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.])
else
AC_MSG_RESULT(found)
guile_msg="yes"
enable_guile=true
fi
fi
if $enable_guile; then
GNOME_CHECK_GUILE
fi
])
AM_CONDITIONAL(WITH_GUILE, $enable_guile)
dnl **************************************************
......@@ -505,28 +507,12 @@ AC_ARG_ENABLE(plugins,
AM_CONDITIONAL(PLUGIN_LIST_GIVEN, $plugin_list_given)
AC_SUBST(PLUGIN_LIST)
dnl **************************************************
dnl stolen from gtk+
AC_MSG_CHECKING(whether make is GNU Make)
STRIP_BEGIN=
STRIP_END=
if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
STRIP_END=')'
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
STRIP_DUMMY=
AC_SUBST(STRIP_DUMMY)
AC_SUBST(STRIP_BEGIN)
AC_SUBST(STRIP_END)
# i18n stuff
ifelse([
TRANSLATORS:
Please note that gtk+ has both po/ and po-functions/ directories.
Please note that gnumeric has both po/ and po-functions/ directories.
If you add a new language to ALL_LINGUAS, please make sure that both
po/ and po-functions/ have .po files that correspond to your language.
If you only add one to po/, the build will break in po-functions/.
......@@ -540,30 +526,50 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[The package name, for gettext]
)
AM_GLIB_GNU_GETTEXT
# Create po-functions/POTFILES.
dnl
dnl Note that po/POTFILES is also created by configure, not by config.status.
dnl In fact, it is created in two iterations: first step was done just above
dnl by AM_GLIB_GNU_GETTEXT, while the second step, which comes from
dnl intltool.m4, is executed just before the creation of config.status.
dnl (But po-functions/POTFILES is created in one step, here.)
[
test -d po-functions || mkdir po-functions
rm -f po-functions/POTFILES
case "$srcdir" in
dnl Code to handle po-functions/Makefile* and po-functions/POTFILES*
dnl
dnl First, let me document how the po/ directory is dealt with.
dnl Dark mysteries here, so skip the next paragraph if you don't have enough
dnl holy water at your hand. You have been warned.
dnl
dnl AM_GLIB_GNU_GETTEXT creates an incorrect incarnation of po/POTFILES, as
dnl glib-gettext.m4 doesn't know about intltool tags. Later on, just before
dnl config.status is created, a code originating from intltool.m4 creates
dnl POTFILES again, this time correctly removing the intltool tags.
dnl config.status then creates po/Makefile, again in two steps. First,
dnl po/Makefile.in is created from po/Makefile.in.in the usual way, and then
dnl a code registered via the obsolete macro AC_OUTPUT_COMMANDS insterts the
dnl contents of file POTFILES to po/Makefile.
dnl
dnl But both glib-gettext and intltool have the dirname "po/" hardwired, so
dnl we are on our own with po-functions.
dnl
dnl We use a more straightforward approach for po-functions:
dnl 1) We create POTFILES immediately here.
dnl 2) We let config.status to create Makefile.in.
dnl 3) We use AC_CONFIG_COMMANDS to create Makefile.
dnl
[# Create po-functions/POTFILES:
if test -d po-functions; then
rm -f po-functions/POTFILES
else
mkdir po-functions
fi
case "$srcdir" in
.) top_srcdir=.. ;;
[\\/]* | ?:[\\/]* ) # Absolute name.
top_srcdir="$srcdir" ;;
*) top_srcdir="../$srcdir" ;;
esac
sed <"$srcdir/po-functions/POTFILES.in" -e '/^#/d' -e 's/^[[].*[]] *//' \
esac
sed <$srcdir/po-functions/POTFILES.in -e '/^#/d' -e 's/^[[].*[]] *//' \
-e '/^[ ]*$/d' -e "s,^, $top_srcdir/," | \
sed -e '$!s/$/ \\/' >po-functions/POTFILES
]
AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-functions/Makefile.in*)
sed -e "/POTFILES =/r po-functions/POTFILES" po-functions/Makefile.in > po-functions/Makefile
esac])
dnl Finally, register for creation of po-functions/Makefile:
AC_CONFIG_COMMANDS(po-functions/Makefile,
[sed -e "/POTFILES =/r po-functions/POTFILES" \
po-functions/Makefile.in > po-functions/Makefile])
SAVE_LIBS="$LIBS"
LIBS="$LIBS $GNUMERIC_LIBS"
......@@ -804,14 +810,14 @@ AC_SUBST(PY_LIB_LOC)
AC_SUBST(PY_CFLAGS)
AC_SUBST(PY_EXTRA_LIBS)
dnl A tricky way to comment out in m4:
ifelse([
dnl **************************************************
dnl * Check for mono
dnl **************************************************
with_mono=no
mono_msg="disabled, still experimental"
dnl A tricky way to comment out in m4:
ifelse([
AC_ARG_WITH(mono, [--{with,without}-mono Compile the mono scripting engine])
case $with_mono in
no) mono_msg="Disabled by request";;
......@@ -823,11 +829,13 @@ no) mono_msg="Disabled by request";;
mono_msg=$with_mono
;;
esac
])
AM_CONDITIONAL(WITH_MONO, test "x$with_mono" = "xyes")
AC_SUBST(MONO_CFLAGS)
AC_SUBST(MONO_LIBS)
])
dnl A hack to silence intltools:
AM_CONDITIONAL(NEVER, false)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
......@@ -940,6 +948,7 @@ plugins/mps/Makefile
plugins/sample_datasource/Makefile
plugins/paradox/Makefile
plugins/uihello/Makefile
plugins/gb/Makefile
po/Makefile.in
po-functions/Makefile.in
schemas/Makefile
......
......@@ -844,7 +844,7 @@
<xsd:attribute name="Rrow" type="xsd:nonNegativeInteger" use="required"/>
<xsd:attribute name="Cols" type="xsd:positiveInteger" use="required"/>
<xsd:attribute name="Rows" type="xsd:positiveInteger" use="required"/>
<xsd:attribute name="Type" type="gmr:solver_contraint_t" use="required"/>
<xsd:attribute name="Type" type="gmr:solver_constraint_t" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
......@@ -865,7 +865,7 @@
<xsd:attribute name="ProgramR" type="xsd:boolean" use="required"/>
</xsd:complexType>
<xsd:simpleType name="solver_contraint_t">
<xsd:simpleType name="solver_constraint_t">
<xsd:restriction base="xsd:integer">
<xsd:enumeration value="0" /> <!-- none -->
<xsd:enumeration value="1" /> <!-- &lt;= -->
......