liblangtag/liblangtag-0.2-msc-configure.patch

   1 --- misc/liblangtag-0.2/configure       2012-06-03 03:21:20.513755000 +0200
   2 +++ misc/build/liblangtag-0.2/configure 2012-06-02 23:04:17.742605700 +0200
   3 @@ -3751,6 +3751,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.2/data/Makefile.in        2012-02-02 11:04:10.000000000 +0100
  13 +++ misc/build/liblangtag-0.2/data/Makefile.in  2012-06-03 03:20:28.045005000 +0200
  14 @@ -59,7 +59,7 @@
  15  reg2xml_OBJECTS = $(am_reg2xml_OBJECTS)
  16  reg2xml_LDADD = $(LDADD)
  17  reg2xml_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  18 -       --mode=link $(CCLD) $(reg2xml_CFLAGS) $(CFLAGS) \
  19 +       --mode=link $(CCLD) \
  20         $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@
  21  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  22  depcomp = $(SHELL) $(top_srcdir)/depcomp
  23 @@ -70,9 +70,9 @@
  24  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  25         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  26         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  27 -CCLD = $(CC)
  28 +CCLD = link
  29  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  30 -       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  31 +       --mode=link $(CCLD) $(AM_LDFLAGS) \
  32         $(LDFLAGS) -o $@
  33  SOURCES = $(reg2xml_SOURCES)
  34  DIST_SOURCES = $(reg2xml_SOURCES)
  35 @@ -422,18 +422,18 @@
  36  @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
  37
  38  reg2xml-reg2xml.o: reg2xml.c
  39 -@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.o -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
  40 +@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.o -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
  41  @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po
  42  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='reg2xml.c' object='reg2xml-reg2xml.o' libtool=no @AMDEPBACKSLASH@
  43  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  44 -@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
  45 +@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c
  46
  47  reg2xml-reg2xml.obj: reg2xml.c
  48 -@am__fastdepCC_TRUE@   $(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`
  49 +@am__fastdepCC_TRUE@   $(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`
  50  @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po
  51  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='reg2xml.c' object='reg2xml-reg2xml.obj' libtool=no @AMDEPBACKSLASH@
  52  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  53 -@am__fastdepCC_FALSE@  $(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`
  54 +@am__fastdepCC_FALSE@  $(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`
  55
  56  mostlyclean-libtool:
  57         -rm -f *.lo
  58 --- misc/liblangtag-0.2/liblangtag/Makefile.in  2012-02-02 11:04:10.000000000 +0100
  59 +++ misc/build/liblangtag-0.2/liblangtag/Makefile.in    2012-06-02 23:04:17.757766800 +0200
  60 @@ -97,8 +97,8 @@
  61  am_liblangtag_la_OBJECTS = $(am__objects_3) $(am__objects_1)
  62  liblangtag_la_OBJECTS = $(am_liblangtag_la_OBJECTS)
  63  liblangtag_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  64 -       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblangtag_la_CFLAGS) \
  65 -       $(CFLAGS) $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@
  66 +       $(LIBTOOLFLAGS) --mode=link $(CCLD) \
  67 +       $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@
  68  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  69  depcomp = $(SHELL) $(top_srcdir)/depcomp
  70  am__depfiles_maybe = depfiles
  71 @@ -108,9 +108,9 @@
  72  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  73         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  74         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  75 -CCLD = $(CC)
  76 +CCLD = link
  77  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  78 -       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  79 +       --mode=link $(CCLD) $(AM_LDFLAGS) \
  80         $(LDFLAGS) -o $@
  81  SOURCES = $(liblangtag_la_SOURCES)
  82  DIST_SOURCES = $(liblangtag_la_SOURCES)
  83 --- misc/liblangtag-0.2/ltmain.sh       2011-12-27 11:43:05.000000000 +0100
  84 +++ misc/build/liblangtag-0.2/ltmain.sh 2012-06-02 23:04:17.772927900 +0200
  85 @@ -8969,7 +8969,7 @@
  86        fi
  87
  88        # Replace the output file specification.
  89 -      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
  90 +      link_command=`$ECHO "$link_command" | $SED 's%-o \+@OUTPUT@%/OUT:'"$output_objdir/$outputname"'%g'`
  91
  92        # Delete the old output files.
  93        $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
  94 --- misc/liblangtag-0.2/tests/Makefile.in       2012-02-02 11:04:10.000000000 +0100
  95 +++ misc/build/liblangtag-0.2/tests/Makefile.in 2012-06-03 03:21:02.982505000 +0200
  96 @@ -149,9 +149,9 @@
  97  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  98         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  99         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 100 -CCLD = $(CC)
 101 +CCLD = link
 102  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 103 -       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 104 +       --mode=link $(CCLD) $(AM_LDFLAGS) \
 105         $(LDFLAGS) -o $@
 106  SOURCES = $(check_extlang_SOURCES) $(check_grandfathered_SOURCES) \
 107         $(check_lang_SOURCES) $(check_region_SOURCES) \
 108 @@ -286,6 +286,8 @@
 109         @LDFLAGS@                                       \
 110         $(top_builddir)/liblangtag/liblangtag.la        \
 111         $(CHECK_LIBS)                                   \
 112 +       $(LIBXML2_LIBS) \
 113 +       $(GLIB_LIBS) \
 114         $(NULL)
 115
 116  LIBTOOL = @LIBTOOL@