]>
Commit | Line | Data |
---|---|---|
91dbb874 JB |
1 | --- linux-gpib-4.0.3/configure.ac.orig 2016-04-09 15:34:55.000000000 +0200 |
2 | +++ linux-gpib-4.0.3/configure.ac 2016-07-06 17:55:18.567320365 +0200 | |
3 | @@ -143,8 +143,10 @@ | |
4 | fi | |
5 | ||
6 | dnl Checks for libraries. | |
7 | +AC_CHECK_LIB([guile-2.0],[scm_c_define],[:],[ | |
8 | AC_CHECK_LIB([guile],[gh_define],[echo this prevents default actions from occurring > /dev/null], | |
9 | [BIND_GUILE="no";AC_MSG_NOTICE([libguile not found, disabling guile binding])],[]) | |
10 | +]) | |
11 | ||
12 | AC_CHECK_LIB([readline], [readline], | |
13 | [readline_lib=yes;AC_SUBST([LIB_READLINE_LDFLAGS], ["-lreadline -lncurses"])], | |
14 | --- linux-gpib-4.0.3/language/guile/gpib.h.orig 2016-04-09 15:33:09.000000000 +0200 | |
15 | +++ linux-gpib-4.0.3/language/guile/gpib.h 2016-07-06 20:44:07.355781339 +0200 | |
16 | @@ -22,12 +22,12 @@ | |
17 | #ifndef SCM_GPIB_H | |
18 | #define SCM_GPIB_H 1 | |
19 | ||
20 | -#if defined (SCM_MINOR_VERSION) && (SCM_MINOR_VERSION >= 5) && \ | |
21 | - defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION >= 1) | |
22 | +#if defined (SCM_MAJOR_VERSION) && ((SCM_MAJOR_VERSION > 1) || ((SCM_MAJOR_VERSION == 1) && \ | |
23 | + defined (SCM_MINOR_VERSION) && (SCM_MINOR_VERSION >= 5))) | |
24 | #define SCM_VERSION_15X 1 | |
25 | #endif | |
26 | -#if defined (SCM_MINOR_VERSION) && (SCM_MINOR_VERSION >= 7) && \ | |
27 | - defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION >= 1) | |
28 | +#if defined (SCM_MAJOR_VERSION) && ((SCM_MAJOR_VERSION > 1) || ((SCM_MAJOR_VERSION == 1) && \ | |
29 | + defined (SCM_MINOR_VERSION) && (SCM_MINOR_VERSION >= 7))) | |
30 | #define SCM_VERSION_17X 1 | |
31 | #endif | |
32 | ||
33 | --- linux-gpib-4.0.3/language/guile/gpib.c.orig 2016-04-09 15:33:09.000000000 +0200 | |
34 | +++ linux-gpib-4.0.3/language/guile/gpib.c 2016-07-06 18:07:48.129926301 +0200 | |
35 | @@ -23,7 +23,7 @@ | |
36 | #include <stdlib.h> | |
37 | #include <string.h> | |
38 | ||
39 | -#include <guile/gh.h> | |
40 | +#include <libguile.h> | |
41 | #include <gpib/ib.h> | |
42 | ||
43 | #include "gpib.h" |