about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--configure.ac11
-rw-r--r--tests/common.sh.in4
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index d5e858123ec2..fdf898640a8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,6 +270,17 @@ if test "$(uname)" = "Darwin"; then
 fi
 
 
+if test "$sys_name" = "cygwin"; then
+    # Dynamically linking against the ATerm DLL does work, except that it requires
+    # the ATerm "lib" directory to be in $PATH, as Windows doesn't have anything
+    # like an RPATH embedded in executable.  Since this is kind of annoying, we
+    # use static libraries for now.  This has to happen at the end of
+    # configure, because the C compiler doesn't know about -all-static
+    # (it's filtered out by libtool, but configure doesn't use libtool).
+    LDFLAGS="-all-static $LDFLAGS"
+fi
+
+
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile
    externals/Makefile
diff --git a/tests/common.sh.in b/tests/common.sh.in
index dde95dd13ca3..5865cf1d637f 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -40,6 +40,10 @@ export xmllint="@xmllint@"
 export xmlflags="@xmlflags@"
 export xsltproc="@xsltproc@"
 
+# Hack to get "atdiff" to run on Cygwin (Windows looks for
+# DLLs in $PATH).
+export PATH=$aterm_bin/../lib:$PATH
+
 export version=@version@
 export system=@system@