]> git.pld-linux.org Git - packages/fribidi.git/blame - fribidi-0.1.12-glib2.patch
projects / packages / fribidi.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- cosmetics.
[packages/fribidi.git] / fribidi-0.1.12-glib2.patch
CommitLineData
247aece8 1diff -ur fribidi-0.1.12.bak/aclocal.m4 fribidi-0.1.12/aclocal.m4
2--- fribidi-0.1.12.bak/aclocal.m4 Fri May 19 05:14:44 2000
3+++ fribidi-0.1.12/aclocal.m4 Fri Jul 14 18:01:11 2000
4@@ -542,6 +542,206 @@
5 # Configure paths for GLIB
6 # Owen Taylor 97-11-3
7
8+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
9+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
10+dnl gthread is specified in MODULES, pass to glib-config
11+dnl
12+AC_DEFUN(AM_PATH_GLIB_2_0,
13+[dnl
14+dnl Get the cflags and libraries from the glib-config-2.0 script
15+dnl
16+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
17+ glib_config_prefix="$withval", glib_config_prefix="")
18+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
19+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
20+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
21+ , enable_glibtest=yes)
22+
23+ if test x$glib_config_exec_prefix != x ; then
24+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
25+ if test x${GLIB_CONFIG_2_0+set} != xset ; then
26+ GLIB_CONFIG_2_0=$glib_config_exec_prefix/bin/glib-config-2.0
27+ fi
28+ fi
29+ if test x$glib_config_prefix != x ; then
30+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
31+ if test x${GLIB_CONFIG_2_0+set} != xset ; then
32+ GLIB_CONFIG_2_0=$glib_config_prefix/bin/glib-config-2.0
33+ fi
34+ fi
35+
36+ for module in . $4
37+ do
38+ case "$module" in
39+ gmodule)
40+ glib_config_args="$glib_config_args gmodule"
41+ ;;
42+ gobject)
43+ glib_config_args="$glib_config_args gobject"
44+ ;;
45+ gthread)
46+ glib_config_args="$glib_config_args gthread"
47+ ;;
48+ esac
49+ done
50+
51+ AC_PATH_PROG(GLIB_CONFIG_2_0, glib-config-2.0, no)
52+ min_glib_version=ifelse([$1], ,1.3.1,$1)
53+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
54+ no_glib=""
55+ if test "$GLIB_CONFIG_2_0" = "no" ; then
56+ no_glib=yes
57+ else
58+ GLIB_CFLAGS=`$GLIB_CONFIG_2_0 $glib_config_args --cflags`
59+ GLIB_LIBS=`$GLIB_CONFIG_2_0 $glib_config_args --libs`
60+ glib_config_major_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
61+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
62+ glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
63+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
64+ glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
65+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
66+ if test "x$enable_glibtest" = "xyes" ; then
67+ ac_save_CFLAGS="$CFLAGS"
68+ ac_save_LIBS="$LIBS"
69+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
70+ LIBS="$GLIB_LIBS $LIBS"
71+dnl
72+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
73+dnl checks the results of glib-config-2.0 to some extent
74+dnl
75+ rm -f conf.glibtest
76+ AC_TRY_RUN([
77+#include <glib.h>
78+#include <stdio.h>
79+#include <stdlib.h>
80+
81+int
82+main ()
83+{
84+ int major, minor, micro;
85+ char *tmp_version;
86+
87+ system ("touch conf.glibtest");
88+
89+ /* HP/UX 9 (%@#!) writes to sscanf strings */
90+ tmp_version = g_strdup("$min_glib_version");
91+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
92+ printf("%s, bad version string\n", "$min_glib_version");
93+ exit(1);
94+ }
95+
96+ if ((glib_major_version != $glib_config_major_version) ||
97+ (glib_minor_version != $glib_config_minor_version) ||
98+ (glib_micro_version != $glib_config_micro_version))
99+ {
100+ printf("\n*** 'glib-config-2.0 --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
101+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
102+ glib_major_version, glib_minor_version, glib_micro_version);
103+ printf ("*** was found! If glib-config-2.0 was correct, then it is best\n");
104+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
105+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
106+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
107+ printf("*** required on your system.\n");
108+ printf("*** If glib-config-2.0 was wrong, set the environment variable GLIB_CONFIG_2_0\n");
109+ printf("*** to point to the correct copy of glib-config-2.0, and remove the file config.cache\n");
110+ printf("*** before re-running configure\n");
111+ }
112+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
113+ (glib_minor_version != GLIB_MINOR_VERSION) ||
114+ (glib_micro_version != GLIB_MICRO_VERSION))
115+ {
116+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
117+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
118+ printf("*** library (version %d.%d.%d)\n",
119+ glib_major_version, glib_minor_version, glib_micro_version);
120+ }
121+ else
122+ {
123+ if ((glib_major_version > major) ||
124+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
125+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
126+ {
127+ return 0;
128+ }
129+ else
130+ {
131+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
132+ glib_major_version, glib_minor_version, glib_micro_version);
133+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
134+ major, minor, micro);
135+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
136+ printf("***\n");
137+ printf("*** If you have already installed a sufficiently new version, this error\n");
138+ printf("*** probably means that the wrong copy of the glib-config-2.0 shell script is\n");
139+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
140+ printf("*** of GLIB, but you can also set the GLIB_CONFIG_2_0 environment to point to the\n");
141+ printf("*** correct copy of glib-config-2.0. (In this case, you will have to\n");
142+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
143+ printf("*** so that the correct libraries are found at run-time))\n");
144+ }
145+ }
146+ return 1;
147+}
148+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
149+ CFLAGS="$ac_save_CFLAGS"
150+ LIBS="$ac_save_LIBS"
151+ fi
152+ fi
153+ if test "x$no_glib" = x ; then
154+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
155+ ifelse([$2], , :, [$2])
156+ else
157+ AC_MSG_RESULT(no)
158+ if test "$GLIB_CONFIG_2_0" = "no" ; then
159+ echo "*** The glib-config-2.0 script installed by GLIB could not be found"
160+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
161+ echo "*** your path, or set the GLIB_CONFIG_2_0 environment variable to the"
162+ echo "*** full path to glib-config-2.0."
163+ else
164+ if test -f conf.glibtest ; then
165+ :
166+ else
167+ echo "*** Could not run GLIB test program, checking why..."
168+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
169+ LIBS="$LIBS $GLIB_LIBS"
170+ AC_TRY_LINK([
171+#include <glib.h>
172+#include <stdio.h>
173+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
174+ [ echo "*** The test program compiled, but did not run. This usually means"
175+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
176+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
177+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
178+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
179+ echo "*** is required on your system"
180+ echo "***"
181+ echo "*** If you have an old version installed, it is best to remove it, although"
182+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
183+ echo "***"
184+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
185+ echo "*** came with the system with the command"
186+ echo "***"
187+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
188+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
189+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
190+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
191+ echo "*** may want to edit the glib-config-2.0 script: $GLIB_CONFIG_2_0" ])
192+ CFLAGS="$ac_save_CFLAGS"
193+ LIBS="$ac_save_LIBS"
194+ fi
195+ fi
196+ GLIB_CFLAGS=""
197+ GLIB_LIBS=""
198+ ifelse([$3], , :, [$3])
199+ fi
200+ AC_SUBST(GLIB_CFLAGS)
201+ AC_SUBST(GLIB_LIBS)
202+ rm -f conf.glibtest
203+])
204+
205+# Configure paths for GLIB
206+# Owen Taylor 97-11-3
207+
208 dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
209 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
210 dnl gthread is specified in MODULES, pass to glib-config
211@@ -576,6 +776,9 @@
212 gmodule)
213 glib_config_args="$glib_config_args gmodule"
214 ;;
215+ gobject)
216+ glib_config_args="$glib_config_args gobject"
217+ ;;
218 gthread)
219 glib_config_args="$glib_config_args gthread"
220 ;;
221@@ -685,7 +888,7 @@
222 fi
223 fi
224 if test "x$no_glib" = x ; then
225- AC_MSG_RESULT(yes)
226+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
227 ifelse([$2], , :, [$2])
228 else
229 AC_MSG_RESULT(no)
230diff -ur fribidi-0.1.12.bak/configure fribidi-0.1.12/configure
231--- fribidi-0.1.12.bak/configure Fri May 19 05:14:51 2000
232+++ fribidi-0.1.12/configure Fri Jul 14 18:01:13 2000
233@@ -27,6 +27,12 @@
234 --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)"
235 ac_help="$ac_help
236 --disable-glibtest Do not try to compile and run a test GLIB program"
237+ac_help="$ac_help
238+ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)"
239+ac_help="$ac_help
240+ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)"
241+ac_help="$ac_help
242+ --disable-glibtest Do not try to compile and run a test GLIB program"
243
244 # Initialize some variables set by options.
245 # The variables have the same names as the options, with
246@@ -571,7 +577,7 @@
247 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
248 # ./install, which can be erroneously created by make from ./install.sh.
249 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
250-echo "configure:575: checking for a BSD compatible install" >&5
251+echo "configure:581: checking for a BSD compatible install" >&5
252 if test -z "$INSTALL"; then
253 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
254 echo $ac_n "(cached) $ac_c" 1>&6
255@@ -624,7 +630,7 @@
256 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
257
258 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
259-echo "configure:628: checking whether build environment is sane" >&5
260+echo "configure:634: checking whether build environment is sane" >&5
261 # Just in case
262 sleep 1
263 echo timestamp > conftestfile
264@@ -681,7 +687,7 @@
265 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
266
267 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
268-echo "configure:685: checking whether ${MAKE-make} sets \${MAKE}" >&5
269+echo "configure:691: checking whether ${MAKE-make} sets \${MAKE}" >&5
270 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
271 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
272 echo $ac_n "(cached) $ac_c" 1>&6
273@@ -727,7 +733,7 @@
274
275 missing_dir=`cd $ac_aux_dir && pwd`
276 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
277-echo "configure:731: checking for working aclocal" >&5
278+echo "configure:737: checking for working aclocal" >&5
279 # Run test in a subshell; some versions of sh will print an error if
280 # an executable is not found, even if stderr is redirected.
281 # Redirect stdin to placate older versions of autoconf. Sigh.
282@@ -740,7 +746,7 @@
283 fi
284
285 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
286-echo "configure:744: checking for working autoconf" >&5
287+echo "configure:750: checking for working autoconf" >&5
288 # Run test in a subshell; some versions of sh will print an error if
289 # an executable is not found, even if stderr is redirected.
290 # Redirect stdin to placate older versions of autoconf. Sigh.
291@@ -753,7 +759,7 @@
292 fi
293
294 echo $ac_n "checking for working automake""... $ac_c" 1>&6
295-echo "configure:757: checking for working automake" >&5
296+echo "configure:763: checking for working automake" >&5
297 # Run test in a subshell; some versions of sh will print an error if
298 # an executable is not found, even if stderr is redirected.
299 # Redirect stdin to placate older versions of autoconf. Sigh.
300@@ -766,7 +772,7 @@
301 fi
302
303 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
304-echo "configure:770: checking for working autoheader" >&5
305+echo "configure:776: checking for working autoheader" >&5
306 # Run test in a subshell; some versions of sh will print an error if
307 # an executable is not found, even if stderr is redirected.
308 # Redirect stdin to placate older versions of autoconf. Sigh.
309@@ -779,7 +785,7 @@
310 fi
311
312 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
313-echo "configure:783: checking for working makeinfo" >&5
314+echo "configure:789: checking for working makeinfo" >&5
315 # Run test in a subshell; some versions of sh will print an error if
316 # an executable is not found, even if stderr is redirected.
317 # Redirect stdin to placate older versions of autoconf. Sigh.
318@@ -873,7 +879,7 @@
319 fi
320
321 echo $ac_n "checking host system type""... $ac_c" 1>&6
322-echo "configure:877: checking host system type" >&5
323+echo "configure:883: checking host system type" >&5
324
325 host_alias=$host
326 case "$host_alias" in
327@@ -894,7 +900,7 @@
328 echo "$ac_t""$host" 1>&6
329
330 echo $ac_n "checking build system type""... $ac_c" 1>&6
331-echo "configure:898: checking build system type" >&5
332+echo "configure:904: checking build system type" >&5
333
334 build_alias=$build
335 case "$build_alias" in
336@@ -914,7 +920,7 @@
337 # Extract the first word of "ranlib", so it can be a program name with args.
338 set dummy ranlib; ac_word=$2
339 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
340-echo "configure:918: checking for $ac_word" >&5
341+echo "configure:924: checking for $ac_word" >&5
342 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
343 echo $ac_n "(cached) $ac_c" 1>&6
344 else
345@@ -944,7 +950,7 @@
346 # Extract the first word of "gcc", so it can be a program name with args.
347 set dummy gcc; ac_word=$2
348 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
349-echo "configure:948: checking for $ac_word" >&5
350+echo "configure:954: checking for $ac_word" >&5
351 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
352 echo $ac_n "(cached) $ac_c" 1>&6
353 else
354@@ -974,7 +980,7 @@
355 # Extract the first word of "cc", so it can be a program name with args.
356 set dummy cc; ac_word=$2
357 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
358-echo "configure:978: checking for $ac_word" >&5
359+echo "configure:984: checking for $ac_word" >&5
360 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
361 echo $ac_n "(cached) $ac_c" 1>&6
362 else
363@@ -1025,7 +1031,7 @@
364 # Extract the first word of "cl", so it can be a program name with args.
365 set dummy cl; ac_word=$2
366 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
367-echo "configure:1029: checking for $ac_word" >&5
368+echo "configure:1035: checking for $ac_word" >&5
369 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
370 echo $ac_n "(cached) $ac_c" 1>&6
371 else
372@@ -1057,7 +1063,7 @@
373 fi
374
375 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
376-echo "configure:1061: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
377+echo "configure:1067: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
378
379 ac_ext=c
380 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
381@@ -1068,12 +1074,12 @@
382
383 cat > conftest.$ac_ext << EOF
384
385-#line 1072 "configure"
386+#line 1078 "configure"
387 #include "confdefs.h"
388
389 main(){return(0);}
390 EOF
391-if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
392+if { (eval echo configure:1083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
393 ac_cv_prog_cc_works=yes
394 # If we can't run a trivial program, we are probably using a cross compiler.
395 if (./conftest; exit) 2>/dev/null; then
396@@ -1099,12 +1105,12 @@
397 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
398 fi
399 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
400-echo "configure:1103: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
401+echo "configure:1109: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
402 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
403 cross_compiling=$ac_cv_prog_cc_cross
404
405 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
406-echo "configure:1108: checking whether we are using GNU C" >&5
407+echo "configure:1114: checking whether we are using GNU C" >&5
408 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
409 echo $ac_n "(cached) $ac_c" 1>&6
410 else
411@@ -1113,7 +1119,7 @@
412 yes;
413 #endif
414 EOF
415-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
416+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
417 ac_cv_prog_gcc=yes
418 else
419 ac_cv_prog_gcc=no
420@@ -1132,7 +1138,7 @@
421 ac_save_CFLAGS="$CFLAGS"
422 CFLAGS=
423 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
424-echo "configure:1136: checking whether ${CC-cc} accepts -g" >&5
425+echo "configure:1142: checking whether ${CC-cc} accepts -g" >&5
426 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
427 echo $ac_n "(cached) $ac_c" 1>&6
428 else
429@@ -1175,7 +1181,7 @@
430 if test "$ac_cv_prog_gcc" = yes; then
431 # Check if gcc -print-prog-name=ld gives a path.
432 echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
433-echo "configure:1179: checking for ld used by GCC" >&5
434+echo "configure:1185: checking for ld used by GCC" >&5
435 ac_prog=`($CC -print-prog-name=ld) 2>&5`
436 case "$ac_prog" in
437 # Accept absolute paths.
438@@ -1199,10 +1205,10 @@
439 esac
440 elif test "$with_gnu_ld" = yes; then
441 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
442-echo "configure:1203: checking for GNU ld" >&5
443+echo "configure:1209: checking for GNU ld" >&5
444 else
445 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
446-echo "configure:1206: checking for non-GNU ld" >&5
447+echo "configure:1212: checking for non-GNU ld" >&5
448 fi
449 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
450 echo $ac_n "(cached) $ac_c" 1>&6
451@@ -1237,7 +1243,7 @@
452 fi
453 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
454 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
455-echo "configure:1241: checking if the linker ($LD) is GNU ld" >&5
456+echo "configure:1247: checking if the linker ($LD) is GNU ld" >&5
457 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
458 echo $ac_n "(cached) $ac_c" 1>&6
459 else
460@@ -1253,7 +1259,7 @@
461
462
463 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
464-echo "configure:1257: checking for BSD-compatible nm" >&5
465+echo "configure:1263: checking for BSD-compatible nm" >&5
466 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
467 echo $ac_n "(cached) $ac_c" 1>&6
468 else
469@@ -1289,7 +1295,7 @@
470 echo "$ac_t""$NM" 1>&6
471
472 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
473-echo "configure:1293: checking whether ln -s works" >&5
474+echo "configure:1299: checking whether ln -s works" >&5
475 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
476 echo $ac_n "(cached) $ac_c" 1>&6
477 else
478@@ -1343,8 +1349,8 @@
479 case "$lt_target" in
480 *-*-irix6*)
481 # Find out which ABI we are using.
482- echo '#line 1347 "configure"' > conftest.$ac_ext
483- if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
484+ echo '#line 1353 "configure"' > conftest.$ac_ext
485+ if { (eval echo configure:1354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
486 case "`/usr/bin/file conftest.o`" in
487 *32-bit*)
488 LD="${LD-ld} -32"
489@@ -1365,19 +1371,19 @@
490 SAVE_CFLAGS="$CFLAGS"
491 CFLAGS="$CFLAGS -belf"
492 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
493-echo "configure:1369: checking whether the C compiler needs -belf" >&5
494+echo "configure:1375: checking whether the C compiler needs -belf" >&5
495 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
496 echo $ac_n "(cached) $ac_c" 1>&6
497 else
498 cat > conftest.$ac_ext <<EOF
499-#line 1374 "configure"
500+#line 1380 "configure"
501 #include "confdefs.h"
502
503 int main() {
504
505 ; return 0; }
506 EOF
507-if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
508+if { (eval echo configure:1387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
509 rm -rf conftest*
510 lt_cv_cc_needs_belf=yes
511 else
512@@ -1482,7 +1488,7 @@
513 # Extract the first word of "gcc", so it can be a program name with args.
514 set dummy gcc; ac_word=$2
515 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
516-echo "configure:1486: checking for $ac_word" >&5
517+echo "configure:1492: checking for $ac_word" >&5
518 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
519 echo $ac_n "(cached) $ac_c" 1>&6
520 else
521@@ -1512,7 +1518,7 @@
522 # Extract the first word of "cc", so it can be a program name with args.
523 set dummy cc; ac_word=$2
524 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
525-echo "configure:1516: checking for $ac_word" >&5
526+echo "configure:1522: checking for $ac_word" >&5
527 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
528 echo $ac_n "(cached) $ac_c" 1>&6
529 else
530@@ -1563,7 +1569,7 @@
531 # Extract the first word of "cl", so it can be a program name with args.
532 set dummy cl; ac_word=$2
533 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
534-echo "configure:1567: checking for $ac_word" >&5
535+echo "configure:1573: checking for $ac_word" >&5
536 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
537 echo $ac_n "(cached) $ac_c" 1>&6
538 else
539@@ -1595,7 +1601,7 @@
540 fi
541
542 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
543-echo "configure:1599: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
544+echo "configure:1605: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
545
546 ac_ext=c
547 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
548@@ -1606,12 +1612,12 @@
549
550 cat > conftest.$ac_ext << EOF
551
552-#line 1610 "configure"
553+#line 1616 "configure"
554 #include "confdefs.h"
555
556 main(){return(0);}
557 EOF
558-if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
559+if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
560 ac_cv_prog_cc_works=yes
561 # If we can't run a trivial program, we are probably using a cross compiler.
562 if (./conftest; exit) 2>/dev/null; then
563@@ -1637,12 +1643,12 @@
564 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
565 fi
566 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
567-echo "configure:1641: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
568+echo "configure:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
569 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
570 cross_compiling=$ac_cv_prog_cc_cross
571
572 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
573-echo "configure:1646: checking whether we are using GNU C" >&5
574+echo "configure:1652: checking whether we are using GNU C" >&5
575 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
576 echo $ac_n "(cached) $ac_c" 1>&6
577 else
578@@ -1651,7 +1657,7 @@
579 yes;
580 #endif
581 EOF
582-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
583+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
584 ac_cv_prog_gcc=yes
585 else
586 ac_cv_prog_gcc=no
587@@ -1670,7 +1676,7 @@
588 ac_save_CFLAGS="$CFLAGS"
589 CFLAGS=
590 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
591-echo "configure:1674: checking whether ${CC-cc} accepts -g" >&5
592+echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5
593 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
594 echo $ac_n "(cached) $ac_c" 1>&6
595 else
596@@ -1713,7 +1719,7 @@
597 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
598 # ./install, which can be erroneously created by make from ./install.sh.
599 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
600-echo "configure:1717: checking for a BSD compatible install" >&5
601+echo "configure:1723: checking for a BSD compatible install" >&5
602 if test -z "$INSTALL"; then
603 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
604 echo $ac_n "(cached) $ac_c" 1>&6
605@@ -1766,7 +1772,7 @@
606 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
607
608 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
609-echo "configure:1770: checking whether ${MAKE-make} sets \${MAKE}" >&5
610+echo "configure:1776: checking whether ${MAKE-make} sets \${MAKE}" >&5
611 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
612 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
613 echo $ac_n "(cached) $ac_c" 1>&6
614@@ -1820,6 +1826,272 @@
615
616 if test x$glib_config_exec_prefix != x ; then
617 glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
618+ if test x${GLIB_CONFIG_2_0+set} != xset ; then
619+ GLIB_CONFIG_2_0=$glib_config_exec_prefix/bin/glib-config-2.0
620+ fi
621+ fi
622+ if test x$glib_config_prefix != x ; then
623+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
624+ if test x${GLIB_CONFIG_2_0+set} != xset ; then
625+ GLIB_CONFIG_2_0=$glib_config_prefix/bin/glib-config-2.0
626+ fi
627+ fi
628+
629+ for module in .
630+ do
631+ case "$module" in
632+ gmodule)
633+ glib_config_args="$glib_config_args gmodule"
634+ ;;
635+ gobject)
636+ glib_config_args="$glib_config_args gobject"
637+ ;;
638+ gthread)
639+ glib_config_args="$glib_config_args gthread"
640+ ;;
641+ esac
642+ done
643+
644+ # Extract the first word of "glib-config-2.0", so it can be a program name with args.
645+set dummy glib-config-2.0; ac_word=$2
646+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
647+echo "configure:1859: checking for $ac_word" >&5
648+if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG_2_0'+set}'`\" = set"; then
649+ echo $ac_n "(cached) $ac_c" 1>&6
650+else
651+ case "$GLIB_CONFIG_2_0" in
652+ /*)
653+ ac_cv_path_GLIB_CONFIG_2_0="$GLIB_CONFIG_2_0" # Let the user override the test with a path.
654+ ;;
655+ ?:/*)
656+ ac_cv_path_GLIB_CONFIG_2_0="$GLIB_CONFIG_2_0" # Let the user override the test with a dos path.
657+ ;;
658+ *)
659+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
660+ ac_dummy="$PATH"
661+ for ac_dir in $ac_dummy; do
662+ test -z "$ac_dir" && ac_dir=.
663+ if test -f $ac_dir/$ac_word; then
664+ ac_cv_path_GLIB_CONFIG_2_0="$ac_dir/$ac_word"
665+ break
666+ fi
667+ done
668+ IFS="$ac_save_ifs"
669+ test -z "$ac_cv_path_GLIB_CONFIG_2_0" && ac_cv_path_GLIB_CONFIG_2_0="no"
670+ ;;
671+esac
672+fi
673+GLIB_CONFIG_2_0="$ac_cv_path_GLIB_CONFIG_2_0"
674+if test -n "$GLIB_CONFIG_2_0"; then
675+ echo "$ac_t""$GLIB_CONFIG_2_0" 1>&6
676+else
677+ echo "$ac_t""no" 1>&6
678+fi
679+
680+ min_glib_version=1.3.1
681+ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
682+echo "configure:1894: checking for GLIB - version >= $min_glib_version" >&5
683+ no_glib=""
684+ if test "$GLIB_CONFIG_2_0" = "no" ; then
685+ no_glib=yes
686+ else
687+ GLIB_CFLAGS=`$GLIB_CONFIG_2_0 $glib_config_args --cflags`
688+ GLIB_LIBS=`$GLIB_CONFIG_2_0 $glib_config_args --libs`
689+ glib_config_major_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
690+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
691+ glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
692+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
693+ glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
694+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
695+ if test "x$enable_glibtest" = "xyes" ; then
696+ ac_save_CFLAGS="$CFLAGS"
697+ ac_save_LIBS="$LIBS"
698+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
699+ LIBS="$GLIB_LIBS $LIBS"
700+ rm -f conf.glibtest
701+ if test "$cross_compiling" = yes; then
702+ echo $ac_n "cross compiling; assumed OK... $ac_c"
703+else
704+ cat > conftest.$ac_ext <<EOF
705+#line 1917 "configure"
706+#include "confdefs.h"
707+
708+#include <glib.h>
709+#include <stdio.h>
710+#include <stdlib.h>
711+
712+int
713+main ()
714+{
715+ int major, minor, micro;
716+ char *tmp_version;
717+
718+ system ("touch conf.glibtest");
719+
720+ /* HP/UX 9 (%@#!) writes to sscanf strings */
721+ tmp_version = g_strdup("$min_glib_version");
722+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
723+ printf("%s, bad version string\n", "$min_glib_version");
724+ exit(1);
725+ }
726+
727+ if ((glib_major_version != $glib_config_major_version) ||
728+ (glib_minor_version != $glib_config_minor_version) ||
729+ (glib_micro_version != $glib_config_micro_version))
730+ {
731+ printf("\n*** 'glib-config-2.0 --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
732+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
733+ glib_major_version, glib_minor_version, glib_micro_version);
734+ printf ("*** was found! If glib-config-2.0 was correct, then it is best\n");
735+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
736+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
737+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
738+ printf("*** required on your system.\n");
739+ printf("*** If glib-config-2.0 was wrong, set the environment variable GLIB_CONFIG_2_0\n");
740+ printf("*** to point to the correct copy of glib-config-2.0, and remove the file config.cache\n");
741+ printf("*** before re-running configure\n");
742+ }
743+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
744+ (glib_minor_version != GLIB_MINOR_VERSION) ||
745+ (glib_micro_version != GLIB_MICRO_VERSION))
746+ {
747+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
748+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
749+ printf("*** library (version %d.%d.%d)\n",
750+ glib_major_version, glib_minor_version, glib_micro_version);
751+ }
752+ else
753+ {
754+ if ((glib_major_version > major) ||
755+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
756+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
757+ {
758+ return 0;
759+ }
760+ else
761+ {
762+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
763+ glib_major_version, glib_minor_version, glib_micro_version);
764+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
765+ major, minor, micro);
766+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
767+ printf("***\n");
768+ printf("*** If you have already installed a sufficiently new version, this error\n");
769+ printf("*** probably means that the wrong copy of the glib-config-2.0 shell script is\n");
770+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
771+ printf("*** of GLIB, but you can also set the GLIB_CONFIG_2_0 environment to point to the\n");
772+ printf("*** correct copy of glib-config-2.0. (In this case, you will have to\n");
773+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
774+ printf("*** so that the correct libraries are found at run-time))\n");
775+ }
776+ }
777+ return 1;
778+}
779+
780+EOF
781+if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
782+then
783+ :
784+else
785+ echo "configure: failed program was:" >&5
786+ cat conftest.$ac_ext >&5
787+ rm -fr conftest*
788+ no_glib=yes
789+fi
790+rm -fr conftest*
791+fi
792+
793+ CFLAGS="$ac_save_CFLAGS"
794+ LIBS="$ac_save_LIBS"
795+ fi
796+ fi
797+ if test "x$no_glib" = x ; then
798+ echo "$ac_t""yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" 1>&6
799+ :
800+ else
801+ echo "$ac_t""no" 1>&6
802+ if test "$GLIB_CONFIG_2_0" = "no" ; then
803+ echo "*** The glib-config-2.0 script installed by GLIB could not be found"
804+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
805+ echo "*** your path, or set the GLIB_CONFIG_2_0 environment variable to the"
806+ echo "*** full path to glib-config-2.0."
807+ else
808+ if test -f conf.glibtest ; then
809+ :
810+ else
811+ echo "*** Could not run GLIB test program, checking why..."
812+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
813+ LIBS="$LIBS $GLIB_LIBS"
814+ cat > conftest.$ac_ext <<EOF
815+#line 2027 "configure"
816+#include "confdefs.h"
817+
818+#include <glib.h>
819+#include <stdio.h>
820+
821+int main() {
822+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
823+; return 0; }
824+EOF
825+if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
826+ rm -rf conftest*
827+ echo "*** The test program compiled, but did not run. This usually means"
828+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
829+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
830+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
831+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
832+ echo "*** is required on your system"
833+ echo "***"
834+ echo "*** If you have an old version installed, it is best to remove it, although"
835+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
836+ echo "***"
837+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
838+ echo "*** came with the system with the command"
839+ echo "***"
840+ echo "*** rpm --erase --nodeps gtk gtk-devel"
841+else
842+ echo "configure: failed program was:" >&5
843+ cat conftest.$ac_ext >&5
844+ rm -rf conftest*
845+ echo "*** The test program failed to compile or link. See the file config.log for the"
846+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
847+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
848+ echo "*** may want to edit the glib-config-2.0 script: $GLIB_CONFIG_2_0"
849+fi
850+rm -f conftest*
851+ CFLAGS="$ac_save_CFLAGS"
852+ LIBS="$ac_save_LIBS"
853+ fi
854+ fi
855+ GLIB_CFLAGS=""
856+ GLIB_LIBS=""
857+ # Check whether --with-glib-prefix or --without-glib-prefix was given.
858+if test "${with_glib_prefix+set}" = set; then
859+ withval="$with_glib_prefix"
860+ glib_config_prefix="$withval"
861+else
862+ glib_config_prefix=""
863+fi
864+
865+# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
866+if test "${with_glib_exec_prefix+set}" = set; then
867+ withval="$with_glib_exec_prefix"
868+ glib_config_exec_prefix="$withval"
869+else
870+ glib_config_exec_prefix=""
871+fi
872+
873+# Check whether --enable-glibtest or --disable-glibtest was given.
874+if test "${enable_glibtest+set}" = set; then
875+ enableval="$enable_glibtest"
876+ :
877+else
878+ enable_glibtest=yes
879+fi
880+
881+
882+ if test x$glib_config_exec_prefix != x ; then
883+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
884 if test x${GLIB_CONFIG+set} != xset ; then
885 GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
886 fi
887@@ -1837,6 +2109,9 @@
888 gmodule)
889 glib_config_args="$glib_config_args gmodule"
890 ;;
891+ gobject)
892+ glib_config_args="$glib_config_args gobject"
893+ ;;
894 gthread)
895 glib_config_args="$glib_config_args gthread"
896 ;;
897@@ -1846,7 +2121,7 @@
898 # Extract the first word of "glib-config", so it can be a program name with args.
899 set dummy glib-config; ac_word=$2
900 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
901-echo "configure:1850: checking for $ac_word" >&5
902+echo "configure:2125: checking for $ac_word" >&5
903 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
904 echo $ac_n "(cached) $ac_c" 1>&6
905 else
906@@ -1881,7 +2156,7 @@
907
908 min_glib_version=1.2.0
909 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
910-echo "configure:1885: checking for GLIB - version >= $min_glib_version" >&5
911+echo "configure:2160: checking for GLIB - version >= $min_glib_version" >&5
912 no_glib=""
913 if test "$GLIB_CONFIG" = "no" ; then
914 no_glib=yes
915@@ -1904,7 +2179,7 @@
916 echo $ac_n "cross compiling; assumed OK... $ac_c"
917 else
918 cat > conftest.$ac_ext <<EOF
919-#line 1908 "configure"
920+#line 2183 "configure"
921 #include "confdefs.h"
922
923 #include <glib.h>
924@@ -1980,7 +2255,7 @@
925 }
926
927 EOF
928-if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
929+if { (eval echo configure:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
930 then
931 :
932 else
933@@ -1997,7 +2272,7 @@
934 fi
935 fi
936 if test "x$no_glib" = x ; then
937- echo "$ac_t""yes" 1>&6
938+ echo "$ac_t""yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" 1>&6
939 :
940 else
941 echo "$ac_t""no" 1>&6
942@@ -2014,7 +2289,7 @@
943 CFLAGS="$CFLAGS $GLIB_CFLAGS"
944 LIBS="$LIBS $GLIB_LIBS"
945 cat > conftest.$ac_ext <<EOF
946-#line 2018 "configure"
947+#line 2293 "configure"
948 #include "confdefs.h"
949
950 #include <glib.h>
951@@ -2024,7 +2299,7 @@
952 return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
953 ; return 0; }
954 EOF
955-if { (eval echo configure:2028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
956+if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
957 rm -rf conftest*
958 echo "*** The test program compiled, but did not run. This usually means"
959 echo "*** that the run-time linker is not finding GLIB or finding the wrong"
960@@ -2062,6 +2337,11 @@
961
962 rm -f conf.glibtest
963
964+ fi
965+
966+
967+ rm -f conf.glibtest
968+
969
970 trap '' 1 2 15
971 cat > confcache <<\EOF
972@@ -2224,6 +2504,7 @@
973 s%@CC@%$CC%g
974 s%@LN_S@%$LN_S%g
975 s%@LIBTOOL@%$LIBTOOL%g
976+s%@GLIB_CONFIG_2_0@%$GLIB_CONFIG_2_0%g
977 s%@GLIB_CONFIG@%$GLIB_CONFIG%g
978 s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
979 s%@GLIB_LIBS@%$GLIB_LIBS%g
980diff -ur fribidi-0.1.12.bak/configure.in fribidi-0.1.12/configure.in
981--- fribidi-0.1.12.bak/configure.in Fri May 19 05:08:15 2000
982+++ fribidi-0.1.12/configure.in Fri Jul 14 18:00:12 2000
983@@ -14,8 +14,9 @@
984 AC_PROG_INSTALL
985 AC_PROG_MAKE_SET
986
987-AM_PATH_GLIB(1.2.0,,
988- AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.))
989+AM_PATH_GLIB_2_0(1.3.1,,
990+ [AM_PATH_GLIB(1.2.0,,
991+ AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.))])
992
993 AC_OUTPUT([
994 Makefile
GNU FriBidi - library implementing the Unicode BiDi algorithm
This page took 0.151325 seconds and 4 git commands to generate.