Commit 98cee657 authored by Lutz Müller's avatar Lutz Müller Committed by Lutz Müller

#undef ENABLE_EVOLUTION Checks for Evolution-Composer.idl. Can be

2001-07-09  Lutz Müller <urc8@rz.uni-karlsruhe.de>

        * acconfig.h: #undef ENABLE_EVOLUTION
        * configure.in: Checks for Evolution-Composer.idl. Can be overwritten
        with --without-evolution.
        * idl/Makefile.am: Let orbit process the Evolution-Composer.idl.
        * idl/.cvsignore: Ignore the generated Evolution* files.
parent e592a39d
......@@ -16,6 +16,7 @@
#undef HAVE_IEEEFP_H
#undef ENABLE_GNOME
#undef HAVE_PSPELL
#undef ENABLE_EVOLUTION
#undef GNUMERIC_VERSION
......
......@@ -509,6 +509,28 @@ dnl fi
AC_SUBST(PSPELL_LIBS)
dnl AM_CONDITIONAL(HAVE_PSPELL, $have_pspell)
dnl ******************************
dnl Check for Evolution
dnl ******************************
try_evolution=$have_bonobo
evolution=no
AC_ARG_WITH(evolution,
[--{with,without}-evolution Use evolution to send images (bonobo needed).],
if test x$withval=xno; then
try_evolution=false
fi
)
if $try_evolution; then
path_to_composer_idl=`gnome-config --datadir`/idl/Evolution-Composer.idl
AC_CHECK_FILE($path_to_composer_idl, evolution=yes, evolution=no)
if test x$evolution=xyes; then
AC_DEFINE(ENABLE_EVOLUTION)
AM_CONDITIONAL(ENABLE_EVOLUTION, true)
else
AM_CONDITIONAL(ENABLE_EVOLUTION, false)
fi
fi
dnl ******************************
dnl Check for Applix SHELF
dnl ******************************
......@@ -553,7 +575,7 @@ dnl Check for libgda
dnl ****************************
try_gda=true
AC_ARG_WITH(gda,
[--{with,without}-gda Compile the Gnome Database Access plugin],
[--{with,without}-gda Compile the Gnome Database Access plugin],
if test x$withval = xno; then
try_gda=false
fi
......@@ -649,6 +671,7 @@ Configuration:
Compiler: ${CC}
Bonobo Support: ${bonobo_msg}
Evolution Support: $evolution
GB Support: ${gb_msg}
"
......
......@@ -11,3 +11,4 @@ gnumeric-graphs-common.c
gnumeric-graphs-skels.c
gnumeric-graphs-stubs.c
my_gnumeric_graphs_idl
Evolution*
......@@ -15,13 +15,24 @@ GNUMERIC_GENERATED = \
Gnumeric-stubs.c \
Gnumeric.h
if ENABLE_EVOLUTION
EVOLUTION_GENERATED = \
Evolution-Composer.h \
Evolution-Composer-common.c \
Evolution-Composer-skels.c \
Evolution-Composer-stubs.c
endif
GNUMERIC_GRAPHS_GENERATED = \
gnumeric-graphs-common.c \
gnumeric-graphs-skels.c \
gnumeric-graphs-stubs.c \
gnumeric-graphs.h
libGnumericIDL_a_SOURCES = $(GNUMERIC_GENERATED) $(GNUMERIC_GRAPHS_GENERATED)
libGnumericIDL_a_SOURCES = \
$(GNUMERIC_GENERATED) \
$(GNUMERIC_GRAPHS_GENERATED) \
$(EVOLUTION_GENERATED)
$(GNUMERIC_GENERATED): $(srcdir)/Gnumeric.idl
orbit-idl -I$(srcdir) $(IDL_FLAGS) $(srcdir)/Gnumeric.idl
......@@ -31,12 +42,17 @@ $(GNUMERIC_GRAPHS_GENERATED): $(srcdir)/gnumeric-graphs.idl
orbit-idl -I$(srcdir) $(IDL_FLAGS) $(srcdir)/gnumeric-graphs.idl
touch my_gnumeric_graphs_idl
$(EVOLUTION_GENERATED):
$(ORBIT_IDL) `$(GNOME_CONFIG) --datadir`/idl/Evolution-Composer.idl
idldir = $(gnumeric_datadir)/idl
idl_DATA = gnumeric-graphs.idl Gnumeric.idl
EXTRA_DIST = $(idl_DATA)
BUILT_SOURCES = $(EVOLUTION_GENERATED)
CLEANFILES += my_gnumeric_idl $(GNUMERIC_GENERATED) \
my_gnumeric_graphs_idl $(GNUMERIC_GRAPHS_GENERATED)
my_gnumeric_graphs_idl $(GNUMERIC_GRAPHS_GENERATED) \
$(BUILT_SOURCES)
dist-hook :
cd $(distdir) && rm -f $(CLEANFILES)
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