aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-30 02:18:18 +0800
committerDan Winship <danw@src.gnome.org>2000-08-30 02:18:18 +0800
commitec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56 (patch)
tree33006e1ac71d0f3a9061802b44b35c66350ff588
parent1e8e112a3eaac13a18106c8feadbc342bef0682f (diff)
downloadgsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar.gz
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar.bz2
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar.lz
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar.xz
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.tar.zst
gsoc2013-evolution-ec4ed21ea96f66ccd4b2c29f4f14046f8ece8a56.zip
decruft
* configure.in, acconfig.h: decruft svn path=/trunk/; revision=5101
-rw-r--r--ChangeLog4
-rw-r--r--acconfig.h3
-rw-r--r--configure.in42
3 files changed, 10 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 35d05d27fb..e9a2dbdcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-29 Dan Winship <danw@helixcode.com>
+
+ * configure.in, acconfig.h: decruft
+
2000-08-28 Jesus Bravo Alvarez <jba@pobox.com>
* configure.in: Added Portuguese (pt) to ALL_LINGUAS
diff --git a/acconfig.h b/acconfig.h
index 70c43a6dfb..f0323958db 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,7 +6,6 @@
#undef HAVE_LIBSM
#undef PACKAGE
#undef VERSION
-#undef HAVE_BONOBO
#undef ENABLE_THREADS
#undef SENDMAIL_PATH
#undef SYSTEM_MAIL_DIR
@@ -16,8 +15,6 @@
#undef USING_OAF
#undef HAVE_KRB4
#undef HAVE_KRB5
-#undef USE_BROKEN_THREADS
-#undef BONOBO_POST_0_15
#undef MOVEMAIL_PATH
#undef PGP_PROGRAM
#undef GPG_PATH
diff --git a/configure.in b/configure.in
index 90ab621e67..1b5a2e8ceb 100644
--- a/configure.in
+++ b/configure.in
@@ -201,13 +201,6 @@ GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
AC_SUBST(GNOME_PRINT_LIBS)
AC_SUBST(GNOME_PRINT_CFLAGS)
-dnl **************************************************
-dnl * ORBit support
-dnl **************************************************
-dnl GNOMEGNORBA_LIBS="$GNOMEGNORBA_LIBS"
-dnl AC_SUBST(GNOMEGNORBA_LIBS)
-
-
dnl ******************************
dnl Check for Bonobo
dnl ******************************
@@ -231,32 +224,20 @@ else
fi
dnl ******************************
-dnl Whether to use OAF
+dnl OAF
dnl ******************************
-AC_MSG_CHECKING(if Bonobo uses OAF)
-if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
- enable_oaf="yes"
- AC_MSG_RESULT(yes)
- AC_PATH_PROG(OAF_CONFIG,oaf-config,no)
- if test x$OAF_CONFIG = xno; then
- AC_MSG_ERROR("The oaf-config program was not found")
- else
- OAF_LIBS=`$OAF_CONFIG --libs`
- OAF_CFLAGS=`$OAF_CONFIG --cflags`
- AC_MSG_RESULT(yes)
- fi
+AC_PATH_PROG(OAF_CONFIG,oaf-config,no)
+if test x$OAF_CONFIG = xno; then
+ AC_MSG_ERROR("The oaf-config program was not found")
else
- enable_oaf="no"
- AC_MSG_ERROR(no, a Bonobo using OAF is required for Evolution)
+ OAF_LIBS=`$OAF_CONFIG --libs`
+ OAF_CFLAGS=`$OAF_CONFIG --cflags`
fi
AC_SUBST(OAF_LIBS)
AC_SUBST(OAF_CFLAGS)
-AM_CONDITIONAL(USING_OAF, test "x$enable_oaf" = "xyes")
-AC_DEFINE(USING_OAF)
-
dnl ******************************
dnl LibGlade checking
@@ -370,17 +351,6 @@ GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
AC_SUBST(GNOME_VFS_LIBS)
AC_SUBST(GNOME_VFS_CFLAGS)
-save_CFLAGS="$CFLAGS"
-save_LIBS="$LIBS"
-CFLAGS="$GNOME_VFS_CFLAGS"
-LIBS="$GNOME_VFS_LIBS"
-AC_CHECK_LIB(gnomevfs, gnome_vfs_mime_get_default_action_without_fallback,[],
-[
- AC_MSG_ERROR([You need a newer Gnome VFS. Try the CVS version])
-])
-CFLAGS="$save_CFLAGS"
-LIBS="$save_LIBS"
-
BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
AC_SUBST(BONOBO_VFS_GNOME_LIBS)