Compare commits

...

2 Commits

Author SHA1 Message Date
CismonX 4e5aff43f5
fix: add readline flags when building libarify 2023-04-27 11:27:24 +08:00
CismonX 09ccd4827a
fix: allow custom pkgconfigdir
should not assume that ${libdir}/pkgconfig is pkgconfigdir.
2023-04-27 11:26:10 +08:00
4 changed files with 6 additions and 6 deletions

View File

@ -11,5 +11,4 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = doc examples include src tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = arif.pc

View File

@ -91,6 +91,7 @@ AC_CHECK_FUNCS([atexit memchr strcasecmp])
# -- Output --
PKG_INSTALLDIR()
AC_CONFIG_FILES([
Makefile
doc/Makefile

View File

@ -43,13 +43,13 @@ dnl
AC_DEFUN([ARIF_CHECK_PKG], [
m4_pushdef([with_var_], [with_]m4_translit([$1], [-+.], [___]))
AC_ARG_WITH([$1], m4_normalize([
AS_HELP_STRING([--with-$1[[=PREFIX]]], [installation path of $3])
AS_HELP_STRING(
[--with-$1[[=PKGCONFIGDIR]]], [pkg-config search path for $3])
]), [], [$4])
AS_VAR_IF(with_var_, [no], [$6], [
AS_VAR_SET([SAVED_PKG_CONFIG_PATH_], ["${PKG_CONFIG_PATH}"])
AS_VAR_IF(with_var_, [yes], [], [
AS_VAR_SET([PKG_CONFIG_PATH],
["${with_$1}/lib/pkgconfig:${PKG_CONFIG_PATH}"])
AS_VAR_SET([PKG_CONFIG_PATH], ["${with_$1}:${PKG_CONFIG_PATH}"])
])
export PKG_CONFIG_PATH
PKG_CHECK_MODULES(m4_toupper([$1]), [$1 $2], [$5])

View File

@ -31,8 +31,8 @@ if BUILD_ARIFY
arify_LDADD = libarify.la
arify_SOURCES = arify_cli.c
libarify_la_CPPFLAGS = $(ARIF_CPPFLAGS_)
libarify_la_LIBADD = $(DL_LIBS) libarif.la
libarify_la_CPPFLAGS = $(READLINE_CFLAGS) $(ARIF_CPPFLAGS_)
libarify_la_LIBADD = $(READLINE_LIBS) $(DL_LIBS) libarif.la
libarify_la_SOURCES = arify.c
if BUILD_ARIF_READLINE