Hi Nilesh,
On Tue, Sep 23, 2025 at 11:25:00PM +0200, Helmut Grohne wrote:
> Arguably, we do want to run autoreconf eventually. Otherwise, we incur
> an rc bug once autoconf2.69 gets removed from unstable. Sometimes making
> autoreconf work is part of the solution.
I am attaching a patch for configure.in. Applying it requires running
autoreconf2.69 of course. With little tweaks this is possible:
AUTOMAKE=true autoreconf2.69 -f -i
sed -i -e 's/^ *-version/--runstatedir=*) ;; &/' configure
The sed script makes the configure script ignore the --runstatedir
option passed by dh_auto_configure.
This patch uses PKG_CHECK_MODULES and no longer runs pkg-config during
dh_auto_build. I think this is the way to go.
Helmut
--- xmlrpc-c-1.59.03.orig/configure.in
+++ xmlrpc-c-1.59.03/configure.in
@@ -694,19 +694,13 @@
dnl Finding OpenSSL
dnl =======================================================================
-AC_MSG_CHECKING(for OpenSSL library)
-
-if pkg-config openssl; then
+PKG_CHECK_MODULES([OPENSSL],[openssl],[
+ OPENSSL_LDADD="$OPENSSL_LIBS"
+ AC_SUBST([OPENSSL_LDADD])
HAVE_OPENSSL=yes
- OPENSSL_LDADD=$(pkg-config openssl --libs)
- AC_SUBST(OPENSSL_LDADD)
- OPENSSL_CFLAGS=$(pkg-config openssl --cflags)
- AC_SUBST(OPENSSL_CFLAGS)
-else
+],[
HAVE_OPENSSL=no
-fi
-
-AC_MSG_RESULT($HAVE_OPENSSL)
+])
# One really annoying case where the user needs to disable building of
# Openssl-based parts explicitly is where there is no Openssl for the target
@@ -782,6 +776,8 @@
ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
AC_SUBST(ENABLE_LIBXML2_BACKEND)
+PKG_CHECK_MODULES([EXPAT],[expat],,)
+
dnl =======================================================================
dnl Compiler information
dnl =======================================================================
--- xmlrpc-c-1.59.03.orig/common.mk
+++ xmlrpc-c-1.59.03/common.mk
@@ -259,7 +259,7 @@
ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
# We're using the internal Expat XML parser
- LDLIBS_XML = $(shell $(PKG_CONFIG) --libs expat)
+ LDLIBS_XML = $(EXPAT_LIBS)
else
LDLIBS_XML = $(shell xml2-config --libs)
endif
--- xmlrpc-c-1.59.03.orig/config.mk.in
+++ xmlrpc-c-1.59.03/config.mk.in
@@ -52,7 +52,6 @@
CCLD = $(CC)
CXXLD = $(CXX)
AR = @AR@
-PKG_CONFIG = pkg-config
RANLIB = @RANLIB@
LN_S = ln -s
INSTALL = $(SRCDIR)/install-sh
@@ -468,3 +467,5 @@
HAVE_OPENSSL = @HAVE_OPENSSL@
OPENSSL_LDADD = @OPENSSL_LDADD@
OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
--- xmlrpc-c-1.59.03.orig/src/Makefile
+++ xmlrpc-c-1.59.03/src/Makefile
@@ -73,7 +73,7 @@
XML_PKGCONFIG_REQ = libxml-2.0
else
XMLRPC_XML_PARSER = xmlrpc_expat
- XML_PARSER_LIBDEP = $(shell $(PKG_CONFIG) expat --libs)
+ XML_PARSER_LIBDEP = $(EXPAT_LIBS)
XML_PARSER_LIBDEP_DEP =
XML_PKGCONFIG_REQ = expat
endif
@@ -276,7 +276,7 @@
ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
LIBXML_INCLUDES = $(shell xml2-config --cflags)
else
- LIBXML_INCLUDES = $(shell $(PKG_CONFIG) --cflags expat)
+ LIBXML_INCLUDES = $(EXPAT_CFLAGS)
endif
$(LIBXMLRPC_MODS:%=%.o) \
--- xmlrpc-c-1.59.03.orig/src/cpp/Makefile
+++ xmlrpc-c-1.59.03/src/cpp/Makefile
@@ -42,13 +42,13 @@
ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
LIBXML_INCLUDES = $(LIBXML2_CFLAGS)
else
- LIBXML_INCLUDES = $(shell $(PKG_CONFIG) --cflags expat)
+ LIBXML_INCLUDES = $(EXPAT_CFLAGS)
endif
ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
XML_PARSER_LIBDEP = $(shell xml2-config --libs)
else
- XML_PARSER_LIBDEP = $(shell $(PKG_CONFIG) --libs expat)
+ XML_PARSER_LIBDEP = $(EXPAT_LIBS)
endif
LIBXMLRPCPP_MODS = fault global outcome param_list value xml
