summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM Joonas Pihlaja <jpihlaja@cc.helsinki.fi>2010-05-06 15:00:10 -0600
committerM Joonas Pihlaja <rowan@sal.math.ualberta.ca>2010-05-06 15:15:46 -0600
commitcc95f3be4c7fba6cffad9a46ffba77397faa8d64 (patch)
tree9d87d1ca45a2299be462822e7b251c3999eec32c
parent824b3cdce7ee6abecdda9cb3fdef086f8c4c9a7a (diff)
Use autom4te to invoke m4.
Invoke the right variant of m4 using autom4te -l M4sugar, and don't rely on the GNU m4 -P option to prefix m4_ to all macros. BSD m4 doesn't support -P.
-rw-r--r--Makefile.am2
-rw-r--r--stubs.c.m47
2 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 6d59f4e..bb700db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ pkgconfig_DATA = pthread-stubs.pc
if BUILD_LIB
stubs.c: list.m4 stubs.c.m4
- m4 -P stubs.c.m4 > $@
+ autom4te -l M4sugar stubs.c.m4 > $@
lib_LTLIBRARIES = libpthread-stubs.la
libpthread_stubs_la_SOURCES = stubs.c
diff --git a/stubs.c.m4 b/stubs.c.m4
index 1616c0a..d2cb428 100644
--- a/stubs.c.m4
+++ b/stubs.c.m4
@@ -1,10 +1,7 @@
-m4_divert(-1)m4_dnl -*- c -*-
-m4_changequote(`[',`]')
m4_changecom()
-
m4_define([upcase], [m4_translit([$*], [a-z], [A-Z])])
-m4_define([alias], [m4_dnl
+m4_define([alias], [dnl
#ifndef upcase(HAVE_[$3])
#define upcase(NEED_[$1]_STUB)
# ifdef SUPPORT_ATTRIBUTE_ALIAS
@@ -15,7 +12,7 @@ m4_define([alias], [m4_dnl
#endif
])
-m4_divert(0)m4_dnl
+m4_divert(0)dnl
/* Copyright (C) 2006 Diego Pettenò
* Copyright (C) 2010 M Joonas Pihlaja
* Inspired by libX11 code copyright (c) 1995 David E. Wexelblat.