diff --git a/ldns-1.7.0/configure b/ldns-1.7.0/configure index cd087de..aeec9fb 100755 --- a/ldns-1.7.0/configure +++ b/ldns-1.7.0/configure @@ -684,6 +684,7 @@ PYTHON_SITE_PKG PYTHON_LDFLAGS PYTHON_CPPFLAGS PYTHON +PYTHON_LIB PYTHON_VERSION UNINSTALL_CONFIG_MANPAGE UNINSTALL_CONFIG @@ -14311,6 +14312,7 @@ EOD` # use the official shared library ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" + PYTHON_LIB="$ac_python_library" else # old way: use libpython from python_configdir ac_python_libdir=`$PYTHON -c \ @@ -14318,6 +14320,7 @@ EOD` import os; \ print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" + PYTHON_LIB="python$ac_python_version" fi if test -z "PYTHON_LDFLAGS"; then diff --git a/ldns-1.7.0/packaging/ldns-config.in b/ldns-1.7.0/packaging/ldns-config.in index ffb2c57..950c135 100755 --- a/ldns-1.7.0/packaging/ldns-config.in +++ b/ldns-1.7.0/packaging/ldns-config.in @@ -3,13 +3,26 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" VERSION="@PACKAGE_VERSION@" -CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@" -LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@" LIBS="@LIBS@ @LIBSSL_LIBS@" -LIBDIR="@libdir@" INCLUDEDIR="@includedir@" LIBVERSION="@VERSION_INFO@" +ARCH="`uname -m`" + +case $ARCH in + x86_64 | amd64 | sparc64 | s390x | ppc64) + + LIBDIR="/usr/lib64" + LIBDIR_SEC="/usr/lib" + ;; + * ) + LIBDIR="/usr/lib" + LIBDIR_SEC="/usr/lib64" + ;; +esac + +LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@" +LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@" for arg in $@ do @@ -21,9 +34,13 @@ do then echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns" fi + if [ $arg = "--libs_sec" ] + then + echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns" + fi if [ $arg = "-h" ] || [ $arg = "--help" ] then - echo "Usage: $0 [--cflags] [--libs] [--version]" + echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]" fi if [ $arg = "--version" ] then