2006-02-22 Marcus Brinkmann <marcus@g10code.de>

	* pth.m4: Fix code generation (required for Max OS X).
	Submitted by Emanuele Giaquinta <exg@gentoo.org>.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a12bf68be0f4f27910f32eb5d99be05d71021876..862751af9f30d4d150e3938cb2b5b93d7236aef1 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-22  Marcus Brinkmann  <marcus@g10code.de>
+
+       * pth.m4: Fix code generation (required for Max OS X).
+       Submitted by Emanuele Giaquinta <exg@gentoo.org>.
+
 2005-11-17  Marcus Brinkmann  <marcus@g10code.de>
 
        * glib-2.0.m4: New file.

diff --git a/m4/pth.m4 b/m4/pth.m4
index db951705510da3065547ba799b247ae11ca0ba12..10f64e158fe9b6f7f3aad65bbbd4614d585df5ca 100644 (file)
--- a/m4/pth.m4
+++ b/m4/pth.m4
@@ -285,8 +285,6 @@ dnl    fi
         #include <pth.h>
         ])
         define(_code2, [dnl
-        int main(int argc, char *argv[])
-        {
             FILE *fp;
             if (!(fp = fopen("conftestval", "w")))
                 exit(1);
@@ -299,7 +297,6 @@ dnl    fi
             fprintf(fp, "yes");
             fclose(fp);
             exit(0);
-        }
         ])
         _AC_PTH_VERBOSE([+ Performing Sanity Checks:])
         _AC_PTH_VERBOSE([    o pre-processor test])
@@ -329,7 +326,7 @@ dnl    fi
             See config.log for possibly more details.])
         fi
         _AC_PTH_VERBOSE([    o run-time check])
-        AC_TRY_RUN(_code1 _code2, _ok=`cat conftestval`, _ok=no, _ok=no)
+        AC_TRY_RUN(AC_LANG_PROGRAM(_code1, _code2), _ok=`cat conftestval`, _ok=no, _ok=no)
         if test ".$_ok" != .yes; then
             if test ".$_ok" = .no; then
                 _AC_PTH_ERROR([dnl