Skip to content

Commit

Permalink
Default DSOFLAGS to LDFLAGS (Issue #325)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Apr 21, 2024
1 parent 7ed214c commit ef6b468
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 44 deletions.
83 changes: 59 additions & 24 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
# Changes in Mini-XML 4.0.2
Changes in Mini-XML
===================


Changes in Mini-XML 4.0.3
-------------------------

- The configure script now defaults the `DSOFLAGS` value to `LDFLAGS` if not
set (Issue #325)


Changes in Mini-XML 4.0.2
-------------------------

- Fixed an issue with GNU make and parallel builds (Issue #314)


# Changes in Mini-XML 4.0.1
Changes in Mini-XML 4.0.1
-------------------------

- Fixed missing "docdir" definition in makefile (Issue #313)
- Fixed missing CPPFLAGS, OPTIM, and WARNINGS in CFLAGS in makefile.
- Fixed configure script issues.


# Changes in Mini-XML 4.0.0
Changes in Mini-XML 4.0.0
-------------------------

- Now require C99 support (Issue #300)
- Now install as "libmxml4" to support installing both Mini-XML 3.x and 4.x at
Expand All @@ -34,18 +48,21 @@
- Fixed real number support in non-English locales (Issue #311)


# Changes in Mini-XML 3.3.2
Changes in Mini-XML 3.3.2
-------------------------

- Updated the autoconf `config.guess` and `config.sub` scripts to support cross
compilation for newer platforms (Issue #296)


# Changes in Mini-XML 3.3.1
Changes in Mini-XML 3.3.1
-------------------------

- Fixed POSIX thread cleanup bugs (Issue #293)


# Changes in Mini-XML 3.3
Changes in Mini-XML 3.3
-----------------------

- Cleaned up usage of `free` throughout the library (Issue #276)
- Added more error handling to the library (Issue #277)
Expand All @@ -56,7 +73,8 @@
- Fixed some minor memory leaks found by Coverity.


# Changes in Mini-XML 3.2
Changes in Mini-XML 3.2
-----------------------

- Added support for shared libraries on Haiku (Issue #262)
- Fixed handling of unquoted attribute values that start with a Unicode
Expand All @@ -65,15 +83,17 @@
- Fixed some minor issues identified by the LGTM security scanner.


# Changes in Mini-XML 3.1
Changes in Mini-XML 3.1
-----------------------

- The `mxmlLoad*` functions now print an error when the XML does not start with
`<` and no parent node is supplied (Issue #256, Issue #259)
- Fixed an issue with "make install" trying to install old files (Issue #257)
- Fixed some DSO installation issues on Linux.


# Changes in Mini-XML 3.0
Changes in Mini-XML 3.0
-----------------------

- Changed the license to Apache 2.0 with exceptions (Issue #239)
- All of the internal node structures are now moved out of the public header
Expand All @@ -90,7 +110,8 @@
- The `_mxml_strdupf` function did not work on Windows (Issue #245)


# Changes in Mini-XML 2.12
Changes in Mini-XML 2.12
------------------------

- Added yet more documentation about using `MXML_OPAQUE_CALLBACK` when you want
to get full strings for inline text instead of separated words (Issue #190)
Expand All @@ -106,7 +127,8 @@
- Updated the markdown and ZIP container libraries used for mxmldoc.


# Changes in Mini-XML 2.11
Changes in Mini-XML 2.11
------------------------

- CDATA nodes now omit the trailing "]]" for convenience (Issue #170)
- Fixed a memory leak in mxmlDelete (Issue #183)
Expand All @@ -131,7 +153,8 @@
`@exclude man,html@`.


# Changes in Mini-XML 2.10
Changes in Mini-XML 2.10
------------------------

- The version number in mxml.h was wrong.
- The mxml.spec file was out of date.
Expand All @@ -144,13 +167,15 @@
stack space depending on the file. (CVE-2016-4571)


# Changes in Mini-XML 2.9
Changes in Mini-XML 2.9
-----------------------

- `mxmlLoad*` did not correctly load value nodes with `MXML_NO_CALLBACK` or
`MXML_TEXT_CALLBACK`.


# Changes in Mini-XML 2.8
Changes in Mini-XML 2.8
-----------------------

- Now call docsetutil using xcrun on macOS.
- mxmldoc did not escape special HTML characters inside @code foo@ comments.
Expand All @@ -161,7 +186,8 @@
- Fixed an XML fragment loading problem.


# Changes in Mini-XML 2.7
Changes in Mini-XML 2.7
-----------------------

- Added 64-bit configurations to the VC++ project files.
- Fixed conformance of mxmldoc's HTML and CSS output.
Expand All @@ -181,7 +207,8 @@
and its children.


# Changes in Mini-XML 2.6
Changes in Mini-XML 2.6
-----------------------

- Documentation fixes.
- The mxmldoc program did not handle typedef comments properly.
Expand All @@ -198,7 +225,8 @@
- The mxmldoc program now handles "typedef enum name {} name" correctly.


# Changes in Mini-XML 2.5
Changes in Mini-XML 2.5
-----------------------

- The mxmldoc program now makes greater use of CSS and supports a `--css` option
to embed an alternate stylesheet.
Expand All @@ -215,7 +243,8 @@
- Spaces around the "=" in attributes were not supported.


# Changes in Mini-XML 2.4
Changes in Mini-XML 2.4
-----------------------

- Fixed shared library build problems on HP-UX and Mac macOS.
- The mxmldoc program did not output argument descriptions for functions
Expand All @@ -234,7 +263,8 @@
node with no children as the top node.


# Changes in Mini-XML 2.3
Changes in Mini-XML 2.3
-----------------------

- Added two exceptions to the LGPL to support static linking of applications
against Mini-XML.
Expand Down Expand Up @@ -268,13 +298,15 @@
- `mxmlLoad*` crashed when reporting an error in some invalid XML.


# Changes in Mini-XML 2.2.2
Changes in Mini-XML 2.2.2
-------------------------

- `mxmlLoad*` did not treat custom data as opaque, so whitespace characters
would be lost.


# Changes in Mini-XML 2.2.1
Changes in Mini-XML 2.2.1
-------------------------

- `mxmlLoad*` now correctly return NULL on error.
- `mxmlNewInteger`, `mxmlNewOpaque`, `mxmlNewReal`, `mxmlNewText`, and
Expand All @@ -285,7 +317,8 @@
- Fixed a MingW/Cygwin compilation problem.


# Changes in Mini-XML 2.2
Changes in Mini-XML 2.2
-----------------------

- Added shared library support.
- `mxmlLoad*` now return an error when an XML stream contains illegal control
Expand All @@ -298,7 +331,8 @@
- Added checking for invalid comment termination: "--->" is not allowed.


# Changes in Mini-XML 2.1
Changes in Mini-XML 2.1
-----------------------

- Added support for custom data nodes.
- Now treat UTF-8 sequences which are longer than necessary as an error.
Expand All @@ -309,7 +343,8 @@
- Fixed multi-word UTF-16 handling.


# Changes in Mini-XML 2.0
Changes in Mini-XML 2.0
-----------------------

- New programmers manual.
- Added Visual C++ project files for Microsoft Windows users.
Expand Down
24 changes: 12 additions & 12 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Mini-XML 4.0.2.
# Generated by GNU Autoconf 2.71 for Mini-XML 4.0.3.
#
# Report bugs to <https://github.com/michaelrsweet/mxml/issues>.
#
Expand Down Expand Up @@ -610,8 +610,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mini-XML'
PACKAGE_TARNAME='mxml'
PACKAGE_VERSION='4.0.2'
PACKAGE_STRING='Mini-XML 4.0.2'
PACKAGE_VERSION='4.0.3'
PACKAGE_STRING='Mini-XML 4.0.3'
PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues'
PACKAGE_URL='https://www.msweet.org/mxml'

Expand Down Expand Up @@ -1299,7 +1299,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Mini-XML 4.0.2 to adapt to many kinds of systems.
\`configure' configures Mini-XML 4.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1365,7 +1365,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Mini-XML 4.0.2:";;
short | recursive ) echo "Configuration of Mini-XML 4.0.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1468,7 +1468,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Mini-XML configure 4.0.2
Mini-XML configure 4.0.3
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1667,7 +1667,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Mini-XML $as_me 4.0.2, which was
It was created by Mini-XML $as_me 4.0.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -2425,7 +2425,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"


MXML_VERSION="4.0.2"
MXML_VERSION="4.0.3"


printf "%s\n" "#define MXML_VERSION \"Mini-XML v$MXML_VERSION\"" >>confdefs.h
Expand Down Expand Up @@ -2524,10 +2524,10 @@ fi

CFLAGS="${CFLAGS:=}"
CPPFLAGS="${CPPFLAGS:=}"
DSO=""
DSOFLAGS="${DSOFLAGS:=}"
LDFLAGS="${LDFLAGS:=}"
LIBS="${LIBS:=}"
DSO=""
DSOFLAGS="${DSOFLAGS:=$LDFLAGS}"
OPTIM="${OPTIM:=}"


Expand Down Expand Up @@ -5232,7 +5232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Mini-XML $as_me 4.0.2, which was
This file was extended by Mini-XML $as_me 4.0.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5297,7 +5297,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
Mini-XML config.status 4.0.2
Mini-XML config.status 4.0.3
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AC_PREREQ([2.70])


dnl Package name and version...
AC_INIT([Mini-XML], [4.0.2], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
AC_INIT([Mini-XML], [4.0.3], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
AC_CONFIG_HEADERS([config.h])

MXML_VERSION="AC_PACKAGE_VERSION"
Expand Down Expand Up @@ -42,10 +42,10 @@ AS_IF([test "x$host_os_version" = x], [
dnl Compiler options...
CFLAGS="${CFLAGS:=}"
CPPFLAGS="${CPPFLAGS:=}"
DSO=""
DSOFLAGS="${DSOFLAGS:=}"
LDFLAGS="${LDFLAGS:=}"
LIBS="${LIBS:=}"
DSO=""
DSOFLAGS="${DSOFLAGS:=$LDFLAGS}"
OPTIM="${OPTIM:=}"

AC_SUBST([DSO])
Expand Down
2 changes: 1 addition & 1 deletion vcnet/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
// Version number
//

# define MXML_VERSION "Mini-XML v4.0.2"
# define MXML_VERSION "Mini-XML v4.0.3"


//
Expand Down
4 changes: 2 additions & 2 deletions vcnet/libmxml4_native.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>libmxml2_native</id>
<title>Small XML File Parsing Library for VS2019+</title>
<version>4.0.2</version>
<version>4.0.3</version>
<authors>Michael R Sweet</authors>
<owners>michaelrsweet</owners>
<projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
Expand All @@ -16,7 +16,7 @@
<copyright>Copyright © 2003-2024 by Michael R Sweet</copyright>
<tags>xml</tags>
<dependencies>
<dependency id="libmxml2_native.redist" version="4.0.2" />
<dependency id="libmxml2_native.redist" version="4.0.3" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion vcnet/libmxml4_native.redist.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>libmxml2_native.redist</id>
<title>Small XML File Parsing Library for VS2019+ Redist</title>
<version>4.0.2</version>
<version>4.0.3</version>
<authors>Michael R Sweet</authors>
<owners>michaelrsweet</owners>
<projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion xcode/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// Version number
//

# define MXML_VERSION "Mini-XML v4.0.2"
# define MXML_VERSION "Mini-XML v4.0.3"


//
Expand Down

0 comments on commit ef6b468

Please sign in to comment.