diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-02-06 01:23:09 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-02-06 01:23:09 +0800 |
| commit | e703f44dbb440836a6973f65842e80aa6880d836 (patch) | |
| tree | dde9e90bc11c1f6da395827f617fda57458ab96c | |
| parent | f6ac018d23ac51b8fb9d99cd6a26db4bc2e604fb (diff) | |
| download | gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar.gz gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar.bz2 gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar.lz gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar.xz gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.tar.zst gsoc2013-evolution-e703f44dbb440836a6973f65842e80aa6880d836.zip | |
define and AC_SUBST privlibexecdir.
* configure.in: define and AC_SUBST privlibexecdir.
* evolution-shell.pc.in: Add privlibexecdir, componentdir,
evolutionuidir, and iconsdir.
svn path=/trunk/; revision=19758
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | evolution-shell.pc.in | 9 |
3 files changed, 26 insertions, 3 deletions
@@ -1,7 +1,18 @@ +2003-02-05 Dan Winship <danw@ximian.com> + + * configure.in: define and AC_SUBST privlibexecdir. + + * evolution-shell.pc.in: Add privlibexecdir, componentdir, + evolutionuidir, and iconsdir. + 2003-02-04 Dan Winship <danw@ximian.com> * configure.in: Update AC_DEFINEs to use the new syntax to make - acconfig.h unnecessary. + acconfig.h unnecessary. (Remove unneeded HAVE_KDE_APPLNK define). + Call GNOME_COMPILE_WARNINGS and add $WARN_CFLAGS to CFLAGS to get + back to the evo 1.2 behavior of defaulting to -Wall everywhere. + Fix up privlibdir definition to avoid undefined variables in + evolution-shell.pc. * acinclude.m4: Update AC_DEFINE diff --git a/configure.in b/configure.in index 3920eb719b..602bab12dc 100644 --- a/configure.in +++ b/configure.in @@ -1135,6 +1135,10 @@ dnl ******************* dnl Special directories dnl ******************* +dnl --- If you add something here, you almost certainly need to add it +dnl --- to evolution-shell.pc.in (or camel.pc.in) as well, for use by +dnl --- connector and other external plugins. + BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'` AC_SUBST(BASE_VERSION) AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) @@ -1142,6 +1146,9 @@ AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)]) privlibdir='${libdir}'/evolution/${BASE_VERSION} AC_SUBST(privlibdir) +privlibexecdir='${libexecdir}'/evolution/${BASE_VERSION} +AC_SUBST(privlibexecdir) + camel_providerdir="$privlibdir/camel-providers" AC_SUBST(camel_providerdir) diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index c27f9f1819..72909b41bb 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -1,12 +1,17 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ +libexecdir=@libexecdir@ includedir=@includedir@ +privlibdir=@privlibdir@ +privlibexecdir=@privlibexecdir@ idldir=@idldir@ -IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ +componentdir=@componentdir@ +evolutionuidir=@evolutionuidir@ +iconsdir=@iconsdir@ -privlibdir=@privlibdir@ +IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ Name: evolution-shell Description: libraries needed for Evolution shell components |