Hopefully fix the macro which guesses argument type of putenv()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@418 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 092db19e1dd178477364e506e8b958c3f2462587..adebad3a05fa1fd87a39d94a8fa94f0f99155637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * config/lyxinclude.m4 (LYX_FUNC_PUTENV_ARGTYPE): fix the macro,
+       which was bogus for several reasons.
+
        * src/LaTeX.C (scanAux): fix the regular expression used to scan
        .aux files. 
        (runBibTeX): ditto.

diff --git a/acinclude.m4 b/acinclude.m4
index 1c78ee274b39b0a1a6322c2f90e9e043c0788c2b..7ae3e626d9c42986d5d5faca11b309c404aca73a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -616,8 +616,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

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index ea8fc35620f3bc6c64123a772998e95d15ecb3c5..4ed9eaea6650cf0e5dfe9a112a940e57b7be7950 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -616,8 +616,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