From 9aff9192760ddfe933ebf07bd9484263309b3d7c Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 2 Feb 2019 12:23:32 +0100 Subject: [PATCH 1/2] add support for pkg-config by emmiting a libb2.pc --- Makefile.am | 4 +++- configure.ac | 3 +++ libb2.pc.in | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 libb2.pc.in diff --git a/Makefile.am b/Makefile.am index 2a829c2..6869496 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = COPYING -SUBDIRS = src \ No newline at end of file +SUBDIRS = src + +pkgconfig_DATA = libb2.pc \ No newline at end of file diff --git a/configure.ac b/configure.ac index c7738a2..98193aa 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,10 @@ AM_CONDITIONAL([USE_FAT], [test "$enable_fat" = "yes"]) dnl Only move away from ref with SSSE3; SSE2 is generally slower AM_CONDITIONAL([USE_SSE], [test "$ax_cv_have_ssse3_ext" = "yes"]) + +PKG_INSTALLDIR AC_CONFIG_FILES([Makefile src/Makefile + libb2.pc ]) AC_OUTPUT diff --git a/libb2.pc.in b/libb2.pc.in new file mode 100644 index 0000000..49c65d7 --- /dev/null +++ b/libb2.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Blake2 +Description: C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp +URL: https://github.com/BLAKE2/libb2 +Version: @VERSION@ +Requires: +Cflags: -I${includedir} +Libs: -L${libdir} -lb2 \ No newline at end of file From 9f7b0fced612455cc25a70fd8c230aede5e304ad Mon Sep 17 00:00:00 2001 From: Samuel Neves Date: Sun, 10 Mar 2019 15:25:30 +0000 Subject: [PATCH 2/2] add newlines to end of files --- Makefile.am | 2 +- libb2.pc.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6869496..33a20e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,4 @@ EXTRA_DIST = COPYING SUBDIRS = src -pkgconfig_DATA = libb2.pc \ No newline at end of file +pkgconfig_DATA = libb2.pc diff --git a/libb2.pc.in b/libb2.pc.in index 49c65d7..ceac946 100644 --- a/libb2.pc.in +++ b/libb2.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: Blake2 +Name: libb2 Description: C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp URL: https://github.com/BLAKE2/libb2 Version: @VERSION@ Requires: Cflags: -I${includedir} -Libs: -L${libdir} -lb2 \ No newline at end of file +Libs: -L${libdir} -lb2