summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-03-20 19:51:32 +0000
committerAdam Jackson <ajax@nwnk.net>2006-03-20 19:51:32 +0000
commitb7de07f180407a1597ee74cc570311d7eb808637 (patch)
tree2699d50365f1550428d7a7e6189d00d07933837f
parentaaee3f658482018c622d8cbb926bbfa14df64eea (diff)
Bug #6243: Fix build on Cygwin, and when srcdir != objdir. (YaakovXORG-7_0_99_901
Selkowitz)
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d14eb3c..c99cb8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-20 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * Makefile.am:
+ Bug #6243: Fix build on Cygwin, and when srcdir != objdir. (Yaakov
+ Selkowitz)
+
2006-01-12 Adam Jackson <ajax@freedesktop.org>
* Wraphelp.c:
diff --git a/Makefile.am b/Makefile.am
index 6c15d1b..b44d5d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libXdmcp.la
AM_CFLAGS=-I${top_srcdir}/include $(XDMCP_CFLAGS)
-libXdmcp_la_LDFLAGS = -version-number 6:0:0
+libXdmcp_la_LDFLAGS = -version-number 6:0:0 -no-undefined
libXdmcp_la_LIBADD = $(XDMCP_LIBS)
libXdmcp_la_SOURCES = \
A8Eq.c \
diff --git a/configure.ac b/configure.ac
index a728521..ee316b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ PKG_CHECK_MODULES(XDMCP, xproto)
AC_SUBST(XDMCP_CFLAGS)
AC_SUBST(XDMCP_LIBS)
-if test -f Wraphelp.c; then
+if test -f ${srcdir}/Wraphelp.c; then
AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
HASXDMAUTH=yes
else