Use autoconf to locate the diff and patch executables and pass those pathnames to...

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 5c269cd4ebfa53852d583cba337a06321b8bfe65..11a65042e5a23f1ace604d6e291cd9f341f67bcf 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -398,6 +398,8 @@ AC_SUBST(DEPEND_FLAG)
 
 AC_PROG_INSTALL
 AC_PROG_YACC
+AC_PATH_PROG(DIFF,diff)
+AC_PATH_PROG(PATCH,patch)
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -568,20 +570,13 @@ AC_CHECK_HEADER(libcitadel.h,
 CFLAGS="$saved_CFLAGS"
 
 
-dnl experimental libev smtp client remove this to...
-AC_DEFINE(EXPERIMENTAL_SMTP_EVENT_CLIENT, [], [should we use the experimental libevent smtp client?])
-dnl here...
-
-
-
-
-                AC_CHECK_LIB(cares, ares_init,
-                  [
+AC_CHECK_LIB(cares, ares_init,
+            [
                     C_ARES_LIBS=-lcares
-                AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
-                have_good_c_ares=yes
-                  ],, $SOCKET_LIBS $NSL_LIBS
-                )
+                   AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
+                    have_good_c_ares=yes
+            ],, $SOCKET_LIBS $NSL_LIBS
+)
 
 
 
@@ -1042,8 +1037,6 @@ AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [
 
 STRUCT_UCRED
 
-
-
 dnl Done! Now write the Makefile and sysdep.h
 AC_SUBST(RESOLV)
 AC_SUBST(chkpwd_LIBS)
@@ -1052,6 +1045,8 @@ AC_SUBST(DATABASE)
 AC_SUBST(SERVER_LDFLAGS)
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SETUP_LIBS)
+AC_SUBST(DIFF)
+AC_SUBST(PATCH)
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT(database_cleanup.sh po/citadel-setup/Makefile)