Mercurial > mxe-octave

comparison src/pstoedit-4-winlibemf.patch @ 3815:deed2268e330

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pstoedit: cleanup wmf/emf patch * src/pstoedit-4-winlibemf.patch: clean up patch
author John Donoghue <john.donoghue@ieee.org>
date Sat, 28 Feb 2015 14:44:57 -0500
parents a6140fcf5631
children
comparison
equal deleted inserted replaced
3814:a6140fcf5631 3815:deed2268e330
1 diff -ur pstoedit-3.62/configure.ac pstoedit-3.62.new/configure.ac 1 diff -ur pstoedit-3.62/configure.ac pstoedit-3.62.new/configure.ac
2 --- pstoedit-3.62/configure.ac 2013-03-10 14:45:43.000000000 -0400 2 --- pstoedit-3.62/configure.ac 2013-03-10 14:45:43.000000000 -0400
3 +++ pstoedit-3.62.new/configure.ac 2015-02-28 14:17:10.000000000 -0500 3 +++ pstoedit-3.62.new/configure.ac 2015-02-28 14:34:33.000000000 -0500
4 @@ -324,6 +324,16 @@ 4 @@ -324,6 +324,9 @@
5 OLD_CPPFLAGS= 5 OLD_CPPFLAGS=
6 OLD_LIBS= 6 OLD_LIBS=
7 7
8 +dnl if windows we can just enable emf/wmf support 8 +dnl if windows we can just enable emf/wmf support
9 +AC_MSG_CHECKING(for windows.h)
10 +AC_CHECK_HEADER(windows.h, 9 +AC_CHECK_HEADER(windows.h,
11 + [have_windows_h=yes]) 10 + [have_windows_h=yes])
12 +
13 +if test "${have_windows_h}" = "yes"; then
14 + AC_MSG_RESULT([yes])
15 +else
16 + AC_MSG_RESULT([yes])
17 +fi
18 11
19 AC_ARG_WITH(libemf-src, 12 AC_ARG_WITH(libemf-src,
20 [ --with-libemf-src=DIR look for libEMF src in dir (e.g. /usr/local/lib)], 13 [ --with-libemf-src=DIR look for libEMF src in dir (e.g. /usr/local/lib)],
21 @@ -382,8 +392,14 @@ 14 @@ -382,8 +385,14 @@
22 if test -n "${LIBEMF_LDFLAGS}" && test -n "${LIBEMF_CFLAGS}"; then 15 if test -n "${LIBEMF_LDFLAGS}" && test -n "${LIBEMF_CFLAGS}"; then
23 HAVE_LIBEMF=yes 16 HAVE_LIBEMF=yes
24 else 17 else
25 - LIBEMF_CFLAGS= 18 - LIBEMF_CFLAGS=
26 - LIBEMF_LDFLAGS= 19 - LIBEMF_LDFLAGS=
33 + LIBEMF_LDFLAGS= 26 + LIBEMF_LDFLAGS=
34 + fi 27 + fi
35 fi 28 fi
36 29
37 AC_SUBST(LIBEMF_LDFLAGS) 30 AC_SUBST(LIBEMF_LDFLAGS)
38 Only in pstoedit-3.62.new: configure.orig
39 Only in pstoedit-3.62.new: tmp