autogen.sh: - Extend the check_m4macros() function to handle Cygwin

	autogen.sh:
	- Extend the check_m4macros() function to handle Cygwin
	  environments. Fixes bug #110947.

svn path=/trunk/; revision=2900

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 02609ff..649a5d1 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,7 +1,10 @@
-2003-05-03  Malcolm Tredinnick <malcolm@commsecure.com.au>
+2003-05-04  Malcolm Tredinnick <malcolm@commsecure.com.au>
        
-       * autogen.sh: Make this portable to Bourne-like shells. Fixes
-       the problems pointed out by Morten Welinder in bug #110177.
+       * autogen.sh:
+       - Make this portable to Bourne-like shells. Fixes the problems
+         pointed out by Morten Welinder in bug #110177.
+       - Extend the check_m4macros() function to handle Cygwin
+         environments. Fixes bug #110947.
 
 2003-04-10  Ross Burton  <ross@burtonini.com>
 

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 5748e09..dd48cdc 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -159,6 +159,16 @@ check_m4macros() {
                    cm_macrofound=true
                    break
                fi
+               # The macro dir in Cygwin environments may contain a file
+               # called dirlist containing other directories to look in.
+               if [ -f "$cm_dir/dirlist" ]; then
+                   for cm_otherdir in `cat $cm_dir/dirlist`; do
+                       if [ -f "$cm_otherdir/$cm_macro" ]; then
+                           cm_macrofound=true
+                           break
+                       fi
+                   done
+               fi
            done
            if $cm_macrofound; then
                :