New Ticket     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Ticket #13472: patch-configure.in

File patch-configure.in, 7.0 KB (added by macosforge.lbn@…, 4 years ago)
Line 
1--- configure.orig      2007-08-19 12:13:03.000000000 -0500
2+++ configure   2007-12-25 20:21:25.000000000 -0600
3@@ -25240,9 +25240,9 @@
4 
5 
6        if test "x$cross_compiling" = "xyes" ; then
7-         name_build_guile="$target_alias-guile-config"
8+         name_build_guile="$target_alias-guile16-config"
9        else
10-         name_build_guile="guile-config"
11+         name_build_guile="guile16-config"
12        fi
13 
14        # Extract the first word of "$name_build_guile", so it can be a program name with args.
15@@ -25425,13 +25425,13 @@
16 
17 
18        if test "x$BUILD_GUILE" = "xyes"; then
19-               { echo "$as_me:$LINENO: checking for guile libraries" >&5
20-echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
21+               { echo "$as_me:$LINENO: checking for guile16 libraries" >&5
22+echo $ECHO_N "checking for guile16 libraries... $ECHO_C" >&6; }
23                GUILE_LIBS="`$name_build_guile link`"
24                { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
25 echo "${ECHO_T}$GUILE_LIBS" >&6; }
26-               { echo "$as_me:$LINENO: checking for guile headers" >&5
27-echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
28+               { echo "$as_me:$LINENO: checking for guile16 headers" >&5
29+echo $ECHO_N "checking for guile16 headers... $ECHO_C" >&6; }
30                GUILE_INCS="`$name_build_guile compile`"
31                { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
32 echo "${ECHO_T}$GUILE_INCS" >&6; }
33@@ -25757,7 +25757,7 @@
34   GUILE_LIBS="$GUILE_LIBS -lsocket"
35 fi
36 
37-               GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
38+               GUILE_LIBS="-lguile16 $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
39        fi
40 
41 
42@@ -25767,8 +25767,8 @@
43        LIBS="$LIBS $GUILE_LIBS"
44        CPPFLAGS="$saved_cppflags $GUILE_INCS"
45 
46-       { echo "$as_me:$LINENO: checking whether guile works" >&5
47-echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
48+       { echo "$as_me:$LINENO: checking whether guile16 works" >&5
49+echo $ECHO_N "checking whether guile16 works... $ECHO_C" >&6; }
50        cat >conftest.$ac_ext <<_ACEOF
51 /* confdefs.h.  */
52 _ACEOF
53@@ -25776,8 +25776,8 @@
54 cat >>conftest.$ac_ext <<_ACEOF
55 /* end confdefs.h.  */
56 
57-               #include <libguile.h>
58-               #include <guile/gh.h>
59+               #include <libguile16.h>
60+               #include <guile16/gh.h>
61 
62 int
63 main ()
64@@ -25880,8 +25880,8 @@
65 
66 
67 if test x${GUILE} = x ; then
68-   # Extract the first word of "guile", so it can be a program name with args.
69-set dummy guile; ac_word=$2
70+   # Extract the first word of "guile16", so it can be a program name with args.
71+set dummy guile16; ac_word=$2
72 { echo "$as_me:$LINENO: checking for $ac_word" >&5
73 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
74 if test "${ac_cv_path_GUILE+set}" = set; then
75@@ -26019,8 +26019,8 @@
76 
77 
78 if test x${GUILE} = x ; then
79-   # Extract the first word of "guile", so it can be a program name with args.
80-set dummy guile; ac_word=$2
81+   # Extract the first word of "guile16", so it can be a program name with args.
82+set dummy guile16; ac_word=$2
83 { echo "$as_me:$LINENO: checking for $ac_word" >&5
84 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
85 if test "${ac_cv_path_GUILE+set}" = set; then
86@@ -26165,20 +26165,20 @@
87 
88 ### Check size of long_long - some guile's are broken.
89 { echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
90-echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
91+echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
92 GNC_OLDCFLAGS="$CFLAGS"
93 CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
94 if test "$cross_compiling" = yes; then
95 
96   { echo "$as_me:$LINENO: result: assuming yes" >&5
97 echo "${ECHO_T}assuming yes" >&6; }
98-  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
99-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
100+  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
101+echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
102 if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
103   echo $ECHO_N "(cached) $ECHO_C" >&6
104 else
105   ac_check_lib_save_LIBS=$LIBS
106-LIBS="-lguile  $LIBS"
107+LIBS="-lguile16  $LIBS"
108 cat >conftest.$ac_ext <<_ACEOF
109 /* confdefs.h.  */
110 _ACEOF
111@@ -26251,7 +26251,7 @@
112 /* end confdefs.h.  */
113 
114   #include <glib.h>
115-  #include <libguile/__scm.h>
116+  #include <libguile16/__scm.h>
117   int main(int argc, char *argv[]) {
118     return(!(sizeof(long_long) >= sizeof(gint64)));
119   }
120@@ -26280,13 +26280,13 @@
121 
122   { echo "$as_me:$LINENO: result: yes" >&5
123 echo "${ECHO_T}yes" >&6; }
124-  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
125-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
126+  { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
127+echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
128 if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
129   echo $ECHO_N "(cached) $ECHO_C" >&6
130 else
131   ac_check_lib_save_LIBS=$LIBS
132-LIBS="-lguile  $LIBS"
133+LIBS="-lguile16  $LIBS"
134 cat >conftest.$ac_ext <<_ACEOF
135 /* confdefs.h.  */
136 _ACEOF
137@@ -26478,8 +26478,8 @@
138 
139 { echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
140 echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
141-# Extract the first word of "guile", so it can be a program name with args.
142-set dummy guile; ac_word=$2
143+# Extract the first word of "guile16", so it can be a program name with args.
144+set dummy guile16; ac_word=$2
145 { echo "$as_me:$LINENO: checking for $ac_word" >&5
146 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
147 if test "${ac_cv_path_GUILE+set}" = set; then
148@@ -26519,13 +26519,13 @@
149 
150 
151   if test "$GUILE" = "" ; then
152-      { { echo "$as_me:$LINENO: error: guile required but not found" >&5
153-echo "$as_me: error: guile required but not found" >&2;}
154+      { { echo "$as_me:$LINENO: error: guile16 required but not found" >&5
155+echo "$as_me: error: guile16 required but not found" >&2;}
156    { (exit 1); exit 1; }; }
157   fi
158 
159-  # Extract the first word of "guile-config", so it can be a program name with args.
160-set dummy guile-config; ac_word=$2
161+  # Extract the first word of "guile16-config", so it can be a program name with args.
162+set dummy guile16-config; ac_word=$2
163 { echo "$as_me:$LINENO: checking for $ac_word" >&5
164 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
165 if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
166@@ -26565,13 +26565,13 @@
167 
168 
169   if test "$GUILE_CONFIG" = "" ; then
170-      { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
171-echo "$as_me: error: guile-config required but not found" >&2;}
172+      { { echo "$as_me:$LINENO: error: guile16-config required but not found" >&5
173+echo "$as_me: error: guile16-config required but not found" >&2;}
174    { (exit 1); exit 1; }; }
175   fi
176 
177-  # Extract the first word of "guile-tools", so it can be a program name with args.
178-set dummy guile-tools; ac_word=$2
179+  # Extract the first word of "guile16-tools", so it can be a program name with args.
180+set dummy guile16-tools; ac_word=$2
181 { echo "$as_me:$LINENO: checking for $ac_word" >&5
182 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
183 if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then