| blob | 6caf675b8b6a07940090ff2647f8afc5734bc114 |
1 fixup configure.in, acinclude.m4 and Makefile.am's for reconfigurability. make
2 gtk-config use pkg-config
4 #
5 # Patch managed by http://www.holgerschurig.de/patcher.html
6 #
8 --- gtk+-1.2.10/configure.in~gtk+1.2-reconf-fix
9 +++ gtk+-1.2.10/configure.in
10 @@ -17,7 +17,9 @@
12 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
13 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
14 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
15 +ifdef([AC_DIVERSION_NOTICE],
16 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
17 + [AC_DIVERT_PUSH(NOTICE)])dnl
18 #
19 # Making releases:
20 # GTK_MICRO_VERSION += 1;
21 @@ -76,7 +78,10 @@
23 dnl figure debugging default, prior to $ac_help setup
24 dnl
25 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
26 +ifdef([AC_DIVERSION_NOTICE],
27 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
28 + [AC_DIVERT_PUSH(NOTICE)])dnl
29 +
30 if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
31 debug_default=yes
32 else
33 @@ -292,12 +297,9 @@
34 AC_SUBST(GLIB_DEPLIBS)
36 # Find the X11 include and library directories
37 -AC_PATH_X
38 AC_PATH_XTRA
40 -if test "x$x_includes" = "x"; then
41 - x_includes="/usr/include"
42 -fi
43 +PKG_CHECK_MODULES(X,x11 xau)
45 saved_cflags="$CFLAGS"
46 saved_ldflags="$LDFLAGS"
47 --- gtk+-1.2.10/gdk/Makefile.am~gtk+1.2-reconf-fix
48 +++ gtk+-1.2.10/gdk/Makefile.am
49 @@ -31,7 +31,7 @@
50 # setup source file variables
51 #
52 # GDK header files for public installation (non-generated)
53 -gdk_public_h_sources = @STRIP_BEGIN@ \
54 +gdk_public_h_sources = \
55 gdk.h \
56 gdkcursors.h \
57 gdkrgb.h \
58 @@ -39,9 +39,9 @@
59 gdkkeysyms.h \
60 gdkprivate.h \
61 gdktypes.h \
62 - gdkx.h \
63 -@STRIP_END@
64 -gdk_c_sources = @STRIP_BEGIN@ \
65 + gdkx.h
66 +
67 +gdk_c_sources = \
68 gdk.c \
69 gdkcc.c \
70 gdkcolor.c \
71 @@ -72,18 +72,16 @@
72 MwmUtil.h \
73 gxid_lib.h \
74 gxid_proto.h \
75 - gxid_lib.c \
76 -@STRIP_END@
77 + gxid_lib.c
79 #
80 # setup GDK sources and their dependancies
81 #
82 libgdkinclude_HEADERS = $(gdk_public_h_sources)
83 libgdk_la_SOURCES = $(gdk_c_sources)
84 -MAINTAINERCLEANFILES +=
85 -EXTRA_HEADERS +=
86 -EXTRA_DIST +=
87 -EXTRA_DIST +=
88 +MAINTAINERCLEANFILES =
89 +EXTRA_HEADERS =
90 +EXTRA_DIST =
92 #
93 # rules to generate built sources
94 --- gtk+-1.2.10/gtk/Makefile.am~gtk+1.2-reconf-fix
95 +++ gtk+-1.2.10/gtk/Makefile.am
96 @@ -39,7 +39,7 @@
97 # setup source file variables
98 #
99 # GTK+ header files for public installation (non-generated)
100 -gtk_public_h_sources = @STRIP_BEGIN@ \
101 +gtk_public_h_sources = \
102 gtk.h \
103 gtkaccelgroup.h \
104 gtkaccellabel.h \
105 @@ -148,13 +148,13 @@
106 gtkvscrollbar.h \
107 gtkvseparator.h \
108 gtkwidget.h \
109 - gtkwindow.h \
110 -@STRIP_END@
111 + gtkwindow.h
112 +
113 # GTK+ header files that don't get installed
114 -gtk_private_h_sources = @STRIP_BEGIN@ \
115 -@STRIP_END@
116 +gtk_private_h_sources =
117 +
118 # GTK+ C sources to build the library from
119 -gtk_c_sources = @STRIP_BEGIN@ \
120 +gtk_c_sources = \
121 gtkaccelgroup.c \
122 gtkaccellabel.c \
123 gtkadjustment.c \
124 @@ -262,8 +262,8 @@
125 gtkwidget.c \
126 gtkwindow.c \
127 fnmatch.c \
128 - fnmatch.h \
129 -@STRIP_END@
130 + fnmatch.h
131 +
132 # we use our own built_sources variable rules to avoid automake's
133 # BUILT_SOURCES oddities
134 # we generate frequently rebuild files piggyback on a stamp file, so sources
135 @@ -271,7 +271,7 @@
136 # content
137 #
138 # built sources that don't get installed
139 -gtk_built_sources = @STRIP_BEGIN@ \
140 +gtk_built_sources = \
141 stamp-gtk.defs \
142 stamp-gtktypebuiltins.h \
143 stamp-gtkmarshal.h \
144 @@ -279,17 +279,18 @@
145 gtktypebuiltins_ids.c \
146 gtktypebuiltins_evals.c \
147 gtkmarshal.c \
148 - gtk.defs \
149 -@STRIP_END@
150 + gtk.defs
151 +
152 +
153 # built sources that get installed with the header files
154 -gtk_built_public_sources = @STRIP_BEGIN@ \
155 +gtk_built_public_sources = \
156 gtkmarshal.h \
157 - gtktypebuiltins.h \
158 -@STRIP_END@
159 + gtktypebuiltins.h
160 +
161 # non-header sources (headers should be specified in the above variables)
162 # that don't serve as direct make target sources, i.e. they don't have
163 # their own .lo rules and don't get publically installed
164 -gtk_extra_sources = @STRIP_BEGIN@ \
165 +gtk_extra_sources = \
166 gtkfeatures.h.in \
167 makeenums.pl \
168 makeenums.awk \
169 @@ -298,8 +299,8 @@
170 gtkargcollector.c \
171 gtk-boxed.defs \
172 genmarshal.pl \
173 - gtkmarshal.list \
174 -@STRIP_END@
175 + gtkmarshal.list
176 +
177 # Extra headers that are used for enum type array/id generation
178 gdk_headers = @STRIP_BEGIN@ \
179 ../gdk/gdktypes.h \
180 @@ -311,9 +312,9 @@
181 #
182 libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
183 libgtk_la_SOURCES = $(gtk_c_sources)
184 -MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
185 -EXTRA_HEADERS +=
186 -EXTRA_DIST += $(gtk_private_h_sources)
187 +MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
188 +EXTRA_HEADERS =
189 +EXTRA_DIST = $(gtk_private_h_sources)
190 EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
192 #
193 @@ -321,7 +322,7 @@
194 #
195 # setup autogeneration dependancies
196 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
197 -CLEANFILES += $(gen_sources)
198 +CLEANFILES = $(gen_sources)
199 COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
200 $(OBJECTS): COPYING # this is our oldest-source-stamp
201 # initial creation of the real stamp-* files
202 --- gtk+-1.2.10/docs/Makefile.am~gtk+1.2-reconf-fix
203 +++ gtk+-1.2.10/docs/Makefile.am
204 @@ -166,7 +166,7 @@
205 echo $$p; \
206 done
208 -EXTRA_DIST += \
209 +EXTRA_DIST = \
210 Changes-1.2.txt \
211 debugging.txt \
212 developers.txt \
213 --- gtk+-1.2.10/acinclude.m4~gtk+1.2-reconf-fix
214 +++ gtk+-1.2.10/acinclude.m4
215 @@ -21,428 +21,6 @@
216 ## configuration script generated by Autoconf, you may include it under
217 ## the same distribution terms that you use for the rest of that program.
219 -# serial 40 AC_PROG_LIBTOOL
220 -AC_DEFUN(AC_PROG_LIBTOOL,
221 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
222 -
223 -# Save cache, so that ltconfig can load it
224 -AC_CACHE_SAVE
225 -
226 -# Actually configure libtool. ac_aux_dir is where install-sh is found.
227 -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
228 -LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
229 -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
230 -DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
231 -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
232 -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
233 -|| AC_MSG_ERROR([libtool configure failed])
234 -
235 -# Reload cache, that may have been modified by ltconfig
236 -AC_CACHE_LOAD
237 -
238 -# This can be used to rebuild libtool when needed
239 -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
240 -
241 -# Always use our own libtool.
242 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
243 -AC_SUBST(LIBTOOL)dnl
244 -
245 -# Redirect the config.log output again, so that the ltconfig log is not
246 -# clobbered by the next message.
247 -exec 5>>./config.log
248 -])
249 -
250 -AC_DEFUN(AC_LIBTOOL_SETUP,
251 -[AC_PREREQ(2.13)dnl
252 -AC_REQUIRE([AC_ENABLE_SHARED])dnl
253 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
254 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
255 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
256 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
257 -AC_REQUIRE([AC_PROG_RANLIB])dnl
258 -AC_REQUIRE([AC_PROG_CC])dnl
259 -AC_REQUIRE([AC_PROG_LD])dnl
260 -AC_REQUIRE([AC_PROG_NM])dnl
261 -AC_REQUIRE([AC_PROG_LN_S])dnl
262 -dnl
263 -
264 -case "$target" in
265 -NONE) lt_target="$host" ;;
266 -*) lt_target="$target" ;;
267 -esac
268 -
269 -# Check for any special flags to pass to ltconfig.
270 -libtool_flags="--cache-file=$cache_file"
271 -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
272 -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
273 -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
274 -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
275 -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
276 -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
277 -[libtool_flags="$libtool_flags --enable-dlopen"])
278 -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
279 -[libtool_flags="$libtool_flags --enable-win32-dll"])
280 -AC_ARG_ENABLE(libtool-lock,
281 - [ --disable-libtool-lock avoid locking (might break parallel builds)])
282 -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
283 -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
284 -
285 -# Some flags need to be propagated to the compiler or linker for good
286 -# libtool support.
287 -case "$lt_target" in
288 -*-*-irix6*)
289 - # Find out which ABI we are using.
290 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
291 - if AC_TRY_EVAL(ac_compile); then
292 - case "`/usr/bin/file conftest.o`" in
293 - *32-bit*)
294 - LD="${LD-ld} -32"
295 - ;;
296 - *N32*)
297 - LD="${LD-ld} -n32"
298 - ;;
299 - *64-bit*)
300 - LD="${LD-ld} -64"
301 - ;;
302 - esac
303 - fi
304 - rm -rf conftest*
305 - ;;
306 -
307 -*-*-sco3.2v5*)
308 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
309 - SAVE_CFLAGS="$CFLAGS"
310 - CFLAGS="$CFLAGS -belf"
311 - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
312 - [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
313 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
314 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
315 - CFLAGS="$SAVE_CFLAGS"
316 - fi
317 - ;;
318 -
319 -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
320 -[*-*-cygwin* | *-*-mingw*)
321 - AC_CHECK_TOOL(DLLTOOL, dlltool, false)
322 - AC_CHECK_TOOL(AS, as, false)
323 - AC_CHECK_TOOL(OBJDUMP, objdump, false)
324 - ;;
325 -])
326 -esac
327 -])
328 -
329 -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
330 -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
331 -
332 -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
333 -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
334 -
335 -# AC_ENABLE_SHARED - implement the --enable-shared flag
336 -# Usage: AC_ENABLE_SHARED[(DEFAULT)]
337 -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
338 -# `yes'.
339 -AC_DEFUN(AC_ENABLE_SHARED, [dnl
340 -define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
341 -AC_ARG_ENABLE(shared,
342 -changequote(<<, >>)dnl
343 -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
344 -changequote([, ])dnl
345 -[p=${PACKAGE-default}
346 -case "$enableval" in
347 -yes) enable_shared=yes ;;
348 -no) enable_shared=no ;;
349 -*)
350 - enable_shared=no
351 - # Look at the argument we got. We use all the common list separators.
352 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
353 - for pkg in $enableval; do
354 - if test "X$pkg" = "X$p"; then
355 - enable_shared=yes
356 - fi
357 - done
358 - IFS="$ac_save_ifs"
359 - ;;
360 -esac],
361 -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
362 -])
363 -
364 -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
365 -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
366 -AC_ENABLE_SHARED(no)])
367 -
368 -# AC_ENABLE_STATIC - implement the --enable-static flag
369 -# Usage: AC_ENABLE_STATIC[(DEFAULT)]
370 -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
371 -# `yes'.
372 -AC_DEFUN(AC_ENABLE_STATIC, [dnl
373 -define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
374 -AC_ARG_ENABLE(static,
375 -changequote(<<, >>)dnl
376 -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
377 -changequote([, ])dnl
378 -[p=${PACKAGE-default}
379 -case "$enableval" in
380 -yes) enable_static=yes ;;
381 -no) enable_static=no ;;
382 -*)
383 - enable_static=no
384 - # Look at the argument we got. We use all the common list separators.
385 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
386 - for pkg in $enableval; do
387 - if test "X$pkg" = "X$p"; then
388 - enable_static=yes
389 - fi
390 - done
391 - IFS="$ac_save_ifs"
392 - ;;
393 -esac],
394 -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
395 -])
396 -
397 -# AC_DISABLE_STATIC - set the default static flag to --disable-static
398 -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
399 -AC_ENABLE_STATIC(no)])
400 -
401 -
402 -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
403 -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
404 -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
405 -# `yes'.
406 -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
407 -define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
408 -AC_ARG_ENABLE(fast-install,
409 -changequote(<<, >>)dnl
410 -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
411 -changequote([, ])dnl
412 -[p=${PACKAGE-default}
413 -case "$enableval" in
414 -yes) enable_fast_install=yes ;;
415 -no) enable_fast_install=no ;;
416 -*)
417 - enable_fast_install=no
418 - # Look at the argument we got. We use all the common list separators.
419 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
420 - for pkg in $enableval; do
421 - if test "X$pkg" = "X$p"; then
422 - enable_fast_install=yes
423 - fi
424 - done
425 - IFS="$ac_save_ifs"
426 - ;;
427 -esac],
428 -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
429 -])
430 -
431 -# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
432 -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
433 -AC_ENABLE_FAST_INSTALL(no)])
434 -
435 -# AC_PROG_LD - find the path to the GNU or non-GNU linker
436 -AC_DEFUN(AC_PROG_LD,
437 -[AC_ARG_WITH(gnu-ld,
438 -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
439 -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
440 -AC_REQUIRE([AC_PROG_CC])dnl
441 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
442 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
443 -ac_prog=ld
444 -if test "$ac_cv_prog_gcc" = yes; then
445 - # Check if gcc -print-prog-name=ld gives a path.
446 - AC_MSG_CHECKING([for ld used by GCC])
447 - ac_prog=`($CC -print-prog-name=ld) 2>&5`
448 - case "$ac_prog" in
449 - # Accept absolute paths.
450 -changequote(,)dnl
451 - [\\/]* | [A-Za-z]:[\\/]*)
452 - re_direlt='/[^/][^/]*/\.\./'
453 -changequote([,])dnl
454 - # Canonicalize the path of ld
455 - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
456 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
457 - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
458 - done
459 - test -z "$LD" && LD="$ac_prog"
460 - ;;
461 - "")
462 - # If it fails, then pretend we aren't using GCC.
463 - ac_prog=ld
464 - ;;
465 - *)
466 - # If it is relative, then search for the first ld in PATH.
467 - with_gnu_ld=unknown
468 - ;;
469 - esac
470 -elif test "$with_gnu_ld" = yes; then
471 - AC_MSG_CHECKING([for GNU ld])
472 -else
473 - AC_MSG_CHECKING([for non-GNU ld])
474 -fi
475 -AC_CACHE_VAL(ac_cv_path_LD,
476 -[if test -z "$LD"; then
477 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
478 - for ac_dir in $PATH; do
479 - test -z "$ac_dir" && ac_dir=.
480 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
481 - ac_cv_path_LD="$ac_dir/$ac_prog"
482 - # Check to see if the program is GNU ld. I'd rather use --version,
483 - # but apparently some GNU ld's only accept -v.
484 - # Break only if it was the GNU/non-GNU ld that we prefer.
485 - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
486 - test "$with_gnu_ld" != no && break
487 - else
488 - test "$with_gnu_ld" != yes && break
489 - fi
490 - fi
491 - done
492 - IFS="$ac_save_ifs"
493 -else
494 - ac_cv_path_LD="$LD" # Let the user override the test with a path.
495 -fi])
496 -LD="$ac_cv_path_LD"
497 -if test -n "$LD"; then
498 - AC_MSG_RESULT($LD)
499 -else
500 - AC_MSG_RESULT(no)
501 -fi
502 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
503 -AC_PROG_LD_GNU
504 -])
505 -
506 -AC_DEFUN(AC_PROG_LD_GNU,
507 -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
508 -[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
509 -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
510 - ac_cv_prog_gnu_ld=yes
511 -else
512 - ac_cv_prog_gnu_ld=no
513 -fi])
514 -])
515 -
516 -# AC_PROG_NM - find the path to a BSD-compatible name lister
517 -AC_DEFUN(AC_PROG_NM,
518 -[AC_MSG_CHECKING([for BSD-compatible nm])
519 -AC_CACHE_VAL(ac_cv_path_NM,
520 -[if test -n "$NM"; then
521 - # Let the user override the test.
522 - ac_cv_path_NM="$NM"
523 -else
524 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
525 - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
526 - test -z "$ac_dir" && ac_dir=.
527 - if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
528 - # Check to see if the nm accepts a BSD-compat flag.
529 - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
530 - # nm: unknown option "B" ignored
531 - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
532 - ac_cv_path_NM="$ac_dir/nm -B"
533 - break
534 - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
535 - ac_cv_path_NM="$ac_dir/nm -p"
536 - break
537 - else
538 - ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
539 - continue # so that we can try to find one that supports BSD flags
540 - fi
541 - fi
542 - done
543 - IFS="$ac_save_ifs"
544 - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
545 -fi])
546 -NM="$ac_cv_path_NM"
547 -AC_MSG_RESULT([$NM])
548 -])
549 -
550 -# AC_CHECK_LIBM - check for math library
551 -AC_DEFUN(AC_CHECK_LIBM,
552 -[AC_REQUIRE([AC_CANONICAL_HOST])dnl
553 -LIBM=
554 -case "$lt_target" in
555 -*-*-beos* | *-*-cygwin*)
556 - # These system don't have libm
557 - ;;
558 -*-ncr-sysv4.3*)
559 - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
560 - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
561 - ;;
562 -*)
563 - AC_CHECK_LIB(m, main, LIBM="-lm")
564 - ;;
565 -esac
566 -])
567 -
568 -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
569 -# the libltdl convenience library, adds --enable-ltdl-convenience to
570 -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
571 -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
572 -# to be `${top_builddir}/libltdl'. Make sure you start DIR with
573 -# '${top_builddir}/' (note the single quotes!) if your package is not
574 -# flat, and, if you're not using automake, define top_builddir as
575 -# appropriate in the Makefiles.
576 -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
577 - case "$enable_ltdl_convenience" in
578 - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
579 - "") enable_ltdl_convenience=yes
580 - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
581 - esac
582 - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
583 - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
584 -])
585 -
586 -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
587 -# the libltdl installable library, and adds --enable-ltdl-install to
588 -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
589 -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
590 -# to be `${top_builddir}/libltdl'. Make sure you start DIR with
591 -# '${top_builddir}/' (note the single quotes!) if your package is not
592 -# flat, and, if you're not using automake, define top_builddir as
593 -# appropriate in the Makefiles.
594 -# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
595 -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
596 - AC_CHECK_LIB(ltdl, main,
597 - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
598 - [if test x"$enable_ltdl_install" = xno; then
599 - AC_MSG_WARN([libltdl not installed, but installation disabled])
600 - else
601 - enable_ltdl_install=yes
602 - fi
603 - ])
604 - if test x"$enable_ltdl_install" = x"yes"; then
605 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
606 - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
607 - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
608 - else
609 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
610 - LIBLTDL="-lltdl"
611 - INCLTDL=
612 - fi
613 -])
614 -
615 -dnl old names
616 -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
617 -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
618 -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
619 -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
620 -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
621 -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
622 -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
623 -
624 -dnl This is just to silence aclocal about the macro not being used
625 -ifelse([AC_DISABLE_FAST_INSTALL])dnl
626 -
627 -# Macro to add for using GNU gettext.
628 -# Ulrich Drepper <drepper@cygnus.com>, 1995.
629 -#
630 -# Modified to never use included libintl.
631 -# Owen Taylor <otaylor@redhat.com>, 12/15/1998
632 -#
633 -#
634 -# This file can be copied and used freely without restrictions. It can
635 -# be used in projects which are not available under the GNU Public License
636 -# but which still want to provide support for the GNU gettext functionality.
637 -# Please note that the actual code is *not* freely available.
638 -
639 -# serial 5
640 -
641 AC_DEFUN(AM_GTK_WITH_NLS,
642 [AC_MSG_CHECKING([whether NLS is requested])
643 dnl Default is enabled NLS