1 --- fontconfig-2.8.0/configure 2009-11-18 15:49:41.000000000 -0800
2 +++ fontconfig-2.8.0/configure 2010-09-09 21:23:24.000000000 -0700
7 +OS_WIN32_ENABLE_SHARED_TRUE
8 +OS_WIN32_ENABLE_SHARED_FALSE
12 @@ -11782,6 +11784,14 @@
16 + if test "$os_win32-$enable_shared" = "yes-yes"; then
17 + OS_WIN32_ENABLE_SHARED_TRUE=
18 + OS_WIN32_ENABLE_SHARED_FALSE='#'
20 + OS_WIN32_ENABLE_SHARED_TRUE='#'
21 + OS_WIN32_ENABLE_SHARED_FALSE=
25 if test "$os_win32" = "yes"; then
26 # Extract the first word of "lib.exe", so it can be a program name with args.
27 @@ -15155,6 +15165,13 @@
28 Usually this means the macro was only invoked conditionally." >&2;}
29 { (exit 1); exit 1; }; }
31 +if test -z "${OS_WIN32_ENABLE_SHARED_TRUE}" && test -z "${OS_WIN32_ENABLE_SHARED_FALSE}"; then
32 + { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32_ENABLE_SHARED\" was never defined.
33 +Usually this means the macro was only invoked conditionally." >&5
34 +echo "$as_me: error: conditional \"OS_WIN32_ENABLE_SHARED\" was never defined.
35 +Usually this means the macro was only invoked conditionally." >&2;}
36 + { (exit 1); exit 1; }; }
38 if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
39 { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined.
40 Usually this means the macro was only invoked conditionally." >&5
41 --- fontconfig-2.8.0/configure.in 2009-11-18 15:49:23.000000000 -0800
42 +++ fontconfig-2.8.0/configure.in 2010-09-09 21:11:37.000000000 -0700
46 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
47 +AM_CONDITIONAL(OS_WIN32_ENABLE_SHARED, test "$os_win32-$enable_shared" = "yes-yes")
49 if test "$os_win32" = "yes"; then
50 AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
51 --- fontconfig-2.8.0/src/Makefile.am 2010-09-09 21:12:43.000000000 -0700
52 +++ fontconfig-2.8.0/src/Makefile.am 2010-09-09 21:13:07.000000000 -0700
54 # gcc import library install/uninstall
56 install-libtool-import-lib:
57 +if OS_WIN32_ENABLE_SHARED
58 $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
60 $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
62 uninstall-libtool-import-lib:
63 --- fontconfig-2.8.0/src/Makefile.in 2009-11-18 15:49:39.000000000 -0800
64 +++ fontconfig-2.8.0/src/Makefile.in 2010-09-09 21:14:38.000000000 -0700
66 # gcc import library install/uninstall
68 @OS_WIN32_TRUE@install-libtool-import-lib:
69 -@OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
70 +@OS_WIN32_ENABLE_SHARED_TRUE@@OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
71 @OS_WIN32_TRUE@ $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
73 @OS_WIN32_TRUE@uninstall-libtool-import-lib: