OSSP CVS Repository

ossp - Check-in [4703]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4703
Date: 2004-Sep-12 13:44:25 (local)
2004-Sep-12 11:44:25 (UTC)
User:rse
Branch:
Comment: Workaround Autoconf/m4 problems in pth.m4 by using "m4_define" instead of just "define" and no using m4_undefine at all.

Hints by: Dr. Andreas Mueller <afm@othello.ch>

Tickets:
Inspections:
Files:
ossp-pkg/pth/ChangeLog      1.618 -> 1.619     4 inserted, 0 deleted
ossp-pkg/pth/pth.m4      1.13 -> 1.14     3 inserted, 4 deleted

ossp-pkg/pth/ChangeLog 1.618 -> 1.619

--- ChangeLog    2004/09/12 11:36:13     1.618
+++ ChangeLog    2004/09/12 11:44:25     1.619
@@ -21,6 +21,10 @@
                   
   Changes between 2.0.1 and 2.0.2 (13-Jul-2003 to xx-XXX-2004)
 
+   *) Workaround Autoconf/m4 problems in pth.m4 by using "m4_define"
+      instead of just "define" and no using m4_undefine at all.
+      [Dr. Andreas Mueller <afm@othello.ch>]
+
    *) Avoid side-effects by defining _XOPEN_SOURCE only temporarily
       for inclusion of <poll.h> instead of permanently.
       [Graham Nash <gnash@ncube.com>]


ossp-pkg/pth/pth.m4 1.13 -> 1.14

--- pth.m4       2004/07/13 10:50:49     1.13
+++ pth.m4       2004/09/12 11:44:25     1.14
@@ -42,14 +42,13 @@
 dnl #   auxilliary macros
 AC_DEFUN(_AC_PTH_ERROR, [dnl
 AC_MSG_RESULT([*FAILED*])
-define(_ac_pth_line,dnl
+m4_define(_ac_pth_line,dnl
 "+------------------------------------------------------------------------+")
 echo " _ac_pth_line" 1>&2
 cat <<EOT | sed -e 's/^[[       ]]*/ | /' -e 's/>>/  /' 1>&2
 $1
 EOT
 echo " _ac_pth_line" 1>&2
-undefine(_ac_pth_line)
 exit 1
 ])
 AC_DEFUN(_AC_PTH_VERBOSE, [dnl
@@ -278,11 +277,11 @@
         _AC_PTH_VERBOSE([    o LDFLAGS=\"$LDFLAGS\"])
         _AC_PTH_VERBOSE([    o LIBS=\"$LIBS\"])
         cross_compile=no
-        define(_code1, [dnl
+        m4_define(_code1, [dnl
         #include <stdio.h>
         #include <pth.h>
         ])
-        define(_code2, [dnl
+        m4_define(_code2, [dnl
         int main(int argc, char *argv[])
         {
             FILE *fp;

CVSTrac 2.0.1