Attachment #125192 for bug #185689




		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
		export CPPFLAGS

		LIBS_SAVED="$LIBS"
		LIBS="$LIBS $BOOST_LDFLAGS"
		export LIBS

        AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available,
					   ax_cv_boost_unit_test_framework,

			AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
			BN=boost_unit_test_framework
            if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
         		saved_libs="${LIBS}"
		    	for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
                             lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
                             $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                   LIBS="${LIBS} -l$ax_lib"
    			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
	      			    		   ax_cv_boost_unit_test_framework_link,
						  [AC_LANG_PUSH([C++])

                                 link_unit_test_framework="yes",link_unit_test_framework="no")
			      AC_LANG_POP([C++])
                  ])
                  LIBS="${saved_libs}"

			      if test "x$link_unit_test_framework" = "xyes"; then
                      BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"

				  fi
                done
            else
         		saved_libs="${LIBS}"
               for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do
                   LIBS="${LIBS} -l$ax_lib"
              			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
	      			    		   ax_cv_boost_unit_test_framework_link,
						  [AC_LANG_PUSH([C++])

                                 link_unit_test_framework="yes",link_unit_test_framework="no")
			      AC_LANG_POP([C++])
                  ])
                  LIBS="${saved_libs}"
			      if test "x$link_unit_test_framework" = "xyes"; then
                      BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
                      AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)

		fi

		CPPFLAGS="$CPPFLAGS_SAVED"
    	LIBS="$LIBS_SAVED"
	fi
])

Return to bug 185689

Lines 57-65 Link Here

(-)exempi-1.99.3.orig/m4/ax_boost_unit_test_framework.m4 (-10 / +10 lines)
57	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"	57	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
58	export CPPFLAGS	58	export CPPFLAGS
59		59
60	LDFLAGS_SAVED="$LDFLAGS"	60	LIBS_SAVED="$LIBS"
61	LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"	61	LIBS="$LIBS $BOOST_LDFLAGS"
62	export LDFLAGS	62	export LIBS
63		63
64	AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available,	64	AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available,
65	ax_cv_boost_unit_test_framework,	65	ax_cv_boost_unit_test_framework,
Lines 74-84 Link Here
74	AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])	74	AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
75	BN=boost_unit_test_framework	75	BN=boost_unit_test_framework
76	if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then	76	if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
77	saved_ldflags="${LDFLAGS}"	77	saved_libs="${LIBS}"
78	for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \	78	for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
79	lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \	79	lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
80	$BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do	80	$BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
81	LDFLAGS="${LDFLAGS} -l$ax_lib"	81	LIBS="${LIBS} -l$ax_lib"
82	AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,	82	AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
83	ax_cv_boost_unit_test_framework_link,	83	ax_cv_boost_unit_test_framework_link,
84	[AC_LANG_PUSH([C++])	84	[AC_LANG_PUSH([C++])
Lines 93-99 Link Here
93	link_unit_test_framework="yes",link_unit_test_framework="no")	93	link_unit_test_framework="yes",link_unit_test_framework="no")
94	AC_LANG_POP([C++])	94	AC_LANG_POP([C++])
95	])	95	])
96	LDFLAGS="${saved_ldflags}"	96	LIBS="${saved_libs}"
97		97
98	if test "x$link_unit_test_framework" = "xyes"; then	98	if test "x$link_unit_test_framework" = "xyes"; then
99	BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"	99	BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
Lines 102-110 Link Here
102	fi	102	fi
103	done	103	done
104	else	104	else
105	saved_ldflags="${LDFLAGS}"	105	saved_libs="${LIBS}"
106	for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do	106	for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do
107	LDFLAGS="${LDFLAGS} -l$ax_lib"	107	LIBS="${LIBS} -l$ax_lib"
108	AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,	108	AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
109	ax_cv_boost_unit_test_framework_link,	109	ax_cv_boost_unit_test_framework_link,
110	[AC_LANG_PUSH([C++])	110	[AC_LANG_PUSH([C++])
Lines 119-125 Link Here
119	link_unit_test_framework="yes",link_unit_test_framework="no")	119	link_unit_test_framework="yes",link_unit_test_framework="no")
120	AC_LANG_POP([C++])	120	AC_LANG_POP([C++])
121	])	121	])
122	LDFLAGS="${saved_ldflags}"	122	LIBS="${saved_libs}"
123	if test "x$link_unit_test_framework" = "xyes"; then	123	if test "x$link_unit_test_framework" = "xyes"; then
124	BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"	124	BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
125	AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)	125	AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
Lines 133-138 Link Here
133	fi	133	fi
134		134
135	CPPFLAGS="$CPPFLAGS_SAVED"	135	CPPFLAGS="$CPPFLAGS_SAVED"
136	LDFLAGS="$LDFLAGS_SAVED"	136	LIBS="$LIBS_SAVED"
137	fi	137	fi
138	])	138	])