diff -Naurp hugin-0.7_beta4.orig/m4/ax_boost.m4 hugin-0.7_beta4/m4/ax_boost.m4
--- hugin-0.7_beta4.orig/m4/ax_boost.m4	2006-11-30 10:36:48 +0300
+++ hugin-0.7_beta4/m4/ax_boost.m4	2007-06-29 00:03:59 +0400
@@ -252,8 +252,9 @@ dnl    AC_CANONICAL_BUILD
                         if test "$ax_cv_boost_filesystem" = "yes"; then
                                 AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available])
                                 BN=boost_filesystem
-                                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 \
+				CCV="${CC}41"
+                                for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main,
                                     [BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break],
@@ -279,8 +280,9 @@ dnl    AC_CANONICAL_BUILD
                             if test "$ax_cv_boost_program_options" = yes; then
                                     AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
                                     BN=boost_program_options
-                                    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 \
+				    CCV="${CC}41"
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main,
                                     [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break],
@@ -325,9 +327,10 @@ dnl    AC_CANONICAL_BUILD
                                     AC_SUBST(BOOST_CPPFLAGS)
                                     AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available])
                                     BN=boost_thread
+				    CCV=41
                                     for BP in "" "lib"; do
                                         for BV in "-$ac_boost_lib_version" ""; do
-                                            for BC in "-gcc" "-mgw" "" ; do
+                                            for BC in "-gcc$CCV" "-mgw" "" ; do
                                                 for BT in "-mt" ""; do
                                                     for BL in "" "-s" ; do
                                                         ax_lib=$BP$BN$BC$BT$BL$BV;
@@ -365,8 +368,9 @@ dnl    AC_CANONICAL_BUILD
                             if test "x$ax_cv_boost_iostreams" = "xyes"; then
                                     AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
                                     BN=boost_iostreams
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break],
                                     [link_thread="no"])
@@ -396,16 +400,18 @@ dnl    AC_CANONICAL_BUILD
                             if test "x$ax_cv_boost_serialization" = "xyes"; then
                                     AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
                                     BN=boost_serialization
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main,
                                     [BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break],
                                     [link_thread="no"])
                                     done
                                     BN=boost_wserialization
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main,
                                     [BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break],
@@ -433,8 +439,9 @@ dnl    AC_CANONICAL_BUILD
                             if test "x$ax_cv_boost_signals" = "xyes"; then
                                     AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
                                     BN=boost_signals
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_thread="yes" break],
                                     [link_thread="no"])
@@ -461,8 +468,9 @@ dnl    AC_CANONICAL_BUILD
                             if test "x$ax_cv_boost_date_time" = "xyes"; then
                                     AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
                                     BN=boost_date_time
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_thread="yes" break],
                                     [link_thread="no"])
@@ -488,8 +496,9 @@ dnl    AC_CANONICAL_BUILD
                             if test "x$ax_cv_boost_regex" = "xyes"; then
                                     AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
                                     BN=boost_regex
-                                    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 \
+				    CCV=${CC}41
+                                    for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                                lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                                 $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                                         AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break],
                                     [link_thread="no"])
@@ -515,8 +524,9 @@ dnl    AC_CANONICAL_BUILD
                     AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available])
                             BN=boost_unit_test_framework
                     saved_ldflags="${LDFLAGS}"
-                            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 \
+			    CCV=${CC}41
+                            for ax_lib in $BN $BN-$CCV $BN-$CCV-mt $BN-$CCV-mt-s $BN-$CCV-s \
+                            lib$BN lib$BN-$CCV lib$BN-$CCV-mt lib$BN-$CCV-mt-s lib$BN-$CCV-s \
                             $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
                     LDFLAGS="${LDFLAGS} -l$ax_lib"
                             AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library,