Bug 216366 - fix for activestate perl using GNU make 3.80 r=bryner

build/autoconf/acoutput-fast.pl

@@ -87,14 +87,25 @@ sub create_directories {
   }
 }
 
-if ($ARGV[0] =~ /^--srcdir=/) {
+while($arg = shift) {
-  $ac_given_srcdir = (split /=/, shift @ARGV)[1];
+    if ($arg =~ /^--srcdir=/) {
-} else {
+        $ac_given_srcdir = (split /=/, $arg)[1];
+    }
+    if ($arg =~ /^--cygwin-srcdir/) {
+        $ac_cygwin_srcdir = (split /=/, $arg)[1];
+    }
+}
+
+if (!$ac_given_srcdir) {
   $ac_given_srcdir = $0;
   $ac_given_srcdir =~ s|/?build/autoconf/.*$||;
   $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
 }
 
+if (!$ac_cygwin_srcdir) {
+    $ac_cygwin_srcdir = $ac_given_srcdir;
+}
+
 # Read list of makefiles from the stdin or,
 #   from files listed on the command-line.
 #
@@ -132,12 +143,12 @@ foreach $ac_file (@makefiles) {
       $top_srcdir = $ac_dots;
       $top_srcdir =~ s%/$%%;
     }
-  } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
+  } elsif ($ac_cygwin_srcdir =~ m%^/% or $ac_cygwin_srcdir =~ m%^.:/%) {
-    $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
+    $srcdir     = "$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_given_srcdir";
+    $top_srcdir = "$ac_cygwin_srcdir";
   } else {
-    $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
+    $srcdir     = "$ac_dots$ac_cygwin_srcdir$ac_dir_suffix";
-    $top_srcdir = "$ac_dots$ac_given_srcdir";
+    $top_srcdir = "$ac_dots$ac_cygwin_srcdir";
   }
 
   if (-e $ac_file) {

build/cygwin-wrapper

@@ -29,26 +29,38 @@ if test "${prog}" = "-up"; then
     shift
 fi
 
+process=1
+
 for i in "${@}"
 do
-    if test -n "${up}"; then
+    if test "${i}" = "-wrap"; then
-        pathname=${i#-I[a-zA-Z]:/}
+        process=1
-        if ! test "${pathname}" = "${i}"; then
-            no_i=${i#-I}
-            driveletter=${no_i%%:*}
-            i=-I${mountpoint}/${driveletter}/${pathname}
-        fi
     else
-        eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
+        if test "${i}" = "-nowrap"; then
-        if ! test "${leader}" = "${i}"; then
+            process=
-            eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
+        else
-            eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
+            if test -n "${process}"; then
-            driveletter=${no_mountpoint%%/*}
+                if test -n "${up}"; then
-            i=${leader}${driveletter}:/${pathname}
+                    pathname=${i#-I[a-zA-Z]:/}
+                    if ! test "${pathname}" = "${i}"; then
+                        no_i=${i#-I}
+                        driveletter=${no_i%%:*}
+                        i=-I${mountpoint}/${driveletter}/${pathname}
+                    fi
+                else
+                    eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
+                    if ! test "${leader}" = "${i}"; then
+                        eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
+                        eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
+                        driveletter=${no_mountpoint%%/*}
+                        i=${leader}${driveletter}:/${pathname}
+                    fi
+                fi
+            fi
+
+            args="${args} ${i}"
         fi
     fi
-
-    args="${args} ${i}"
 done
 
 exec $prog $args

configure.in

@@ -1060,9 +1060,9 @@ case "$target" in
         _pwd=`pwd`
          CYGWIN_WRAPPER="${_pwd}/${srcdir}/build/cygwin-wrapper"
     fi
-    if test "`${PERL} -v | grep -c cygwin  2>/dev/null`" != 0; then
+    if test `${PERL} -v | grep -c cygwin  2>/dev/null` -eq 0; then
-        PERL="${CYGWIN_WRAPPER} -up ${PERL}"
+        _AS_PERL=1
-        _CYGWIN_PERL=1
+        PERL="${CYGWIN_WRAPPER} ${PERL}"
     fi
     DSO_CFLAGS=
     DSO_PIC_CFLAGS=
@@ -3646,11 +3646,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0; then
 fi
 
 dnl Remove dupes
-if test -n "${_CYGWIN_PERL}"; then
 MOZ_EXTENSIONS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_EXTENSIONS}`
-else
-MOZ_EXTENSIONS=`${CYGWIN_WRAPPER} ${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_EXTENSIONS}`
-fi
 
 dnl ========================================================
 dnl Image decoders
@@ -3688,11 +3684,7 @@ done],
     MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT")
 
 dnl Remove dupes
-if test -n "${_CYGWIN_PERL}"; then
 MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}`
-else
-MOZ_IMG_DECODERS=`${CYGWIN_WRAPPER} ${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}`
-fi
 
 dnl ========================================================
 dnl experimental ldap features
@@ -4894,11 +4886,7 @@ MOZ_ARG_ENABLE_STRING(necko-protocols,
 done],
     NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT")
 dnl Remove dupes
-if test -n "${_CYGWIN_PERL}"; then
+NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}`
-    NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}`
-else
-    NECKO_PROTOCOLS=`${CYGWIN_WRAPPER} ${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}`
-fi
 AC_SUBST(NECKO_PROTOCOLS)
 for p in $NECKO_PROTOCOLS; do
     AC_DEFINE_UNQUOTED(NECKO_PROTOCOL_$p)
@@ -5299,9 +5287,6 @@ mingw*|cygwin*|msvc*|mks*)
     AS="\$(CYGWIN_WRAPPER) $AS"
     RC="\$(CYGWIN_WRAPPER) $RC"
     MIDL="\$(CYGWIN_WRAPPER) $MIDL"
-    if test -z "${_CYGWIN_PERL}"; then
-        PERL="${CYGWIN_WRAPPER} $PERL"
-    fi
     CYGDRIVE_MOUNT=`mount -p | awk '{ if (/^\//) { print $1; exit } }'`
     ;;
 esac
@@ -5420,7 +5405,11 @@ dnl This does not change the $MAKEFILES variable.
 dnl
 dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
 dnl
-echo $MAKEFILES | $PERL $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
+if test -z "${_AS_PERL}"; then
+echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
+else
+echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
+fi
 . ./conftest.sh
 rm conftest.sh