Merged across diffs between setup_crypto_branch_branchpoint and

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

diff --git a/configure.in b/configure.in
index 6dee5321d26fd649f82052678432a584410853d1..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])
@@ -28,9 +28,9 @@ AC_REVISION($Revision$)dnl
 
 AC_MSG_CHECKING([Whether to build inilint])
 AC_ARG_ENABLE(inilint,
-           AC_HELP_STRING([--disable-inilint],
-                          [Do not build the inilint tool]),
-           ac_cv_enable_inilint=$enableval, ac_cv_enable_inilint=yes)
+           AC_HELP_STRING([--enable-inilint],
+                          [Build the inilint tool]),
+           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\$(EXEEXT)"
@@ -70,7 +70,10 @@ AC_CHECK_HEADERS(alloca.h \
                 string \
                 string.h )
 
-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