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"
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;;
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;;
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
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