delorie.com/archives/browse.cgi   search  
Mail Archives: geda-user/2019/09/27/20:26:09

X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X_CMAE_Category: , ,
X-CNFS-Analysis: v=2.3 cv=FLplONgs c=1 sm=1 tr=0 a=OAvc3ylXTZnwW13UMKQG5A==:117 a=OAvc3ylXTZnwW13UMKQG5A==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=jlQd9YhnVdoA:10 a=J70Eh1EUuV4A:10 a=JbhlE8a8jZIA:10 a=bqMIs5ru_oZ8IBRIsU0A:9 a=QEXdDO2ut3YA:10
X-CM-Score: 0
X-Scanned-by: Cloudmark Authority Engine
X-Authed-Username: dG9tZGVhbkB3YXZlY2FibGUuY29t
X_CMAE_Category: , ,
X-CNFS-Analysis:
X-CM-Score:
X-Scanned-by: Cloudmark Authority Engine
Authentication-Results: smtp02.emerald.cmh.synacor.com smtp.mail=tomdean AT wavecable DOT com; spf=permerror; sender-id=permerror
Authentication-Results: smtp02.emerald.cmh.synacor.com header.from=tomdean AT wavecable DOT com; sender-id=permerror
Authentication-Results: smtp02.emerald.cmh.synacor.com smtp.user=tomdean; auth=pass (LOGIN)
To: geda-user AT delorie DOT com
From: "Thomas D. Dean (tomdean AT wavecable DOT com) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
Subject: [geda-user] Lepton Config Patch
Message-ID: <e2e88f5f-e662-f51e-7964-414812c4cbf0@wavecable.com>
Date: Fri, 27 Sep 2019 17:03:51 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
Thunderbird/60.8.0
MIME-Version: 1.0
Reply-To: geda-user AT delorie DOT com

I have a patch to check for proper -dev package when building lepton-geda.

 > diff -c m4/geda-guile.m4.orig m4/geda-guile.m4

*** m4/geda-guile.m4.orig       Thu Sep 26 10:23:51 2019
--- m4/geda-guile.m4    Thu Sep 26 10:22:38 2019
***************
*** 34,50 ****
     GUILE_MIN_MINOR=`echo ${GUILE_MIN_VER} | sed -e 's;[[^\.]]*\.;;' -e 
's;\..*;;g'`
     GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`

-   _found_pkg_config_guile=yes
     PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
!                            [GUILE_PKG_NAME=guile-2.2], 
[_found_pkg_config_guile=no])

     if test "${_found_pkg_config_guile}" = "no" ; then
      PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
                               [_found_pkg_config_guile=yes
                                GUILE_PKG_NAME=guile-2.0],
                               [_found_pkg_config_guile=no])
-   fi

     if test "${_found_pkg_config_guile}" = "no" ; then
       AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])
     fi
--- 34,68 ----
     GUILE_MIN_MINOR=`echo ${GUILE_MIN_VER} | sed -e 's;[[^\.]]*\.;;' -e 
's;\..*;;g'`
     GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`

     PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
!                            [_found_pkg_config_guile=yes
!                             GUILE_PKG_NAME=guile-2.2],
!                            [_found_pkg_config_guile=no])

+   # if found guile-2.2, check for guile-2.2-dev
+   if test "${_found_pkg_config_guile}" = "yes" ; then
+    PKG_CHECK_MODULES(GUILE, [guile-2.2-dev >= $GUILE_MIN_VER],
+                             [_found_pkg_config_guile_dev=yes
+                              GUILE_PKG_DEV_NAME=guile-2.2-dev],
+                             [_found_pkg_config_guile=no])
+   fi
+
+   ## if did not find guile-2.2, check for guile-2.0 and its dev
     if test "${_found_pkg_config_guile}" = "no" ; then
      PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
                               [_found_pkg_config_guile=yes
                                GUILE_PKG_NAME=guile-2.0],
                               [_found_pkg_config_guile=no])

+     # if found guile-2.0, check for guile-2.0-dev
+     if test "${_found_pkg_config_guile}" = "yes" ; then
+     PKG_CHECK_MODULES(GUILE, [guile-2.0-dev >= $GUILE_MIN_VER],
+                              [_found_pkg_config_guile_dev=yes
+                               GUILE_PKG_DEV_NAME=guile-2.0-dev],
+                              [_found_pkg_config_guile=no])
+     fi
+   fi
+
     if test "${_found_pkg_config_guile}" = "no" ; then
       AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])
     fi

- Raw text -


  webmaster     delorie software   privacy  
  Copyright © 2019   by DJ Delorie     Updated Jul 2019