From: Marcus Brinkmann <mb@g10code.com>
Date: Wed, 22 Feb 2006 11:58:33 +0000 (+0000)
Subject: 2006-02-22  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~228
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=789cb8d390cbe108ca5f7f7c6a22b8f225dc67ae;p=gpgme.git

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/trunk/m4/ChangeLog b/trunk/m4/ChangeLog
index a12bf68..862751a 100644
--- a/trunk/m4/ChangeLog
+++ b/trunk/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/trunk/m4/pth.m4 b/trunk/m4/pth.m4
index db95170..10f64e1 100644
--- a/trunk/m4/pth.m4
+++ b/trunk/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