From ae26cd403a0cba0ac0b52c208887b5db909922be Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 19 May 2003 22:46:57 +0000 Subject: Remove GNOME_PREFIX stuff. Add --disable-default-binary command line * configure.in: Remove GNOME_PREFIX stuff. Add --disable-default-binary command line option, with corresponding DEFAULT_BINARY Automake conditional. svn path=/trunk/; revision=21273 --- ChangeLog | 6 ++++++ configure.in | 13 ++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46e7aa5e2a..06f5b4da62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-05-19 Ettore Perazzoli + + * configure.in: Remove GNOME_PREFIX stuff. Add + --disable-default-binary command line option, with corresponding + DEFAULT_BINARY Automake conditional. + 2003-05-19 Not Zed * NEWS: Updated for mail/ camel/ filter/ and e-util/ diff --git a/configure.in b/configure.in index ef425e904b..f388dc473d 100644 --- a/configure.in +++ b/configure.in @@ -947,15 +947,6 @@ else AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD", [Command to kill processes by name]) fi -dnl **************************************************** -dnl GNOME_PREFIX is is needed by shell/evolution-nognome -dnl **************************************************** -dnl -dnl FIXME this doesn't work with GNOME 2. - -GNOME_PREFIX="`gnome-config --prefix`" -AC_SUBST(GNOME_PREFIX) - dnl ****************************** dnl OpenSSL dnl ****************************** @@ -1255,6 +1246,10 @@ dnl ****************** AC_ARG_WITH(sub-version, [ --with-sub-version=VERSION Specify a sub-version string]) AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version", [Version substring, for packagers]) +AC_ARG_ENABLE(default-binary, [ --disable-default-binary Do not install as the default "evolution" binary ], , enable_default_binary=yes) +AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes) + + dnl ******************** dnl KDE applnk directory dnl ******************** -- cgit v1.2.3