[libxml2] Remove special configuration for certain maintainers



commit 6117700e2c5db0baf7844f04c38ccdd39d389091
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Sun Feb 20 20:56:40 2022 +0100

    Remove special configuration for certain maintainers

 Makefile.am              |  2 +-
 configure.ac             | 35 +----------------------------------
 doc/examples/Makefile.am |  2 +-
 doc/examples/index.py    |  2 +-
 example/Makefile.am      |  2 +-
 fuzz/Makefile.am         |  2 +-
 6 files changed, 6 insertions(+), 39 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3b3fe19a..bd5b7d36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
                xmlmodule.c schematron.c xzlib.c
 
 DEPS = $(top_builddir)/libxml2.la
-LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) 
$(M_LIBS) $(WIN32_EXTRA_LIBADD)
+LDADDS = $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) 
$(WIN32_EXTRA_LIBADD)
 
 
 man_MANS = xml2-config.1 libxml.3
diff --git a/configure.ac b/configure.ac
index dea488e1..41c39dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@ AC_ARG_ENABLE(rebuild-docs,
 if test "$enable_rebuild_docs" = "yes" -a "$srcdir" != "."; then
   AC_MSG_ERROR([cannot rebuild docs when builddir != srcdir])
 fi
-AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes" -o "$USER" = "veillard"])
+AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes"])
 
 dnl
 dnl hard dependencies on options
@@ -944,39 +944,6 @@ AC_SUBST(MODULE_PLATFORM_LIBS)
 AC_SUBST(MODULE_EXTENSION)
 AC_SUBST(TEST_MODULES)
 
-dnl
-dnl Tester makes use of readline if present
-dnl
-
-dnl
-dnl specific tests to setup DV and Bill's devel environments with debug etc ...
-dnl (-Wunreachable-code)
-dnl
-if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \
-   [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/home/veillard/libxml2" ]] || \
-   [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomesvn/libxml2" ]]
-   then
-    if test "$with_minimum" != "yes"
-    then
-       if test "${with_mem_debug}" = "" ; then
-           echo Activating memory debugging
-           with_mem_debug="yes"
-           with_run_debug="yes"
-       fi
-       if test "${with_docbook}" = "" ; then
-           with_docbook="no"
-       fi
-    fi
-    if test "${GCC}" = "yes" ; then
-    EXTRA_CFLAGS="-g -O -pedantic -W -Wformat -Wno-format-extra-args -Wunused -Wimplicit -Wreturn-type 
-Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith 
-Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs 
-Winline -Wredundant-decls -Wall"
-    fi
-    STATIC_BINARIES="-static"
-dnl -Wcast-qual -ansi
-else
-    STATIC_BINARIES=
-fi
-AC_SUBST(STATIC_BINARIES)
-
 dnl
 dnl Check for trio string functions
 dnl
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 446ecb85..cd417848 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -5,7 +5,7 @@
 
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
 AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
-LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
+LDADD = $(RDL_LIBS) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
 
 CLEANFILES = *.tmp
 
diff --git a/doc/examples/index.py b/doc/examples/index.py
index ac44ec51..ed1df59c 100755
--- a/doc/examples/index.py
+++ b/doc/examples/index.py
@@ -227,7 +227,7 @@ def dump_Makefile():
 
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
 AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
-LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
+LDADD = $(RDL_LIBS) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
 
 CLEANFILES = *.tmp
 
diff --git a/example/Makefile.am b/example/Makefile.am
index 49bca390..5839bd0f 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = gjobread
 
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
 AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
-LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
+LDADD = $(RDL_LIBS) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm 
$(WIN32_EXTRA_LIBADD)
 
 gjobread_SOURCES=gjobread.c
diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
index af4f23f9..69410bc5 100644
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = html.dict regexp.dict schema.dict xml.dict xpath.dict \
 CLEANFILES = $(EXTRA_PROGRAMS)
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 DEPENDENCIES = $(top_builddir)/libxml2.la
-LDADD = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) 
$(M_LIBS) $(WIN32_EXTRA_LIBADD)
+LDADD = $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) 
$(WIN32_EXTRA_LIBADD)
 
 XML_MAX_LEN = 80000
 # Single quotes to avoid wildcard expansion by the shell


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]