[Gpg4win-commits] r40 - trunk

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-03 10:14:23 +0100 (Thu, 03 Nov 2005)
New Revision: 40

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
Log:
Detect missing tools

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-02 13:11:29 UTC (rev 39)
+++ trunk/ChangeLog	2005-11-03 09:14:23 UTC (rev 40)
@@ -1,3 +1,7 @@
+2005-11-03  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Bail out if a required tool is missing.
+
 2005-11-02  Werner Koch  <wk at g10code.com>
 
 	* README.SVN, autogen.sh: New.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-11-02 13:11:29 UTC (rev 39)
+++ trunk/Makefile.am	2005-11-03 09:14:23 UTC (rev 40)
@@ -23,7 +23,7 @@
 SUBDIRS = packages include src
 
 EXTRA_DIST = \
-	README.SVN
+	autogen.sh README.SVN
 	patches/gnupg-1.4.2/01-po-subdirs.patch \
 	patches/gpgme-1.1.0/01-gpgme-def.patch \
 	patches/gpgme-1.1.0/02-libtool-dll.patch

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-02 13:11:29 UTC (rev 39)
+++ trunk/configure.ac	2005-11-03 09:14:23 UTC (rev 40)
@@ -51,7 +51,15 @@
 AC_CHECK_PROGS(MAKENSIS, makensis)
 AC_PROG_INSTALL
 
+missing_tools=
+for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS; do
+   eval tmp='$'$i
+   if test -z "$tmp"; then 
+      missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
+   fi
+done
 
+
 # Optional tools.
 
 AC_CHECK_PROGS(WGET, wget)
@@ -84,7 +92,19 @@
 
 GPG4WIN_FINALIZE
 
+# Throw an error if required tools are missing
+if test -n "$missing_tools"; then
+    for i in $missing_tools; do 
+      AC_MSG_NOTICE([$i is missing])
+    done
+    AC_MSG_ERROR([[
+***
+*** Required tools not found. Please consult the above messages
+*** and install them before running configure again.
+***]])
+fi
 
+
 # Finalize.
 
 AC_CONFIG_FILES(Makefile packages/Makefile include/Makefile src/Makefile)