File 0001-build-adjust-for-new-cddlib-paths-and-pkgc... of Package latte

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-build-adjust-for-new-cddlib-paths-and-pkgconfig-file.patch of Package latte (Revision 9103e5deeeab0210fe3cc09a2c9ccee1)

Currently displaying revision 9103e5deeeab0210fe3cc09a2c9ccee1 , Show latest

From 8c2edf7c04d03c8b9ee8e7195081835ec0399033 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 20 Sep 2020 09:47:55 +0200
Subject: [PATCH] build: adjust for new cddlib paths and pkgconfig file
Upstream: https://github.com/latte-int/latte/pull/17

Fixes #15.
---
 code/latte/latte_cddlib.h |  10 +---
 configure.ac              |  13 -----
 m4/cddlib-check.m4        | 105 ++++++--------------------------------
 4 files changed, 18 insertions(+), 116 deletions(-)

diff --git a/code/latte/latte_cddlib.h b/code/latte/latte_cddlib.h
index 94a13a2..a048c09 100644
--- a/code/latte/latte_cddlib.h
+++ b/code/latte/latte_cddlib.h
@@ -26,15 +26,9 @@
 #include <gmp.h>
 #include "config.h"
 
-#ifdef HAVE_CDDLIB_C_LINKAGE
-extern "C" {
-#endif
 #define GMPRATIONAL
-#include <setoper.h>
-#include <cdd.h>
-#ifdef HAVE_CDDLIB_C_LINKAGE
-}
-#endif
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
 
 #include "cone.h"
 
diff --git a/configure.ac b/configure.ac
index 2c1949f..15ab2bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,19 +90,6 @@ fi
 
 # Cddlib library
 LB_CHECK_CDDLIB
-if test "x$cddlib_found" = "xno" ; then
-   # Older versions of cddlib are compiled with the C compiler;
-   # also some people compile newer versions with the C compiler instead of the C++ compiler.
-   AC_LANG(C)
-   LB_CHECK_CDDLIB
-   if test "x$cddlib_found" = "xyes" ; then
-      AC_DEFINE(HAVE_CDDLIB_C_LINKAGE, 1, [Define if the cddlib library has C linkage])
-   fi
-   AC_LANG(C++)
-fi   
-if test "x$cddlib_found" = "xno" ; then
-   AC_MSG_ERROR([The cddlib headers and library are required for LattE.])
-fi
 AC_CACHE_SAVE
 	  
 # From LRS
