fix some of the bugs reported, should hopefully be a bit better now.

[lyx.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 1c78ee274b39b0a1a6322c2f90e9e043c0788c2b..00ad1f508ea3be410750a50a1f955c2f1204395e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -425,10 +425,11 @@ dnl   good enough to suit our needs.
 AC_DEFUN(LYX_CXX_NAMESPACES,[
 AC_CACHE_CHECK(for correct namespaces support,lyx_cv_cxx_namespace,
  [AC_TRY_COMPILE([
-  #include <vector>
-  using std::vector;
+  namespace foo {
+    int bar;
+  }
 ],[
-       vector<int> test;
+        foo::bar = 0;
        return 0;
 ],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
 ])
@@ -616,8 +617,9 @@ AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE,
 [AC_MSG_CHECKING([type of argument for putenv()])
  AC_CACHE_VAL(lyx_cv_func_putenv_arg,dnl
   [AC_TRY_COMPILE(dnl
-[#include <cstdlib>
-extern int putenv(const char *);],,dnl
+[#include <cstdlib>],
+[char const * foo = "bar";
+ putenv(foo);],dnl
    [lyx_cv_func_putenv_arg='char const *'],[lyx_cv_func_putenv_arg='char *'])])
  AC_MSG_RESULT($lyx_cv_func_putenv_arg)
  AC_DEFINE_UNQUOTED(PUTENV_TYPE_ARG,$lyx_cv_func_putenv_arg,dnl