Remove included regex lib

[apps/madmutt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2327b8f..c229080 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,10 @@ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),[
     if test x$enableval = xyes; then
         AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
         MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
         AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
+        AM_CONDITIONAL(BUILD_GPGME, true)
+    else
+        AM_CONDITIONAL(BUILD_GPGME, false)
     fi
 ])
 
@@ -257,30 +259,11 @@ if test $ac_cv_func_getopt = yes; then
     AC_CHECK_HEADERS(getopt.h)
 fi
 
-AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]),
-        [mutt_cv_regex=yes],
-        [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
-
-if test $mutt_cv_regex = no ; then
-    AC_CACHE_CHECK([whether your system's regexp library is completely broken],
-        [mutt_cv_regex_broken],
-        AC_TRY_RUN([
-#include <unistd.h>
-#include <regex.h>
-main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
-        mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))
-    if test $mutt_cv_regex_broken = yes ; then
-        echo "Using the included GNU regex instead." >&AC_FD_MSG
-        mutt_cv_regex=yes
-    fi
+AC_CHECK_FUNC(regcomp)
+if test $ac_cv_func_regcomp = yes; then
+   AC_CHECK_HEADERS(regex.h)
 fi
 
-if test $mutt_cv_regex = yes; then
-    AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
-    LIBOBJS="$LIBOBJS regex.o"
-fi
-
-
 AC_ARG_WITH(homespool,
             AC_HELP_STRING([--with-homespool[=FILE]],
                            [File in user's directory where new mail is spooled]),
@@ -929,6 +912,7 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         lib-mime/Makefile
         lib-crypt/Makefile
         lib-hash/Makefile
+        lib-ui/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile