diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | camel.pc.in | 13 | ||||
| -rw-r--r-- | camelConf.sh.in | 10 | ||||
| -rw-r--r-- | configure.in | 51 | ||||
| -rw-r--r-- | evolution-addressbook.pc.in | 16 | ||||
| -rw-r--r-- | evolution-calendar.pc.in | 16 | ||||
| -rw-r--r-- | evolution-shell.pc.in | 16 | ||||
| -rw-r--r-- | evolution_addressbookConf.sh.in | 10 | ||||
| -rw-r--r-- | evolution_calendarConf.sh.in | 10 | ||||
| -rw-r--r-- | evolution_shellConf.sh.in | 10 |
12 files changed, 119 insertions, 98 deletions
diff --git a/.cvsignore b/.cvsignore index 41579e4948..0af925edd0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -24,4 +24,4 @@ xlibtool xltmain.sh evolution.spec intltool-* -*Conf.sh +*.pc @@ -1,3 +1,30 @@ +2003-01-06 Dan Winship <danw@ximian.com> + + * 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). + 2002-12-04 Ettore Perazzoli <ettore@ximian.com> * configure.in: Define COMPONENT_DIR. diff --git a/Makefile.am b/Makefile.am index 05b24c0f11..f059374d8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,12 @@ changelogs = \ ChangeLog -confexecdir = $(libdir) -confexec_DATA = \ - camelConf.sh \ - evolution_shellConf.sh \ - evolution_addressbookConf.sh \ - evolution_calendarConf.sh +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = \ + camel.pc \ + evolution-shell.pc \ + evolution-addressbook.pc \ + evolution-calendar.pc EXTRA_DIST = \ AUTHORS \ @@ -20,7 +20,7 @@ EXTRA_DIST = \ xml-i18n-merge.in \ xml-i18n-update.in \ xml-i18n-extract.in \ - $(confexec_DATA:.sh=.sh.in) + $(pkgconfig_DATA:.pc=.pc.in) SUBDIRS = \ data \ @@ -30,12 +30,12 @@ SUBDIRS = \ widgets \ shell \ camel \ + filter \ libwombat \ addressbook \ calendar \ my-evolution \ art \ - filter \ composer \ mail \ ui \ @@ -46,26 +46,6 @@ SUBDIRS = \ # omf-install -%Conf.sh: %Conf.sh.in Makefile - sed -e 's?\@EVOLUTION_LIBDIR\@?$(EVOLUTION_LIBDIR)?g' \ - -e 's?\@EVOLUTION_DATADIR\@?$(EVOLUTION_DATADIR)?g' \ - -e 's?\@EVOLUTION_INCLUDEDIR\@?$(EVOLUTION_INCLUDEDIR)?g' \ - -e 's?\@CAMEL_INCLUDEDIR\@?$(CAMEL_INCLUDEDIR)?g' \ - -e 's?\@VERSION\@?$(VERSION)?g' \ - -e 's?\@privlibdir\@?$(privlibdir)?g' \ - -e 's?\@SHELL_LIBS\@?$(SHELL_LIBS)?g' \ - -e 's?\@SHELL_CFLAGS\@?$(SHELL_CFLAGS)?g' \ - -e 's?\@CAMEL_LIBS\@?$(CAMEL_LIBS)?g' \ - -e 's?\@CAMEL_CFLAGS\@?$(CAMEL_CFLAGS)?g' \ - -e 's?\@LDAP_LIBS\@?$(LDAP_LIBS)?g' \ - -e 's?\@LDAP_CFLAGS\@?$(LDAP_CFLAGS)?g' \ - -e 's?\@EVOLUTION_ADDRESSBOOK_LIBS\@?$(EVOLUTION_ADDRESSBOOK_LIBS)?g' \ - -e 's?\@EVOLUTION_ADDRESSBOOK_CFLAGS\@?$(EVOLUTION_ADDRESSBOOK_CFLAGS)?g' \ - -e 's?\@EVOLUTION_CALENDAR_LIBS\@?$(EVOLUTION_CALENDAR_LIBS)?g' \ - -e 's?\@EVOLUTION_CALENDAR_CFLAGS\@?$(EVOLUTION_CALENDAR_CFLAGS)?g' \ - < $(srcdir)/$< > $@.tmp \ - && mv $@.tmp $@ - # CDE Stuff if HAVE_DTAPPINTEGRATE diff --git a/camel.pc.in b/camel.pc.in new file mode 100644 index 0000000000..8e637b9ba1 --- /dev/null +++ b/camel.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +camel_providerdir=@camel_providerdir@ + +Name: camel +Description: the Evolution mail library +Version: @VERSION@ +Requires: gal-2.0 >= @GAL_VERSION@ +Libs: -L${libdir} -lcamel +Cflags: -I${includedir} 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@" diff --git a/configure.in b/configure.in index 20c6903831..33c1da7e6d 100644 --- a/configure.in +++ b/configure.in @@ -1,27 +1,12 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(Evolution, 1.3.0.99, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) +AC_INIT(evolution, 1.3.0.99, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) AC_CONFIG_SRCDIR(README) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) -if test -f libversit/CVS/Repository; then - case `cat libversit/CVS/Repository` in - gnome-pim*) - echo "" - echo "ERROR: CVS working directory is out of date" - echo "Please do:" - echo " rm -rf libversit" - echo " cvs update -d libversit" - echo " automake libversit/Makefile" - echo "and try again. We apologize for the inconvenience" - exit 1 - ;; - esac -fi - AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(VERSION_COMMENT, "(Preview Release)") @@ -1041,6 +1026,7 @@ dnl --- Flags to get all the GNOME stuff dnl --- We require at least this version of GAL. GAL_VERSION=0.0.9.99 +AC_SUBST(GAL_VERSION) FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-2.0 >= $GAL_VERSION" @@ -1119,16 +1105,6 @@ dnl AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS) dnl --- evolution-mail flags -dnl ****************************** -dnl Versioned library files -dnl ****************************** - -privlibdir='$(pkglibdir)/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION -AC_SUBST(privlibdir) - -camel_providerdir="$privlibdir/camel-providers" -AC_SUBST(camel_providerdir) - EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 soup-2.0 libgnomeprint-2.0 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) @@ -1139,6 +1115,19 @@ EVO_SET_COMPILE_FLAGS(WOMBAT, libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS) AC_SUBST(WOMBAT_CFLAGS) AC_SUBST(WOMBAT_LIBS) +dnl ******************* +dnl Special directories +dnl ******************* + +privlibdir='${libdir}'/evolution/`echo $VERSION | awk -F. '{print $1 "." $2;}'` +AC_SUBST(privlibdir) + +camel_providerdir="$privlibdir/camel-providers" +AC_SUBST(camel_providerdir) + +idldir="$datadir/idl" +AC_SUBST(idldir) + ################################################## # Check for gtk-doc. ################################################## @@ -1222,9 +1211,9 @@ fi AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x) AC_SUBST(KDE_APPLNK_DIR) -dnl ****************************** -dnl foo for *Conf.sh.in -dnl ****************************** +dnl *********************** +dnl foo for pkgconfig files +dnl *********************** EVOLUTION_LIBDIR="-L${libdir}" EVOLUTION_DATADIR="${datadir}" @@ -1333,6 +1322,10 @@ calendar/importers/Makefile composer/Makefile mail/Makefile mail/importers/Makefile +evolution-shell.pc +evolution-addressbook.pc +evolution-calendar.pc +camel.pc ]) if test "x$with_sub_version" != "x"; then diff --git a/evolution-addressbook.pc.in b/evolution-addressbook.pc.in new file mode 100644 index 0000000000..dfdf85412b --- /dev/null +++ b/evolution-addressbook.pc.in @@ -0,0 +1,16 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +idldir=@idldir@ +IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ + +privlibdir=@privlibdir@ + +Name: evolution-addressbook +Description: libraries needed for Evolution addressbook backends +Version: @VERSION@ +Requires: gconf-2.0 libbonobo-2.0 gal-2.0 >= @GAL_VERSION@ libgnome-2.0 camel = @VERSION@ +Libs: -L${libdir} -L${privlibdir} -lpas -lebook -lename -lversit +Cflags: -I${includedir}/evolution diff --git a/evolution-calendar.pc.in b/evolution-calendar.pc.in new file mode 100644 index 0000000000..d4478294a4 --- /dev/null +++ b/evolution-calendar.pc.in @@ -0,0 +1,16 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +idldir=@idldir@ +IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ + +privlibdir=@privlibdir@ + +Name: evolution-calendar +Description: libraries needed for Evolution calendar backends +Version: @VERSION@ +Requires: libgnome-2.0 libbonobo-2.0 gal-2.0 >= @GAL_VERSION@ gnome-vfs-2.0 +Libs: -L${libdir} -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil +Cflags: -I${includedir}/evolution diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in new file mode 100644 index 0000000000..c27f9f1819 --- /dev/null +++ b/evolution-shell.pc.in @@ -0,0 +1,16 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +idldir=@idldir@ +IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ + +privlibdir=@privlibdir@ + +Name: evolution-shell +Description: libraries needed for Evolution shell components +Version: @VERSION@ +Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= @GAL_VERSION@ +Libs: -L${libdir} -leshell +Cflags: -I${includedir}/evolution diff --git a/evolution_addressbookConf.sh.in b/evolution_addressbookConf.sh.in deleted file mode 100644 index 0aee3050c8..0000000000 --- a/evolution_addressbookConf.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Configuration file for using the Evolution Personal Addressbook Server library in GNOME applications -# -EVOLUTION_ADDRESSBOOK_LIBDIR="@EVOLUTION_LIBDIR@" -EVOLUTION_ADDRESSBOOK_DATADIR="@EVOLUTION_DATADIR@" - -EVOLUTION_ADDRESSBOOK_INCLUDEDIR="@EVOLUTION_INCLUDEDIR@ @EVOLUTION_ADDRESSBOOK_CFLAGS@" -EVOLUTION_ADDRESSBOOK_LIBS="-lpas -lebook -lename -lversit -lcamel -L@privlibdir@ @EVOLUTION_ADDRESSBOOK_LIBS@" - -MODULE_VERSION="evolution_addressbook-@VERSION@" diff --git a/evolution_calendarConf.sh.in b/evolution_calendarConf.sh.in deleted file mode 100644 index a8adf1d2b3..0000000000 --- a/evolution_calendarConf.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Configuration file for using the Evolution Personal Calendar Server library in GNOME applications -# -EVOLUTION_CALENDAR_LIBDIR="@EVOLUTION_LIBDIR@" -EVOLUTION_CALENDAR_DATADIR="@EVOLUTION_DATADIR@" - -EVOLUTION_CALENDAR_INCLUDEDIR="@EVOLUTION_INCLUDEDIR@ @EVOLUTION_CALENDAR_CFLAGS@" -EVOLUTION_CALENDAR_LIBS="-lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil -L@privlibdir@ @EVOLUTION_CALENDAR_LIBS@" - -MODULE_VERSION="evolution_calendar-@VERSION@" diff --git a/evolution_shellConf.sh.in b/evolution_shellConf.sh.in deleted file mode 100644 index 638a7080ae..0000000000 --- a/evolution_shellConf.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Configuration file for using the Evolution Shell library in GNOME applications -# -EVOLUTION_SHELL_LIBDIR="@EVOLUTION_LIBDIR@" -EVOLUTION_SHELL_DATADIR="@EVOLUTION_DATADIR@" - -EVOLUTION_SHELL_INCLUDEDIR="@EVOLUTION_INCLUDEDIR@ @SHELL_CFLAGS@" -EVOLUTION_SHELL_LIBS="-leshell @SHELL_LIBS@" - -MODULE_VERSION="evolution-@VERSION@" |