From fbc229598cebbe3dc971b91d5302b7bca17e6688 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 16 Sep 2002 21:01:46 +0000 Subject: New. New. New. New. New. New. New. New. New. New. * data/cde_app_root/Makefile.am: New. * data/cde_app_root/dt/Makefile.am: New. * data/cde_app_root/dt/appconfig/Makefile.am: New. * data/cde_app_root/dt/appconfig/appmanager/Makefile.am: New. * data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am: New. * data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am: New. * data/cde_app_root/dt/appconfig/icons/Makefile.am: New. * data/cde_app_root/dt/appconfig/icons/C/Makefile.am: New. * data/cde_app_root/dt/appconfig/types/Makefile.am: New. * data/cde_app_root/dt/appconfig/types/C/Makefile.am: New. * configure.in: Add a `--with-cde-path' option. Check for dtappintegrate in that path. Define HAVE_DTAPPINTEGRATE and GNOME_PREFIX. Also, generate data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in and shell/evolution-nognome. svn path=/trunk/; revision=18083 --- configure.in | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 8971115f0e..c65a56048f 100644 --- a/configure.in +++ b/configure.in @@ -884,6 +884,34 @@ AC_SUBST(NSPR_LDFLAGS) AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_LDFLAGS) +dnl ****************** +dnl CDE dtappintegrate +dnl ****************** + +AC_ARG_WITH(cde-path, [ --with-cde-path=PATH Location of CDE installation], + [with_cde_path="$withval"]) +if test -z "$with_cde_path"; then + with_cde_path="/usr/dt" +fi + +AC_MSG_CHECKING(for dtappintegrate) +if test -x "$with_cde_path/bin/dtappintegrate" ; then + DTAPPINTEGRATE="$with_cde_path/bin/dtappintegrate" +else + DTAPPINTEGRATE="no" +fi +AC_MSG_RESULT([$DTAPPINTEGRATE]) + +AC_SUBST(DTAPPINTEGRATE) +AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, test "x$DTAPPINTEGRATE" != "xno") + +dnl **************************************************** +dnl GNOME_PREFIX is is needed by shell/evolution-nognome +dnl **************************************************** + +GNOME_PREFIX="`gnome-config --prefix`" +AC_SUBST(GNOME_PREFIX) + dnl ****************************** dnl OpenSSL dnl ****************************** @@ -1217,6 +1245,17 @@ camel/tests/smime/Makefile camel/tests/stream/Makefile composer/Makefile data/Makefile +data/cde_app_root/Makefile +data/cde_app_root/dt/Makefile +data/cde_app_root/dt/appconfig/Makefile +data/cde_app_root/dt/appconfig/appmanager/Makefile +data/cde_app_root/dt/appconfig/appmanager/C/Makefile +data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile +data/cde_app_root/dt/appconfig/icons/Makefile +data/cde_app_root/dt/appconfig/icons/C/Makefile +data/cde_app_root/dt/appconfig/types/Makefile +data/cde_app_root/dt/appconfig/types/C/Makefile +data/cde_app_root/dt/appconfig/types/C/Ximian.dt default_user/Makefile default_user/local/Makefile default_user/local/Calendar/Makefile @@ -1249,6 +1288,7 @@ my-evolution/Makefile omf-install/Makefile po/Makefile.in shell/Makefile +shell/evolution-nognome shell/glade/Makefile shell/importer/Makefile sounds/Makefile -- cgit v1.2.3