Merged across diffs between setup_crypto_branch_branchpoint and

[cygwin-apps/setup.git] / configure.in

diff --git a/configure.in b/configure.in
index 2780c30d84c47a7f8909b046164380cef1b38505..784e40fcd6ccb2d941359f3bf3d7ce9f3bc5d081 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,10 +17,10 @@ dnl Autoconf configure script for Cygwin utilities.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT
-AC_PREREQ(2.53)
-AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(setup, 0)
+AC_INIT([setup], [0], [cygwin-apps@cygwin.com])
+AC_PREREQ(2.60)
+AC_CONFIG_AUX_DIR([cfgaux])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.9 foreign no-define -Wall -Wno-portability])
 dnl AM_CONFIG_HEADER(include/autoconf.h)
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([Makefile.in])
@@ -33,31 +33,12 @@ AC_ARG_ENABLE(inilint,
            ac_cv_enable_inilint=$enableval, ac_cv_enable_inilint=no)
 AC_MSG_RESULT([$ac_cv_enable_inilint])
 if test $ac_cv_enable_inilint = yes; then
-  INILINT="inilint"
+  INILINT="inilint\$(EXEEXT)"
 else
   INILINT=
 fi
 AC_SUBST(INILINT)
 
-AC_MSG_CHECKING([Whether to enable rsync support])
-AC_ARG_ENABLE(rsync,
-             AC_HELP_STRING([--enable-rsync],
-                            [Compile in rsync support]),
-             ac_cv_enable_rsync=$enableval, ac_cv_enable_rsync=no)
-AC_MSG_RESULT([$ac_cv_enable_rsync])
-if test $ac_cv_enable_rsync = yes; then
-  AM_CONDITIONAL(ENABLERSYNC, true)
-  RSYNC="rsync"
-  RSYNCLIB=rsync/librsync.la
-  AC_CONFIG_SUBDIRS(rsync)
-else
-  AM_CONDITIONAL(ENABLERSYNC, false)
-  RSYNC=
-  RSYNCLIB=
-fi
-AC_SUBST(RSYNC)
-AC_SUBST(RSYNCLIB)
-
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 AM_PROG_CC_C_O
@@ -89,9 +70,10 @@ AC_CHECK_HEADERS(alloca.h \
                 string \
                 string.h )
 
-AC_CONFIG_SUBDIRS(zlib)
-AC_CONFIG_SUBDIRS(bz2lib)
-AC_CONFIG_SUBDIRS(libgetopt++)
+dnl override configure of sub-libraries
+ac_cv_path_GPG_ERROR_CONFIG="${ac_abs_confdir}/gpg-error-config-fake --dir=$ac_pwd"
+
+AC_CONFIG_SUBDIRS(libgetopt++ libgpg-error libgcrypt)
 
 dnl add portability sources to inilint
 case "$host_os" in
@@ -103,5 +85,5 @@ mingw32)
   ;;
 esac
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_OUTPUT