[svn] commit: r1745 - in /trunk: ./ configure.ac src/lib/cc/ src/lib/dns/ src/lib/dns/rdata/generic/rrsig_46.cc src/lib/dns/tests/

[BIND 10 source code commits]

Author: jinmei
Date: Mon Apr 19 21:43:25 2010
New Revision: 1745

Log:
merge from branch: try ${PYTHON}-config --prefix/lib for a last resort LDFLAGS for libpython (trac #149)

Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/src/lib/cc/   (props changed)
    trunk/src/lib/dns/   (props changed)
    trunk/src/lib/dns/rdata/generic/rrsig_46.cc   (props changed)
    trunk/src/lib/dns/tests/   (props changed)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Apr 19 21:43:25 2010
@@ -51,8 +51,18 @@
 PYTHON_INCLUDES=`${PYTHON}-config --includes`
 AC_SUBST(PYTHON_INCLUDES)
 for flag in `${PYTHON}-config --ldflags`; do
-	PYTHON_LDFLAGS="$PYTHON_LDFLAGS `echo $flag | sed -ne 's/^\(\-L.*\)$/\1/p'`"
+	# add any '-L..." flags to PYTHON_LDFLAGS
+	flag=`echo $flag | sed -ne 's/^\(\-L.*\)$/\1/p'`
+	if test "X${flag}" != X; then
+		PYTHON_LDFLAGS="$PYTHON_LDFLAGS ${flag}"
+	fi
 done
+# on some platforms, ${PYTHON}-config --ldflags doesn't provide a -L option
+# while having the library under a non trivial directory.  as a workaround
+# we try the "lib" sub directory under the common prefix for this python.
+if test -z "${PYTHON_LDFLAGS}"; then
+	PYTHON_LDFLAGS="-L`${PYTHON}-config --prefix`/lib"
+fi
 AC_SUBST(PYTHON_LDFLAGS)
 
 # Check for python library (not absolutely mandatory, but needed for