[svn] commit: r1786 - /branches/trac148/configure.ac

[BIND 10 source code commits]

Author: jinmei
Date: Wed Apr 21 17:03:36 2010
New Revision: 1786

Log:
checkpoint

Modified:
    branches/trac148/configure.ac

Modified: branches/trac148/configure.ac
==============================================================================
--- branches/trac148/configure.ac (original)
+++ branches/trac148/configure.ac Wed Apr 21 17:03:36 2010
@@ -62,6 +62,7 @@
 # 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"
+	python_rpath="-R`${PYTHON}-config --prefix`/lib"
 fi
 AC_SUBST(PYTHON_LDFLAGS)
 
@@ -213,8 +214,9 @@
 				BOOST_SYSTEM_LIB="-l${BOOST_TRY_LIB}"
 				;;
 			with_rflag)
-				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS} ${boost_rpath_flag}"
+				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS} -Wl,${boost_rpath_flag}"
 				BOOST_SYSTEM_LIB="-l${BOOST_TRY_LIB}"
+				result_msg=" (using rpath)"
 				;;
 			with_static)
 				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}"
@@ -222,6 +224,7 @@
 					continue
 				fi
 				BOOST_SYSTEM_LIB="${boost_library_path}/lib${BOOST_TRY_LIB}.a"
+				result_msg=" (using static library)"
 				;;
 			esac
 			LIBS="$LIBS_SAVED ${BOOST_SYSTEM_LIB}"
@@ -233,7 +236,7 @@
     return 0;
 }
 ],
-			[ AC_MSG_RESULT(yes)
+			[ AC_MSG_RESULT([yes${result_msg}])
 			if test $mode = "with_rflag"; then
 				use_boost_rflag=yes
 			fi
@@ -289,18 +292,21 @@
 				BOOST_PYTHON_LIB="-l${BOOST_TRY_LIB}"
 				;;
 			with_rflag)
-				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS} ${boost_rpath_flag}"
+				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS} -Wl,${boost_rpath_flag}"
 				BOOST_PYTHON_LIB="-l${BOOST_TRY_LIB}"
+				result_msg=" (using rpath)"
 				;;
 			with_static)
-				LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}"
+				LDFLAGS="-static $LDFLAGS_SAVED ${BOOST_LDFLAGS}"
 				if test -z "${boost_library_path}"; then
 					continue
 				fi
 				BOOST_PYTHON_LIB="${boost_library_path}/lib${BOOST_TRY_LIB}.a"
+				result_msg=" (using static library)"
 				;;
 			esac
-			LIBS="$LIBS_SAVED ${BOOST_PYTHON_LIB}"
+			LIBS="$LIBS_SAVED ${BOOST_PYTHON_LIB} ${PYTHON_LIB}"
+			LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS -Wl,${python_rpath}"
 			AC_TRY_RUN([
 #include <boost/python/module.hpp>
 using namespace boost::python;
@@ -309,8 +315,7 @@
 	return 0;
 }
 ],
-				[ AC_MSG_RESULT(yes)
-				BOOST_PYTHON_LIB="-l${BOOST_TRY_LIB}"
+				[ AC_MSG_RESULT(yes${result_msg})
 				if test $mode = "with_rflag"; then
 					use_boost_rflag=yes
 				fi
@@ -343,7 +348,7 @@
 AC_SUBST(BOOST_PYTHON_LIB)
 
 if test $use_boost_rflag = "yes"; then
-	BOOST_LDFLAGS=$boost_rpath_flag
+	BOOST_LDFLAGS="$BOOST_LDFLAGS $boost_rpath_flag"
 fi
 AC_SUBST(BOOST_LDFLAGS)