From cd6da3a0c9804ca8c75b69d47e16ca67847c0b1f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 6 Jan 2003 14:16:59 +0000 Subject: Use "Evolution", not "evolution", since that becomes the value of the * configure.in (AC_INIT): Use "Evolution", not "evolution", since that becomes the value of the PACKAGE variable (privlibdir): parse $VERSION by hand since. EVOLUTION_MAJOR_VERSION, etc aren't defined any more (and trying to pass a variable to AC_INIT won't work). This and the above change fix the problem that privlibdir was being defined as "${libdir}/Evolution/." instead of "${libdir}/evolution/1.3" (GAL_VERSION): AC_SUBST this since it's needed in the .pc files (idldir): define this here rather than in each Makefile.am that needs it. (AC_OUTPUT): Add .pc files * Makefile.am (pkgconfig_DATA): Add pc files. (confexec_DATA): Remove this (fooConf.sh files) (SUBDIRS): Move filter earlier in the build. (I think it was calendar that depends on it now?) (%Conf.sh): Remove this. The .pc files are output by configure.in now. * camel.pc.in, evolution-addressbook.pc.in, evolution-calendar.pc.in, evolution-shell.pc.in: Replace the *Conf.sh files with these. In addition to the basic variables, include camel_providerdir (in camel.pc) and idldir, IDL_INCLUDES and privlibdir (in the others). svn path=/trunk/; revision=19241 --- camelConf.sh.in | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 camelConf.sh.in (limited to 'camelConf.sh.in') diff --git a/camelConf.sh.in b/camelConf.sh.in deleted file mode 100644 index f89d08872f..0000000000 --- a/camelConf.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Configuration file for using Camel in GNOME applications -# -CAMEL_LIBDIR="@EVOLUTION_LIBDIR@" - -# We need e-util... -CAMEL_INCLUDEDIR="@CAMEL_INCLUDEDIR@ @EVOLUTION_INCLUDEDIR@ @CAMEL_CFLAGS@" -CAMEL_LIBS="-lcamel @CAMEL_LIBS@" - -MODULE_VERSION="camel-@VERSION@" -- cgit