mirror/mkp224o
1
0
Fork 0
mirror of https://github.com/cathugger/mkp224o.git synced 2025-12-05 21:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

try to make regex stuff work on some shitty systems

Browse Source
This commit is contained in:
cathugger
2018-01-21 21:22:11 +00:00
parent c65672193f
commit b1549bdb1a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -54,7 +54,7 @@ ALLO= $(sort \
ALLC= $(patsubst %.c.o,%.c,$(filter %.c.o %.c,$(ALLO))) ALLC= $(patsubst %.c.o,%.c,$(filter %.c.o %.c,$(ALLO)))
CLEANO= $(filter %.o,$(ALLO)) CLEANO= $(filter %.o,$(ALLO))
MAINLIB= -lpthread -lsodium MAINLIB= -lpthread -lsodium @MAINLIB@
TEST_ED25519LIB= -lsodium TEST_ED25519LIB= -lsodium
EXE= mkp224o test_base32 test_base16 test_ed25519 EXE= mkp224o test_base32 test_base16 test_ed25519

6
configure.ac
View File

@@ -51,6 +51,7 @@ then
fi fi
MYDEFS="" MYDEFS=""
MAINLIB=""
ed25519impl="" ed25519impl=""
AC_ARG_ENABLE([ref10], AC_ARG_ENABLE([ref10],
@@ -235,7 +236,7 @@ then
MYDEFS="$MYDEFS -DSTATISTICS" MYDEFS="$MYDEFS -DSTATISTICS"
fi fi
AC_ARG_WITH([pcre2],[AC_HELP_STRING([--with-pcre2],[pcre2-config executable @<:@default=pcre2@:>@])],[],[with_pcre2="pcre2-config"]) AC_ARG_WITH([pcre2],[AC_HELP_STRING([--with-pcre2],[pcre2-config executable @<:@default=pcre2-config@:>@])],[],[with_pcre2="pcre2-config"])
AC_ARG_ENABLE([regex],[AC_HELP_STRING([--enable-regex],[whether to enable regex engine. currently possible values are "pcre2" and "yes" which defaults to "pcre2" @<:@default=no@:>@])],[],[enable_regex=no]) AC_ARG_ENABLE([regex],[AC_HELP_STRING([--enable-regex],[whether to enable regex engine. currently possible values are "pcre2" and "yes" which defaults to "pcre2" @<:@default=no@:>@])],[],[enable_regex=no])
case "$enable_regex" in case "$enable_regex" in
@@ -260,7 +261,7 @@ yes|pcre2)
LF=`"$with_pcre2" --libs8` LF=`"$with_pcre2" --libs8`
if test -n "$LF" if test -n "$LF"
then then
LDFLAGS="$LDFLAGS $LF" MAINLIB="$MAINLIB $LF"
fi fi
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
@@ -275,5 +276,6 @@ esac
AC_SUBST(CSTD,["$cstd"]) AC_SUBST(CSTD,["$cstd"])
AC_SUBST(ED25519IMPL,["$ed25519impl"]) AC_SUBST(ED25519IMPL,["$ed25519impl"])
AC_SUBST(MYDEFS,["$MYDEFS"]) AC_SUBST(MYDEFS,["$MYDEFS"])
AC_SUBST(MAINLIB,["$MAINLIB"])
AC_SUBST(NOPIE,["$nopie"]) AC_SUBST(NOPIE,["$nopie"])
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)