Commit 6bebab24 authored by Jody Goldberg's avatar Jody Goldberg

Initial port to gnome-2

parent 1c27e32d
......@@ -21,10 +21,9 @@ gnumeric.keys
gnumeric.spec
gnumeric.desktop
gnumeric.desktop.in
gnumericConf.sh
ID
tags
xml-i18n-*
intl
ABOUT-NLS
intltool-extract*
intltool-merge*
intltool-update*
GNOME_Gnumeric.oaf
......@@ -161,6 +161,10 @@ Long term breakage
: An optional stippled trim would be a nice addition for components to
indicate that you can click there for a menu.
- Add a warning when attempting to save using the suffix from a different saver.
eg saving .gnumeric as foo.xls
- Can we probe for .gzipped files to catch the misnaming ?
Dialogs
-------
- Function selector
......
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
* src/gui-file.c (can_try_save_to) : Use the new glib2 file utilities.
* src/gnumeric.h : remove the gnome-1.4 compatibility shims.
* src/gnumeric-pane.c (gnumeric_pane_realized) : renamed to be
consistent.
* src/gnumeric-graph.c (bonobo_activation_exception_id) : renamed from
oaf_exception_id.
(gnm_graph_setup) : begin conversion to bonobo-activation.
* src/gnumeric-canvas.c : disable the IM support for now.
* src/formats.c (currency_symbols) : pound, yen, euro -> utf8.
* src/format.c : no need for portability.h
* src/func.c : ditto.
* src/file.c (gnum_file_saver_setup) : disable mime for now.
* src/command-context.c : Inherit directly from GObject.
* src/commands.c : ditto.
* src/complete-sheet.c : ditto.
* src/complete.c : ditto.
* src/application.c : convert to new stock icon management.
* src/Makefile.am : remove portability.h.
Add pixmaps subdir.
Build marshallers.
* Makefile.am : Convert to intltool.
* acconfig.h : Convert to gnome2 gettext format.
* .cvsignore : Convert to intltool, and remove the Conf file.
* src/.cvsignore : Update.
* autogen.sh : Convert to gnome2.
* configure.in : Rough conversion to gnome2. We'll need to re-enable
the plugins.
* idl/GNOME_Gnumeric.idl : Delete an unused interface.
* idl/Makefile.am (dist) : update.
* plugins/Makefile.am : Use WITH_GUILE rather than just GUILE to be
consistent.
* plugins/*/Makefile.am : Convert to intltool.
2002-01-22 Jody Goldberg <jody@gnome.org>
* src/sheet-autofill.c (autofill_create_fill_items) : Use
......
SUBDIRS = . intl po macros idl src plugins doc icons templates tools omf-install
SUBDIRS = . po idl src plugins doc icons templates tools omf-install
XML_I18N_XML_KIND = --pass-through
......@@ -20,16 +20,16 @@ appicon_DATA = gnome-gnumeric.png \
Applicationsdir = $(datadir)/gnome/apps/Applications
Applications_in_files = gnumeric.desktop.in
Applications_DATA = gnumeric.desktop
@XML_I18N_MERGE_DESKTOP_RULE@
@INTLTOOL_DESKTOP_RULE@
gnewdir = $(datadir)/mc/templates
gnew_in_files = gnumeric.desktop.in
gnew_DATA = gnumeric.desktop
@XML_I18N_MERGE_DESKTOP_RULE@
@INTLTOOL_DESKTOP_RULE@
Mimedir = $(datadir)/mime-info
Mime_DATA = gnumeric.keys gnumeric.mime
@XML_I18N_MERGE_OAF_RULE@
@INTLTOOL_OAF_RULE@
oafdir = $(datadir)/oaf
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
......@@ -40,12 +40,12 @@ EXTRA_DIST = \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
gnumeric.xsd \
README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs) \
xml-i18n-extract.in \
xml-i18n-merge.in \
xml-i18n-update.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
$(oaf_in_files)
if BONOBO
if WITH_BONOBO
gnumeric_version="$(VERSION)-bonobo"
else
gnumeric_version="$(VERSION)"
......
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
* src/gui-file.c (can_try_save_to) : Use the new glib2 file utilities.
* src/gnumeric.h : remove the gnome-1.4 compatibility shims.
* src/gnumeric-pane.c (gnumeric_pane_realized) : renamed to be
consistent.
* src/gnumeric-graph.c (bonobo_activation_exception_id) : renamed from
oaf_exception_id.
(gnm_graph_setup) : begin conversion to bonobo-activation.
* src/gnumeric-canvas.c : disable the IM support for now.
* src/formats.c (currency_symbols) : pound, yen, euro -> utf8.
* src/format.c : no need for portability.h
* src/func.c : ditto.
* src/file.c (gnum_file_saver_setup) : disable mime for now.
* src/command-context.c : Inherit directly from GObject.
* src/commands.c : ditto.
* src/complete-sheet.c : ditto.
* src/complete.c : ditto.
* src/application.c : convert to new stock icon management.
* src/Makefile.am : remove portability.h.
Add pixmaps subdir.
Build marshallers.
* Makefile.am : Convert to intltool.
* acconfig.h : Convert to gnome2 gettext format.
* .cvsignore : Convert to intltool, and remove the Conf file.
* src/.cvsignore : Update.
* autogen.sh : Convert to gnome2.
* configure.in : Rough conversion to gnome2. We'll need to re-enable
the plugins.
* idl/GNOME_Gnumeric.idl : Delete an unused interface.
* idl/Makefile.am (dist) : update.
* plugins/Makefile.am : Use WITH_GUILE rather than just GUILE to be
consistent.
* plugins/*/Makefile.am : Convert to intltool.
2002-01-22 Jody Goldberg <jody@gnome.org>
* src/sheet-autofill.c (autofill_create_fill_items) : Use
......
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
* src/gui-file.c (can_try_save_to) : Use the new glib2 file utilities.
* src/gnumeric.h : remove the gnome-1.4 compatibility shims.
* src/gnumeric-pane.c (gnumeric_pane_realized) : renamed to be
consistent.
* src/gnumeric-graph.c (bonobo_activation_exception_id) : renamed from
oaf_exception_id.
(gnm_graph_setup) : begin conversion to bonobo-activation.
* src/gnumeric-canvas.c : disable the IM support for now.
* src/formats.c (currency_symbols) : pound, yen, euro -> utf8.
* src/format.c : no need for portability.h
* src/func.c : ditto.
* src/file.c (gnum_file_saver_setup) : disable mime for now.
* src/command-context.c : Inherit directly from GObject.
* src/commands.c : ditto.
* src/complete-sheet.c : ditto.
* src/complete.c : ditto.
* src/application.c : convert to new stock icon management.
* src/Makefile.am : remove portability.h.
Add pixmaps subdir.
Build marshallers.
* Makefile.am : Convert to intltool.
* acconfig.h : Convert to gnome2 gettext format.
* .cvsignore : Convert to intltool, and remove the Conf file.
* src/.cvsignore : Update.
* autogen.sh : Convert to gnome2.
* configure.in : Rough conversion to gnome2. We'll need to re-enable
the plugins.
* idl/GNOME_Gnumeric.idl : Delete an unused interface.
* idl/Makefile.am (dist) : update.
* plugins/Makefile.am : Use WITH_GUILE rather than just GUILE to be
consistent.
* plugins/*/Makefile.am : Convert to intltool.
2002-01-22 Jody Goldberg <jody@gnome.org>
* src/sheet-autofill.c (autofill_create_fill_items) : Use
......
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
* src/gui-file.c (can_try_save_to) : Use the new glib2 file utilities.
* src/gnumeric.h : remove the gnome-1.4 compatibility shims.
* src/gnumeric-pane.c (gnumeric_pane_realized) : renamed to be
consistent.
* src/gnumeric-graph.c (bonobo_activation_exception_id) : renamed from
oaf_exception_id.
(gnm_graph_setup) : begin conversion to bonobo-activation.
* src/gnumeric-canvas.c : disable the IM support for now.
* src/formats.c (currency_symbols) : pound, yen, euro -> utf8.
* src/format.c : no need for portability.h
* src/func.c : ditto.
* src/file.c (gnum_file_saver_setup) : disable mime for now.
* src/command-context.c : Inherit directly from GObject.
* src/commands.c : ditto.
* src/complete-sheet.c : ditto.
* src/complete.c : ditto.
* src/application.c : convert to new stock icon management.
* src/Makefile.am : remove portability.h.
Add pixmaps subdir.
Build marshallers.
* Makefile.am : Convert to intltool.
* acconfig.h : Convert to gnome2 gettext format.
* .cvsignore : Convert to intltool, and remove the Conf file.
* src/.cvsignore : Update.
* autogen.sh : Convert to gnome2.
* configure.in : Rough conversion to gnome2. We'll need to re-enable
the plugins.
* idl/GNOME_Gnumeric.idl : Delete an unused interface.
* idl/Makefile.am (dist) : update.
* plugins/Makefile.am : Use WITH_GUILE rather than just GUILE to be
consistent.
* plugins/*/Makefile.am : Convert to intltool.
2002-01-22 Jody Goldberg <jody@gnome.org>
* src/sheet-autofill.c (autofill_create_fill_items) : Use
......
#undef PACKAGE
#undef GETTEXT_PACKAGE
#undef VERSION
#undef GNUMERIC_VERSION
#undef GNUMERIC_PREFIX
#undef HAVE_LIBSM
#undef ENABLE_NLS
#undef HAVE_CATGETS
......@@ -19,8 +23,4 @@
#undef HAVE_PSPELL
#undef ENABLE_EVOLUTION
#undef GNUMERIC_VERSION
#undef USE_WM_ICONS
@BOTTOM@
......@@ -6,6 +6,14 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="Gnumeric"
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="Gnumeric"
(test -f $srcdir/configure.in \
&& test -d $srcdir/src \
&& test -f $srcdir/src/gnumeric.h) || {
......@@ -24,4 +32,21 @@ if libtool --version >/dev/null 2>&1; then
fi
fi
. $srcdir/macros/autogen.sh
ifs_save="$IFS"; IFS=":"
for dir in $PATH ; do
test -z "$dir" && dir=.
if test -f $dir/gnome-autogen.sh ; then
gnome_autogen="$dir/gnome-autogen.sh"
gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
break
fi
done
IFS="$ifs_save"
if test -z "$gnome_autogen" ; then
echo "You need to install the gnome-common module and make"
echo "sure the gnome-autogen.sh script is in your \$PATH."
exit 1
fi
GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen
AC_INIT(src/gnumeric.h)
AM_CONFIG_HEADER(gnumeric-config.h)
AM_INIT_AUTOMAKE(gnumeric,1.0.4)
AM_INIT_AUTOMAKE(gnumeric,1.1.0)
AM_MAINTAINER_MODE
GNOME_COMMON_INIT
GNOME_PLATFORM_GNOME_2(yes, force)
# Make --disable-static the default
AC_DISABLE_STATIC
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_YACC
AM_PROG_LEX
AM_PROG_LIBTOOL
AC_PROG_INTLTOOL
AM_PROG_LIBTOOL
AC_STDC_HEADERS
AC_ARG_PROGRAM
AM_PROG_LIBTOOL
GNOME_INIT
AM_PATH_GTK(1.2.7)
PKG_CHECK_MODULES(GNUMERIC,[
glib-2.0 >= 1.3.10
gtk+-2.0 >= 1.3.10
gal-2.0 >= 0.0.0
libgnome-2.0 >= 1.105.0
libgnomeui-2.0 >= 1.106.0
libbonobo-2.0 >= 1.106.0
libbonoboui-2.0 >= 1.106.0
libgnomeprint-2.0 >= 1.106.0
libgnomeprintui-2.0 >= 1.106.0
libglade-2.0 >= 1.99.4
libxml-2.0 >= 2.4.12
libole2-2.0 >= 1.3.0
])
AC_SUBST(GNUMERIC_LIBS)
AC_SUBST(GNUMERIC_CFLAGS)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
## this should come after `AC_PROG_CC'
GNOME_COMPILE_WARNINGS
......@@ -60,28 +82,6 @@ else
AC_MSG_RESULT($need_bsd)
fi
GNOME_X_CHECKS
GNOME_XML_CHECK
dnl
dnl alloca tests
dnl
dnl with autoconf 2.50 and later, the cache value changed,
dnl so we test against both possible cache values -- if either of them
dnl are yes, then we know we have a usable alloca.h
dnl
AC_FUNC_ALLOCA
if test X"$ac_cv_header_alloca_h" = X"yes" \
|| test X"$ac_cv_working_alloca_h" = X"yes" ; then
GNUMERIC_HAVE_ALLOCA_H=1
else
GNUMERIC_HAVE_ALLOCA_H=0
fi
AC_SUBST(GNUMERIC_HAVE_ALLOCA_H)
AC_SUBST(QTTHREADS_LIB)
AC_SUBST(TERMCAP_LIB)
AC_SUBST(READLINE_LIB)
AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE_INCS)
guile_msg='not requested'
......@@ -89,7 +89,7 @@ guile_msg='not requested'
#check for guile 1.5
try_guile=true
guile_msg="no"
build_guile=false
with_guile=false
AC_ARG_WITH(guile,
[--{with,without}-guile Compile with Guile support or without it],
if test x$withval = xno; then
......@@ -104,21 +104,17 @@ if $try_guile; then
else
AC_MSG_RESULT(found)
guile_msg="yes"
build_guile=true
with_guile=true
fi
fi
AM_CONDITIONAL(HAVE_GUILE, $build_guile)
AM_CONDITIONAL(WITH_GUILE, $with_guile)
if $build_guile; then
if $with_guile; then
GNOME_CHECK_GUILE
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
dnl **************************************************
dnl * psiconv support
dnl **************************************************
......@@ -141,17 +137,36 @@ if test "$want_psiconv" = "yes"; then
AM_CONDITIONAL(WITH_PSICONV,$with_psiconv)
fi
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)
dnl **************************************************
dnl * internationalization support
dnl **************************************************
dnl
dnl
dnl Check doc/translating.sgml for a description of how to translate
dnl and why we have so many translations.
dnl
ALL_LINGUAS="ca cs da de en_AU en_CA en_GB el es et fi fr ga gl hr hu it ja ko nl nn no pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
AM_GNOME_GETTEXT
GETTEXT_PACKAGE=gnumeric
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
AM_GLIB_GNU_GETTEXT
# AM_GNOME_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
......@@ -194,35 +209,6 @@ dnl we need iconv for translating to/from locale's charset when
dnl reading/writing Excel files
AC_CHECK_HEADERS(iconv.h)
dnl **************************************************
dnl * ORBit support
dnl **************************************************
GNOMEGNORBA_LIBS="$GNOMEGNORBA_LIBS"
AC_SUBST(GNOMEGNORBA_LIBS)
dnl ******************************
dnl gnome-xml checking
dnl ******************************
AC_MSG_CHECKING(for libxml (aka gnome-xml) libraries 1.8.14 <= version < 2.0.0 )
if xml-config --libs > /dev/null 2>&1; then
verstxt=`xml-config --version`
vers=`echo "$verstxt" | sed -e "s/libxml //" | \
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$vers" -ge 1008014; then
if test "$vers" -lt 2000000; then
AC_MSG_RESULT($marker_ok found $verstxt)
else
AC_MSG_RESULT($marker_fail found unsupported $verstxt)
AC_MSG_ERROR(This version of Gnumeric does not support libxml (aka gnome-xml) 2.x.x yet.)
fi
else
AC_MSG_RESULT($marker_fail found only $verstxt)
AC_MSG_ERROR(You need at least libxml (aka gnome-xml) 1.8.14)
fi
else
AC_MSG_RESULT($marker_fail not found)
fi
dnl **************************************************
dnl * Check for Perl
dnl **************************************************
......@@ -327,79 +313,17 @@ else
AM_CONDITIONAL(WITH_PYTHON, false)
fi
dnl Check for libole2
AC_MSG_CHECKING(for libole2 >= 0.2.4 )
libole2_ok=no
if gnome-config --libs libole2 > /dev/null 2>&1; then
verstxt=`gnome-config --modversion libole2`
vers=`echo "$verstxt" | sed -e "s/^libole2-//" | \
awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
if test "$vers" -ge 204; then
AC_MSG_RESULT($marker_ok found $verstxt)
libole2_ok=yes
else
AC_MSG_RESULT($marker_fail found only $verstxt)
fi
else
AC_MSG_RESULT($marker_fail not found)
fi
if test "$libole2_ok" = no; then
AC_MSG_ERROR(This version of gnumeric requires an external
libole2 library the latest version can be obtained from
ftp://ftp.gnome.org/pub/GNOME/unstable/sources/libole2/
)
fi
unset libole2_ok
dnl ******************************
dnl Check for Bonobo
dnl ******************************
try_bonobo=true
bonobo=
bonobo_msg=no
bonobo_suffix=
have_bonobo=false
enable_bonobo=true
bonobo_msg=yes
AC_ARG_WITH(bonobo,
[--{with,without}-bonobo Compile with Bonobo support or without it],
if test x$withval = xno; then
try_bonobo=false
[--{with,without}-bonobo Use the bonobo UI routines],
if test "x$withval" = xno; then
enable_bonobo=false
bonobo_msg=disabled
fi
)
if $try_bonobo; then
AC_MSG_CHECKING(for Bonobo >= 1.0.9 )
if gnome-config --libs bonobo > /dev/null 2>&1; then
verstxt=`gnome-config --modversion bonobo`
vers=`echo "$verstxt" | sed -e "s/^bonobo-//" | \
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
else
verstxt="-"
vers=0
fi
if test "$vers" -ge 1000009; then
AC_MSG_RESULT($marker_ok found $verstxt)
AM_PATH_OAF(0.6.2,,AC_MSG_ERROR([OAF not found or too old]))
if test x"$OAF_CFLAGS" != "x" ; then
AC_DEFINE(ENABLE_BONOBO)
have_bonobo=true
bonobo=bonobox_print
bonobo_msg=yes
bonobo_suffix=-bonobo
fi
else
if test "$vers" -eq 0; then
AC_MSG_RESULT($marker_no not found)
else
AC_MSG_RESULT($marker_no found only $verstxt)
fi
fi
fi
gnumeric_bonobo_enabled=$bonobo_msg
AM_CONDITIONAL(BONOBO, $have_bonobo)
gnumeric_bonobo_enabled=$enable_bonobo
AM_CONDITIONAL(WITH_BONOBO, $enable_bonobo)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
......@@ -415,6 +339,7 @@ gnumeric_autoformatdir="${gnumeric_datadir}/autoformat-templates"
dnl Export to gnumeric-config.h
AC_DEFINE_UNQUOTED(GNUMERIC_VERSION, "$gnumeric_version")
AC_DEFINE_UNQUOTED(GNUMERIC_PREFIX, "$gnumeric_prefix")
AC_SUBST(gnumeric_prefix)
AC_SUBST(gnumeric_exec_prefix)
......@@ -426,157 +351,11 @@ AC_SUBST(gnumeric_gladedir)
AC_SUBST(gnumeric_autoformatdir)
AC_SUBST(gnumeric_bonobo_enabled)
dnl ******************************
dnl Check for GB
dnl ******************************
try_gb=true
gb=
gb_msg=no
have_gb=false
GB_CFLAGS=
GB_LIBS=
AC_ARG_WITH(gb,
[--{with,without}-gb Compile with Gb support or without it],
if test x$withval = xno; then
try_gb=false
fi
)
if $try_gb; then
AC_MSG_CHECKING(for Gb == 0.0.17 )
if gnome-config --libs gb > /dev/null 2>&1; then
verstxt=`gnome-config --modversion gb 2>/dev/null`
vers=`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
if test "$vers" -eq 000017; then
AC_MSG_RESULT($marker_ok found $verstxt)
AC_DEFINE(ENABLE_GB)
GB_LIBS=`gnome-config --libs gb`
GB_CFLAGS=`gnome-config --cflags gb`
have_gb=true
gb=gb
g