ragel: Patch to link against shared colm
All checks were successful
test Test.

This commit is contained in:
Eugen Wissner 2023-03-30 08:46:51 +02:00
parent 484d170b24
commit 9c85c52599
Signed by: belka
GPG Key ID: A27FDC1E8EE902C0
2 changed files with 32 additions and 0 deletions

View File

@ -87,6 +87,7 @@ find -L . \
if [ "$LIBDIRSUFFIX" = "64" ]; then if [ "$LIBDIRSUFFIX" = "64" ]; then
patch --verbose -p1 -i $CWD/lib64.patch patch --verbose -p1 -i $CWD/lib64.patch
fi fi
patch --verbose -p1 -i $CWD/shared-colm.patch
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \

View File

@ -0,0 +1,31 @@
diff --git a/configure.ac b/configure.ac
index e1a0fc67..07a2b075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,26 @@ AC_CHECK_FILES(
[],
[AC_ERROR([colm is required to build ragel])]
)
+
+dnl If the .la files are present use those, otherwise locate the libs with AC_CHECK_LIB.
+AC_CHECK_FILES(
+ [$LIBCOLM_LA $LIBFSM_LA],
+ [],
+ [
+ AC_CHECK_LIB(
+ [colm],
+ [colm_run_program],
+ [LIBCOLM_LA=-lcolm],
+ [AC_ERROR([libcolm is required to build ragel])]
+ )
+ AC_CHECK_LIB(
+ [fsm],
+ [libfsm_present],
+ [LIBFSM_LA=-lfsm],
+ [AC_ERROR([libfsm is required to build ragel])]
+ )
+ ]
+)
AC_SUBST(COLM)
AC_SUBST(COLM_WRAP)
AC_SUBST(COLM_SHARE)