don't attempt to link with libX11 under MinGW

diff --git a/configure b/configure
index 3a7ebb501e17ad024e17215579180fac9328cf76..9095957e712b30187cd540b918fe8133c5c0d20b 100755 (executable)
--- a/configure
+++ b/configure
@@ -5539,7 +5539,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 fi
 
 
-LDFLAGS="$LDFLAGS -lz -lX11 -lm"
+LDFLAGS="$LDFLAGS -lz -lm"
 
 pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 x11"
 
@@ -5826,8 +5826,8 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Win32 environment" >&5
-$as_echo_n "checking for Win32 environment... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows environment" >&5
+$as_echo_n "checking for Windows environment... " >&6; }
 case "$host" in
  *-*-mingw*)
    os_win32=yes;;

diff --git a/configure.in b/configure.in
index ee539ae813ed3b4d6fff000f6b5e8b28f1d0d46f..2bae7afa0c859fe200f393ecd967080bbe13c63a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,16 +11,16 @@ AM_PROG_CC_STDC
 AC_PROG_RANLIB
 AC_HEADER_STDC
 
-LDFLAGS="$LDFLAGS -lz -lX11 -lm"
+LDFLAGS="$LDFLAGS -lz -lm"
 
 pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 x11"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-dnl detect Win32 environment...
+dnl detect Windows environment...
 AC_CANONICAL_HOST
-AC_MSG_CHECKING([for Win32 environment])
+AC_MSG_CHECKING([for Windows environment])
 case "$host" in
  *-*-mingw*)
    os_win32=yes;;

diff --git a/src/Makefile.am b/src/Makefile.am
index 59ba381e8f6ed0d8bc3910423d7562a8e838b0b1..03ecd359df28532db8639bab416b07a7919bad95 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,6 @@ if WIN32
   xournal_LDFLAGS = -mwindows
   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
 else
-  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11
 endif
 

diff --git a/src/Makefile.in b/src/Makefile.in
index a3d3a0a2ba9319618b99740581c100a77ecc54eb..45ebffa3456dde36eba7bfdb0c2d60d4725dfe27 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -247,7 +247,7 @@ xournal_SOURCES = \
        xo-shapes.c xo-shapes.h
 
 @WIN32_TRUE@xournal_LDFLAGS = -mwindows
-@WIN32_FALSE@xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
+@WIN32_FALSE@xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11
 @WIN32_TRUE@xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
 all: all-recursive