?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Bump for 4.0-11
[LibreOffice.git] / liblangtag / liblangtag-0.4.0-msc-configure.patch
blob7c042a0c786cb3a70ee722db3eebebafdc73c1cd
1 --- misc/liblangtag-0.4.0/configure 2012-10-22 05:47:24.000000000 +0200
2 +++ misc/build/liblangtag-0.4.0/configure 2012-11-06 14:40:01.653623759 +0100
3 @@ -3871,6 +3871,8 @@
4 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5 ac_c_werror_flag=$ac_save_c_werror_flag
6 fi
7 +# MSVC displays only " Command line warning D9002 : ignoring unknown option '-g'", explicitly set to no.
8 +ac_cv_prog_cc_g=no
9 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
10 $as_echo "$ac_cv_prog_cc_g" >&6; }
11 if test "$ac_test_CFLAGS" = set; then
12 --- misc/liblangtag-0.4.0/Makefile.in 2012-10-22 04:47:24.000000000 +0100
13 +++ misc/build/liblangtag-0.4.0/Makefile.in 2012-11-06 20:03:08.906250000 +0000
14 @@ -136,8 +136,7 @@
15 distdir dist dist-all distcheck
16 ETAGS = etags
17 CTAGS = ctags
18 -DIST_SUBDIRS = liblangtag extensions data docs liblangtag-gobject \
19 - tests
20 +DIST_SUBDIRS = liblangtag extensions data docs liblangtag-gobject
21 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
22 distdir = $(PACKAGE)-$(VERSION)
23 top_distdir = $(distdir)
24 @@ -339,7 +338,7 @@
25 NULL =
26 AUTOMAKE_OPTIONS = dist-bzip2
27 #SUBDIRS += docs tests
28 -SUBDIRS = liblangtag extensions data docs $(am__append_1) tests
29 +SUBDIRS = liblangtag extensions data docs $(am__append_1)
30 CONFIGURE_DEPENDENCIES = \
31 requires \
32 $(NULL)
33 --- misc/liblangtag-0.4.0/data/Makefile.in 2012-10-22 05:47:23.000000000 +0200
34 +++ misc/build/liblangtag-0.4.0/data/Makefile.in 2012-11-06 14:47:23.173704887 +0100
35 @@ -52,7 +52,7 @@
36 POST_UNINSTALL = :
37 build_triplet = @build@
38 host_triplet = @host@
39 -noinst_PROGRAMS = reg2xml$(EXEEXT) $(am__EXEEXT_1)
40 +noinst_PROGRAMS = $(am__EXEEXT_1)
41 subdir = data
42 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
43 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44 @@ -80,8 +80,8 @@
45 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
46 am__v_lt_0 = --silent
47 reg2xml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
48 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(reg2xml_CFLAGS) \
49 - $(CFLAGS) $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@
50 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
51 + $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@
52 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
53 depcomp = $(SHELL) $(top_srcdir)/depcomp
54 am__depfiles_maybe = depfiles
55 @@ -98,9 +98,9 @@
56 AM_V_at = $(am__v_at_@AM_V@)
57 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
58 am__v_at_0 = @
59 -CCLD = $(CC)
60 +CCLD = link
61 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
62 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
63 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
64 $(AM_LDFLAGS) $(LDFLAGS) -o $@
65 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
66 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
67 @@ -485,14 +485,14 @@
68 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po
69 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reg2xml.c' object='reg2xml-reg2xml.o' libtool=no @AMDEPBACKSLASH@
70 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
71 -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
72 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
73
74 reg2xml-reg2xml.obj: reg2xml.c
75 -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi`
76 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi`
77 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po
78 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reg2xml.c' object='reg2xml-reg2xml.obj' libtool=no @AMDEPBACKSLASH@
79 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
80 -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi`
81 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi`
82
83 mostlyclean-libtool:
84 -rm -f *.lo
85 --- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2012-10-22 05:47:23.000000000 +0200
86 +++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.in 2012-11-06 14:51:04.551628998 +0100
87 @@ -136,8 +136,8 @@
88 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
89 am__v_lt_0 = --silent
90 liblangtag_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
91 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblangtag_la_CFLAGS) \
92 - $(CFLAGS) $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@
93 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
94 + $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@
95 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
96 depcomp = $(SHELL) $(top_srcdir)/depcomp
97 am__depfiles_maybe = depfiles
98 @@ -154,9 +154,9 @@
99 AM_V_at = $(am__v_at_@AM_V@)
100 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
101 am__v_at_0 = @
102 -CCLD = $(CC)
103 +CCLD = link
104 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
105 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
106 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
107 $(AM_LDFLAGS) $(LDFLAGS) -o $@
108 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
109 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
110 --- misc/liblangtag-0.4.0/ltmain.sh 2012-10-09 11:00:50.000000000 +0200
111 +++ misc/build/liblangtag-0.4.0/ltmain.sh 2012-11-06 14:40:01.656623672 +0100
112 @@ -8985,7 +8985,7 @@
113 fi
114
115 # Replace the output file specification.
116 - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
117 + link_command=`$ECHO "$link_command" | $SED 's%-o \+@OUTPUT@%/OUT:'"$output_objdir/$outputname"'%g'`
118
119 # Delete the old output files.
120 $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
121 --- misc/liblangtag-0.4.0/tests/Makefile.in 2012-10-22 05:47:23.000000000 +0200
122 +++ misc/build/liblangtag-0.4.0/tests/Makefile.in 2012-11-06 14:49:08.108344563 +0100
123 @@ -187,9 +187,9 @@
124 AM_V_at = $(am__v_at_@AM_V@)
125 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
126 am__v_at_0 = @
127 -CCLD = $(CC)
128 +CCLD = link
129 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
130 - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
131 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
132 $(AM_LDFLAGS) $(LDFLAGS) -o $@
133 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
134 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
135 @@ -324,6 +324,7 @@
136 @LDFLAGS@ \
137 $(top_builddir)/liblangtag/liblangtag.la \
138 $(CHECK_LIBS) \
139 + $(LIBXML2_LIBS) \
140 $(NULL)
141
142 LIBTOOL = @LIBTOOL@
FREE OFFICE SUITE