diff --git a/m4/cddlib-check.m4 b/m4/cddlib-check.m4
index 2fcce40..b73922c 100644
--- a/m4/cddlib-check.m4
+++ b/m4/cddlib-check.m4
@@ -1,99 +1,24 @@
-# Check for cddlib, derived from lidia-check.m4
-
-dnl LB_CHECK_CDDLIB ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl LB_CHECK_CDDLIB()
 dnl
 dnl Test for CDDLIB Library and define CDDLIB_CFLAGS and CDDLIB_LIBS
 
 AC_DEFUN([LB_CHECK_CDDLIB],
 [
 
-CDDLIB_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+AC_ARG_WITH([cddlib],
+	[AS_HELP_STRING([--with-cddlib=auto|yes|no], [Make use of cddlib])],
+	[want_cddlib="$withval"], [want_cddlib=auto])
 
-AC_ARG_WITH(cddlib,
-	    [  --with-cddlib=<path>|yes|no 
-					   Use cddlib. 
-					   If argument is no, you do not have the library installed on your machine (set as default).
-					   If argument is yes or <empty> that means the library is reachable with the standard
-					   search path (/usr or /usr/local).
-	 				   Otherwise you give the <path> to the directory which contain the library. 
-	     ],
-	     [if test "$withval" = yes ; then
-			CDDLIB_HOME_PATH="${DEFAULT_CHECKING_PATH}"
-	      elif test "$withval" != no ; then
-			CDDLIB_HOME_PATH="$withval"
-	     fi],
-	     [])
-
-min_cddlib_version=ifelse([$1], , 093c,$1)
-
-
-dnl Check for existence
-
-BACKUP_CXXFLAGS=${CXXFLAGS}
-BACKUP_CFLAGS=${CFLAGS}
-BACKUP_LIBS=${LIBS}
-
-if test -n "$CDDLIB_HOME_PATH" ; then
-AC_MSG_CHECKING(for CDDLIB >= $min_cddlib_version)
-fi
-
-for CDDLIB_HOME in ${CDDLIB_HOME_PATH} 
- do	
-if test -r "$CDDLIB_HOME/include/cdd.h" -o -r "$CDDLIB_HOME/include/cdd/cdd.h"; then
-	if test "x$CDDLIB_HOME" != "x/usr" -a "x$CDDLIB_HOME" != "x/usr/local"; then
-	        if test -r "$CDDLIB_HOME/include/cdd/cdd.h"; then
-		   CDDLIB_CFLAGS="-I${CDDLIB_HOME}/include/cdd"
-		else
-		   CDDLIB_CFLAGS="-I${CDDLIB_HOME}/include"
-		fi
-		CDDLIB_LIBS="-L${CDDLIB_HOME}/lib -lcddgmp"
-	else
-	        if test -r "$CDDLIB_HOME/include/cdd/cdd.h"; then
-		   CDDLIB_CFLAGS="-I${CDDLIB_HOME}/include/cdd"
-		else
-		   CDDLIB_CFLAGS=
-		fi
-		CDDLIB_LIBS="-lcddgmp"		
-	fi	
-	CXXFLAGS="${BACKUP_CXXFLAGS} ${CDDLIB_CFLAGS} ${GMP_CFLAGS}" 
-	CFLAGS="${BACKUP_CFLAGS} ${CDDLIB_CFLAGS} ${GMP_CFLAGS}" 
-	LIBS="${BACKUP_LIBS} ${CDDLIB_LIBS} ${GMP_LIBS}"
-
-	AC_TRY_LINK([
-#define GMPRATIONAL
-#include <setoper.h>
-#include <cddmp.h>
-#include <cdd.h>
-],
-[ mytype a;
-  dd_init(a);
-  dd_abs(a, a);
-],
-[	cddlib_found="yes"
-	break
-]
-)
-else
-	cddlib_found="no"
-fi
-done
-
-if test "x$cddlib_found" = "xyes" ; then		
-	AC_SUBST(CDDLIB_CFLAGS)
-	AC_SUBST(CDDLIB_LIBS)
-	AC_DEFINE(HAVE_CDDLIB,1,[Define if CDDLIB is installed])
-	HAVE_CDDLIB=yes
-	AC_MSG_RESULT(found)
-else
-	AC_MSG_RESULT(not found)
-	ifelse([$3], , :, [$3])
-fi	
-
-AM_CONDITIONAL(HAVE_CDDLIB, test "x$HAVE_CDDLIB" = "xyes")
-
-CXXFLAGS=${BACKUP_CXXFLAGS}
-CFLAGS=${BACKUP_CFLAGS}
-LIBS=${BACKUP_LIBS}
-#unset LD_LIBRARY_PATH
+have_cddlib=0
+AS_IF([test "$want_cddlib" != no], [
+	PKG_CHECK_MODULES([CDDLIB], [cddlib >= 0.94l], [
+		have_cddlib=1
+		AH_TEMPLATE([HAVE_CDDLIB], [Whether cddlib is available])
+		AC_DEFINE([HAVE_CDDLIB], [1])
+        ], [
+		AS_IF([test "$want_cddlib" = yes], [AC_MSG_ERROR([$libcrypto_PKG_ERRORS])])
+	])
+])
+AM_CONDITIONAL([HAVE_CDDLIB], [test "$have_cddlib" = 1])
 
 ])
-- 
2.28.0

Places

File 0001-build-adjust-for-new-cddlib-paths-and-pkgconfig-file.patch of Package latte (Revision 9103e5deeeab0210fe3cc09a2c9ccee1)

Places