aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-07-26 07:51:52 +0800
committerDan Winship <danw@src.gnome.org>2000-07-26 07:51:52 +0800
commit43c1a59230a924858a6f9c04d0f679f3fa29676a (patch)
tree1d4ee360b6aa0fa5c43ad24d012f2d2066135ed6
parent2993a5c0e84002579a002eda0b89346338b7e468 (diff)
downloadgsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar.gz
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar.bz2
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar.lz
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar.xz
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.tar.zst
gsoc2013-evolution-43c1a59230a924858a6f9c04d0f679f3fa29676a.zip
some unrelated changes: check for mkdtemp,
* configure.in: some unrelated changes: check for mkdtemp, gnome_vfs_mime_get_default_action_without_fallback, and a setuid/setgid movemail binary. * acconfig.h: add MOVEMAIL_PATH svn path=/trunk/; revision=4339
-rw-r--r--ChangeLog8
-rw-r--r--acconfig.h1
-rw-r--r--configure.in41
3 files changed, 49 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41b877e765..eb170a9c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-25 Dan Winship <danw@helixcode.com>
+
+ * configure.in: some unrelated changes: check for mkdtemp,
+ gnome_vfs_mime_get_default_action_without_fallback, and a
+ setuid/setgid movemail binary.
+
+ * acconfig.h: add MOVEMAIL_PATH
+
2000-07-25 Christopher James Lahey <clahey@helixcode.com>
* configure.in: Added addressbook/conduit/Makefile.
diff --git a/acconfig.h b/acconfig.h
index 29a1e3de1c..ef8526ea5d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -18,6 +18,7 @@
#undef HAVE_KRB5
#undef USE_BROKEN_THREADS
#undef BONOBO_POST_0_15
+#undef MOVEMAIL_PATH
/* Define this if you want to build against the development gtk */
#undef HAVE_DEVGTK
diff --git a/configure.in b/configure.in
index d987dd1344..c021ae3cc3 100644
--- a/configure.in
+++ b/configure.in
@@ -108,7 +108,7 @@ else
fi
fi
-AC_CHECK_FUNCS(mkstemp)
+AC_CHECK_FUNCS(mkstemp mkdtemp)
dnl **************************************************
dnl ctime_r prototype
@@ -360,6 +360,14 @@ else
AC_MSG_ERROR(GNOME-VFS is required to compile Evolution)
fi
+saved_CFLAGS="$CFLAGS"
+saved_LDFLAGS="$LDFLAGS"
+CFLAGS="$CFLAGS `gnome-config --cflags vfs`"
+LDFLAGS="$LDFLAGS `gnome-config --libs vfs`"
+AC_CHECK_FUNCS(gnome_vfs_mime_get_default_action_without_fallback)
+CFLAGS="$saved_CFLAGS"
+LDFLAGS="$saved_LDFLAGS"
+
BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
AC_SUBST(BONOBO_VFS_GNOME_LIBS)
@@ -484,6 +492,37 @@ dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+dnl ********
+dnl movemail
+dnl ********
+AC_ARG_WITH(movemail, [ --with-movemail=PATH Path to a movemail binary])
+AC_MSG_CHECKING(for movemail)
+if test x$with_movemail = xyes -o x$with_movemail = x; then
+ with_movemail=no
+fi
+if test x$with_movemail != xno; then
+ AC_DEFINE(MOVEMAIL_PATH, $with_movemail)
+ AC_MSG_RESULT($with_movemail)
+else
+ emacs_exec_dir=`emacs --batch --eval '(message exec-directory)' 2>&1`
+ case $emacs_exec_dir in
+ /*) if test -x $emacs_exec_dir/movemail; then
+ if test -u $emacs_exec_dir/movemail -o -g $emacs_exec_dir/movemail; then
+ AC_MSG_RESULT($emacs_exec_dir/movemail)
+ AC_DEFINE(MOVEMAIL_PATH, $emacs_exec_dir/movemail)
+ else
+ AC_MSG_RESULT($emacs_exec_dir/movemail... not set-id: ignored)
+ fi
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ ;;
+ esac
+fi
+
dnl ******************************
dnl Makefiles