blob: f5f12ec4491a8fb924bde7bf370d0fea6e73af40 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Jan Engelhardt <jengelh@inai.de>
Date: 2021-04-27 18:22:18.718396764 +0200
ragel just completely lacks a block to support system colm.
---
configure.ac | 14 ++++++++------
src/Makefile.am | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
Index: ragel-7.0.4/configure.ac
===================================================================
--- ragel-7.0.4.orig/configure.ac
+++ ragel-7.0.4/configure.ac
@@ -51,14 +51,16 @@ AC_ARG_WITH(colm,
LIBFSM_LA="$withval/lib/libfsm.la"
COLM_SHARE="$withval/share"
],
- []
+ [
+ COLM=/usr/bin/colm
+ COLM_WRAP=/usr/bin/colm-wrap
+ CPPFLAGS="-I/usr/include/aapl $CPPFLAGS"
+ LIBCOLM_LA=-lcolm
+ LIBFSM_LA=-lfsm
+ COLM_SHARE='${datadir}/colm'
+ ]
)
-AC_CHECK_FILES(
- [$COLM],
- [],
- [AC_ERROR([colm is required to build ragel])]
-)
AC_SUBST(COLM)
AC_SUBST(COLM_WRAP)
AC_SUBST(COLM_SHARE)
Index: ragel-7.0.4/src/Makefile.am
===================================================================
--- ragel-7.0.4.orig/src/Makefile.am
+++ ragel-7.0.4/src/Makefile.am
@@ -39,7 +39,7 @@ nodist_ragel_SOURCES = \
parse.c rlreduce.cc
ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+ragel_DEPENDENCIES = libragel.la
BUILT_SOURCES = \
version.h \
|
