Some opensource build fixes

[folly.git] / folly / m4 / ax_boost_regex.m4

diff --git a/folly/m4/ax_boost_regex.m4 b/folly/m4/ax_boost_regex.m4
index f3e5cc1856e97ad7e14cee44be45538b4e6e64d5..918f16a47afc3b3767064898e607587bd3a3a4e3 100644 (file)
--- a/folly/m4/ax_boost_regex.m4
+++ b/folly/m4/ax_boost_regex.m4
@@ -30,69 +30,69 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 20
+#serial 22
 
 AC_DEFUN([AX_BOOST_REGEX],
 [
-        AC_ARG_WITH([boost-regex],
-        AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
+       AC_ARG_WITH([boost-regex],
+       AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
                    [use the Regex library from boost - it is possible to specify a certain library for the linker
                         e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
         [
         if test "$withval" = "no"; then
-                want_boost="no"
+                       want_boost="no"
         elif test "$withval" = "yes"; then
             want_boost="yes"
             ax_boost_user_regex_lib=""
         else
-                    want_boost="yes"
-                        ax_boost_user_regex_lib="$withval"
-                                fi
+                   want_boost="yes"
+               ax_boost_user_regex_lib="$withval"
+               fi
         ],
         [want_boost="yes"]
-        )
+       )
 
-        if test "x$want_boost" = "xyes"; then
+       if test "x$want_boost" = "xyes"; then
         AC_REQUIRE([AC_PROG_CC])
-                CPPFLAGS_SAVED="$CPPFLAGS"
-                        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-                                            export CPPFLAGS
+               CPPFLAGS_SAVED="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+               export CPPFLAGS
 
-                                                   LDFLAGS_SAVED="$LDFLAGS"
-                                                        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-                                                                          export LDFLAGS
+               LDFLAGS_SAVED="$LDFLAGS"
+               LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+               export LDFLAGS
 
         AC_CACHE_CHECK(whether the Boost::Regex library is available,
-                                                           ax_cv_boost_regex,
+                                          ax_cv_boost_regex,
         [AC_LANG_PUSH([C++])
-                         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
-                                                                                                                            ]],
+                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
+                                                                                               ]],
                                    [[boost::regex r(); return 0;]])],
                    ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
          AC_LANG_POP([C++])
-                ])
-                        if test "x$ax_cv_boost_regex" = "xyes"; then
-                                AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
+               ])
+               if test "x$ax_cv_boost_regex" = "xyes"; then
+                       AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_regex_lib" = "x"; then
-                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
+                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
                      ax_lib=${libextension}
-                                            AC_CHECK_LIB($ax_lib, exit,
+                                   AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
                                  [link_regex="no"])
-                                                        done
+                               done
                 if test "x$link_regex" != "xyes"; then
-                for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
+                for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
                      ax_lib=${libextension}
-                                            AC_CHECK_LIB($ax_lib, exit,
+                                   AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
                                  [link_regex="no"])
-                                                        done
+                               done
                 fi
 
             else
                for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do
-                                   AC_CHECK_LIB($ax_lib, main,
+                                     AC_CHECK_LIB($ax_lib, main,
                                    [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
                                    [link_regex="no"])
                done
@@ -100,12 +100,12 @@ AC_DEFUN([AX_BOOST_REGEX],
             if test "x$ax_lib" = "x"; then
                 AC_MSG_ERROR(Could not find a version of the Boost::Regex library!)
             fi
-                        if test "x$link_regex" != "xyes"; then
-                                               AC_MSG_ERROR(Could not link against $ax_lib !)
-                                                                      fi
-                                                                        fi
+                       if test "x$link_regex" != "xyes"; then
+                               AC_MSG_ERROR(Could not link against $ax_lib !)
+                       fi
+               fi
 
-                                                                                CPPFLAGS="$CPPFLAGS_SAVED"
-                                                                                LDFLAGS="$LDFLAGS_SAVED"
-                                                                                fi
-])
\ No newline at end of file
+               CPPFLAGS="$CPPFLAGS_SAVED"
+       LDFLAGS="$LDFLAGS_SAVED"
+       fi
+])