Commit 9202942b authored by William M. Brack's avatar William M. Brack
Browse files

applied suggestion from Miloslav Trmac (see Bug 130419) and eliminated

* xmlmemory.c: applied suggestion from Miloslav Trmac (see
  Bug 130419) and eliminated xmlInitMemoryDone.  More
  improvement needed.

* xml2-config.in: added an additional flag (--exec-prefix) to
  allow library directory to be different from include directory
  (Bug 129558).
parent d34b0b8f
Sun Jan 4 08:57:51 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xmlmemory.c: applied suggestion from Miloslav Trmac (see
Bug 130419) and eliminated xmlInitMemoryDone. More
improvement needed.
* xml2-config.in: added an additional flag (--exec-prefix) to
allow library directory to be different from include directory
(Bug 129558).
Fri Jan 2 21:22:18 CET 2004 Daniel Veillard <daniel@veillard.com>
 
* error.c: applied patch from Stphane Bidoul for structured error
......
......@@ -13,6 +13,7 @@ Usage: xml2-config [OPTION]
Known values for OPTION are:
--prefix=DIR change libxml prefix [default $prefix]
--exec-prefix=DIR change libxml exec prefix [default $exec_prefix]
--libs print library linking information
--libtool-libs print linking information for use with libtool
--cflags print pre-processor and compiler flags
......@@ -47,6 +48,15 @@ while test $# -gt 0; do
echo $prefix
;;
--exec-prefix=*)
exec_prefix=$optarg
libdir=$exec_prefix/lib
;;
--exec-prefix)
echo $exec_prefix
;;
--version)
echo @VERSION@
exit 0
......
......@@ -769,8 +769,6 @@ xmlMemoryDump(void)
* *
****************************************************************/
static int xmlInitMemoryDone = 0;
/**
* xmlInitMemory:
*
......@@ -784,9 +782,12 @@ xmlInitMemory(void)
#ifdef HAVE_STDLIB_H
char *breakpoint;
#endif
/*
This is really not good code (see Bug 130419). Suggestions for
improvement will be welcome!
*/
if (xmlMemInitialized) return(-1);
xmlMemInitialized = 1;
if (xmlInitMemoryDone) return(-1);
xmlMemMutex = xmlNewMutex();
#ifdef HAVE_STDLIB_H
......@@ -806,7 +807,6 @@ xmlInitMemory(void)
xmlGenericError(xmlGenericErrorContext,
"xmlInitMemory() Ok\n");
#endif
xmlInitMemoryDone = 1;
return(0);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment