[rs-commit] r66 - in /redwax-signtext/trunk/src/linux: config.h.in configure.ac redwax-signtext.spec.in

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Sep 18 17:20:45 2022
New Revision: 66

Log:
Find ksba and gcrypt on platforms with broken pkgconfig.

Modified:
    redwax-signtext/trunk/src/linux/config.h.in
    redwax-signtext/trunk/src/linux/configure.ac
    redwax-signtext/trunk/src/linux/redwax-signtext.spec.in

Modified: redwax-signtext/trunk/src/linux/config.h.in
==============================================================================
--- redwax-signtext/trunk/src/linux/config.h.in	(original)
+++ redwax-signtext/trunk/src/linux/config.h.in	Sun Sep 18 17:20:45 2022
@@ -15,11 +15,11 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
@@ -63,7 +63,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */

Modified: redwax-signtext/trunk/src/linux/configure.ac
==============================================================================
--- redwax-signtext/trunk/src/linux/configure.ac	(original)
+++ redwax-signtext/trunk/src/linux/configure.ac	Sun Sep 18 17:20:45 2022
@@ -23,14 +23,23 @@
 PKG_CHECK_MODULES([KSBA],
    [ksba >= 1],[],
    [
-      AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
-      KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
-      KSBA_LIBS=`$KSBA_CONFIG --libs`
+      AC_SEARCH_LIBS(gpg_err_init, [gpg-error], [], [
+         AC_MSG_ERROR([unable to find the gpg_err_init function])
+      ])
+      AC_SEARCH_LIBS(ksba_cert_new, [ksba], [], [
+         AC_MSG_ERROR([unable to find the ksba_cert_new function])
+      ], [-lgpg-error])
    ]
 )
 
 PKG_CHECK_MODULES([GCRYPT],
-   [libgcrypt >= 1])
+   [libgcrypt >= 1], [],
+   [
+      AC_SEARCH_LIBS(gcry_check_version, [gcrypt], [], [
+         AC_MSG_ERROR([unable to find the gcry_check_version function])
+      ])
+   ]
+)
 
 AC_CHECK_FUNCS([gtk_box_append gtk_window_set_child])
 

Modified: redwax-signtext/trunk/src/linux/redwax-signtext.spec.in
==============================================================================
--- redwax-signtext/trunk/src/linux/redwax-signtext.spec.in	(original)
+++ redwax-signtext/trunk/src/linux/redwax-signtext.spec.in	Sun Sep 18 17:20:45 2022
@@ -12,6 +12,11 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(gck-1)
+BuildRequires: pkgconfig(ksba)
+BuildRequires: pkgconfig(libgcrypt)
 
 %description
 The Redwax SignText native extension and web extension allows text