- Patches needed for cygwin.

diff --git a/ginac/utils.h b/ginac/utils.h
index 7018bc9511a02584ffb885b81bf0cffb9d183a1b..13fa2c8b956bafc17d8ca33640b8575467b9ba44 100644 (file)
--- a/ginac/utils.h
+++ b/ginac/utils.h
@@ -45,7 +45,10 @@ string ToString(const T & t)
  *  signal that ordinary Taylor expansion is safe. */
 class do_taylor {};
 
+// cygwin defines a macro log2, causing confusion
+#ifndef log2
 unsigned log2(unsigned n);
+#endif
 
 int compare_pointers(const void * a, const void * b);
 

diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am
index d16cd4d3e31e4ca6baf735b12e23b1aec6044788..29ff9d40e33db67d9e36e89e4fe8e4705e71d590 100644 (file)
--- a/ginsh/Makefile.am
+++ b/ginsh/Makefile.am
@@ -10,10 +10,10 @@ YFLAGS = -d
 EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed
 
 # files created by sed scripts
-ginsh_fcn_help.c: ginsh.1 ginsh_fcn_help.sed
-       sed -n -f ginsh_fcn_help.sed <$< >$@
+ginsh_fcn_help.c: ginsh.1 $(srcdir)/ginsh_fcn_help.sed
+       sed -n -f $(srcdir)/ginsh_fcn_help.sed <$< >$@
 
-ginsh_op_help.c: ginsh.1 ginsh_op_help.sed
-       sed -n -f ginsh_op_help.sed <$< >$@
+ginsh_op_help.c: ginsh.1 $(srcdir)/ginsh_op_help.sed
+       sed -n -f $(srcdir)/ginsh_op_help.sed <$< >$@
 
 ginsh_parser.o: ginsh_fcn_help.c ginsh_op_help.c