Compare commits
No commits in common. "4e5aff43f57821e7590faee9d1da861f8947b730" and "6d0c97895a209df1dced12a8c22548a121fa5c20" have entirely different histories.
4e5aff43f5
...
6d0c97895a
|
@ -11,4 +11,5 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
SUBDIRS = doc examples include src tests
|
||||
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = arif.pc
|
||||
|
|
|
@ -91,7 +91,6 @@ AC_CHECK_FUNCS([atexit memchr strcasecmp])
|
|||
|
||||
# -- Output --
|
||||
|
||||
PKG_INSTALLDIR()
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
doc/Makefile
|
||||
|
|
|
@ -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[[=PKGCONFIGDIR]]], [pkg-config search path for $3])
|
||||
AS_HELP_STRING([--with-$1[[=PREFIX]]], [installation path of $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}:${PKG_CONFIG_PATH}"])
|
||||
AS_VAR_SET([PKG_CONFIG_PATH],
|
||||
["${with_$1}/lib/pkgconfig:${PKG_CONFIG_PATH}"])
|
||||
])
|
||||
export PKG_CONFIG_PATH
|
||||
PKG_CHECK_MODULES(m4_toupper([$1]), [$1 $2], [$5])
|
||||
|
|
|
@ -31,8 +31,8 @@ if BUILD_ARIFY
|
|||
arify_LDADD = libarify.la
|
||||
arify_SOURCES = arify_cli.c
|
||||
|
||||
libarify_la_CPPFLAGS = $(READLINE_CFLAGS) $(ARIF_CPPFLAGS_)
|
||||
libarify_la_LIBADD = $(READLINE_LIBS) $(DL_LIBS) libarif.la
|
||||
libarify_la_CPPFLAGS = $(ARIF_CPPFLAGS_)
|
||||
libarify_la_LIBADD = $(DL_LIBS) libarif.la
|
||||
libarify_la_SOURCES = arify.c
|
||||
|
||||
if BUILD_ARIF_READLINE
|
||||
|
|
Loading…
Reference in New Issue