Fix for 334

[Andreas Buening]

Hello!

The latest fix for 334 wasn't really satisfying because it still
needs cygpath which works only for cygwin. If you already use
some if/then clauses I propose to replace "cygpath -w" by $(CYGPATH)
in lib/am/depend2.am and to check for cygpath in AM_INIT_AUTOMAKE.


ChangeLog:
from  Andreas Buening  <address@hidden>
        * lib/am/depend2.am: Replaced "cygpath -w" by $(CYGPATH).
        * m4/init.m4: New make variable CYGPATH.


lib/am/depend2.am:
=====================================
--- depend2.am.old      Sat Sep  7 15:01:40 2002
+++ depend2.am  Sat Sep  7 15:04:42 2002
@@ -62,7 +62,7 @@
        if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
 ## Ugly invocation here; using a variable fails due to a parsing
 ## problem in automake.
-         %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; 
else cygpath -w '$(srcdir)/%SOURCE%'`; \
+         %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH) '%SOURCE%'; 
else $(CYGPATH) '$(srcdir)/%SOURCE%'`; \
        then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
        else rm -f "%DEPBASE%.Tpo"; exit 1; \
        fi
@@ -72,8 +72,8 @@
        depfile='%DEPBASE%.Po' tmpdepfile='%DEPBASE%.TPo' @AMDEPBACKSLASH@
        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then cygpath -w 
'%SOURCE%'; else cygpath -w '$(srcdir)/%SOURCE%'`
-?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then cygpath -w '%SOURCE%'; else 
cygpath -w '$(srcdir)/%SOURCE%'`
+?-o?   %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH) 
'%SOURCE%'; else $(CYGPATH) '$(srcdir)/%SOURCE%'`
+?!-o?  %COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH) '%SOURCE%'; else 
$(CYGPATH) '$(srcdir)/%SOURCE%'`
 endif !%FASTDEP%
 
 if %?LIBTOOL%
=====================================


m4/init.m4:
=====================================
--- init.m4.old Sat Sep  7 15:02:28 2002
+++ init.m4     Sat Sep  7 15:15:34 2002
@@ -56,6 +56,13 @@
   AC_MSG_ERROR([source directory already configured; run "make distclean" 
there first])
 fi
 
+# test whether we have cygpath
+if cygpath --version >/dev/null 2>/dev/null; then
+  AC_SUBST([CYGPATH], ['cygpath -w'])
+else
+  AC_SUBST([CYGPATH], ['echo'])
+fi
+
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
=====================================


Please reply directly to me because I haven't subscribed
to any automake mailing list.

bye,
Andreas