|
@@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile.
|
|
|
|
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
|
|
|
|
-Index: libksba-1.3.0/Makefile.am
|
|
|
+Index: libksba-1.3.5/Makefile.am
|
|
|
===================================================================
|
|
|
---- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000
|
|
|
-+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000
|
|
|
-@@ -21,6 +21,9 @@
|
|
|
+--- libksba-1.3.5.orig/Makefile.am
|
|
|
++++ libksba-1.3.5/Makefile.am
|
|
|
+@@ -20,6 +20,9 @@
|
|
|
+
|
|
|
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
|
|
|
- AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
|
|
|
|
|
|
+pkgconfigdir = ${libdir}/pkgconfig
|
|
|
+pkgconfig_DATA = ksba.pc
|
|
@@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am
|
|
|
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
|
|
|
GITLOG_TO_CHANGELOG=gitlog-to-changelog
|
|
|
|
|
|
-Index: libksba-1.3.0/configure.ac
|
|
|
+Index: libksba-1.3.5/configure.ac
|
|
|
===================================================================
|
|
|
---- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000
|
|
|
-+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000
|
|
|
-@@ -400,6 +400,7 @@
|
|
|
+--- libksba-1.3.5.orig/configure.ac
|
|
|
++++ libksba-1.3.5/configure.ac
|
|
|
+@@ -414,6 +414,7 @@ gl/Makefile
|
|
|
src/Makefile
|
|
|
src/ksba-config
|
|
|
src/versioninfo.rc
|
|
@@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac
|
|
|
tests/Makefile
|
|
|
doc/Makefile
|
|
|
])
|
|
|
-Index: libksba-1.3.0/ksba.pc.in
|
|
|
+Index: libksba-1.3.5/ksba.pc.in
|
|
|
===================================================================
|
|
|
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
|
-+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000
|
|
|
+--- /dev/null
|
|
|
++++ libksba-1.3.5/ksba.pc.in
|
|
|
@@ -0,0 +1,17 @@
|
|
|
+prefix=@prefix@
|
|
|
+exec_prefix=@exec_prefix@
|
|
@@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in
|
|
|
+Libs.private: -L${libdir} -lgpg-error
|
|
|
+Cflags: -I${includedir}
|
|
|
+
|
|
|
-Index: libksba-1.3.0/src/ksba.m4
|
|
|
+Index: libksba-1.3.5/src/ksba.m4
|
|
|
===================================================================
|
|
|
---- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000
|
|
|
-+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000
|
|
|
-@@ -22,18 +22,7 @@
|
|
|
+--- libksba-1.3.5.orig/src/ksba.m4
|
|
|
++++ libksba-1.3.5/src/ksba.m4
|
|
|
+@@ -22,18 +22,7 @@ dnl with a changed API.
|
|
|
dnl
|
|
|
AC_DEFUN([AM_PATH_KSBA],
|
|
|
[AC_REQUIRE([AC_CANONICAL_HOST])
|
|
@@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4
|
|
|
tmp=ifelse([$1], ,1:1.0.0,$1)
|
|
|
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
|
|
req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
|
|
-@@ -43,48 +32,13 @@
|
|
|
+@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA],
|
|
|
min_ksba_version="$tmp"
|
|
|
fi
|
|
|
|
|
@@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4
|
|
|
if test "$tmp" -gt 0 ; then
|
|
|
AC_MSG_CHECKING([KSBA API version])
|
|
|
if test "$req_ksba_api" -eq "$tmp" ; then
|
|
|
-@@ -97,10 +51,8 @@
|
|
|
+@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA],
|
|
|
fi
|
|
|
fi
|
|
|
if test $ok = yes; then
|
|
@@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4
|
|
|
if test x"$libksba_config_host" != xnone ; then
|
|
|
if test x"$libksba_config_host" != x"$host" ; then
|
|
|
AC_MSG_WARN([[
|
|
|
-@@ -114,8 +66,6 @@
|
|
|
+@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA],
|
|
|
fi
|
|
|
fi
|
|
|
else
|