diff options
193 files changed, 14640 insertions, 3078 deletions
@@ -1,3 +1,8 @@ +2007-10-19 Michael Olbrich <m.olbrich@pengutronix.de> + + * xorg: Update to Xorg 7.3. Add new dependencies libxcb and + pixman. Update all packages to the corresponding versions. + 2007-10-18 Robert Schwebel <r.schwebel@pengutronix.de> * xorg-app-mkfontscale: fix dependency to freetype diff --git a/patches/font-alias-X11R7.0-1.0.1/generic/alias_variable_font_dir.diff b/patches/font-alias-1.0.1/generic/alias_variable_font_dir.diff index 12ef4739a..4aae4803b 100644 --- a/patches/font-alias-X11R7.0-1.0.1/generic/alias_variable_font_dir.diff +++ b/patches/font-alias-1.0.1/generic/alias_variable_font_dir.diff @@ -22,7 +22,7 @@ Index: font-alias-X11R7.0-1.0.1/75dpi/fonts.alias --- font-alias-X11R7.0-1.0.1.orig/75dpi/fonts.alias +++ font-alias-X11R7.0-1.0.1/75dpi/fonts.alias @@ -1,3 +1,4 @@ -+tariable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 ++variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1 lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1 lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1 diff --git a/patches/libX11-1.1.3/generic/libX11-1.1.3-autoreconf.diff b/patches/libX11-1.1.3/generic/libX11-1.1.3-autoreconf.diff new file mode 100644 index 000000000..f30393995 --- /dev/null +++ b/patches/libX11-1.1.3/generic/libX11-1.1.3-autoreconf.diff @@ -0,0 +1,81 @@ +--- + src/util/Makefile.in | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +Index: libX11-1.1.3/src/util/Makefile.in +=================================================================== +--- libX11-1.1.3.orig/src/util/Makefile.in 2007-08-01 20:36:48.000000000 +0200 ++++ libX11-1.1.3/src/util/Makefile.in 2007-10-17 17:03:21.000000000 +0200 +@@ -51,8 +51,8 @@ + makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT) + makekeys_LDADD = $(LDADD) + makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) \ ++ $(makekeys_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -62,6 +62,9 @@ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = makekeys.c + DIST_SOURCES = makekeys.c + ETAGS = etags +@@ -80,11 +83,13 @@ + AWK = @AWK@ + BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ + BIGFONT_LIBS = @BIGFONT_LIBS@ +-CC = @CC@ ++CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++ ++# evil hack ++CFLAGS = $(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS) + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = $(CPPFLAGS_FOR_BUILD) + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -112,10 +117,10 @@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + KEYSYMDEF = @KEYSYMDEF@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = $(LDFLAGS_FOR_BUILD) + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag=CC + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ + LINT = @LINT@ +@@ -140,7 +145,6 @@ + RANLIB = @RANLIB@ + RAWCPP = @RAWCPP@ + RAWCPPFLAGS = @RAWCPPFLAGS@ +-SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -223,10 +227,9 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-makekeys_CFLAGS = $(X11_CFLAGS) +- +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++makekeys_CFLAGS = $(CFLAGS_FOR_BUILD) ++makekeys_CPPLAGS = $(CPPFLAGS_FOR_BUILD) ++makekeys_LDFLAGS = $(LDFLAGS_FOR_BUILD) + EXTRA_DIST = mkks.sh + + # Check source code with tools like lint & sparse diff --git a/patches/libX11-1.1.3/generic/libX11-1.1.3-fix-cross-compile.diff b/patches/libX11-1.1.3/generic/libX11-1.1.3-fix-cross-compile.diff new file mode 100644 index 000000000..e6b307f7c --- /dev/null +++ b/patches/libX11-1.1.3/generic/libX11-1.1.3-fix-cross-compile.diff @@ -0,0 +1,54 @@ +# +# Submitted-By: Sascha Hauer, 2006-02-23 +# Committed-By: Sascha Hauer +# +# Error: +# +# makekeys gets crosscompiled but is needed for the host +# +# Description: +# +# use Benes *_FOR_BUILD hack +# +# rediffed for X.org7.1 by Luotao Fu, 2006-06-19 +# State: +# +# not reported upstream +# +# This patch is broken: it should use CC_FOR_BUILD only if +# crosscompiling; at the moment it breaks if CC_FOR_BUILD is not set and +# we build for the host. See nfsutils for an example how to solve it +# correctly. (MKL, RSC) +# + +--- + src/util/Makefile.am | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +Index: libX11-1.1.3/src/util/Makefile.am +=================================================================== +--- libX11-1.1.3.orig/src/util/Makefile.am 2007-05-16 17:34:44.000000000 +0200 ++++ libX11-1.1.3/src/util/Makefile.am 2007-10-17 16:59:32.000000000 +0200 +@@ -1,11 +1,18 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC + +-makekeys_CFLAGS=$(X11_CFLAGS) ++noinst_PROGRAMS=makekeys + +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++makekeys_CFLAGS=$(CFLAGS_FOR_BUILD) ++makekeys_CPPLAGS=$(CPPFLAGS_FOR_BUILD) ++makekeys_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + EXTRA_DIST = mkks.sh + diff --git a/patches/libX11-1.1.3/generic/series b/patches/libX11-1.1.3/generic/series new file mode 100644 index 000000000..180ee3ec6 --- /dev/null +++ b/patches/libX11-1.1.3/generic/series @@ -0,0 +1,2 @@ +libX11-1.1.3-fix-cross-compile.diff +libX11-1.1.3-autoreconf.diff diff --git a/patches/libX11-X11R7.1-1.0.1/generic/libX11-X11R7.1-1.0.1-crosscompile.diff b/patches/libX11-X11R7.1-1.0.1/generic/libX11-X11R7.1-1.0.1-crosscompile.diff deleted file mode 100644 index 25433297b..000000000 --- a/patches/libX11-X11R7.1-1.0.1/generic/libX11-X11R7.1-1.0.1-crosscompile.diff +++ /dev/null @@ -1,104 +0,0 @@ -# -# Submitted-By: Sascha Hauer, 2006-02-23 -# Committed-By: Sascha Hauer -# -# Error: -# -# makekeys gets crosscompiled but is needed for the host -# -# Description: -# -# use Benes *_FOR_BUILD hack -# -# rediffed for X.org7.1 by Luotao Fu, 2006-06-19 -# State: -# -# not reported upstream -# -# This patch is broken: it should use CC_FOR_BUILD only if -# crosscompiling; at the moment it breaks if CC_FOR_BUILD is not set and -# we build for the host. See nfsutils for an example how to solve it -# correctly. (MKL, RSC) -# - -diff -r -u libX11-X11R7.1-1.0.1.orig/src/util/Makefile.am libX11-X11R7.1-1.0.1/src/util/Makefile.am ---- libX11-X11R7.1-1.0.1.orig/src/util/Makefile.am 2006-06-14 13:33:44.152294000 +0200 -+++ libX11-X11R7.1-1.0.1/src/util/Makefile.am 2006-06-14 14:42:17.598756893 +0200 -@@ -1,10 +1,17 @@ - # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ - --noinst_PROGRAMS=makekeys -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC - --makekeys_CFLAGS=$(X11_CFLAGS) -+noinst_PROGRAMS=makekeys - --#override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+makekeys_CFLAGS=$(CFLAGS_FOR_BUILD) -+makekeys_CPPLAGS=$(CPPFLAGS_FOR_BUILD) -+makekeys_LDFLAGS=$(LDFLAGS_FOR_BUILD) - - EXTRA_DIST = mkks.sh -diff -r -u libX11-X11R7.1-1.0.1.orig/src/util/Makefile.in libX11-X11R7.1-1.0.1/src/util/Makefile.in ---- libX11-X11R7.1-1.0.1.orig/src/util/Makefile.in 2006-06-14 13:33:44.154295000 +0200 -+++ libX11-X11R7.1-1.0.1/src/util/Makefile.in 2006-06-14 14:54:12.436541319 +0200 -@@ -63,6 +63,8 @@ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ - SOURCES = makekeys.c - DIST_SOURCES = makekeys.c - ETAGS = etags -@@ -83,11 +85,12 @@ - AWK = @AWK@ - BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ - BIGFONT_LIBS = @BIGFONT_LIBS@ --CC = @CC@ -+CC = $(CC_FOR_BUILD) - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+# evil hack -+CFLAGS = $(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS) - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = $(CPPFLAGS_FOR_BUILD) - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -227,7 +230,9 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --makekeys_CFLAGS = $(X11_CFLAGS) -+makekeys_CFLAGS = $(CFLAGS_FOR_BUILD) -+makekeys_CPPLAGS = $(CPPFLAGS_FOR_BUILD) -+makekeys_LDFLAGS = $(LDFLAGS_FOR_BUILD) - - #override CC = gcc - LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -306,14 +311,14 @@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - makekeys-makekeys.o: makekeys.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c; \ -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makekeys-makekeys.Tpo" "$(DEPDIR)/makekeys-makekeys.Po"; else rm -f "$(DEPDIR)/makekeys-makekeys.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c - - makekeys-makekeys.obj: makekeys.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`; \ -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makekeys-makekeys.Tpo" "$(DEPDIR)/makekeys-makekeys.Po"; else rm -f "$(DEPDIR)/makekeys-makekeys.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff --git a/patches/libXrender-0.9.4/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff b/patches/libXrender-0.9.4/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff new file mode 100644 index 000000000..6d8e7a81e --- /dev/null +++ b/patches/libXrender-0.9.4/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff @@ -0,0 +1,26 @@ +Index: libXrender-0.9.4/src/Makefile.am +=================================================================== +--- libXrender-0.9.4.orig/src/Makefile.am 2007-08-31 22:44:10.000000000 +0200 ++++ libXrender-0.9.4/src/Makefile.am 2007-10-18 19:16:26.000000000 +0200 +@@ -17,7 +17,7 @@ + Xrender.c \ + Xrenderint.h + +-libXrender_la_LIBADD = @X_LIBS@ -lX11 ++libXrender_la_LIBADD = @X_LIBS@ + + # -version-number requires libtool >= 1.5 + libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined +Index: libXrender-0.9.4/src/Makefile.in +=================================================================== +--- libXrender-0.9.4.orig/src/Makefile.in 2007-09-05 17:20:48.000000000 +0200 ++++ libXrender-0.9.4/src/Makefile.in 2007-10-18 19:16:26.000000000 +0200 +@@ -215,7 +215,7 @@ + Xrender.c \ + Xrenderint.h + +-libXrender_la_LIBADD = @X_LIBS@ -lX11 ++libXrender_la_LIBADD = @X_LIBS@ + + # -version-number requires libtool >= 1.5 + libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined diff --git a/patches/libXrender-X11R7.1-0.9.1/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff b/patches/libXrender-X11R7.1-0.9.1/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff deleted file mode 100644 index 34675dc78..000000000 --- a/patches/libXrender-X11R7.1-0.9.1/generic/libXrender-X11R7.1-0.9.1-illegallibX11.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN libXrender-X11R7.1-0.9.1-orig/src/Makefile.am libXrender-X11R7.1-0.9.1/src/Makefile.am ---- libXrender-X11R7.1-0.9.1-orig/src/Makefile.am 2005-12-03 05:41:50.000000000 +0100 -+++ libXrender-X11R7.1-0.9.1/src/Makefile.am 2006-06-19 18:51:49.000000000 +0200 -@@ -17,7 +17,7 @@ - Xrender.c \ - Xrenderint.h - --libXrender_la_LIBADD = @X_LIBS@ -lX11 -+libXrender_la_LIBADD = @X_LIBS@ - - # -version-number requires libtool >= 1.5 - libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined -diff -urN libXrender-X11R7.1-0.9.1-orig/src/Makefile.in libXrender-X11R7.1-0.9.1/src/Makefile.in ---- libXrender-X11R7.1-0.9.1-orig/src/Makefile.in 2006-05-22 03:42:59.000000000 +0200 -+++ libXrender-X11R7.1-0.9.1/src/Makefile.in 2006-06-19 18:52:28.000000000 +0200 -@@ -209,7 +209,7 @@ - Xrender.c \ - Xrenderint.h - --libXrender_la_LIBADD = @X_LIBS@ -lX11 -+libXrender_la_LIBADD = @X_LIBS@ - - # -version-number requires libtool >= 1.5 - libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined diff --git a/patches/libXt-1.0.4/generic/libXt-1.0.4-autoreconf.diff b/patches/libXt-1.0.4/generic/libXt-1.0.4-autoreconf.diff new file mode 100644 index 000000000..d92d18741 --- /dev/null +++ b/patches/libXt-1.0.4/generic/libXt-1.0.4-autoreconf.diff @@ -0,0 +1,45 @@ +Index: libXt-1.0.4/util/Makefile.in +=================================================================== +--- libXt-1.0.4.orig/util/Makefile.in 2006-11-08 15:16:24.000000000 +0100 ++++ libXt-1.0.4/util/Makefile.in 2007-10-17 17:29:45.000000000 +0200 +@@ -96,11 +96,13 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-CC = @CC@ ++CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++ ++# evil hack ++CFLAGS = $(CFLAGS_FOR_BUILD) + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = $(CPPFLAGS_FOR_BUILD) + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -127,10 +129,10 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = $(LDFLAGS_FOR_BUILD) + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag=CC + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ + LN_S = @LN_S@ +@@ -214,7 +216,9 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) +-makestrs_CFLAGS = $(XT_CFLAGS) ++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD) $(XT_CFLAGS) ++makestrs_CPPLAGS = $(CPPFLAGS_FOR_BUILD) ++makestrs_LDFLAGS = $(LDFLAGS_FOR_BUILD) + makestrs_SOURCES = makestrs.c + + # Man page diff --git a/patches/libXt-X11R7.1-1.0.2/generic/libXt-X11R7.1-1.0.2-crosscompile.diff b/patches/libXt-1.0.4/generic/libXt-1.0.4-fix-cross-compile.diff index b4bee3c6b..3031d57a5 100644 --- a/patches/libXt-X11R7.1-1.0.2/generic/libXt-X11R7.1-1.0.2-crosscompile.diff +++ b/patches/libXt-1.0.4/generic/libXt-1.0.4-fix-cross-compile.diff @@ -49,46 +49,3 @@ makestrs_SOURCES = makestrs.c ---- libXt-X11R7.1-1.0.2.orig/util/Makefile.in 2006-05-22 03:44:12.000000000 +0200 -+++ libXt-X11R7.1-1.0.2/util/Makefile.in 2006-06-15 10:48:51.392387927 +0200 -@@ -91,11 +91,13 @@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --CC = @CC@ -+CC = $(CC_FOR_BUILD) - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+ -+# evil hack -+CFLAGS = $(CFLAGS_FOR_BUILD) - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = $(CPPFLAGS_FOR_BUILD) - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -121,10 +123,10 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = $(LDFLAGS_FOR_BUILD) - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ --LIBTOOL = @LIBTOOL@ -+LIBTOOL = @LIBTOOL@ --tag=CC - LIB_MAN_DIR = @LIB_MAN_DIR@ - LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ - LN_S = @LN_S@ -@@ -204,7 +206,9 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) --makestrs_CFLAGS = $(XT_CFLAGS) -+makestrs_CFLAGS = $(CFLAGS_FOR_BUILD) $(XT_CFLAGS) -+makestrs_CPPLAGS = $(CPPFLAGS_FOR_BUILD) -+makestrs_LDFLAGS = $(LDFLAGS_FOR_BUILD) - makestrs_SOURCES = makestrs.c - - # Man page diff --git a/patches/libXt-1.0.4/generic/series b/patches/libXt-1.0.4/generic/series new file mode 100644 index 000000000..50c81a7e4 --- /dev/null +++ b/patches/libXt-1.0.4/generic/series @@ -0,0 +1,2 @@ +libXt-1.0.4-fix-cross-compile.diff +libXt-1.0.4-autoreconf.diff diff --git a/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-autoreconf.diff b/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-autoreconf.diff new file mode 100644 index 000000000..5fe8045f0 --- /dev/null +++ b/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-autoreconf.diff @@ -0,0 +1,12962 @@ +Index: liblbxutil-1.0.1/configure +=================================================================== +--- liblbxutil-1.0.1.orig/configure 2006-05-15 22:24:51.000000000 +0200 ++++ liblbxutil-1.0.1/configure 2007-10-18 09:35:26.000000000 +0200 +@@ -1,27 +1,56 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.59 for lbxutil 1.0.1. ++# Generated by GNU Autoconf 2.61 for lbxutil 1.0.1. + # + # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. + # +-# Copyright (C) 2003 Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi +-DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +@@ -31,8 +60,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -46,18 +110,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -65,157 +130,388 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# CDPATH. ++$as_unset CDPATH + +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no + fi + ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in ++ case $as_dir in + /*) +- if ("$as_dir/$as_base" -c ' ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || ++ chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +@@ -224,7 +520,28 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -233,15 +550,6 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + + + # Check that we are running under the correct shell. +@@ -397,29 +705,26 @@ + + tagnames=${tagnames+${tagnames},}F77 + ++exec 7<&0 </dev/null 6>&1 ++ + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +-exec 6>&1 +- + # + # Initializations. + # + ac_default_prefix=/usr/local ++ac_clean_files= + ac_config_libobj_dir=. ++LIBOBJS= + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + +-# Maximum number of lines to put in a shell here document. +-# This variable seems obsolete. It should probably be removed, and +-# only ac_max_sed_lines should be used. +-: ${ac_max_here_lines=38} +- + # Identity of this package. + PACKAGE_NAME='lbxutil' + PACKAGE_TARNAME='liblbxutil' +@@ -430,42 +735,168 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include <stdio.h> +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include <sys/stat.h> + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include <stdlib.h> + # include <stddef.h> + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include <stdlib.h> + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include <memory.h> + # endif + # include <string.h> + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include <strings.h> + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include <inttypes.h> +-#else +-# if HAVE_STDINT_H +-# include <stdint.h> +-# endif + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDINT_H ++# include <stdint.h> ++#endif ++#ifdef HAVE_UNISTD_H + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LBXUTIL_CFLAGS LBXUTIL_LIBS LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++am__isrc ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++mkdir_p ++AWK ++SET_MAKE ++am__leading_dot ++AMTAR ++am__tar ++am__untar ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++GREP ++EGREP ++LN_S ++ECHO ++AR ++RANLIB ++CPP ++CXX ++CXXFLAGS ++ac_ct_CXX ++CXXDEPMODE ++am__fastdepCXX_TRUE ++am__fastdepCXX_FALSE ++CXXCPP ++F77 ++FFLAGS ++ac_ct_F77 ++LIBTOOL ++PKG_CONFIG ++LBXUTIL_CFLAGS ++LBXUTIL_LIBS ++LIBOBJS ++LTLIBOBJS' + ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP ++CXX ++CXXFLAGS ++CCC ++CXXCPP ++F77 ++FFLAGS ++PKG_CONFIG ++LBXUTIL_CFLAGS ++LBXUTIL_LIBS' ++ + + # Initialize some variables set by options. + ac_init_help= +@@ -492,34 +923,48 @@ + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case $ac_option in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; +@@ -541,33 +986,45 @@ + --config-cache | -C) + cache_file=config.cache ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval "enable_$ac_feature=no" ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "enable_$ac_feature='$ac_optarg'" ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -594,6 +1051,12 @@ + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; +@@ -618,13 +1081,16 @@ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +@@ -689,6 +1155,16 @@ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; +@@ -741,24 +1217,20 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "with_$ac_package='$ac_optarg'" ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval "with_$ac_package=no" ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -789,8 +1261,7 @@ + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +- eval "$ac_envvar='$ac_optarg'" ++ eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) +@@ -810,27 +1281,19 @@ + { (exit 1); exit 1; }; } + fi + +-# Be sure to have absolute paths. +-for ac_var in exec_prefix prefix +-do +- eval ac_val=$`echo $ac_var` +- case $ac_val in +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; +- esac +-done +- +-# Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir + do +- eval ac_val=$`echo $ac_var` ++ eval ac_val=\$$ac_var + case $ac_val in +- [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -857,106 +1320,76 @@ + test "$silent" = yes && exec 6>/dev/null + + +-# Find the source files, if location was not specified. +-if test -z "$srcdir"; then ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ ++ ++# Find the source files, if location was not specified. ++if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_confdir=`(dirname "$0") 2>/dev/null || ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || + $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +- { (exit 1); exit 1; }; } +- else +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +- fi + fi +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +-ac_env_build_alias_set=${build_alias+set} +-ac_env_build_alias_value=$build_alias +-ac_cv_env_build_alias_set=${build_alias+set} +-ac_cv_env_build_alias_value=$build_alias +-ac_env_host_alias_set=${host_alias+set} +-ac_env_host_alias_value=$host_alias +-ac_cv_env_host_alias_set=${host_alias+set} +-ac_cv_env_host_alias_value=$host_alias +-ac_env_target_alias_set=${target_alias+set} +-ac_env_target_alias_value=$target_alias +-ac_cv_env_target_alias_set=${target_alias+set} +-ac_cv_env_target_alias_value=$target_alias +-ac_env_CC_set=${CC+set} +-ac_env_CC_value=$CC +-ac_cv_env_CC_set=${CC+set} +-ac_cv_env_CC_value=$CC +-ac_env_CFLAGS_set=${CFLAGS+set} +-ac_env_CFLAGS_value=$CFLAGS +-ac_cv_env_CFLAGS_set=${CFLAGS+set} +-ac_cv_env_CFLAGS_value=$CFLAGS +-ac_env_LDFLAGS_set=${LDFLAGS+set} +-ac_env_LDFLAGS_value=$LDFLAGS +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +-ac_cv_env_LDFLAGS_value=$LDFLAGS +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_env_CPPFLAGS_value=$CPPFLAGS +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS +-ac_env_CPP_set=${CPP+set} +-ac_env_CPP_value=$CPP +-ac_cv_env_CPP_set=${CPP+set} +-ac_cv_env_CPP_value=$CPP +-ac_env_CXX_set=${CXX+set} +-ac_env_CXX_value=$CXX +-ac_cv_env_CXX_set=${CXX+set} +-ac_cv_env_CXX_value=$CXX +-ac_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_env_CXXFLAGS_value=$CXXFLAGS +-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_cv_env_CXXFLAGS_value=$CXXFLAGS +-ac_env_CXXCPP_set=${CXXCPP+set} +-ac_env_CXXCPP_value=$CXXCPP +-ac_cv_env_CXXCPP_set=${CXXCPP+set} +-ac_cv_env_CXXCPP_value=$CXXCPP +-ac_env_F77_set=${F77+set} +-ac_env_F77_value=$F77 +-ac_cv_env_F77_set=${F77+set} +-ac_cv_env_F77_value=$F77 +-ac_env_FFLAGS_set=${FFLAGS+set} +-ac_env_FFLAGS_value=$FFLAGS +-ac_cv_env_FFLAGS_set=${FFLAGS+set} +-ac_cv_env_FFLAGS_value=$FFLAGS +-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} +-ac_env_PKG_CONFIG_value=$PKG_CONFIG +-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} +-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG +-ac_env_LBXUTIL_CFLAGS_set=${LBXUTIL_CFLAGS+set} +-ac_env_LBXUTIL_CFLAGS_value=$LBXUTIL_CFLAGS +-ac_cv_env_LBXUTIL_CFLAGS_set=${LBXUTIL_CFLAGS+set} +-ac_cv_env_LBXUTIL_CFLAGS_value=$LBXUTIL_CFLAGS +-ac_env_LBXUTIL_LIBS_set=${LBXUTIL_LIBS+set} +-ac_env_LBXUTIL_LIBS_value=$LBXUTIL_LIBS +-ac_cv_env_LBXUTIL_LIBS_set=${LBXUTIL_LIBS+set} +-ac_cv_env_LBXUTIL_LIBS_value=$LBXUTIL_LIBS ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done + + # + # Report the --help message. +@@ -985,9 +1418,6 @@ + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +-_ACEOF +- +- cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] +@@ -1005,15 +1435,22 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/liblbxutil] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1042,10 +1479,8 @@ + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors +- --enable-shared[=PKGS] +- build shared libraries [default=yes] +- --enable-static[=PKGS] +- build static libraries [default=yes] ++ --enable-shared[=PKGS] build shared libraries [default=yes] ++ --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) +@@ -1056,8 +1491,7 @@ + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] +- --with-tags[=TAGS] +- include additional configurations [automatic] ++ --with-tags[=TAGS] include additional configurations [automatic] + --with-release-version=STRING + Use release version string in package name + +@@ -1066,8 +1500,9 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> +- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have +- headers in a nonstandard directory <include dir> ++ LIBS libraries to pass to the linker, e.g. -l<library> ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ you have headers in a nonstandard directory <include dir> + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags +@@ -1085,120 +1520,86 @@ + + Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. + _ACEOF ++ac_status=$? + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. +- ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d $ac_dir || continue ++ test -d "$ac_dir" || continue + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +- cd $ac_dir +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_srcdir/configure.gnu; then +- echo +- $SHELL $ac_srcdir/configure.gnu --help=recursive +- elif test -f $ac_srcdir/configure; then +- echo +- $SHELL $ac_srcdir/configure --help=recursive +- elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then +- echo +- $ac_configure --help ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi +- cd $ac_popdir ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + +-test -n "$ac_init_help" && exit 0 ++test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + lbxutil configure 1.0.1 +-generated by GNU Autoconf 2.59 ++generated by GNU Autoconf 2.61 + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +- exit 0 ++ exit + fi +-exec 5>config.log +-cat >&5 <<_ACEOF ++cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by lbxutil $as_me 1.0.1, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + + _ACEOF ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -1217,7 +1618,7 @@ + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` + /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +@@ -1231,6 +1632,7 @@ + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" + done ++IFS=$as_save_IFS + + } >&5 + +@@ -1252,7 +1654,6 @@ + ac_configure_args= + ac_configure_args0= + ac_configure_args1= +-ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do +@@ -1263,7 +1664,7 @@ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +@@ -1285,9 +1686,7 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- # Get rid of the leading space. +- ac_sep=" " ++ ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +@@ -1298,8 +1697,8 @@ + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. +-# WARNING: Be sure not to use single quotes in there, as some shells, +-# such as our DU 5.0 friend, will then `close' the trap. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { +@@ -1312,20 +1711,34 @@ + _ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done + (set) 2>&1 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + sed -n \ +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +- ;; ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( + *) +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} ++ esac | ++ sort ++) + echo + + cat <<\_ASBOX +@@ -1336,22 +1749,28 @@ + echo + for ac_var in $ac_subst_vars + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +-## ------------- ## +-## Output files. ## +-## ------------- ## ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## + _ASBOX + echo + for ac_var in $ac_subst_files + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1363,26 +1782,24 @@ + ## ----------- ## + _ASBOX + echo +- sed "/^$/d" confdefs.h | sort ++ cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 +- rm -f core *.core && +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +- ' 0 ++' 0 + for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo >confdefs.h ++rm -f -r conftest* confdefs.h + + # Predefined preprocessor variables. + +@@ -1413,14 +1830,17 @@ + + # Let the site file select an alternate cache file if it wants to. + # Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" ++else ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi +-for ac_site_file in $CONFIG_SITE; do ++shift ++for ac_site_file ++do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} +@@ -1436,8 +1856,8 @@ + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +- [\\/]* | ?:[\\/]* ) . $cache_file;; +- *) . ./$cache_file;; ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; + esac + fi + else +@@ -1449,12 +1869,11 @@ + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +-for ac_var in `(set) 2>&1 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val="\$ac_cv_env_${ac_var}_value" +- eval ac_new_val="\$ac_env_${ac_var}_value" ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +@@ -1479,8 +1898,7 @@ + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -1497,11 +1915,6 @@ + { (exit 1); exit 1; }; } + fi + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +@@ -1526,34 +1939,45 @@ + + + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ++am__api_version='1.10' + +-am__api_version="1.9" + ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break +- elif test -f $ac_dir/install.sh; then ++ elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break +- elif test -f $ac_dir/shtool; then ++ elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } + fi +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -1568,8 +1992,8 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1591,7 +2015,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -1610,21 +2034,22 @@ + ;; + esac + done ++IFS=$as_save_IFS + + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the path is relative. ++ # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -1634,8 +2059,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -1677,20 +2102,20 @@ + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + test "$program_prefix" != NONE && +- program_transform_name="s,^,$program_prefix,;$program_transform_name" ++ program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && +- program_transform_name="s,\$,$program_suffix,;$program_transform_name" ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" + # Double any \ or $. echo might interpret backslashes. + # By default was `s,x,x', remove it if useless. + cat <<\_ACEOF >conftest.sed + s/[\\$]/&&/g;s/;s,x,x,$// + _ACEOF + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm conftest.sed ++rm -f conftest.sed + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -1705,45 +2130,60 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" + else +- mkdir_p='$(install_sh) -d' ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" + fi + fi ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1756,54 +2196,57 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$AWK" && break + done + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="$(MAKE)"' ++ @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac + rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -1816,12 +2259,16 @@ + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -1864,7 +2311,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -1874,8 +2321,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1888,32 +2335,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -1926,33 +2375,47 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- STRIP=$ac_ct_STRIP ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi + else + STRIP="$ac_cv_prog_STRIP" + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -1966,20 +2429,18 @@ + + + +-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 +- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then +- enableval="$enable_maintainer_mode" +- USE_MAINTAINER_MODE=$enableval ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no +-fi; +- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 +- ++fi + +-if test $USE_MAINTAINER_MODE = yes; then ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -1991,7 +2452,7 @@ + + + +- ac_config_headers="$ac_config_headers config.h" ++ac_config_headers="$ac_config_headers config.h" + + + # Check for progs +@@ -2003,8 +2464,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2017,32 +2478,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2055,36 +2518,51 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + else + CC="$ac_cv_prog_CC" + fi + + if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2097,74 +2575,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi + ++ fi + fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2178,7 +2616,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2189,6 +2627,7 @@ + fi + done + done ++IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. +@@ -2206,22 +2645,23 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2234,36 +2674,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2276,29 +2718,45 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_CC" && break + done + +- CC=$ac_ct_CC ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi + + fi +@@ -2311,21 +2769,35 @@ + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +- (eval $ac_compiler --version </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 +- (eval $ac_compiler -v </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 +- (eval $ac_compiler -V </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +@@ -2350,47 +2822,77 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +- (eval $ac_link_default) 2>&5 ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- # Find the output, starting from the most likely. This scheme is +-# not robust to junk in `.', hence go to wildcards (a.*) only as a last +-# resort. +- +-# Be careful to initialize this variable, since it used to be cached. +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +-ac_cv_exeext= +-# b.out is created by i960 compilers. +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +- ;; +- conftest.$ac_ext ) +- # This is the source file. ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. + break;; + * ) + break;; + esac + done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -2402,19 +2904,21 @@ + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6 + +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -2433,22 +2937,27 @@ + fi + fi + fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check the compiler produces executables we can run. If not, either ++# Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6 +- +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -2459,9 +2968,8 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- export ac_cv_exeext + break;; + * ) break;; + esac +@@ -2475,14 +2983,14 @@ + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2502,14 +3010,20 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +@@ -2527,12 +3041,12 @@ + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -2555,50 +3069,49 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-CFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -2614,38 +3127,118 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_cc_g=no ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -2661,12 +3254,12 @@ + CFLAGS= + fi + fi +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_prog_cc_stdc=no ++ ac_cv_prog_cc_c89=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -2700,12 +3293,17 @@ + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std1 is added to get ++ as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std1. */ ++ that's true only with -std. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; +@@ -2720,205 +3318,57 @@ + return 0; + } + _ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break + done +-rm -f conftest.$ac_ext conftest.$ac_objext ++rm -f conftest.$ac_ext + CC=$ac_save_CC + + fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + esac + +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include <stdlib.h> +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2926,7 +3376,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" + +- ac_config_commands="$ac_config_commands depfiles" ++ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} +@@ -2936,8 +3386,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } + am__include="#" + am__quote= + _am_result=none +@@ -2964,22 +3414,20 @@ + fi + + +-echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6 ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } + rm -f confinc confmf + +-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. ++# Check whether --enable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then +- enableval="$enable_dependency_tracking" ++ enableval=$enable_dependency_tracking; ++fi + +-fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -2989,11 +3437,10 @@ + + + +- + depcc="$CC" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3057,6 +3504,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -3082,13 +3530,11 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -3099,10 +3545,9 @@ + fi + + +-# Check whether --enable-shared or --disable-shared was given. ++# Check whether --enable-shared was given. + if test "${enable_shared+set}" = set; then +- enableval="$enable_shared" +- p=${PACKAGE-default} ++ enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; +@@ -3121,12 +3566,12 @@ + esac + else + enable_shared=yes +-fi; ++fi ++ + +-# Check whether --enable-static or --disable-static was given. ++# Check whether --enable-static was given. + if test "${enable_static+set}" = set; then +- enableval="$enable_static" +- p=${PACKAGE-default} ++ enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; +@@ -3145,12 +3590,12 @@ + esac + else + enable_static=yes +-fi; ++fi ++ + +-# Check whether --enable-fast-install or --disable-fast-install was given. ++# Check whether --enable-fast-install was given. + if test "${enable_fast_install+set}" = set; then +- enableval="$enable_fast_install" +- p=${PACKAGE-default} ++ enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; +@@ -3169,64 +3614,94 @@ + esac + else + enable_fast_install=yes +-fi; ++fi ++ + + # Make sure we can run config.sub. +-$ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +-echo "$as_me: error: cannot run $ac_config_sub" >&2;} ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_build_alias=$build_alias +-test -z "$ac_cv_build_alias" && +- ac_cv_build_alias=`$ac_config_guess` +-test -z "$ac_cv_build_alias" && ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + build=$ac_cv_build +-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_host_alias=$host_alias +-test -z "$ac_cv_host_alias" && +- ac_cv_host_alias=$ac_cv_build_alias +-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } ++fi + + fi +-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} ++ { (exit 1); exit 1; }; };; ++esac + host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } + if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3279,37 +3754,184 @@ + fi + + SED=$lt_cv_path_SED +-echo "$as_me:$LINENO: result: $SED" >&5 +-echo "${ECHO_T}$SED" >&6 ++{ echo "$as_me:$LINENO: result: $SED" >&5 ++echo "${ECHO_T}$SED" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ # Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_GREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ + +-echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +-if test "${ac_cv_prog_egrep+set}" = set; then ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ # Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count + fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_EGREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" + + + +-# Check whether --with-gnu-ld or --without-gnu-ld was given. ++# Check whether --with-gnu-ld was given. + if test "${with_gnu_ld+set}" = set; then +- withval="$with_gnu_ld" +- test "$withval" = no || with_gnu_ld=yes ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +-fi; ++fi ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -3338,11 +3960,11 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3375,17 +3997,17 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6 ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 + echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3399,20 +4021,20 @@ + ;; + esac + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } + if test "${lt_cv_ld_reload_flag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; +@@ -3429,8 +4051,8 @@ + ;; + esac + +-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } + if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3478,23 +4100,23 @@ + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + fi + fi +-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++echo "${ECHO_T}$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" + +-echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6 ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 ++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3544,7 +4166,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -3598,11 +4220,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -3669,8 +4291,8 @@ + esac + + fi +-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3688,11 +4310,11 @@ + compiler=$CC + + +-# Check whether --enable-libtool-lock or --disable-libtool-lock was given. ++# Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then +- enableval="$enable_libtool_lock" ++ enableval=$enable_libtool_lock; ++fi + +-fi; + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good +@@ -3719,7 +4341,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 3722 "configure"' > conftest.$ac_ext ++ echo '#line 4344 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -3804,8 +4426,8 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } + if test "${lt_cv_cc_needs_belf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -3831,35 +4453,32 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -3868,8 +4487,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" +@@ -3906,8 +4525,8 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3941,24 +4560,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3967,9 +4584,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3979,24 +4597,22 @@ + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -4007,6 +4623,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -4024,8 +4641,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6 ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -4048,24 +4665,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4074,9 +4689,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4086,24 +4702,22 @@ + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -4114,6 +4728,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -4136,8 +4751,8 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4161,35 +4776,31 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +@@ -4245,6 +4856,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ctype.h> ++#include <stdlib.h> + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -4264,18 +4876,27 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +@@ -4288,12 +4909,14 @@ + ( exit $ac_status ) + ac_cv_header_stdc=no + fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++ ++ + fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -4316,9 +4939,9 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +@@ -4332,38 +4955,35 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-eval "$as_ac_Header=no" ++ eval "$as_ac_Header=no" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +@@ -4378,18 +4998,19 @@ + for ac_header in dlfcn.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4400,41 +5021,37 @@ + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_header_compiler=no ++ ac_header_compiler=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4443,24 +5060,22 @@ + /* end confdefs.h. */ + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4468,9 +5083,10 @@ + + ac_header_preproc=no + fi ++ + rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +@@ -4494,25 +5110,24 @@ + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX ++ ( cat <<\_ASBOX + ## ---------------------------------------------------------------------- ## + ## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## + ## ---------------------------------------------------------------------- ## + _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 ++ ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi + if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -4524,18 +5139,22 @@ + + done + +-ac_ext=cc ++ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4548,36 +5167,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:$LINENO: result: $CXX" >&5 +-echo "${ECHO_T}$CXX" >&6 ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$CXX" && break + done + fi + if test -z "$CXX"; then + ac_ct_CXX=$CXX +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4590,55 +5211,85 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-echo "${ECHO_T}$ac_ct_CXX" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_CXX" && break + done +-test -n "$ac_ct_CXX" || ac_ct_CXX="g++" + +- CXX=$ac_ct_CXX ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi + fi + +- ++ fi ++fi + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C++ compiler version" >&5 ++echo "$as_me:$LINENO: checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +- (eval $ac_compiler --version </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 +- (eval $ac_compiler -v </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 +- (eval $ac_compiler -V </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4661,50 +5312,49 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } + GXX=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-CXXFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -4720,160 +5370,134 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_cxx_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +-if test "$ac_test_CXXFLAGS" = set; then +- CXXFLAGS=$ac_save_CXXFLAGS +-elif test $ac_cv_prog_cxx_g = yes; then +- if test "$GXX" = yes; then +- CXXFLAGS="-g -O2" +- else +- CXXFLAGS="-g" +- fi +-else +- if test "$GXX" = yes; then +- CXXFLAGS="-O2" +- else +- CXXFLAGS= +- fi +-fi +-for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF ++ CXXFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_declaration +-#include <stdlib.h> ++ + int + main () + { +-exit (42); ++ + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_declaration ++ + int + main () + { +-exit (42); ++ + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-ac_ext=cc ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +@@ -4881,8 +5505,8 @@ + + depcc="$CXX" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -4946,6 +5570,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -4971,13 +5596,11 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 ++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -4993,13 +5616,13 @@ + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +- ac_ext=cc ++ ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5029,24 +5652,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5055,9 +5676,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5067,24 +5689,22 @@ + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5095,6 +5715,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -5112,8 +5733,8 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-echo "${ECHO_T}$CXXCPP" >&6 ++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++echo "${ECHO_T}$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do +@@ -5136,24 +5757,22 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5162,9 +5781,10 @@ + # Broken: fails on valid input. + continue + fi ++ + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -5174,24 +5794,22 @@ + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5202,6 +5820,7 @@ + ac_preproc_ok=: + break + fi ++ + rm -f conftest.err conftest.$ac_ext + + done +@@ -5217,7 +5836,7 @@ + { (exit 1); exit 1; }; } + fi + +-ac_ext=cc ++ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +@@ -5231,12 +5850,12 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5249,36 +5868,38 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + F77=$ac_cv_prog_F77 + if test -n "$F77"; then +- echo "$as_me:$LINENO: result: $F77" >&5 +-echo "${ECHO_T}$F77" >&6 ++ { echo "$as_me:$LINENO: result: $F77" >&5 ++echo "${ECHO_T}$F77" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$F77" && break + done + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5291,48 +5912,78 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then +- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-echo "${ECHO_T}$ac_ct_F77" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++echo "${ECHO_T}$ac_ct_F77" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + test -n "$ac_ct_F77" && break + done + +- F77=$ac_ct_F77 ++ if test "x$ac_ct_F77" = x; then ++ F77="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ F77=$ac_ct_F77 ++ fi + fi + + + # Provide some information about the compiler. +-echo "$as_me:5321:" \ +- "checking for Fortran 77 compiler version" >&5 ++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 +- (eval $ac_compiler --version </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 +- (eval $ac_compiler -v </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 +- (eval $ac_compiler -V </dev/null >&5) 2>&5 ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +@@ -5342,8 +5993,8 @@ + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F +-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } + if test "${ac_cv_f77_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5356,46 +6007,42 @@ + end + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_f77_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= +-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_f77_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5406,39 +6053,35 @@ + end + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_prog_f77_g=no ++ ac_cv_prog_f77_g=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS + elif test $ac_cv_prog_f77_g = yes; then +@@ -5467,8 +6110,8 @@ + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + + # find the maximum length of command line arguments +-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } + if test "${lt_cv_sys_max_cmd_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5576,19 +6219,19 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 ++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } + else +- echo "$as_me:$LINENO: result: none" >&5 +-echo "${ECHO_T}none" >&6 ++ { echo "$as_me:$LINENO: result: none" >&5 ++echo "${ECHO_T}none" >&6; } + fi + + + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } + if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5623,7 +6266,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -5792,15 +6435,15 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6 ++ { echo "$as_me:$LINENO: result: failed" >&5 ++echo "${ECHO_T}failed" >&6; } + else +- echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6 ++ { echo "$as_me:$LINENO: result: ok" >&5 ++echo "${ECHO_T}ok" >&6; } + fi + +-echo "$as_me:$LINENO: checking for objdir" >&5 +-echo $ECHO_N "checking for objdir... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for objdir" >&5 ++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } + if test "${lt_cv_objdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5814,8 +6457,8 @@ + fi + rmdir .libs 2>/dev/null + fi +-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-echo "${ECHO_T}$lt_cv_objdir" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++echo "${ECHO_T}$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + +@@ -5866,8 +6509,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5880,32 +6523,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:$LINENO: result: $AR" >&5 +-echo "${ECHO_T}$AR" >&6 ++ { echo "$as_me:$LINENO: result: $AR" >&5 ++echo "${ECHO_T}$AR" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5918,27 +6563,41 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-echo "${ECHO_T}$ac_ct_AR" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++echo "${ECHO_T}$ac_ct_AR" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- AR=$ac_ct_AR ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi + else + AR="$ac_cv_prog_AR" + fi +@@ -5946,8 +6605,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5960,32 +6619,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -5998,27 +6659,41 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- RANLIB=$ac_ct_RANLIB ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi + else + RANLIB="$ac_cv_prog_RANLIB" + fi +@@ -6026,8 +6701,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6040,32 +6715,34 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6078,27 +6755,41 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- STRIP=$ac_ct_STRIP ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi + else + STRIP="$ac_cv_prog_STRIP" + fi +@@ -6157,8 +6848,8 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6210,17 +6901,17 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6 ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- echo "$as_me:$LINENO: checking for file" >&5 +-echo $ECHO_N "checking for file... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for file" >&5 ++echo $ECHO_N "checking for file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6272,11 +6963,11 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6 ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + else +@@ -6291,21 +6982,21 @@ + enable_dlopen=no + enable_win32_dll=no + +-# Check whether --enable-libtool-lock or --disable-libtool-lock was given. ++# Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then +- enableval="$enable_libtool_lock" ++ enableval=$enable_libtool_lock; ++fi + +-fi; + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + +-# Check whether --with-pic or --without-pic was given. ++# Check whether --with-pic was given. + if test "${with_pic+set}" = set; then +- withval="$with_pic" +- pic_mode="$withval" ++ withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +-fi; ++fi ++ + test -z "$pic_mode" && pic_mode=default + + # Use C for the default configuration in the libtool script +@@ -6363,8 +7054,8 @@ + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + +-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6381,11 +7072,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6384: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7075: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6388: \$? = $ac_status" >&5 ++ echo "$as_me:7079: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6398,8 +7089,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -6413,8 +7104,8 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -6543,7 +7234,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -6623,16 +7314,16 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then + +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6649,11 +7340,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6652: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7343: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6656: \$? = $ac_status" >&5 ++ echo "$as_me:7347: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6666,8 +7357,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } + + if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -6694,8 +7385,8 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6722,8 +7413,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + + if test x"$lt_prog_compiler_static_works" = xyes; then + : +@@ -6732,8 +7423,8 @@ + fi + + +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6753,11 +7444,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6756: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7447: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:6760: \$? = $ac_status" >&5 ++ echo "$as_me:7451: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -6779,23 +7470,23 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +@@ -6805,8 +7496,8 @@ + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag= +@@ -6982,7 +7673,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -7008,12 +7699,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -7221,27 +7913,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -7252,8 +7940,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -7282,27 +7972,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -7313,8 +7999,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -7445,7 +8133,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -7547,7 +8235,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -7763,8 +8451,8 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-echo "${ECHO_T}$ld_shlibs" >&6 ++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++echo "${ECHO_T}$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + + # +@@ -7784,8 +8472,8 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +@@ -7822,16 +8510,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc" >&6 ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; + esac + +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -8037,18 +8725,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -8204,7 +8880,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8218,31 +8894,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 8225 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -8254,7 +8909,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8263,7 +8918,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -8439,8 +9094,8 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -8448,8 +9103,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ +@@ -8473,8 +9128,8 @@ + # directories. + hardcode_action=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-echo "${ECHO_T}$hardcode_action" >&6 ++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++echo "${ECHO_T}$hardcode_action" >&6; } + + if test "$hardcode_action" = relink; then + # Fast installation is not supported +@@ -8487,29 +9142,29 @@ + + striplib= + old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + fi +@@ -8541,8 +9196,8 @@ + + darwin*) + # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8555,56 +9210,53 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } + if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +@@ -8618,8 +9270,8 @@ + ;; + + *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for shl_load" >&5 ++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } + if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8646,73 +9298,64 @@ + + #undef shl_load + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char shl_load (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) ++#if defined __stub_shl_load || defined __stub___shl_load + choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != shl_load; ++return shl_load (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_shl_load=no ++ ac_cv_func_shl_load=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } + if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" + else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8725,61 +9368,58 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char shl_load (); + int + main () + { +-shl_load (); ++return shl_load (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } + if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8806,73 +9446,64 @@ + + #undef dlopen + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" +-{ + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) ++#if defined __stub_dlopen || defined __stub___dlopen + choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} + #endif + + int + main () + { +-return f != dlopen; ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_func_dlopen=no ++ ac_cv_func_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } + if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" + else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8885,61 +9516,58 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } + if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } + if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -8952,61 +9580,58 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); ++return dlopen (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } + if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9019,56 +9644,53 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dld_link (); + int + main () + { +-dld_link (); ++return dld_link (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + fi +@@ -9108,8 +9730,8 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9119,7 +9741,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 9122 "configure" ++#line 9744 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -9203,13 +9825,13 @@ + + + fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -9219,7 +9841,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 9222 "configure" ++#line 9844 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -9303,8 +9925,8 @@ + + + fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -9326,13 +9948,13 @@ + + + # Report which library types will actually be built +-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6 ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -9352,15 +9974,15 @@ + fi + ;; + esac +-echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6 ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +-echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6 ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -9852,11 +10474,11 @@ + CC="$lt_save_CC" + + +-# Check whether --with-tags or --without-tags was given. ++# Check whether --with-tags was given. + if test "${with_tags+set}" = set; then +- withval="$with_tags" +- tagnames="$withval" +-fi; ++ withval=$with_tags; tagnames="$withval" ++fi ++ + + if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then +@@ -9910,7 +10532,7 @@ + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +- ac_ext=cc ++ ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +@@ -10029,18 +10651,18 @@ + # Set up default GNU C++ configuration + + +-# Check whether --with-gnu-ld or --without-gnu-ld was given. ++# Check whether --with-gnu-ld was given. + if test "${with_gnu_ld+set}" = set; then +- withval="$with_gnu_ld" +- test "$withval" = no || with_gnu_ld=yes ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +-fi; ++fi ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -10069,11 +10691,11 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10106,17 +10728,17 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- echo "$as_me:$LINENO: result: $LD" >&5 +-echo "${ECHO_T}$LD" >&6 ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 + echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -10130,8 +10752,8 @@ + ;; + esac + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +@@ -10181,8 +10803,8 @@ + fi + + # PORTME: fill in a description of your system's C++ link characteristics +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -10294,27 +10916,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10325,8 +10943,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10356,27 +10976,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -10387,8 +11003,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10536,7 +11154,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -10695,7 +11313,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -10797,7 +11415,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -11119,8 +11737,8 @@ + ld_shlibs_CXX=no + ;; + esac +-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" +@@ -11259,8 +11877,8 @@ + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -11364,7 +11982,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -11407,7 +12025,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -11450,7 +12068,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -11533,16 +12151,16 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then + +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11559,11 +12177,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11562: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12180: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11566: \$? = $ac_status" >&5 ++ echo "$as_me:12184: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11576,8 +12194,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in +@@ -11604,8 +12222,8 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11632,8 +12250,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + + if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +@@ -11642,8 +12260,8 @@ + fi + + +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -11663,11 +12281,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12284: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11670: \$? = $ac_status" >&5 ++ echo "$as_me:12288: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11689,23 +12307,23 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +@@ -11715,8 +12333,8 @@ + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -11735,13 +12353,16 @@ + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + # +@@ -11761,8 +12382,8 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +@@ -11799,16 +12420,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; + esac + +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -12014,18 +12635,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -12181,7 +12790,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12195,31 +12804,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 12202 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -12231,7 +12819,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12240,7 +12828,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -12416,8 +13004,8 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -12425,8 +13013,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +@@ -12450,8 +13038,8 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-echo "${ECHO_T}$hardcode_action_CXX" >&6 ++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++echo "${ECHO_T}$hardcode_action_CXX" >&6; } + + if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported +@@ -12976,13 +13564,13 @@ + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6 ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -13001,15 +13589,15 @@ + fi + ;; + esac +-echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6 ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +-echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6 ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + GCC_F77="$G77" + LD_F77="$LD" +@@ -13018,8 +13606,8 @@ + lt_prog_compiler_pic_F77= + lt_prog_compiler_static_F77= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' +@@ -13148,7 +13736,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -13228,16 +13816,16 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_F77"; then + +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13254,11 +13842,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13257: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13845: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13261: \$? = $ac_status" >&5 ++ echo "$as_me:13849: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13271,8 +13859,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } + + if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in +@@ -13299,8 +13887,8 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13327,8 +13915,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + + if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +@@ -13337,8 +13925,8 @@ + fi + + +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -13358,11 +13946,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13361: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13949: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13365: \$? = $ac_status" >&5 ++ echo "$as_me:13953: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13384,23 +13972,23 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +@@ -13410,8 +13998,8 @@ + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_F77= +@@ -13587,7 +14175,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -13613,12 +14201,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -13816,27 +14405,23 @@ + end + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13847,8 +14432,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13867,27 +14454,23 @@ + end + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -13898,8 +14481,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -14030,7 +14615,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -14132,7 +14717,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -14348,8 +14933,8 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-echo "${ECHO_T}$ld_shlibs_F77" >&6 ++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++echo "${ECHO_T}$ld_shlibs_F77" >&6; } + test "$ld_shlibs_F77" = no && can_build_shared=no + + # +@@ -14369,8 +14954,8 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +@@ -14407,16 +14992,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; + esac + +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -14622,18 +15207,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -14789,7 +15362,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14803,31 +15376,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 14810 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -14839,7 +15391,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14848,7 +15400,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -15024,8 +15576,8 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -15033,8 +15585,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_F77= + if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ +@@ -15058,8 +15610,8 @@ + # directories. + hardcode_action_F77=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-echo "${ECHO_T}$hardcode_action_F77" >&6 ++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++echo "${ECHO_T}$hardcode_action_F77" >&6; } + + if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported +@@ -15496,7 +16048,6 @@ + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + + +- + # Source file extension for Java test sources. + ac_ext=java + +@@ -15564,8 +16115,8 @@ + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15582,11 +16133,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15585: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16136: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15589: \$? = $ac_status" >&5 ++ echo "$as_me:16140: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15599,8 +16150,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +@@ -15614,8 +16165,8 @@ + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_static_GCJ= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -15744,7 +16295,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -15824,16 +16375,16 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_GCJ"; then + +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15850,11 +16401,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15853: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16404: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15857: \$? = $ac_status" >&5 ++ echo "$as_me:16408: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15867,8 +16418,8 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in +@@ -15895,8 +16446,8 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15923,8 +16474,8 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + + if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +@@ -15933,8 +16484,8 @@ + fi + + +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -15954,11 +16505,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15957: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16508: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15961: \$? = $ac_status" >&5 ++ echo "$as_me:16512: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15980,23 +16531,23 @@ + $rm conftest* + + fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +@@ -16006,8 +16557,8 @@ + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_GCJ= +@@ -16183,7 +16734,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -16209,12 +16760,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -16422,27 +16974,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -16453,8 +17001,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -16483,27 +17033,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } + }'` +@@ -16514,8 +17060,10 @@ + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + ++ + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -16646,7 +17194,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -16748,7 +17296,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -16964,8 +17512,8 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-echo "${ECHO_T}$ld_shlibs_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } + test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # +@@ -16985,8 +17533,8 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + +@@ -17023,16 +17571,16 @@ + cat conftest.err 1>&5 + fi + $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; + esac + +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -17238,18 +17786,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -17405,7 +17941,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17419,31 +17955,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 17426 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -17455,7 +17970,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17464,7 +17979,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -17640,8 +18155,8 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +@@ -17649,8 +18164,8 @@ + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_GCJ= + if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ +@@ -17674,8 +18189,8 @@ + # directories. + hardcode_action_GCJ=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-echo "${ECHO_T}$hardcode_action_GCJ" >&6 ++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++echo "${ECHO_T}$hardcode_action_GCJ" >&6; } + + if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported +@@ -18111,7 +18626,6 @@ + RC) + + +- + # Source file extension for RC test sources. + ac_ext=rc + +@@ -18650,8 +19164,8 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -18666,34 +19180,35 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + ;; + esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- + if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ + fi + if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -18708,28 +19223,42 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ++IFS=$as_save_IFS + + ;; + esac + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +- + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- PKG_CONFIG=$ac_pt_PKG_CONFIG ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi + else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + fi +@@ -18737,22 +19266,22 @@ + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + + fi + + pkg_failed=no +-echo "$as_me:$LINENO: checking for LBXUTIL" >&5 +-echo $ECHO_N "checking for LBXUTIL... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for LBXUTIL" >&5 ++echo $ECHO_N "checking for LBXUTIL... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$LBXUTIL_CFLAGS"; then +@@ -18840,7 +19369,7 @@ + and LBXUTIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -18850,19 +19379,19 @@ + and LBXUTIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + LBXUTIL_CFLAGS=$pkg_cv_LBXUTIL_CFLAGS + LBXUTIL_LIBS=$pkg_cv_LBXUTIL_LIBS +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + : + fi + +-echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for deflate in -lz" >&5 ++echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; } + if test "${ac_cv_lib_z_deflate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -18875,56 +19404,53 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any gcc2 internal prototype to avoid an error. */ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char deflate (); + int + main () + { +-deflate (); ++return deflate (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_z_deflate=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_z_deflate=no ++ ac_cv_lib_z_deflate=no + fi +-rm -f conftest.err conftest.$ac_objext \ ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 ++echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; } + if test $ac_cv_lib_z_deflate = yes; then + LBXUTIL_LIBS="${LBXUTIL_LIBS} -lz" + else +@@ -18942,13 +19468,13 @@ + + + +-# Check whether --with-release-version or --without-release-version was given. ++# Check whether --with-release-version was given. + if test "${with_release_version+set}" = set; then +- withval="$with_release_version" +- RELEASE_VERSION="$withval" ++ withval=$with_release_version; RELEASE_VERSION="$withval" + else + RELEASE_VERSION="" +-fi; ++fi ++ + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" +@@ -18956,8 +19482,32 @@ + echo "$as_me: Building with package name set to $PACKAGE" >&6;} + fi + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` ++_ACEOF ++ ++ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` ++ if test "x$PVM" = "x"; then ++ PVM="0" ++ fi ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION_MINOR $PVM ++_ACEOF ++ ++ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` ++ if test "x$PVP" = "x"; then ++ PVP="0" ++ fi ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION_PATCHLEVEL $PVP ++_ACEOF ++ ++ ++ ++ac_config_files="$ac_config_files Makefile src/Makefile src/image/Makefile lbxutil.pc" + +- ac_config_files="$ac_config_files Makefile src/Makefile lbxutil.pc" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -18976,39 +19526,58 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; +- esac; +-} | ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -19017,32 +19586,18 @@ + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/; +-s/:*\${srcdir}:*/:/; +-s/:*@srcdir@:*/:/; +-s/^\([^=]*=[ ]*\):*/\1/; +-s/:*$//; +-s/^[^=]*=[ ]*$//; +-}' +-fi +- + DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. +- ac_i=`echo "$ac_i" | +- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +- # 2. Add them. +- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + +@@ -19101,17 +19656,45 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ ++fi ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi +-DUALCASE=1; export DUALCASE # for MKS sh + + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +@@ -19121,8 +19704,43 @@ + fi + + ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ + # Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done + PS1='$ ' + PS2='> ' + PS4='+ ' +@@ -19136,18 +19754,19 @@ + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else +- $as_unset $as_var ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi + done + + # Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false +@@ -19155,159 +19774,120 @@ + + + # Name of the executable. +-as_me=`$as_basename "$0" || ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || + echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi ++# CDPATH. ++$as_unset CDPATH + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done + +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + + +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; + esac + +-if expr a : '\(a\)' >/dev/null 2>&1; then ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + + rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi + echo >conf$$.file + if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +@@ -19316,7 +19896,28 @@ + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -19325,31 +19926,14 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + exec 6>&1 + +-# Open the log real soon, to keep \$[0] and so on meaningful, and to ++# Save the log message, to keep $[0] and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. Logging --version etc. is OK. +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 +-cat >&5 <<_CSEOF +- ++# values after options handling. ++ac_log=" + This file was extended by lbxutil $as_me 1.0.1, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -19357,30 +19941,20 @@ + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +-_CSEOF +-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +-echo >&5 ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ + _ACEOF + ++cat >>$CONFIG_STATUS <<_ACEOF + # Files that config.status was made for. +-if test -n "$ac_config_files"; then +- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +-fi ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" + +-if test -n "$ac_config_headers"; then +- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_links"; then +- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_commands"; then +- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +-fi ++_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +- + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. +@@ -19388,7 +19962,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -19407,19 +19981,22 @@ + $config_commands + + Report bugs to <bug-autoconf@gnu.org>." +-_ACEOF + ++_ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + lbxutil config.status 1.0.1 +-configured by $0, generated by GNU Autoconf 2.59, +- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.61, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2003 Free Software Foundation, Inc. ++Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." +-srcdir=$srcdir +-INSTALL="$INSTALL" ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -19430,39 +20007,24 @@ + do + case $1 in + --*=*) +- ac_option=`expr "x$1" : 'x\([^=]*\)='` +- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; +- -*) ++ *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; +- *) # This is not an option, so the user has probably given explicit +- # arguments. +- ac_option=$1 +- ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; +- --version | --vers* | -V ) +- echo "$ac_cs_version"; exit 0 ;; +- --he | --h) +- # Conflict between --help and --header +- { { echo "$as_me:$LINENO: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- echo "$ac_cs_usage"; exit 0 ;; +- --debug | --d* | -d ) ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +@@ -19472,18 +20034,24 @@ + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +- *) ac_config_targets="$ac_config_targets $1" ;; ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; + + esac + shift +@@ -19499,39 +20067,52 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then +- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ echo "$ac_log" ++} >&5 + ++_ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + # +-# INIT-COMMANDS section. ++# INIT-COMMANDS + # +- + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + _ACEOF + +- +- + cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. + for ac_config_target in $ac_config_targets + do +- case "$ac_config_target" in +- # Handling of arguments. +- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; +- "lbxutil.pc" ) CONFIG_FILES="$CONFIG_FILES lbxutil.pc" ;; +- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; ++ "src/image/Makefile") CONFIG_FILES="$CONFIG_FILES src/image/Makefile" ;; ++ "lbxutil.pc") CONFIG_FILES="$CONFIG_FILES lbxutil.pc" ;; ++ + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done + ++ + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. + # We use the long form for the default assignment because of an extremely +@@ -19543,358 +20124,469 @@ + fi + + # Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason to put it here, and in addition, ++# simply because there is no reason against having it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. +-# Create a temporary directory, and hook for its removal unless debugging. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 + } +- + # Create a (secure) tmp directory for tmp files. + + { +- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { +- tmp=./confstat$$-$RANDOM +- (umask 077 && mkdir $tmp) ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") + } || + { + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF +- + # +-# CONFIG_FILES section. ++# Set up the sed scripts for CONFIG_FILES section. + # + + # No need to generate the scripts if there are no CONFIG_FILES. + # This happens for instance when ./config.status config.h +-if test -n "\$CONFIG_FILES"; then +- # Protect against being on the right side of a sed subst in config.status. +- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +-s,@SHELL@,$SHELL,;t t +-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +-s,@exec_prefix@,$exec_prefix,;t t +-s,@prefix@,$prefix,;t t +-s,@program_transform_name@,$program_transform_name,;t t +-s,@bindir@,$bindir,;t t +-s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t +-s,@datadir@,$datadir,;t t +-s,@sysconfdir@,$sysconfdir,;t t +-s,@sharedstatedir@,$sharedstatedir,;t t +-s,@localstatedir@,$localstatedir,;t t +-s,@libdir@,$libdir,;t t +-s,@includedir@,$includedir,;t t +-s,@oldincludedir@,$oldincludedir,;t t +-s,@infodir@,$infodir,;t t +-s,@mandir@,$mandir,;t t +-s,@build_alias@,$build_alias,;t t +-s,@host_alias@,$host_alias,;t t +-s,@target_alias@,$target_alias,;t t +-s,@DEFS@,$DEFS,;t t +-s,@ECHO_C@,$ECHO_C,;t t +-s,@ECHO_N@,$ECHO_N,;t t +-s,@ECHO_T@,$ECHO_T,;t t +-s,@LIBS@,$LIBS,;t t +-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +-s,@INSTALL_DATA@,$INSTALL_DATA,;t t +-s,@CYGPATH_W@,$CYGPATH_W,;t t +-s,@PACKAGE@,$PACKAGE,;t t +-s,@VERSION@,$VERSION,;t t +-s,@ACLOCAL@,$ACLOCAL,;t t +-s,@AUTOCONF@,$AUTOCONF,;t t +-s,@AUTOMAKE@,$AUTOMAKE,;t t +-s,@AUTOHEADER@,$AUTOHEADER,;t t +-s,@MAKEINFO@,$MAKEINFO,;t t +-s,@install_sh@,$install_sh,;t t +-s,@STRIP@,$STRIP,;t t +-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +-s,@mkdir_p@,$mkdir_p,;t t +-s,@AWK@,$AWK,;t t +-s,@SET_MAKE@,$SET_MAKE,;t t +-s,@am__leading_dot@,$am__leading_dot,;t t +-s,@AMTAR@,$AMTAR,;t t +-s,@am__tar@,$am__tar,;t t +-s,@am__untar@,$am__untar,;t t +-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +-s,@MAINT@,$MAINT,;t t +-s,@CC@,$CC,;t t +-s,@CFLAGS@,$CFLAGS,;t t +-s,@LDFLAGS@,$LDFLAGS,;t t +-s,@CPPFLAGS@,$CPPFLAGS,;t t +-s,@ac_ct_CC@,$ac_ct_CC,;t t +-s,@EXEEXT@,$EXEEXT,;t t +-s,@OBJEXT@,$OBJEXT,;t t +-s,@DEPDIR@,$DEPDIR,;t t +-s,@am__include@,$am__include,;t t +-s,@am__quote@,$am__quote,;t t +-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +-s,@CCDEPMODE@,$CCDEPMODE,;t t +-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +-s,@build@,$build,;t t +-s,@build_cpu@,$build_cpu,;t t +-s,@build_vendor@,$build_vendor,;t t +-s,@build_os@,$build_os,;t t +-s,@host@,$host,;t t +-s,@host_cpu@,$host_cpu,;t t +-s,@host_vendor@,$host_vendor,;t t +-s,@host_os@,$host_os,;t t +-s,@EGREP@,$EGREP,;t t +-s,@LN_S@,$LN_S,;t t +-s,@ECHO@,$ECHO,;t t +-s,@AR@,$AR,;t t +-s,@ac_ct_AR@,$ac_ct_AR,;t t +-s,@RANLIB@,$RANLIB,;t t +-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +-s,@CPP@,$CPP,;t t +-s,@CXX@,$CXX,;t t +-s,@CXXFLAGS@,$CXXFLAGS,;t t +-s,@ac_ct_CXX@,$ac_ct_CXX,;t t +-s,@CXXDEPMODE@,$CXXDEPMODE,;t t +-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t +-s,@CXXCPP@,$CXXCPP,;t t +-s,@F77@,$F77,;t t +-s,@FFLAGS@,$FFLAGS,;t t +-s,@ac_ct_F77@,$ac_ct_F77,;t t +-s,@LIBTOOL@,$LIBTOOL,;t t +-s,@PKG_CONFIG@,$PKG_CONFIG,;t t +-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t +-s,@LBXUTIL_CFLAGS@,$LBXUTIL_CFLAGS,;t t +-s,@LBXUTIL_LIBS@,$LBXUTIL_LIBS,;t t +-s,@LIBOBJS@,$LIBOBJS,;t t +-s,@LTLIBOBJS@,$LTLIBOBJS,;t t +-CEOF +- +-_ACEOF +- +- cat >>$CONFIG_STATUS <<\_ACEOF +- # Split the substitutions into bite-sized pieces for seds with +- # small command number limits, like on Digital OSF/1 and HP-UX. +- ac_max_sed_lines=48 +- ac_sed_frag=1 # Number of current file. +- ac_beg=1 # First line for current file. +- ac_end=$ac_max_sed_lines # Line after last line for current file. +- ac_more_lines=: +- ac_sed_cmds= +- while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- else +- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- fi +- if test ! -s $tmp/subs.frag; then +- ac_more_lines=false +- else +- # The purpose of the label and of the branching condition is to +- # speed up the sed processing (if there are no `@' at all, there +- # is no need to browse any of the substitutions). +- # These are the two extra sed commands mentioned above. +- (echo ':t +- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +- fi +- ac_sed_frag=`expr $ac_sed_frag + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_lines` +- fi +- done +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++if test -n "$CONFIG_FILES"; then ++ ++_ACEOF ++ ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++LN_S!$LN_S$ac_delim ++ECHO!$ECHO$ac_delim ++AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++CPP!$CPP$ac_delim ++CXX!$CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXDEPMODE!$CXXDEPMODE$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +-fi # test -n "$CONFIG_FILES" ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi + ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS <conf$$subs.sed ++rm -f conf$$subs.sed ++cat >>$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof + _ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim ++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim ++CXXCPP!$CXXCPP$ac_delim ++F77!$F77$ac_delim ++FFLAGS!$FFLAGS$ac_delim ++ac_ct_F77!$ac_ct_F77$ac_delim ++LIBTOOL!$LIBTOOL$ac_delim ++PKG_CONFIG!$PKG_CONFIG$ac_delim ++LBXUTIL_CFLAGS!$LBXUTIL_CFLAGS$ac_delim ++LBXUTIL_LIBS!$LBXUTIL_LIBS$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS <conf$$subs.sed ++rm -f conf$$subs.sed ++cat >>$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof ++_ACEOF ++ ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ + cat >>$CONFIG_STATUS <<\_ACEOF +-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++fi # test -n "$CONFIG_FILES" ++ ++ ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; + esac + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ ac_dir=`$as_dirname -- "$ac_file" || + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || + echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break + done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- + ac_builddir=. + +-if test "$ac_dir" != .; then ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac + ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac ++_ACEOF + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- configure_input= +- else +- configure_input="$ac_file. " +- fi +- configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac + _ACEOF ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub + $extrasub +@@ -19902,248 +20594,131 @@ + cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@configure_input@,$configure_input,;t t +-s,@srcdir@,$ac_srcdir,;t t +-s,@abs_srcdir@,$ac_abs_srcdir,;t t +-s,@top_srcdir@,$ac_top_srcdir,;t t +-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +-s,@builddir@,$ac_builddir,;t t +-s,@abs_builddir@,$ac_abs_builddir,;t t +-s,@top_builddir@,$ac_top_builddir,;t t +-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +-s,@INSTALL@,$ac_INSTALL,;t t +-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +- rm -f $tmp/stdin +- if test x"$ac_file" != x-; then +- mv $tmp/out $ac_file +- else +- cat $tmp/out +- rm -f $tmp/out +- fi ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} + +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# +- +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' +- +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ rm -f "$tmp/stdin" + case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac +- +- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- # Do quote $f, to prevent DOS paths from being IFS'd. +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in +- ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # + _ACEOF + +-# Transform confdefs.h into two sed scripts, `conftest.defines' and +-# `conftest.undefs', that substitutes the proper values into +-# config.h.in to produce config.h. The first handles `#define' +-# templates, and the second `#undef' templates. +-# And first: Protect against being on the right side of a sed subst in +-# config.status. Protect against being in an unquoted here document +-# in config.status. +-rm -f conftest.defines conftest.undefs +-# Using a here document instead of a string reduces the quoting nightmare. +-# Putting comments in sed scripts is not portable. +-# +-# `end' is used to avoid that the second main sed command (meant for +-# 0-ary CPP macros) applies to n-ary macro definitions. +-# See the Autoconf documentation for `clear'. +-cat >confdef2sed.sed <<\_ACEOF +-s/[\\&,]/\\&/g +-s,[\\$`],\\&,g +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +-t end +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +-: end +-_ACEOF +-# If some macros were called several times there might be several times +-# the same #defines, which is useless. Nevertheless, we may not want to +-# sort them, since we want the *last* AC-DEFINE to be honored. +-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +-rm -f confdef2sed.sed ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' + +-# This sed command replaces #undef with comments. This is necessary, for ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for + # example, in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. +-cat >>conftest.undefs <<\_ACEOF +-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +-_ACEOF ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' + +-# Break up conftest.defines because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +-echo ' :' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.defines >/dev/null ++while : + do +- # Write a limited-size here document to $tmp/defines.sed. +- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS +- # Speed up: don't consider the non `#define' lines. +- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF +- sed -f $tmp/defines.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines + done +-rm -f conftest.defines +-echo ' fi # grep' >>$CONFIG_STATUS +-echo >>$CONFIG_STATUS +- +-# Break up conftest.undefs because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.undefs >/dev/null +-do +- # Write a limited-size here document to $tmp/undefs.sed. +- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS +- # Speed up: don't consider the non `#undef' +- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/undefs.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail +- rm -f conftest.undefs +- mv conftest.tail conftest.undefs +-done +-rm -f conftest.undefs ++rm -f conftest.defines conftest.tail + ++echo "ac_result=$ac_in" >>$CONFIG_STATUS + cat >>$CONFIG_STATUS <<\_ACEOF +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- echo "/* Generated by configure. */" >$tmp/config.h +- else +- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h +- fi +- cat $tmp/in >>$tmp/config.h +- rm -f $tmp/in + if test x"$ac_file" != x-; then +- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else +- ac_dir=`(dirname "$ac_file") 2>/dev/null || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- + rm -f $ac_file +- mv $tmp/config.h $ac_file ++ mv "$tmp/config.h" $ac_file + fi + else +- cat $tmp/config.h +- rm -f $tmp/config.h ++ echo "/* $configure_input */" ++ cat "$ac_result" + fi ++ rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do +@@ -20154,135 +20729,39 @@ + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || ++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || + $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || + echo X$ac_file | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'`/stamp-h$_am_stamp_count +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_COMMANDS section. +-# +-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue +- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` +- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_dir=`(dirname "$ac_dest") 2>/dev/null || +-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_dest" : 'X\(//\)[^/]' \| \ +- X"$ac_dest" : 'X\(//\)$' \| \ +- X"$ac_dest" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_dest" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- ac_builddir=. +- +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi +- +-case $srcdir in +- .) # No --srcdir option. We are building in place. +- ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; + +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac + + +- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +-echo "$as_me: executing $ac_dest commands" >&6;} +- case $ac_dest in +- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +@@ -20290,20 +20769,32 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`(dirname "$mf") 2>/dev/null || ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || + echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + else + continue + fi +@@ -20325,53 +20816,79 @@ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +- fdir=`(dirname "$file") 2>/dev/null || ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || + echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p $dirpart/$fdir +- else +- as_dir=$dirpart/$fdir ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir=$dirpart/$fdir ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || + $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break + done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + ;; ++ + esac +-done +-_ACEOF ++done # for ac_tag + +-cat >>$CONFIG_STATUS <<\_ACEOF + + { (exit 0); exit 0; } + _ACEOF +Index: liblbxutil-1.0.1/Makefile.in +=================================================================== +--- liblbxutil-1.0.1.orig/Makefile.in 2006-05-15 22:24:52.000000000 +0200 ++++ liblbxutil-1.0.1/Makefile.in 2007-10-18 09:35:27.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -37,15 +37,11 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -59,18 +55,18 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ ++subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/lbxutil.pc.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing +-subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = lbxutil.pc +@@ -78,10 +74,11 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -91,6 +88,8 @@ + am__installdirs = "$(DESTDIR)$(pkgconfigdir)" + pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgconfig_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -106,8 +105,6 @@ + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -134,6 +131,8 @@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -147,9 +146,8 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -164,17 +162,13 @@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -186,28 +180,39 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AM_CFLAGS = $(X_CFLAGS) + SUBDIRS = src + pkgconfigdir = $(libdir)/pkgconfig +@@ -254,7 +259,7 @@ + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +@@ -278,10 +283,9 @@ + + distclean-libtool: + -rm -f libtool +-uninstall-info-am: + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -328,8 +332,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -431,24 +434,22 @@ + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkdir_p) $(distdir)/. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -462,7 +463,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -470,6 +471,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -477,7 +480,7 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +@@ -552,7 +555,7 @@ + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -577,7 +580,7 @@ + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -625,12 +628,20 @@ + + install-data-am: install-pkgconfigDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -651,25 +662,26 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA ++uninstall-am: uninstall-pkgconfigDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ +- dist-shar dist-tarZ dist-zip distcheck distclean \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ +- distclean-recursive distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-pkgconfigDATA install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-pkgconfigDATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: liblbxutil-1.0.1/src/Makefile.in +=================================================================== +--- liblbxutil-1.0.1.orig/src/Makefile.in 2006-05-15 22:24:52.000000000 +0200 ++++ liblbxutil-1.0.1/src/Makefile.in 2007-10-18 09:35:27.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,16 +14,11 @@ + + @SET_MAKE@ + +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,7 +32,6 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = mkg3states$(EXEEXT) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -63,30 +57,37 @@ + nodist_liblbxutil_la_OBJECTS = + liblbxutil_la_OBJECTS = $(am_liblbxutil_la_OBJECTS) \ + $(nodist_liblbxutil_la_OBJECTS) +-PROGRAMS = $(noinst_PROGRAMS) +-am_mkg3states_OBJECTS = mkg3states.$(OBJEXT) +-mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) +-mkg3states_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++liblbxutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(liblbxutil_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(liblbxutil_la_SOURCES) $(nodist_liblbxutil_la_SOURCES) \ +- $(mkg3states_SOURCES) +-DIST_SOURCES = $(liblbxutil_la_SOURCES) $(mkg3states_SOURCES) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(liblbxutil_la_SOURCES) $(nodist_liblbxutil_la_SOURCES) ++DIST_SOURCES = $(liblbxutil_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -113,6 +114,8 @@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -126,9 +129,8 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -143,17 +145,13 @@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -165,32 +163,41 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++SUBDIRS = image + lib_LTLIBRARIES = liblbxutil.la +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c +- + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ + $(srcdir)/lbx_zlib/lbx_zlib_io.c \ +@@ -211,7 +218,7 @@ + INCLUDES = @LBXUTIL_CFLAGS@ + liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined + CLEANFILES = g3states.h +-all: all-am ++all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +@@ -246,7 +253,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -257,7 +264,7 @@ + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +@@ -272,17 +279,7 @@ + rm -f "$${dir}/so_locations"; \ + done + liblbxutil.la: $(liblbxutil_la_OBJECTS) $(liblbxutil_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(liblbxutil_la_LDFLAGS) $(liblbxutil_la_OBJECTS) $(liblbxutil_la_LIBADD) $(LIBS) +- +-clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done +-mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) +- @rm -f mkg3states$(EXEEXT) +- $(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS) ++ $(liblbxutil_la_LINK) -rpath $(libdir) $(liblbxutil_la_OBJECTS) $(liblbxutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -298,106 +295,91 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbx_zlib_io.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbxdelta.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reqstats.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + lbx_zlib_io.lo: $(srcdir)/lbx_zlib/lbx_zlib_io.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbx_zlib_io.lo -MD -MP -MF "$(DEPDIR)/lbx_zlib_io.Tpo" -c -o lbx_zlib_io.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib_io.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib_io.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lbx_zlib_io.Tpo" "$(DEPDIR)/lbx_zlib_io.Plo"; else rm -f "$(DEPDIR)/lbx_zlib_io.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbx_zlib_io.lo -MD -MP -MF $(DEPDIR)/lbx_zlib_io.Tpo -c -o lbx_zlib_io.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib_io.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib_io.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/lbx_zlib_io.Tpo $(DEPDIR)/lbx_zlib_io.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/lbx_zlib/lbx_zlib_io.c' object='lbx_zlib_io.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbx_zlib_io.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib_io.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib_io.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbx_zlib_io.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib_io.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib_io.c + + lbx_zlib.lo: $(srcdir)/lbx_zlib/lbx_zlib.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbx_zlib.lo -MD -MP -MF "$(DEPDIR)/lbx_zlib.Tpo" -c -o lbx_zlib.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lbx_zlib.Tpo" "$(DEPDIR)/lbx_zlib.Plo"; else rm -f "$(DEPDIR)/lbx_zlib.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbx_zlib.lo -MD -MP -MF $(DEPDIR)/lbx_zlib.Tpo -c -o lbx_zlib.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/lbx_zlib.Tpo $(DEPDIR)/lbx_zlib.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/lbx_zlib/lbx_zlib.c' object='lbx_zlib.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbx_zlib.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbx_zlib.lo `test -f '$(srcdir)/lbx_zlib/lbx_zlib.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/lbx_zlib.c + + reqstats.lo: $(srcdir)/lbx_zlib/reqstats.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reqstats.lo -MD -MP -MF "$(DEPDIR)/reqstats.Tpo" -c -o reqstats.lo `test -f '$(srcdir)/lbx_zlib/reqstats.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/reqstats.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/reqstats.Tpo" "$(DEPDIR)/reqstats.Plo"; else rm -f "$(DEPDIR)/reqstats.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reqstats.lo -MD -MP -MF $(DEPDIR)/reqstats.Tpo -c -o reqstats.lo `test -f '$(srcdir)/lbx_zlib/reqstats.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/reqstats.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/reqstats.Tpo $(DEPDIR)/reqstats.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/lbx_zlib/reqstats.c' object='reqstats.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reqstats.lo `test -f '$(srcdir)/lbx_zlib/reqstats.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/reqstats.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reqstats.lo `test -f '$(srcdir)/lbx_zlib/reqstats.c' || echo '$(srcdir)/'`$(srcdir)/lbx_zlib/reqstats.c + + misc.lo: $(srcdir)/image/misc.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.lo -MD -MP -MF "$(DEPDIR)/misc.Tpo" -c -o misc.lo `test -f '$(srcdir)/image/misc.c' || echo '$(srcdir)/'`$(srcdir)/image/misc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc.Tpo" "$(DEPDIR)/misc.Plo"; else rm -f "$(DEPDIR)/misc.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.lo -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.lo `test -f '$(srcdir)/image/misc.c' || echo '$(srcdir)/'`$(srcdir)/image/misc.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/misc.c' object='misc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.lo `test -f '$(srcdir)/image/misc.c' || echo '$(srcdir)/'`$(srcdir)/image/misc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.lo `test -f '$(srcdir)/image/misc.c' || echo '$(srcdir)/'`$(srcdir)/image/misc.c + + dpackbits.lo: $(srcdir)/image/dpackbits.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dpackbits.lo -MD -MP -MF "$(DEPDIR)/dpackbits.Tpo" -c -o dpackbits.lo `test -f '$(srcdir)/image/dpackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/dpackbits.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dpackbits.Tpo" "$(DEPDIR)/dpackbits.Plo"; else rm -f "$(DEPDIR)/dpackbits.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dpackbits.lo -MD -MP -MF $(DEPDIR)/dpackbits.Tpo -c -o dpackbits.lo `test -f '$(srcdir)/image/dpackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/dpackbits.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dpackbits.Tpo $(DEPDIR)/dpackbits.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/dpackbits.c' object='dpackbits.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dpackbits.lo `test -f '$(srcdir)/image/dpackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/dpackbits.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dpackbits.lo `test -f '$(srcdir)/image/dpackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/dpackbits.c + + epackbits.lo: $(srcdir)/image/epackbits.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT epackbits.lo -MD -MP -MF "$(DEPDIR)/epackbits.Tpo" -c -o epackbits.lo `test -f '$(srcdir)/image/epackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/epackbits.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/epackbits.Tpo" "$(DEPDIR)/epackbits.Plo"; else rm -f "$(DEPDIR)/epackbits.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT epackbits.lo -MD -MP -MF $(DEPDIR)/epackbits.Tpo -c -o epackbits.lo `test -f '$(srcdir)/image/epackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/epackbits.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/epackbits.Tpo $(DEPDIR)/epackbits.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/epackbits.c' object='epackbits.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o epackbits.lo `test -f '$(srcdir)/image/epackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/epackbits.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o epackbits.lo `test -f '$(srcdir)/image/epackbits.c' || echo '$(srcdir)/'`$(srcdir)/image/epackbits.c + + dfaxg42d.lo: $(srcdir)/image/dfaxg42d.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dfaxg42d.lo -MD -MP -MF "$(DEPDIR)/dfaxg42d.Tpo" -c -o dfaxg42d.lo `test -f '$(srcdir)/image/dfaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/dfaxg42d.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dfaxg42d.Tpo" "$(DEPDIR)/dfaxg42d.Plo"; else rm -f "$(DEPDIR)/dfaxg42d.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dfaxg42d.lo -MD -MP -MF $(DEPDIR)/dfaxg42d.Tpo -c -o dfaxg42d.lo `test -f '$(srcdir)/image/dfaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/dfaxg42d.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dfaxg42d.Tpo $(DEPDIR)/dfaxg42d.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/dfaxg42d.c' object='dfaxg42d.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dfaxg42d.lo `test -f '$(srcdir)/image/dfaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/dfaxg42d.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dfaxg42d.lo `test -f '$(srcdir)/image/dfaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/dfaxg42d.c + + efaxg42d.lo: $(srcdir)/image/efaxg42d.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT efaxg42d.lo -MD -MP -MF "$(DEPDIR)/efaxg42d.Tpo" -c -o efaxg42d.lo `test -f '$(srcdir)/image/efaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/efaxg42d.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/efaxg42d.Tpo" "$(DEPDIR)/efaxg42d.Plo"; else rm -f "$(DEPDIR)/efaxg42d.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT efaxg42d.lo -MD -MP -MF $(DEPDIR)/efaxg42d.Tpo -c -o efaxg42d.lo `test -f '$(srcdir)/image/efaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/efaxg42d.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/efaxg42d.Tpo $(DEPDIR)/efaxg42d.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/efaxg42d.c' object='efaxg42d.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o efaxg42d.lo `test -f '$(srcdir)/image/efaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/efaxg42d.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o efaxg42d.lo `test -f '$(srcdir)/image/efaxg42d.c' || echo '$(srcdir)/'`$(srcdir)/image/efaxg42d.c + + lbxdelta.lo: $(srcdir)/delta/lbxdelta.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbxdelta.lo -MD -MP -MF "$(DEPDIR)/lbxdelta.Tpo" -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lbxdelta.Tpo" "$(DEPDIR)/lbxdelta.Plo"; else rm -f "$(DEPDIR)/lbxdelta.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lbxdelta.lo -MD -MP -MF $(DEPDIR)/lbxdelta.Tpo -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/lbxdelta.Tpo $(DEPDIR)/lbxdelta.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/delta/lbxdelta.c' object='lbxdelta.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c +- +-mkg3states.o: $(srcdir)/image/mkg3states.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.o -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/mkg3states.c' object='mkg3states.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c +- +-mkg3states.obj: $(srcdir)/image/mkg3states.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.obj -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/mkg3states.c' object='mkg3states.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi` ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -405,9 +387,75 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -419,10 +467,23 @@ + mkid -fID $$unique + tags: TAGS + +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +@@ -435,7 +496,7 @@ + $$tags $$unique; \ + fi + ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +@@ -458,22 +519,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -484,22 +544,40 @@ + || exit 1; \ + fi; \ + done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done + check-am: all-am +-check: check-am +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +-installdirs: ++check: check-recursive ++all-am: Makefile $(LTLIBRARIES) ++installdirs: installdirs-recursive ++installdirs-am: + for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive + + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +-installcheck: installcheck-am ++installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +@@ -516,76 +594,90 @@ + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am ++clean: clean-recursive + + clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +- clean-noinstPROGRAMS mostlyclean-am ++ mostlyclean-am + +-distclean: distclean-am ++distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + +-dvi: dvi-am ++dvi: dvi-recursive + + dvi-am: + +-html: html-am ++html: html-recursive + +-info: info-am ++info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-libLTLIBRARIES + +-install-info: install-info-am ++install-html: install-html-recursive ++ ++install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + +-maintainer-clean: maintainer-clean-am ++maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic + +-mostlyclean: mostlyclean-am ++mostlyclean: mostlyclean-recursive + + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +-pdf: pdf-am ++pdf: pdf-recursive + + pdf-am: + +-ps: ps-am ++ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ++uninstall-am: uninstall-libLTLIBRARIES ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic \ ++ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-libLTLIBRARIES install-man \ +- install-strip installcheck installcheck-am installdirs \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am uninstall-libLTLIBRARIES ++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-libLTLIBRARIES + + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states ++g3states.h: image/mkg3states + -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: liblbxutil-1.0.1/src/image/Makefile.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ liblbxutil-1.0.1/src/image/Makefile.in 2007-10-18 09:35:27.000000000 +0200 +@@ -0,0 +1,456 @@ ++# Makefile.in generated by automake 1.10 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++noinst_PROGRAMS = mkg3states$(EXEEXT) ++subdir = src/image ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++PROGRAMS = $(noinst_PROGRAMS) ++am_mkg3states_OBJECTS = mkg3states-mkg3states.$(OBJEXT) ++mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) ++mkg3states_LDADD = $(LDADD) ++mkg3states_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(mkg3states_CFLAGS) \ ++ $(CFLAGS) $(mkg3states_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(mkg3states_SOURCES) ++DIST_SOURCES = $(mkg3states_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = $(CC_FOR_BUILD) ++CCDEPMODE = @CCDEPMODE@ ++ ++# evil hack ++CFLAGS = $(CFLAGS_FOR_BUILD) ++CPP = @CPP@ ++CPPFLAGS = $(CPPFLAGS_FOR_BUILD) ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LBXUTIL_CFLAGS = @LBXUTIL_CFLAGS@ ++LBXUTIL_LIBS = @LBXUTIL_LIBS@ ++LDFLAGS = $(LDFLAGS_FOR_BUILD) ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ --tag=CC ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++RANLIB = @RANLIB@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS = $(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS = $(LDFLAGS_FOR_BUILD) ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .c .lo .o .obj ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/image/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/image/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++clean-noinstPROGRAMS: ++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done ++mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) ++ @rm -f mkg3states$(EXEEXT) ++ $(mkg3states_LINK) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states-mkg3states.Po@am__quote@ ++ ++.c.o: ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++.c.lo: ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++ ++mkg3states-mkg3states.o: mkg3states.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -MT mkg3states-mkg3states.o -MD -MP -MF $(DEPDIR)/mkg3states-mkg3states.Tpo -c -o mkg3states-mkg3states.o `test -f 'mkg3states.c' || echo '$(srcdir)/'`mkg3states.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mkg3states-mkg3states.Tpo $(DEPDIR)/mkg3states-mkg3states.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkg3states.c' object='mkg3states-mkg3states.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -c -o mkg3states-mkg3states.o `test -f 'mkg3states.c' || echo '$(srcdir)/'`mkg3states.c ++ ++mkg3states-mkg3states.obj: mkg3states.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -MT mkg3states-mkg3states.obj -MD -MP -MF $(DEPDIR)/mkg3states-mkg3states.Tpo -c -o mkg3states-mkg3states.obj `if test -f 'mkg3states.c'; then $(CYGPATH_W) 'mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/mkg3states.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mkg3states-mkg3states.Tpo $(DEPDIR)/mkg3states-mkg3states.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkg3states.c' object='mkg3states-mkg3states.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -c -o mkg3states-mkg3states.obj `if test -f 'mkg3states.c'; then $(CYGPATH_W) 'mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/mkg3states.c'; fi` ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(PROGRAMS) ++installdirs: ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ ++ mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstPROGRAMS ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: diff --git a/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-cross-compile.diff b/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-cross-compile.diff new file mode 100644 index 000000000..dd87a82ba --- /dev/null +++ b/patches/liblbxutil-1.0.1/generic/liblbxutil-1.0.1-fix-cross-compile.diff @@ -0,0 +1,87 @@ +# +# Submitted-By: Marc Kleine-Budde, 2006-01-19 +# Committed-By: Marc Kleine-Budde +# +# Error: +# +# crosscompiling sux, x86 doesn't like it, when arm binaries are executed: +# +# /bin/sh ../libtool --mode=link arm-softfloat-linux-gnu-gcc -O +# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib +# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib +# -o mkg3states mkg3states.o arm-softfloat-linux-gnu-gcc -O -o +# mkg3states mkg3states.o +# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib +# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib +# rm -f g3states.h ./mkg3states -c > g3states.h_ && mv g3states.h_ +# g3states.h /bin/sh: ./mkg3states: cannot execute binary file +# make[3]: *** [g3states.h] Error 126 +# +# +# Description: +# +# build mkg3states for build not for host, using BSP hack, but works +# rediffed for Xorg7.1 by Luotao Fu, 2006-06-19 +# +# State: +# +# submitted upstream +# +Index: liblbxutil-1.0.1/configure.ac +=================================================================== +--- liblbxutil-1.0.1.orig/configure.ac 2007-10-18 09:39:19.000000000 +0200 ++++ liblbxutil-1.0.1/configure.ac 2007-10-18 09:40:53.000000000 +0200 +@@ -51,4 +51,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +Index: liblbxutil-1.0.1/src/Makefile.am +=================================================================== +--- liblbxutil-1.0.1.orig/src/Makefile.am 2007-10-18 09:39:19.000000000 +0200 ++++ liblbxutil-1.0.1/src/Makefile.am 2007-10-18 09:39:22.000000000 +0200 +@@ -1,9 +1,6 @@ +-lib_LTLIBRARIES = liblbxutil.la +- +-noinst_PROGRAMS = mkg3states ++SUBDIRS = image + +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++lib_LTLIBRARIES = liblbxutil.la + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,9 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states ++g3states.h: image/mkg3states + -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined + +Index: liblbxutil-1.0.1/src/image/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ liblbxutil-1.0.1/src/image/Makefile.am 2007-10-18 09:39:27.000000000 +0200 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/patches/liblbxutil-1.0.1/generic/series b/patches/liblbxutil-1.0.1/generic/series new file mode 100644 index 000000000..bf9cf0c65 --- /dev/null +++ b/patches/liblbxutil-1.0.1/generic/series @@ -0,0 +1,2 @@ +liblbxutil-1.0.1-fix-cross-compile.diff +liblbxutil-1.0.1-fix-autoreconf.diff diff --git a/patches/liblbxutil-X11R7.1-1.0.1/generic/src_image_mkg3states_c.diff b/patches/liblbxutil-X11R7.1-1.0.1/generic/src_image_mkg3states_c.diff deleted file mode 100644 index 5c8d4e254..000000000 --- a/patches/liblbxutil-X11R7.1-1.0.1/generic/src_image_mkg3states_c.diff +++ /dev/null @@ -1,2236 +0,0 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-01-19 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# crosscompiling sux, x86 doesn't like it, when arm binaries are executed: -# -# /bin/sh ../libtool --mode=link arm-softfloat-linux-gnu-gcc -O -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib -# -o mkg3states mkg3states.o arm-softfloat-linux-gnu-gcc -O -o -# mkg3states mkg3states.o -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/lib -# -L/home/frogger/projects/pengutronix/ptxdist/ptxdist-0.9-trunk/local/arm-softfloat-linux-gnu/usr/lib -# rm -f g3states.h ./mkg3states -c > g3states.h_ && mv g3states.h_ -# g3states.h /bin/sh: ./mkg3states: cannot execute binary file -# make[3]: *** [g3states.h] Error 126 -# -# -# Description: -# -# build mkg3states for build not for host, using BSP hack, but works -# rediffed for Xorg7.1 by Luotao Fu, 2006-06-19 -# -# State: -# -# submitted upstream -# - -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/aclocal.m4 liblbxutil-X11R7.1-1.0.1/aclocal.m4 ---- liblbxutil-X11R7.1-1.0.1.orig/aclocal.m4 2006-05-22 03:27:15.000000000 +0200 -+++ liblbxutil-X11R7.1-1.0.1/aclocal.m4 2006-06-15 09:25:37.806710206 +0200 -@@ -13,7 +13,7 @@ - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 48 AC_PROG_LIBTOOL -+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1578,27 +1578,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -1610,6 +1593,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - knetbsd*-gnu) - version_type=linux - need_lib_prefix=no -@@ -2385,7 +2380,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -3394,7 +3389,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -5018,7 +5013,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -5370,6 +5365,12 @@ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ kfreebsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; -+ linux*) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -5566,12 +5567,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5901,12 +5903,21 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+ -+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. -+ kfreebsd*-gnu) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - - hpux9*) - if test "$GCC" = yes; then -@@ -6003,7 +6014,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -6562,50 +6573,6 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - --dnl Copyright 2005 Red Hat, Inc --dnl --dnl Permission to use, copy, modify, distribute, and sell this software and its --dnl documentation for any purpose is hereby granted without fee, provided that --dnl the above copyright notice appear in all copies and that both that --dnl copyright notice and this permission notice appear in supporting --dnl documentation. --dnl --dnl The above copyright notice and this permission notice shall be included --dnl in all copies or substantial portions of the Software. --dnl --dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --dnl OTHER DEALINGS IN THE SOFTWARE. --dnl --dnl Except as contained in this notice, the name of the copyright holders shall --dnl not be used in advertising or otherwise to promote the sale, use or --dnl other dealings in this Software without prior written authorization --dnl from the copyright holders. --dnl -- --# XORG_RELEASE_VERSION --# -------------------- --# Adds --with/without-release-string and changes the PACKAGE and --# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If --# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. -- --AC_DEFUN([XORG_RELEASE_VERSION],[ -- AC_ARG_WITH(release-version, -- AC_HELP_STRING([--with-release-version=STRING], -- [Use release version string in package name]), -- [RELEASE_VERSION="$withval"], -- [RELEASE_VERSION=""]) -- if test "x$RELEASE_VERSION" != "x"; then -- PACKAGE="$PACKAGE-$RELEASE_VERSION" -- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -- AC_MSG_NOTICE([Building with package name set to $PACKAGE]) -- fi --]) -- - # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/compile liblbxutil-X11R7.1-1.0.1/compile ---- liblbxutil-X11R7.1-1.0.1.orig/compile 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-X11R7.1-1.0.1/compile 2006-06-15 09:25:05.167235125 +0200 -@@ -0,0 +1,142 @@ -+#! /bin/sh -+# Wrapper for compilers which do not understand `-c -o'. -+ -+scriptversion=2005-05-14.22 -+ -+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -+# Written by Tom Tromey <tromey@cygnus.com>. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# This file is maintained in Automake, please report -+# bugs to <bug-automake@gnu.org> or send patches to -+# <automake-patches@gnu.org>. -+ -+case $1 in -+ '') -+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 -+ exit 1; -+ ;; -+ -h | --h*) -+ cat <<\EOF -+Usage: compile [--help] [--version] PROGRAM [ARGS] -+ -+Wrapper for compilers which do not understand `-c -o'. -+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -+arguments, and rename the output as expected. -+ -+If you are trying to build a whole package this is not the -+right script to run: please start by reading the file `INSTALL'. -+ -+Report bugs to <bug-automake@gnu.org>. -+EOF -+ exit $? -+ ;; -+ -v | --v*) -+ echo "compile $scriptversion" -+ exit $? -+ ;; -+esac -+ -+ofile= -+cfile= -+eat= -+ -+for arg -+do -+ if test -n "$eat"; then -+ eat= -+ else -+ case $1 in -+ -o) -+ # configure might choose to run compile as `compile cc -o foo foo.c'. -+ # So we strip `-o arg' only if arg is an object. -+ eat=1 -+ case $2 in -+ *.o | *.obj) -+ ofile=$2 -+ ;; -+ *) -+ set x "$@" -o "$2" -+ shift -+ ;; -+ esac -+ ;; -+ *.c) -+ cfile=$1 -+ set x "$@" "$1" -+ shift -+ ;; -+ *) -+ set x "$@" "$1" -+ shift -+ ;; -+ esac -+ fi -+ shift -+done -+ -+if test -z "$ofile" || test -z "$cfile"; then -+ # If no `-o' option was seen then we might have been invoked from a -+ # pattern rule where we don't need one. That is ok -- this is a -+ # normal compilation that the losing compiler can handle. If no -+ # `.c' file was seen then we are probably linking. That is also -+ # ok. -+ exec "$@" -+fi -+ -+# Name of file we expect compiler to create. -+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` -+ -+# Create the lock directory. -+# Note: use `[/.-]' here to ensure that we don't use the same name -+# that we are using for the .o file. Also, base the name on the expected -+# object file name, since that is what matters with a parallel build. -+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -+while true; do -+ if mkdir "$lockdir" >/dev/null 2>&1; then -+ break -+ fi -+ sleep 1 -+done -+# FIXME: race condition here if user kills between mkdir and trap. -+trap "rmdir '$lockdir'; exit 1" 1 2 15 -+ -+# Run the compile. -+"$@" -+ret=$? -+ -+if test -f "$cofile"; then -+ mv "$cofile" "$ofile" -+elif test -f "${cofile}bj"; then -+ mv "${cofile}bj" "$ofile" -+fi -+ -+rmdir "$lockdir" -+exit $ret -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/configure liblbxutil-X11R7.1-1.0.1/configure ---- liblbxutil-X11R7.1-1.0.1.orig/configure 2006-05-22 03:36:09.000000000 +0200 -+++ liblbxutil-X11R7.1-1.0.1/configure 2006-06-15 09:29:21.331661749 +0200 -@@ -1058,8 +1058,6 @@ - both] - --with-tags[=TAGS] - include additional configurations [automatic] -- --with-release-version=STRING -- Use release version string in package name - - Some influential environment variables: - CC C compiler command -@@ -1172,7 +1170,7 @@ - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -2563,8 +2561,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2622,8 +2619,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2739,8 +2735,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2794,8 +2789,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2840,8 +2834,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2885,8 +2878,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3602,7 +3594,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -3719,7 +3711,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 3722 "configure"' > conftest.$ac_ext -+ echo '#line 3714 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -3839,8 +3831,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4169,8 +4160,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4340,8 +4330,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4408,8 +4397,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4669,8 +4657,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4728,8 +4715,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4800,8 +4786,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4845,8 +4830,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5318,7 +5302,7 @@ - - - # Provide some information about the compiler. --echo "$as_me:5321:" \ -+echo "$as_me:5305:" \ - "checking for Fortran 77 compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` - { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -@@ -5364,8 +5348,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5414,8 +5397,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6381,11 +6363,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:6384: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6366: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:6388: \$? = $ac_status" >&5 -+ echo "$as_me:6370: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -6649,11 +6631,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:6652: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6634: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:6656: \$? = $ac_status" >&5 -+ echo "$as_me:6638: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -6753,11 +6735,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:6756: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:6738: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:6760: \$? = $ac_status" >&5 -+ echo "$as_me:6742: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -7008,12 +6990,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -7229,8 +7212,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7290,8 +7272,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7445,11 +7426,20 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ -+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. -+ kfreebsd*-gnu) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ link_all_deplibs=no - ;; - - hpux9*) -@@ -7547,7 +7537,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -8218,31 +8208,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 8225 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -8254,6 +8223,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - knetbsd*-gnu) - version_type=linux - need_lib_prefix=no -@@ -8579,8 +8560,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8683,8 +8663,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8749,8 +8728,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8843,8 +8821,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8909,8 +8886,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8976,8 +8952,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9043,8 +9018,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9119,7 +9093,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 9122 "configure" -+#line 9096 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -9219,7 +9193,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 9222 "configure" -+#line 9196 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10302,8 +10276,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10364,8 +10337,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10797,7 +10769,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -11450,7 +11422,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -11559,11 +11531,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:11562: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11534: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:11566: \$? = $ac_status" >&5 -+ echo "$as_me:11538: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -11663,11 +11635,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:11666: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11638: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:11670: \$? = $ac_status" >&5 -+ echo "$as_me:11642: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -11735,6 +11707,12 @@ - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ kfreebsd*-gnu) -+ link_all_deplibs_CXX=no -+ ;; -+ linux*) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -12195,31 +12173,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 12202 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12231,6 +12188,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - knetbsd*-gnu) - version_type=linux - need_lib_prefix=no -@@ -13254,11 +13223,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13257: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13226: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13261: \$? = $ac_status" >&5 -+ echo "$as_me:13230: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -13358,11 +13327,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13361: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13330: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13365: \$? = $ac_status" >&5 -+ echo "$as_me:13334: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -13613,12 +13582,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -13824,8 +13794,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13875,8 +13844,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14030,11 +13998,20 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) -+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ -+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. -+ kfreebsd*-gnu) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no -+ link_all_deplibs_F77=no - ;; - - hpux9*) -@@ -14132,7 +14109,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -14803,31 +14780,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 14810 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -14839,6 +14795,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - knetbsd*-gnu) - version_type=linux - need_lib_prefix=no -@@ -15582,11 +15550,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15585: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15553: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15589: \$? = $ac_status" >&5 -+ echo "$as_me:15557: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15850,11 +15818,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15853: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15821: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15857: \$? = $ac_status" >&5 -+ echo "$as_me:15825: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15954,11 +15922,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15957: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15925: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15961: \$? = $ac_status" >&5 -+ echo "$as_me:15929: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16209,12 +16177,13 @@ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -16430,8 +16399,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16491,8 +16459,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16646,11 +16613,20 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu | dragonfly*) -+ freebsd* | dragonfly*) -+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ -+ # GNU/kFreeBSD uses gcc -shared to do shared libraries. -+ kfreebsd*-gnu) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no -+ link_all_deplibs_GCJ=no - ;; - - hpux9*) -@@ -16748,7 +16724,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -17419,31 +17395,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 17426 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -17455,6 +17410,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - knetbsd*-gnu) - version_type=linux - need_lib_prefix=no -@@ -18899,8 +18866,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18940,8 +18906,6 @@ - # Check fixesext configuration, strip extra digits from package version to - # find the required protocol version - -- -- - # Check whether --with-release-version or --without-release-version was given. - if test "${with_release_version+set}" = set; then - withval="$with_release_version" -@@ -18949,15 +18913,15 @@ - else - RELEASE_VERSION="" - fi; -- if test "x$RELEASE_VERSION" != "x"; then -- PACKAGE="$PACKAGE-$RELEASE_VERSION" -- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -- { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 -+ if test "x$RELEASE_VERSION" != "x"; then -+ PACKAGE="$PACKAGE-$RELEASE_VERSION" -+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" -+ { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 - echo "$as_me: Building with package name set to $PACKAGE" >&6;} -- fi -+ fi - - -- ac_config_files="$ac_config_files Makefile src/Makefile lbxutil.pc" -+ ac_config_files="$ac_config_files Makefile src/Makefile src/image/Makefile lbxutil.pc" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -19523,6 +19487,7 @@ - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -+ "src/image/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/image/Makefile" ;; - "lbxutil.pc" ) CONFIG_FILES="$CONFIG_FILES lbxutil.pc" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -@@ -19851,11 +19816,6 @@ - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -19894,6 +19854,12 @@ - fi;; - esac - done` || { (exit 1); exit 1; } -+ -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/configure.ac liblbxutil-X11R7.1-1.0.1/configure.ac ---- liblbxutil-X11R7.1-1.0.1.orig/configure.ac 2006-05-19 20:36:46.000000000 +0200 -+++ liblbxutil-X11R7.1-1.0.1/configure.ac 2006-06-15 09:25:05.181236187 +0200 -@@ -51,4 +51,5 @@ - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/Makefile.in liblbxutil-X11R7.1-1.0.1/Makefile.in ---- liblbxutil-X11R7.1-1.0.1.orig/Makefile.in 2006-05-22 03:27:24.000000000 +0200 -+++ liblbxutil-X11R7.1-1.0.1/Makefile.in 2006-06-15 09:25:43.194118743 +0200 -@@ -62,8 +62,8 @@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/lbxutil.pc.in $(top_srcdir)/configure AUTHORS \ -- COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ -- install-sh ltmain.sh missing -+ COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ -+ depcomp install-sh ltmain.sh missing - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/src/image/Makefile.am liblbxutil-X11R7.1-1.0.1/src/image/Makefile.am ---- liblbxutil-X11R7.1-1.0.1.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-X11R7.1-1.0.1/src/image/Makefile.am 2006-06-15 09:25:05.184236414 +0200 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/src/image/Makefile.in liblbxutil-X11R7.1-1.0.1/src/image/Makefile.in ---- liblbxutil-X11R7.1-1.0.1.orig/src/image/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-X11R7.1-1.0.1/src/image/Makefile.in 2006-06-15 09:25:43.048107671 +0200 -@@ -0,0 +1,444 @@ -+# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = ../.. -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+noinst_PROGRAMS = mkg3states$(EXEEXT) -+subdir = src/image -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(install_sh) -d -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+PROGRAMS = $(noinst_PROGRAMS) -+am_mkg3states_OBJECTS = mkg3states-mkg3states.$(OBJEXT) -+mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) -+mkg3states_LDADD = $(LDADD) -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(mkg3states_SOURCES) -+DIST_SOURCES = $(mkg3states_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CC = $(CC_FOR_BUILD) -+CCDEPMODE = @CCDEPMODE@ -+ -+# evil hack -+CFLAGS = $(CFLAGS_FOR_BUILD) -+CPP = @CPP@ -+CPPFLAGS = $(CPPFLAGS_FOR_BUILD) -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LBXUTIL_CFLAGS = @LBXUTIL_CFLAGS@ -+LBXUTIL_LIBS = @LBXUTIL_LIBS@ -+LDFLAGS = $(LDFLAGS_FOR_BUILD) -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ --tag=CC -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -+MAKEINFO = @MAKEINFO@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PKG_CONFIG = @PKG_CONFIG@ -+RANLIB = @RANLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS = $(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS = $(LDFLAGS_FOR_BUILD) -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/image/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu src/image/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+clean-noinstPROGRAMS: -+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done -+mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) -+ @rm -f mkg3states$(EXEEXT) -+ $(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states-mkg3states.Po@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mkg3states-mkg3states.o: mkg3states.c -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -MT mkg3states-mkg3states.o -MD -MP -MF "$(DEPDIR)/mkg3states-mkg3states.Tpo" -c -o mkg3states-mkg3states.o `test -f 'mkg3states.c' || echo '$(srcdir)/'`mkg3states.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states-mkg3states.Tpo" "$(DEPDIR)/mkg3states-mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states-mkg3states.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkg3states.c' object='mkg3states-mkg3states.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -c -o mkg3states-mkg3states.o `test -f 'mkg3states.c' || echo '$(srcdir)/'`mkg3states.c -+ -+mkg3states-mkg3states.obj: mkg3states.c -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -MT mkg3states-mkg3states.obj -MD -MP -MF "$(DEPDIR)/mkg3states-mkg3states.Tpo" -c -o mkg3states-mkg3states.obj `if test -f 'mkg3states.c'; then $(CYGPATH_W) 'mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/mkg3states.c'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states-mkg3states.Tpo" "$(DEPDIR)/mkg3states-mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states-mkg3states.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mkg3states.c' object='mkg3states-mkg3states.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkg3states_CFLAGS) $(CFLAGS) -c -o mkg3states-mkg3states.obj `if test -f 'mkg3states.c'; then $(CYGPATH_W) 'mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/mkg3states.c'; fi` -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(PROGRAMS) -+installdirs: -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-am -+ -+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -+ mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: -+ -+install-exec-am: -+ -+install-info: install-info-am -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-noinstPROGRAMS ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-exec \ -+ install-exec-am install-info install-info-am install-man \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-info-am -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/src/Makefile.am liblbxutil-X11R7.1-1.0.1/src/Makefile.am ---- liblbxutil-X11R7.1-1.0.1.orig/src/Makefile.am 2006-03-20 20:46:29.000000000 +0100 -+++ liblbxutil-X11R7.1-1.0.1/src/Makefile.am 2006-06-15 09:25:05.181236187 +0200 -@@ -1,9 +1,6 @@ --lib_LTLIBRARIES = liblbxutil.la -- --noinst_PROGRAMS = mkg3states -+SUBDIRS = image - --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+lib_LTLIBRARIES = liblbxutil.la - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -28,9 +25,9 @@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -+g3states.h: image/mkg3states - -rm -f g3states.h -- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined - -diff -uN -r liblbxutil-X11R7.1-1.0.1.orig/src/Makefile.in liblbxutil-X11R7.1-1.0.1/src/Makefile.in ---- liblbxutil-X11R7.1-1.0.1.orig/src/Makefile.in 2006-05-22 03:27:24.000000000 +0200 -+++ liblbxutil-X11R7.1-1.0.1/src/Makefile.in 2006-06-15 09:25:42.893095916 +0200 -@@ -14,7 +14,6 @@ - - @SET_MAKE@ - -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -37,7 +36,6 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = mkg3states$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -63,10 +61,6 @@ - nodist_liblbxutil_la_OBJECTS = - liblbxutil_la_OBJECTS = $(am_liblbxutil_la_OBJECTS) \ - $(nodist_liblbxutil_la_OBJECTS) --PROGRAMS = $(noinst_PROGRAMS) --am_mkg3states_OBJECTS = mkg3states.$(OBJEXT) --mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) --mkg3states_LDADD = $(LDADD) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -78,11 +72,17 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(liblbxutil_la_SOURCES) $(nodist_liblbxutil_la_SOURCES) \ -- $(mkg3states_SOURCES) --DIST_SOURCES = $(liblbxutil_la_SOURCES) $(mkg3states_SOURCES) -+SOURCES = $(liblbxutil_la_SOURCES) $(nodist_liblbxutil_la_SOURCES) -+DIST_SOURCES = $(liblbxutil_la_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-exec-recursive install-info-recursive \ -+ install-recursive installcheck-recursive installdirs-recursive \ -+ pdf-recursive ps-recursive uninstall-info-recursive \ -+ uninstall-recursive - ETAGS = etags - CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ -@@ -187,10 +187,8 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+SUBDIRS = image - lib_LTLIBRARIES = liblbxutil.la --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -- - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ - $(srcdir)/lbx_zlib/lbx_zlib_io.c \ -@@ -211,7 +209,7 @@ - INCLUDES = @LBXUTIL_CFLAGS@ - liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined - CLEANFILES = g3states.h --all: all-am -+all: all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj -@@ -274,16 +272,6 @@ - liblbxutil.la: $(liblbxutil_la_OBJECTS) $(liblbxutil_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(liblbxutil_la_LDFLAGS) $(liblbxutil_la_OBJECTS) $(liblbxutil_la_LIBADD) $(LIBS) - --clean-noinstPROGRAMS: -- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -- echo " rm -f $$p $$f"; \ -- rm -f $$p $$f ; \ -- done --mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) -- @rm -f mkg3states$(EXEEXT) -- $(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS) -- - mostlyclean-compile: - -rm -f *.$(OBJEXT) - -@@ -298,7 +286,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbx_zlib_io.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbxdelta.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reqstats.Plo@am__quote@ - - .c.o: -@@ -385,20 +372,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c - --mkg3states.o: $(srcdir)/image/mkg3states.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.o -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/mkg3states.c' object='mkg3states.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c -- --mkg3states.obj: $(srcdir)/image/mkg3states.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.obj -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/image/mkg3states.c' object='mkg3states.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi` -- - mostlyclean-libtool: - -rm -f *.lo - -@@ -409,6 +382,77 @@ - -rm -f libtool - uninstall-info-am: - -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+mostlyclean-recursive clean-recursive distclean-recursive \ -+maintainer-clean-recursive: -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -419,10 +463,23 @@ - mkid -fID $$unique - tags: TAGS - --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -@@ -435,7 +492,7 @@ - $$tags $$unique; \ - fi - ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -@@ -484,22 +541,38 @@ - || exit 1; \ - fi; \ - done -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done - check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) --installdirs: -+check: check-recursive -+all-am: Makefile $(LTLIBRARIES) -+installdirs: installdirs-recursive -+installdirs-am: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -+install: install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - --installcheck: installcheck-am -+installcheck: installcheck-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -@@ -516,24 +589,24 @@ - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." --clean: clean-am -+clean: clean-recursive - - clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -- clean-noinstPROGRAMS mostlyclean-am -+ mostlyclean-am - --distclean: distclean-am -+distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - --dvi: dvi-am -+dvi: dvi-recursive - - dvi-am: - --html: html-am -+html: html-recursive - --info: info-am -+info: info-recursive - - info-am: - -@@ -541,51 +614,55 @@ - - install-exec-am: install-libLTLIBRARIES - --install-info: install-info-am -+install-info: install-info-recursive - - install-man: - - installcheck-am: - --maintainer-clean: maintainer-clean-am -+maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - --mostlyclean: mostlyclean-am -+mostlyclean: mostlyclean-recursive - - mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - --pdf: pdf-am -+pdf: pdf-recursive - - pdf-am: - --ps: ps-am -+ps: ps-recursive - - ps-am: - - uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES - --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ -- distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am html \ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -+ clean clean-generic clean-libLTLIBRARIES clean-libtool \ -+ clean-recursive ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-libLTLIBRARIES - - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -+g3states.h: image/mkg3states - -rm -f g3states.h -- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/patches/xf86-input-mouse-X11R7.1-1.1.0/generic/xf86-input-mouse-X11R7.0-1.0.3.1-crosscompile.diff b/patches/xf86-input-mouse-X11R7.1-1.1.0/generic/xf86-input-mouse-X11R7.0-1.0.3.1-crosscompile.diff deleted file mode 100644 index edfbaaa9a..000000000 --- a/patches/xf86-input-mouse-X11R7.1-1.1.0/generic/xf86-input-mouse-X11R7.0-1.0.3.1-crosscompile.diff +++ /dev/null @@ -1,226 +0,0 @@ -diff -u xf86-input-mouse-X11R7.1-1.1.0/configure xf86-input-mouse-X11R7.1-1.1.0.new/configure ---- xf86-input-mouse-X11R7.1-1.1.0/configure 2006-05-23 05:22:29.000000000 +0200 -+++ xf86-input-mouse-X11R7.1-1.1.0.new/configure 2006-06-10 22:54:01.000000000 +0200 -@@ -465,7 +465,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -20156,124 +20156,10 @@ - fi - - -- --as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 --echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 --if eval "test \"\${$as_ac_File+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- test "$cross_compiling" = yes && -- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 --echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -- { (exit 1); exit 1; }; } --if test -r "$prefix/share/X11/sgml/defs.ent"; then -- eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 --if test `eval echo '${'$as_ac_File'}'` = yes; then -- DEFS_ENT_PATH=$prefix/share/X11/sgml --else -- DEFS_ENT_PATH= -- --fi -- -- --# Extract the first word of "linuxdoc", so it can be a program name with args. --set dummy linuxdoc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_LINUXDOC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $LINUXDOC in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_LINUXDOC="$LINUXDOC" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_LINUXDOC="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- ;; --esac --fi --LINUXDOC=$ac_cv_path_LINUXDOC -- --if test -n "$LINUXDOC"; then -- echo "$as_me:$LINENO: result: $LINUXDOC" >&5 --echo "${ECHO_T}$LINUXDOC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --# Extract the first word of "ps2pdf", so it can be a program name with args. --set dummy ps2pdf; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_PS2PDF+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $PS2PDF in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- ;; --esac --fi --PS2PDF=$ac_cv_path_PS2PDF -- --if test -n "$PS2PDF"; then -- echo "$as_me:$LINENO: result: $PS2PDF" >&5 --echo "${ECHO_T}$PS2PDF" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- --echo "$as_me:$LINENO: checking Whether to build documentation" >&5 --echo $ECHO_N "checking Whether to build documentation... $ECHO_C" >&6 -- --if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then -- BUILDDOC=yes --else -- BUILDDOC=no --fi -+# XORG_CHECK_LINUXDOC - - -- --if test x$BUILDDOC = xyes; then -+if false; then - BUILD_LINUXDOC_TRUE= - BUILD_LINUXDOC_FALSE='#' - else -@@ -20282,43 +20168,6 @@ - fi - - --echo "$as_me:$LINENO: result: $BUILDDOC" >&5 --echo "${ECHO_T}$BUILDDOC" >&6 -- --echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5 --echo $ECHO_N "checking Whether to build pdf documentation... $ECHO_C" >&6 -- --if test x$PS2PDF != x ; then -- BUILDPDFDOC=yes --else -- BUILDPDFDOC=no --fi -- -- -- --if test x$BUILDPDFDOC = xyes; then -- BUILD_PDFDOC_TRUE= -- BUILD_PDFDOC_FALSE='#' --else -- BUILD_PDFDOC_TRUE='#' -- BUILD_PDFDOC_FALSE= --fi -- -- --echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5 --echo "${ECHO_T}$BUILDPDFDOC" >&6 -- --MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" --MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps" --MAKE_PDF="$PS2PDF" --MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0" -- -- -- -- -- -- -- - ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -20453,13 +20302,6 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi --if test -z "${BUILD_PDFDOC_TRUE}" && test -z "${BUILD_PDFDOC_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"BUILD_PDFDOC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"BUILD_PDFDOC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi - - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files -@@ -21080,16 +20922,8 @@ - s,@MISC_MAN_DIR@,$MISC_MAN_DIR,;t t - s,@DRIVER_MAN_DIR@,$DRIVER_MAN_DIR,;t t - s,@ADMIN_MAN_DIR@,$ADMIN_MAN_DIR,;t t --s,@LINUXDOC@,$LINUXDOC,;t t --s,@PS2PDF@,$PS2PDF,;t t - s,@BUILD_LINUXDOC_TRUE@,$BUILD_LINUXDOC_TRUE,;t t - s,@BUILD_LINUXDOC_FALSE@,$BUILD_LINUXDOC_FALSE,;t t --s,@BUILD_PDFDOC_TRUE@,$BUILD_PDFDOC_TRUE,;t t --s,@BUILD_PDFDOC_FALSE@,$BUILD_PDFDOC_FALSE,;t t --s,@MAKE_TEXT@,$MAKE_TEXT,;t t --s,@MAKE_PS@,$MAKE_PS,;t t --s,@MAKE_PDF@,$MAKE_PDF,;t t --s,@MAKE_HTML@,$MAKE_HTML,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF -diff -u xf86-input-mouse-X11R7.1-1.1.0/configure.ac xf86-input-mouse-X11R7.1-1.1.0.new/configure.ac ---- xf86-input-mouse-X11R7.1-1.1.0/configure.ac 2006-04-07 19:59:54.000000000 +0200 -+++ xf86-input-mouse-X11R7.1-1.1.0.new/configure.ac 2006-06-10 22:51:52.000000000 +0200 -@@ -89,6 +89,7 @@ - XORG_MANPAGE_SECTIONS - XORG_RELEASE_VERSION - --XORG_CHECK_LINUXDOC -+# XORG_CHECK_LINUXDOC -+AM_CONDITIONAL(BUILD_LINUXDOC, false) - - AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff --git a/patches/xf86-video-apm-X11R7.1-1.1.1/generic/apm.diff b/patches/xf86-video-apm-1.1.1/generic/apm.diff index 83fc9b08e..83fc9b08e 100644 --- a/patches/xf86-video-apm-X11R7.1-1.1.1/generic/apm.diff +++ b/patches/xf86-video-apm-1.1.1/generic/apm.diff diff --git a/patches/xf86-video-apm-X11R7.1-1.1.1/generic/series b/patches/xf86-video-apm-1.1.1/generic/series index 318297ca1..318297ca1 100644 --- a/patches/xf86-video-apm-X11R7.1-1.1.1/generic/series +++ b/patches/xf86-video-apm-1.1.1/generic/series diff --git a/patches/xf86-video-dummy-0.2.0/generic/series b/patches/xf86-video-dummy-0.2.0/generic/series new file mode 100644 index 000000000..8f72b2fab --- /dev/null +++ b/patches/xf86-video-dummy-0.2.0/generic/series @@ -0,0 +1 @@ +xf86-video-dummy-0.2.0-sdkdir.diff diff --git a/patches/xf86-video-dummy-X11R7.1-0.2.0/generic/xf86-video-dummy-X11R7.1-0.2.0-sdkdir.diff b/patches/xf86-video-dummy-0.2.0/generic/xf86-video-dummy-0.2.0-sdkdir.diff index 5e60a5a47..5e60a5a47 100644 --- a/patches/xf86-video-dummy-X11R7.1-0.2.0/generic/xf86-video-dummy-X11R7.1-0.2.0-sdkdir.diff +++ b/patches/xf86-video-dummy-0.2.0/generic/xf86-video-dummy-0.2.0-sdkdir.diff diff --git a/patches/xf86-video-dummy-X11R7.1-0.2.0/generic/series b/patches/xf86-video-dummy-X11R7.1-0.2.0/generic/series deleted file mode 100644 index 6b23f4f86..000000000 --- a/patches/xf86-video-dummy-X11R7.1-0.2.0/generic/series +++ /dev/null @@ -1 +0,0 @@ -xf86-video-dummy-X11R7.1-0.2.0-sdkdir.diff diff --git a/patches/xf86-video-fbdev-X11R7.1-0.3.0/generic/ignore-timing-option.diff b/patches/xf86-video-fbdev-0.3.1/generic/ignore-timing-option.diff index a1bef66e3..19a0a201b 100644 --- a/patches/xf86-video-fbdev-X11R7.1-0.3.0/generic/ignore-timing-option.diff +++ b/patches/xf86-video-fbdev-0.3.1/generic/ignore-timing-option.diff @@ -11,28 +11,27 @@ # # <upstream state of this problem> # -Index: xf86-video-fbdev-X11R7.0-0.1.0.5/src/fbdev.c +Index: xf86-video-fbdev-0.3.1/src/fbdev.c =================================================================== ---- xf86-video-fbdev-X11R7.0-0.1.0.5.orig/src/fbdev.c -+++ xf86-video-fbdev-X11R7.0-0.1.0.5/src/fbdev.c -@@ -114,13 +114,15 @@ static SymTabRec FBDevChipsets[] = { - typedef enum { +--- xf86-video-fbdev-0.3.1.orig/src/fbdev.c 2006-12-29 12:39:35.000000000 +0100 ++++ xf86-video-fbdev-0.3.1/src/fbdev.c 2007-10-18 18:47:00.000000000 +0200 +@@ -104,6 +104,7 @@ OPTION_SHADOW_FB, OPTION_ROTATE, -- OPTION_FBDEV -+ OPTION_FBDEV, -+ OPTION_DONT_SET_TIMING + OPTION_FBDEV, ++ OPTION_DONT_SET_TIMING, + OPTION_DEBUG } FBDevOpts; - static const OptionInfoRec FBDevOptions[] = { +@@ -111,6 +112,7 @@ { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_ROTATE, "Rotate", OPTV_STRING, {0}, FALSE }, { OPTION_FBDEV, "fbdev", OPTV_STRING, {0}, FALSE }, + { OPTION_DONT_SET_TIMING, "DontSetTiming", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_DEBUG, "debug", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; - -@@ -510,9 +512,11 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag +@@ -503,9 +505,11 @@ } /* select video modes */ diff --git a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series b/patches/xf86-video-vesa-1.3.0/generic/series index 3549e2472..3549e2472 100644 --- a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/series +++ b/patches/xf86-video-vesa-1.3.0/generic/series diff --git a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff b/patches/xf86-video-vesa-1.3.0/generic/vesa.diff index fc2d912bc..fc2d912bc 100644 --- a/patches/xf86-video-vesa-X11R7.1-1.2.0/generic/vesa.diff +++ b/patches/xf86-video-vesa-1.3.0/generic/vesa.diff diff --git a/patches/xorg-server-1.4/generic/series b/patches/xorg-server-1.4/generic/series new file mode 100644 index 000000000..66e7e5783 --- /dev/null +++ b/patches/xorg-server-1.4/generic/series @@ -0,0 +1,3 @@ +xorg-server-1.4-remove-link-dependency.diff +xorg-server-1.4-libdrm.diff +xorg-server-1.4-reconf.diff diff --git a/patches/xorg-server-1.4/generic/xorg-server-1.4-libdrm.diff b/patches/xorg-server-1.4/generic/xorg-server-1.4-libdrm.diff new file mode 100644 index 000000000..dd72695b0 --- /dev/null +++ b/patches/xorg-server-1.4/generic/xorg-server-1.4-libdrm.diff @@ -0,0 +1,30 @@ +# +# Submitted-By: Robert Schwebel, 2006-10-19 +# Committed-By: Robert Schwebel +# +# Error: +# +# no error, at least not if you have installed libdrm on the host :) +# +# Description: +# +# This code includes host header files. +# +# State: +# +# unknown +# + +Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-10-17 18:48:54.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2007-10-17 18:48:58.000000000 +0200 +@@ -41,7 +41,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/patches/xorg-server-1.4/generic/xorg-server-1.4-reconf.diff b/patches/xorg-server-1.4/generic/xorg-server-1.4-reconf.diff new file mode 100644 index 000000000..2c6acfbf0 --- /dev/null +++ b/patches/xorg-server-1.4/generic/xorg-server-1.4-reconf.diff @@ -0,0 +1,34 @@ +Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.in +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.in 2007-10-17 21:16:57.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.in 2007-10-17 21:18:42.000000000 +0200 +@@ -411,7 +411,7 @@ + $(PLATFORM_PCI_SUPPORT) + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ +Index: xorg-server-1.4/hw/xfree86/xaa/Makefile.in +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/xaa/Makefile.in 2007-10-17 21:16:57.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/xaa/Makefile.in 2007-10-17 21:18:45.000000000 +0200 +@@ -60,7 +60,7 @@ + am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(sdkdir)" + moduleLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(module_LTLIBRARIES) +-libxaa_la_DEPENDENCIES = $(top_builddir)/miext/cw/libcw.la ++libxaa_la_LIBADD = + am__objects_1 = s-xaaLine.lo s-xaaDashLine.lo + am__objects_2 = l-xaaBitmap.lo l-xaaStipple.lo l-xaaTEGlyph.lo + am__objects_3 = m-xaaBitmap.lo m-xaaStipple.lo m-xaaTEGlyph.lo +@@ -399,7 +399,6 @@ + MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c + POLYSEG = s-xaaLine.c s-xaaDashLine.c + libxaa_la_LDFLAGS = -avoid-version +-libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la + module_LTLIBRARIES = libxaa.la + libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \ + xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \ diff --git a/patches/xorg-server-1.4/generic/xorg-server-1.4-remove-link-dependency.diff b/patches/xorg-server-1.4/generic/xorg-server-1.4-remove-link-dependency.diff new file mode 100644 index 000000000..c79d190a3 --- /dev/null +++ b/patches/xorg-server-1.4/generic/xorg-server-1.4-remove-link-dependency.diff @@ -0,0 +1,12 @@ +Index: xorg-server-1.4/hw/xfree86/xaa/Makefile.am +=================================================================== +--- xorg-server-1.4.orig/hw/xfree86/xaa/Makefile.am 2007-10-17 21:16:59.000000000 +0200 ++++ xorg-server-1.4/hw/xfree86/xaa/Makefile.am 2007-10-17 21:17:24.000000000 +0200 +@@ -9,7 +9,6 @@ + POLYSEG = s-xaaLine.c s-xaaDashLine.c + + libxaa_la_LDFLAGS = -avoid-version +-libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la + + module_LTLIBRARIES = libxaa.la + libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \ diff --git a/patches/xorg-server-X11R7.1-1.1.0/generic/series b/patches/xorg-server-X11R7.1-1.1.0/generic/series deleted file mode 100644 index e8683b435..000000000 --- a/patches/xorg-server-X11R7.1-1.1.0/generic/series +++ /dev/null @@ -1,3 +0,0 @@ -xorg-server-1.1.0-fontcache.diff -xorg-server-1.1.0-libdrm.diff -xorg-server-1.1.0-reconf.diff diff --git a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-fontcache.diff b/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-fontcache.diff deleted file mode 100644 index f9f509275..000000000 --- a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-fontcache.diff +++ /dev/null @@ -1,36 +0,0 @@ -# -# Submitted-By: Erwin Rol, 2006-02-22 -# Committed-By: Erwin Rol -# -# Error: -# -# i586-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../include -I../include -I../include -I../include -I../include -I../include -I../hw/xfree86/dixmods/extmod -I../hw/xfree86/os-support -isystem /home/erwin/projects/annax/devenv/visbox/local/i586-unknown-linux-gnu/include -isystem /home/erwin/projects/annax/devenv/visbox/local/i586-unknown-linux-gnu/usr/include -DHAVE_DIX_CONFIG_H -DXFree86Server -DXFree86LOADER -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/home/erwin/projects/annax/devenv/visbox/local/i586-unknown-linux-gnu/usr/include -I/home/erwin/projects/annax/devenv/visbox/local/i586-unknown-linux-gnu/usr/include/freetype2 -I../include -I../include -I../Xext -I../damageext -I../xfixes -I../Xi -I../mi -I../miext/shadow -I../miext/damage -I../render -I../randr -I../fb -g -O2 -MT fontcache.lo -MD -MP -MF .deps/fontcache.Tpo -c fontcache.c -fPIC -DPIC -o .libs/fontcache.o -# fontcache.c:49:24: fontcacheP.h: No such file or directory -# fontcache.c:50:25: fontcachstr.h: No such file or directory -# fontcache.c:79: warning: no previous prototype for 'FontCacheExtensionInit' -# -# -# Description: -# -# The missing header files are in .../include/X11/extensions/ but the source files -# includes them as "fontcacheP.h" so they are not found. I am not sure if this -# is not an other configuration error, but this patch seems to work for now. -# -# State: -# -# Unknown. -# - ---- xorg-server-X11R7.0-1.0.1/Xext/fontcache.c.orig 2006-02-22 01:10:48.000000000 +0100 -+++ xorg-server-X11R7.0-1.0.1/Xext/fontcache.c 2006-02-22 01:11:20.000000000 +0100 -@@ -46,8 +46,8 @@ - #include "inputstr.h" - #include "servermd.h" - #define _FONTCACHE_SERVER_ --#include "fontcacheP.h" --#include "fontcachstr.h" -+#include <X11/extensions/fontcacheP.h> -+#include <X11/extensions/fontcachstr.h> - #include <X11/Xfuncproto.h> - - #include "swaprep.h" diff --git a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-libdrm.diff b/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-libdrm.diff deleted file mode 100644 index 333ae87aa..000000000 --- a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-libdrm.diff +++ /dev/null @@ -1,29 +0,0 @@ -# -# Submitted-By: Robert Schwebel, 2006-10-19 -# Committed-By: Robert Schwebel -# -# Error: -# -# no error, at least not if you have installed libdrm on the host :) -# -# Description: -# -# This code includes host header files. -# -# State: -# -# unknown -# - -diff -urN xorg-server-1.1.0/hw/xfree86/os-support/linux/Makefile.am xorg-server-1.1.0-ptx/hw/xfree86/os-support/linux/Makefile.am ---- xorg-server-1.1.0/hw/xfree86/os-support/linux/Makefile.am 2006-05-09 20:04:29.000000000 +0200 -+++ xorg-server-1.1.0-ptx/hw/xfree86/os-support/linux/Makefile.am 2006-10-19 09:21:52.000000000 +0200 -@@ -36,7 +36,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ - --INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SOURCES = \ diff --git a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-reconf.diff b/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-reconf.diff deleted file mode 100644 index a080725e1..000000000 --- a/patches/xorg-server-X11R7.1-1.1.0/generic/xorg-server-1.1.0-reconf.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN xorg-server-1.1.0-ptx/hw/xfree86/os-support/linux/Makefile.in xorg-server-1.1.0/hw/xfree86/os-support/linux/Makefile.in ---- xorg-server-1.1.0-ptx/hw/xfree86/os-support/linux/Makefile.in 2006-05-22 19:21:09.000000000 +0200 -+++ xorg-server-1.1.0/hw/xfree86/os-support/linux/Makefile.in 2006-10-19 09:42:39.000000000 +0200 -@@ -568,7 +570,7 @@ - $(PLATFORM_PCI_SUPPORT) - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ --INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SOURCES = \ diff --git a/rules/host-libpthread-stubs.in b/rules/host-libpthread-stubs.in new file mode 100644 index 000000000..6ada36172 --- /dev/null +++ b/rules/host-libpthread-stubs.in @@ -0,0 +1,2 @@ +config HOST_LIBPTHREAD_STUBS + bool diff --git a/rules/host-libpthread-stubs.make b/rules/host-libpthread-stubs.make new file mode 100644 index 000000000..88ef4426a --- /dev/null +++ b/rules/host-libpthread-stubs.make @@ -0,0 +1,97 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBPTHREAD_STUBS) += host-libpthread-stubs + +# +# Paths and names +# +HOST_LIBPTHREAD_STUBS_DIR = $(HOST_BUILDDIR)/$(LIBPTHREAD_STUBS) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_get: $(STATEDIR)/host-libpthread-stubs.get + +$(STATEDIR)/host-libpthread-stubs.get: $(STATEDIR)/libpthread-stubs.get + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_extract: $(STATEDIR)/host-libpthread-stubs.extract + +$(STATEDIR)/host-libpthread-stubs.extract: $(host-libpthread-stubs_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_LIBPTHREAD_STUBS_DIR)) + @$(call extract, LIBPTHREAD_STUBS, $(HOST_BUILDDIR)) + @$(call patchin, LIBPTHREAD_STUBS, $(HOST_LIBPTHREAD_STUBS_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_prepare: $(STATEDIR)/host-libpthread-stubs.prepare + +HOST_LIBPTHREAD_STUBS_PATH := PATH=$(HOST_PATH) +HOST_LIBPTHREAD_STUBS_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_LIBPTHREAD_STUBS_AUTOCONF := $(HOST_AUTOCONF) + +$(STATEDIR)/host-libpthread-stubs.prepare: $(host-libpthread-stubs_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_LIBPTHREAD_STUBS_DIR)/config.cache) + cd $(HOST_LIBPTHREAD_STUBS_DIR) && \ + $(HOST_LIBPTHREAD_STUBS_PATH) $(HOST_LIBPTHREAD_STUBS_ENV) \ + ./configure $(HOST_LIBPTHREAD_STUBS_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_compile: $(STATEDIR)/host-libpthread-stubs.compile + +$(STATEDIR)/host-libpthread-stubs.compile: $(host-libpthread-stubs_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_LIBPTHREAD_STUBS_DIR) && $(HOST_LIBPTHREAD_STUBS_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_install: $(STATEDIR)/host-libpthread-stubs.install + +$(STATEDIR)/host-libpthread-stubs.install: $(host-libpthread-stubs_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_LIBPTHREAD_STUBS,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-libpthread-stubs_clean: + rm -rf $(STATEDIR)/host-libpthread-stubs.* + rm -rf $(HOST_LIBPTHREAD_STUBS_DIR) + +# vim: syntax=make diff --git a/rules/host-libxcb.in b/rules/host-libxcb.in new file mode 100644 index 000000000..c2a0650ee --- /dev/null +++ b/rules/host-libxcb.in @@ -0,0 +1,7 @@ +config HOST_LIBXCB + bool + select HOST_XCB_PROTO + select HOST_LIBXSLT + select HOST_LIBXSLT_XSLTPROC + select HOST_LIBPTHREAD_STUBS + select HOST_XORG_LIB_XAU diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make new file mode 100644 index 000000000..63c1cee7d --- /dev/null +++ b/rules/host-libxcb.make @@ -0,0 +1,99 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_LIBXCB) += host-libxcb + +# +# Paths and names +# +HOST_LIBXCB_DIR = $(HOST_BUILDDIR)/$(LIBXCB) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-libxcb_get: $(STATEDIR)/host-libxcb.get + +$(STATEDIR)/host-libxcb.get: $(STATEDIR)/libxcb.get + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-libxcb_extract: $(STATEDIR)/host-libxcb.extract + +$(STATEDIR)/host-libxcb.extract: $(host-libxcb_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_LIBXCB_DIR)) + @$(call extract, LIBXCB, $(HOST_BUILDDIR)) + @$(call patchin, LIBXCB, $(HOST_LIBXCB_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-libxcb_prepare: $(STATEDIR)/host-libxcb.prepare + +HOST_LIBXCB_PATH := PATH=$(HOST_PATH) +HOST_LIBXCB_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_LIBXCB_AUTOCONF := \ + $(HOST_AUTOCONF) \ + --disable-build-docs + +$(STATEDIR)/host-libxcb.prepare: $(host-libxcb_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_LIBXCB_DIR)/config.cache) + cd $(HOST_LIBXCB_DIR) && \ + $(HOST_LIBXCB_PATH) $(HOST_LIBXCB_ENV) \ + ./configure $(HOST_LIBXCB_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-libxcb_compile: $(STATEDIR)/host-libxcb.compile + +$(STATEDIR)/host-libxcb.compile: $(host-libxcb_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_LIBXCB_DIR) && $(HOST_LIBXCB_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-libxcb_install: $(STATEDIR)/host-libxcb.install + +$(STATEDIR)/host-libxcb.install: $(host-libxcb_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_LIBXCB,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-libxcb_clean: + rm -rf $(STATEDIR)/host-libxcb.* + rm -rf $(HOST_LIBXCB_DIR) + +# vim: syntax=make diff --git a/rules/host-xcb-proto.in b/rules/host-xcb-proto.in new file mode 100644 index 000000000..e70b0ec93 --- /dev/null +++ b/rules/host-xcb-proto.in @@ -0,0 +1,2 @@ +config HOST_XCB_PROTO + bool diff --git a/rules/host-xcb-proto.make b/rules/host-xcb-proto.make new file mode 100644 index 000000000..ea7534e0e --- /dev/null +++ b/rules/host-xcb-proto.make @@ -0,0 +1,97 @@ +# -*-makefile-*- +# $Id$ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_XCB_PROTO) += host-xcb-proto + +# +# Paths and names +# +HOST_XCB_PROTO_DIR = $(HOST_BUILDDIR)/$(XCB_PROTO) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +host-xcb-proto_get: $(STATEDIR)/host-xcb-proto.get + +$(STATEDIR)/host-xcb-proto.get: $(STATEDIR)/xcb-proto.get + @$(call targetinfo, $@) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +host-xcb-proto_extract: $(STATEDIR)/host-xcb-proto.extract + +$(STATEDIR)/host-xcb-proto.extract: $(host-xcb-proto_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_XCB_PROTO_DIR)) + @$(call extract, XCB_PROTO, $(HOST_BUILDDIR)) + @$(call patchin, XCB_PROTO, $(HOST_XCB_PROTO_DIR)) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +host-xcb-proto_prepare: $(STATEDIR)/host-xcb-proto.prepare + +HOST_XCB_PROTO_PATH := PATH=$(HOST_PATH) +HOST_XCB_PROTO_ENV := $(HOST_ENV) + +# +# autoconf +# +HOST_XCB_PROTO_AUTOCONF := $(HOST_AUTOCONF) + +$(STATEDIR)/host-xcb-proto.prepare: $(host-xcb-proto_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(HOST_XCB_PROTO_DIR)/config.cache) + cd $(HOST_XCB_PROTO_DIR) && \ + $(HOST_XCB_PROTO_PATH) $(HOST_XCB_PROTO_ENV) \ + ./configure $(HOST_XCB_PROTO_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +host-xcb-proto_compile: $(STATEDIR)/host-xcb-proto.compile + +$(STATEDIR)/host-xcb-proto.compile: $(host-xcb-proto_compile_deps_default) + @$(call targetinfo, $@) + cd $(HOST_XCB_PROTO_DIR) && $(HOST_XCB_PROTO_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +host-xcb-proto_install: $(STATEDIR)/host-xcb-proto.install + +$(STATEDIR)/host-xcb-proto.install: $(host-xcb-proto_install_deps_default) + @$(call targetinfo, $@) + @$(call install, HOST_XCB_PROTO,,h) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +host-xcb-proto_clean: + rm -rf $(STATEDIR)/host-xcb-proto.* + rm -rf $(HOST_XCB_PROTO_DIR) + +# vim: syntax=make diff --git a/rules/host-xorg-lib-X11.in b/rules/host-xorg-lib-X11.in index 9d1cd778a..e917cc17a 100644 --- a/rules/host-xorg-lib-X11.in +++ b/rules/host-xorg-lib-X11.in @@ -2,6 +2,7 @@ config HOST_XORG_LIB_X11 bool select HOST_XORG_PROTO_X + select HOST_LIBXCB select HOST_XORG_PROTO_XEXT select HOST_XORG_LIB_XTRANS select HOST_XORG_LIB_XAU diff --git a/rules/hosttools.in b/rules/hosttools.in index cfaa7c9ab..81f07f961 100644 --- a/rules/hosttools.in +++ b/rules/hosttools.in @@ -44,6 +44,7 @@ source "rules/host-localedef.in" source "rules/host-fontconfig.in" source "rules/host-libxml2.in" source "rules/host-libxslt.in" +source "rules/host-libpthread-stubs.in" comment "------------------------------" comment "Scripting Languages " @@ -62,6 +63,8 @@ source "rules/host-mysql.in" source "rules/host-zlib.in" source "rules/host-mtd-utils.in" source "rules/host-pkg-config.in" +source "rules/host-xcb-proto.in" +source "rules/host-libxcb.in" source "rules/host-xorg-app-bdftopcf.in" source "rules/host-xorg-app-mkfontdir.in" source "rules/host-xorg-app-mkfontscale.in" diff --git a/rules/libiconv.make b/rules/libiconv.make index b01716d3f..c190c2562 100644 --- a/rules/libiconv.make +++ b/rules/libiconv.make @@ -63,7 +63,8 @@ LIBICONV_ENV := $(CROSS_ENV) # # autoconf # -LIBICONV_AUTOCONF := $(CROSS_AUTOCONF_USR) +LIBICONV_AUTOCONF := $(CROSS_AUTOCONF_USR) \ + --enable-static ifdef PTXCONF_LIBICONV_EXTRA_ENCODINGS LIBICONV_AUTOCONF += --enable-extra-encodings diff --git a/rules/libpthread-stubs.in b/rules/libpthread-stubs.in new file mode 100644 index 000000000..05b429ba5 --- /dev/null +++ b/rules/libpthread-stubs.in @@ -0,0 +1,2 @@ +config LIBPTHREAD_STUBS + bool diff --git a/rules/libpthread-stubs.make b/rules/libpthread-stubs.make new file mode 100644 index 000000000..a85b44705 --- /dev/null +++ b/rules/libpthread-stubs.make @@ -0,0 +1,129 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBPTHREAD_STUBS) += libpthread-stubs + +# +# Paths and names +# +LIBPTHREAD_STUBS_VERSION := 0.1 +LIBPTHREAD_STUBS := libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION) +LIBPTHREAD_STUBS_SUFFIX := tar.bz2 +LIBPTHREAD_STUBS_URL := http://xcb.freedesktop.org/dist/$(LIBPTHREAD_STUBS).$(LIBPTHREAD_STUBS_SUFFIX) +LIBPTHREAD_STUBS_SOURCE := $(SRCDIR)/$(LIBPTHREAD_STUBS).$(LIBPTHREAD_STUBS_SUFFIX) +LIBPTHREAD_STUBS_DIR := $(BUILDDIR)/$(LIBPTHREAD_STUBS) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +libpthread-stubs_get: $(STATEDIR)/libpthread-stubs.get + +$(STATEDIR)/libpthread-stubs.get: $(libpthread-stubs_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(LIBPTHREAD_STUBS_SOURCE): + @$(call targetinfo, $@) + @$(call get, LIBPTHREAD_STUBS) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +libpthread-stubs_extract: $(STATEDIR)/libpthread-stubs.extract + +$(STATEDIR)/libpthread-stubs.extract: $(libpthread-stubs_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(LIBPTHREAD_STUBS_DIR)) + @$(call extract, LIBPTHREAD_STUBS) + @$(call patchin, LIBPTHREAD_STUBS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +libpthread-stubs_prepare: $(STATEDIR)/libpthread-stubs.prepare + +LIBPTHREAD_STUBS_PATH := PATH=$(CROSS_PATH) +LIBPTHREAD_STUBS_ENV := $(CROSS_ENV) + +# +# autoconf +# +LIBPTHREAD_STUBS_AUTOCONF := $(CROSS_AUTOCONF_USR) + +$(STATEDIR)/libpthread-stubs.prepare: $(libpthread-stubs_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(LIBPTHREAD_STUBS_DIR)/config.cache) + cd $(LIBPTHREAD_STUBS_DIR) && \ + $(LIBPTHREAD_STUBS_PATH) $(LIBPTHREAD_STUBS_ENV) \ + ./configure $(LIBPTHREAD_STUBS_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +libpthread-stubs_compile: $(STATEDIR)/libpthread-stubs.compile + +$(STATEDIR)/libpthread-stubs.compile: $(libpthread-stubs_compile_deps_default) + @$(call targetinfo, $@) + cd $(LIBPTHREAD_STUBS_DIR) && $(LIBPTHREAD_STUBS_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +libpthread-stubs_install: $(STATEDIR)/libpthread-stubs.install + +$(STATEDIR)/libpthread-stubs.install: $(libpthread-stubs_install_deps_default) + @$(call targetinfo, $@) + @$(call install, LIBPTHREAD_STUBS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +libpthread-stubs_targetinstall: $(STATEDIR)/libpthread-stubs.targetinstall + +$(STATEDIR)/libpthread-stubs.targetinstall: $(libpthread-stubs_targetinstall_deps_default) + @$(call targetinfo, $@) + + @$(call install_init, libpthread-stubs) + @$(call install_fixup, libpthread-stubs,PACKAGE,libpthread-stubs) + @$(call install_fixup, libpthread-stubs,PRIORITY,optional) + @$(call install_fixup, libpthread-stubs,VERSION,$(LIBPTHREAD_STUBS_VERSION)) + @$(call install_fixup, libpthread-stubs,SECTION,base) + @$(call install_fixup, libpthread-stubs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, libpthread-stubs,DEPENDS,) + @$(call install_fixup, libpthread-stubs,DESCRIPTION,missing) + + @$(call install_finish, libpthread-stubs) + + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +libpthread-stubs_clean: + rm -rf $(STATEDIR)/libpthread-stubs.* + rm -rf $(IMAGEDIR)/libpthread-stubs_* + rm -rf $(LIBPTHREAD_STUBS_DIR) + +# vim: syntax=make diff --git a/rules/libxcb.in b/rules/libxcb.in new file mode 100644 index 000000000..473747cb8 --- /dev/null +++ b/rules/libxcb.in @@ -0,0 +1,12 @@ +config LIBXCB + bool + prompt "libxcb" + select XCB_PROTO + select LIBXSLT + select LIBXSLT_XSLTPROC + select LIBPTHREAD_STUBS + select XORG_LIB_XAU + help + The X protocol C-language Binding (XCB) is a replacement for Xlib + featuring a small footprint, latency hiding, direct access to the + protocol, improved threading support, and extensibility. diff --git a/rules/libxcb.make b/rules/libxcb.make new file mode 100644 index 000000000..2384a8f10 --- /dev/null +++ b/rules/libxcb.make @@ -0,0 +1,198 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBXCB) += libxcb + +# +# Paths and names +# +LIBXCB_VERSION := 1.0 +LIBXCB := libxcb-$(LIBXCB_VERSION) +LIBXCB_SUFFIX := tar.bz2 +LIBXCB_URL := http://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX) +LIBXCB_SOURCE := $(SRCDIR)/$(LIBXCB).$(LIBXCB_SUFFIX) +LIBXCB_DIR := $(BUILDDIR)/$(LIBXCB) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +libxcb_get: $(STATEDIR)/libxcb.get + +$(STATEDIR)/libxcb.get: $(libxcb_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(LIBXCB_SOURCE): + @$(call targetinfo, $@) + @$(call get, LIBXCB) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +libxcb_extract: $(STATEDIR)/libxcb.extract + +$(STATEDIR)/libxcb.extract: $(libxcb_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(LIBXCB_DIR)) + @$(call extract, LIBXCB) + @$(call patchin, LIBXCB) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +libxcb_prepare: $(STATEDIR)/libxcb.prepare + +LIBXCB_PATH := PATH=$(CROSS_PATH) +LIBXCB_ENV := $(CROSS_ENV) + +# +# autoconf +# +LIBXCB_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --disable-build-docs + +$(STATEDIR)/libxcb.prepare: $(libxcb_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(LIBXCB_DIR)/config.cache) + cd $(LIBXCB_DIR) && \ + $(LIBXCB_PATH) $(LIBXCB_ENV) \ + ./configure $(LIBXCB_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +libxcb_compile: $(STATEDIR)/libxcb.compile + +$(STATEDIR)/libxcb.compile: $(libxcb_compile_deps_default) + @$(call targetinfo, $@) + cd $(LIBXCB_DIR) && $(LIBXCB_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +libxcb_install: $(STATEDIR)/libxcb.install + +$(STATEDIR)/libxcb.install: $(libxcb_install_deps_default) + @$(call targetinfo, $@) + @$(call install, LIBXCB) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +libxcb_targetinstall: $(STATEDIR)/libxcb.targetinstall + +$(STATEDIR)/libxcb.targetinstall: $(libxcb_targetinstall_deps_default) + @$(call targetinfo, $@) + + @$(call install_init, libxcb) + @$(call install_fixup, libxcb,PACKAGE,libxcb) + @$(call install_fixup, libxcb,PRIORITY,optional) + @$(call install_fixup, libxcb,VERSION,$(LIBXCB_VERSION)) + @$(call install_fixup, libxcb,SECTION,base) + @$(call install_fixup, libxcb,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, libxcb,DEPENDS,) + @$(call install_fixup, libxcb,DESCRIPTION,missing) + + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so.0.0.0) + @$(call install_link, libxcb, libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so.0) + @$(call install_link, libxcb, libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so.0.0.0) + @$(call install_link, libxcb, libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so.0) + @$(call install_link, libxcb, libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so.0.0.0) + @$(call install_link, libxcb, libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so.0) + @$(call install_link, libxcb, libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so.0.0.0) + @$(call install_link, libxcb, libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so.0) + @$(call install_link, libxcb, libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so.0.0.0) + @$(call install_link, libxcb, libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so.0) + @$(call install_link, libxcb, libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so.0.0.0) + @$(call install_link, libxcb, libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so.0) + @$(call install_link, libxcb, libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so.0.0.0) + @$(call install_link, libxcb, libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so.0) + @$(call install_link, libxcb, libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so.0.0.0) + @$(call install_link, libxcb, libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so.0) + @$(call install_link, libxcb, libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so.0.0.0) + @$(call install_link, libxcb, libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so.0) + @$(call install_link, libxcb, libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so.0.0.0) + @$(call install_link, libxcb, libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so.0) + @$(call install_link, libxcb, libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so.0.0.0) + @$(call install_link, libxcb, libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so.0) + @$(call install_link, libxcb, libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so.0.0.0) + @$(call install_link, libxcb, libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so.0) + @$(call install_link, libxcb, libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so.0.0.0) + @$(call install_link, libxcb, libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so.0) + @$(call install_link, libxcb, libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so.0.0.0) + @$(call install_link, libxcb, libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so.0) + @$(call install_link, libxcb, libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so.0.0.0) + @$(call install_link, libxcb, libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so.0) + @$(call install_link, libxcb, libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so.0.0.0) + @$(call install_link, libxcb, libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so.0) + @$(call install_link, libxcb, libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so.0.0.0) + @$(call install_link, libxcb, libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so.0) + @$(call install_link, libxcb, libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so.0.0.0) + @$(call install_link, libxcb, libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so.0) + @$(call install_link, libxcb, libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so.0.0.0) + @$(call install_link, libxcb, libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so.0) + @$(call install_link, libxcb, libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so.0.0.0) + @$(call install_link, libxcb, libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so.0) + @$(call install_link, libxcb, libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so.0.0.0) + @$(call install_link, libxcb, libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so.0) + @$(call install_link, libxcb, libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so) + @$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb.so.1.0.0, /usr/lib/libxcb.so.1.0.0) + @$(call install_link, libxcb, libxcb.so.1.0.0, /usr/lib/libxcb.so.1) + @$(call install_link, libxcb, libxcb.so.1.0.0, /usr/lib/libxcb.so) + + @$(call install_finish, libxcb) + + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +libxcb_clean: + rm -rf $(STATEDIR)/libxcb.* + rm -rf $(IMAGEDIR)/libxcb_* + rm -rf $(LIBXCB_DIR) + +# vim: syntax=make diff --git a/rules/pixman.in b/rules/pixman.in new file mode 100644 index 000000000..30d17c366 --- /dev/null +++ b/rules/pixman.in @@ -0,0 +1,6 @@ +config PIXMAN + bool + prompt "pixman" + help + Pixman contains lowlevel pixel manipulation routines and is used by + both xorg and cairo. diff --git a/rules/pixman.make b/rules/pixman.make new file mode 100644 index 000000000..d8e8618a6 --- /dev/null +++ b/rules/pixman.make @@ -0,0 +1,133 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PIXMAN) += pixman + +# +# Paths and names +# +PIXMAN_VERSION := 0.9.5 +PIXMAN := pixman-$(PIXMAN_VERSION) +PIXMAN_SUFFIX := tar.bz2 +PIXMAN_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib//$(PIXMAN).$(PIXMAN_SUFFIX) +PIXMAN_SOURCE := $(SRCDIR)/$(PIXMAN).$(PIXMAN_SUFFIX) +PIXMAN_DIR := $(BUILDDIR)/$(PIXMAN) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +pixman_get: $(STATEDIR)/pixman.get + +$(STATEDIR)/pixman.get: $(pixman_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(PIXMAN_SOURCE): + @$(call targetinfo, $@) + @$(call get, PIXMAN) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +pixman_extract: $(STATEDIR)/pixman.extract + +$(STATEDIR)/pixman.extract: $(pixman_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(PIXMAN_DIR)) + @$(call extract, PIXMAN) + @$(call patchin, PIXMAN) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +pixman_prepare: $(STATEDIR)/pixman.prepare + +PIXMAN_PATH := PATH=$(CROSS_PATH) +PIXMAN_ENV := $(CROSS_ENV) + +# +# autoconf +# +PIXMAN_AUTOCONF := $(CROSS_AUTOCONF_USR) + +$(STATEDIR)/pixman.prepare: $(pixman_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(PIXMAN_DIR)/config.cache) + cd $(PIXMAN_DIR) && \ + $(PIXMAN_PATH) $(PIXMAN_ENV) \ + ./configure $(PIXMAN_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +pixman_compile: $(STATEDIR)/pixman.compile + +$(STATEDIR)/pixman.compile: $(pixman_compile_deps_default) + @$(call targetinfo, $@) + cd $(PIXMAN_DIR) && $(PIXMAN_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +pixman_install: $(STATEDIR)/pixman.install + +$(STATEDIR)/pixman.install: $(pixman_install_deps_default) + @$(call targetinfo, $@) + @$(call install, PIXMAN) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +pixman_targetinstall: $(STATEDIR)/pixman.targetinstall + +$(STATEDIR)/pixman.targetinstall: $(pixman_targetinstall_deps_default) + @$(call targetinfo, $@) + + @$(call install_init, pixman) + @$(call install_fixup, pixman,PACKAGE,pixman) + @$(call install_fixup, pixman,PRIORITY,optional) + @$(call install_fixup, pixman,VERSION,$(PIXMAN_VERSION)) + @$(call install_fixup, pixman,SECTION,base) + @$(call install_fixup, pixman,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, pixman,DEPENDS,) + @$(call install_fixup, pixman,DESCRIPTION,missing) + + @$(call install_copy, pixman, 0, 0, 0644, $(PIXMAN_DIR)/pixman/.libs/libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so.0.9.5) + @$(call install_link, pixman, libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so.0) + @$(call install_link, pixman, libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so) + + @$(call install_finish, pixman) + + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +pixman_clean: + rm -rf $(STATEDIR)/pixman.* + rm -rf $(IMAGEDIR)/pixman_* + rm -rf $(PIXMAN_DIR) + +# vim: syntax=make diff --git a/rules/xcb-proto.in b/rules/xcb-proto.in new file mode 100644 index 000000000..33bdfb4bf --- /dev/null +++ b/rules/xcb-proto.in @@ -0,0 +1,7 @@ +config XCB_PROTO + bool + prompt "xcb-proto" + help + The X protocol C-language Binding (XCB) is a replacement for Xlib + featuring a small footprint, latency hiding, direct access to the + protocol, improved threading support, and extensibility. diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make new file mode 100644 index 000000000..411ebd537 --- /dev/null +++ b/rules/xcb-proto.make @@ -0,0 +1,129 @@ +# -*-makefile-*- +# $Id: template 6655 2007-01-02 12:55:21Z rsc $ +# +# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto + +# +# Paths and names +# +XCB_PROTO_VERSION := 1.0 +XCB_PROTO := xcb-proto-$(XCB_PROTO_VERSION) +XCB_PROTO_SUFFIX := tar.bz2 +XCB_PROTO_URL := http://xcb.freedesktop.org/dist/$(XCB_PROTO).$(XCB_PROTO_SUFFIX) +XCB_PROTO_SOURCE := $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX) +XCB_PROTO_DIR := $(BUILDDIR)/$(XCB_PROTO) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- + +xcb-proto_get: $(STATEDIR)/xcb-proto.get + +$(STATEDIR)/xcb-proto.get: $(xcb-proto_get_deps_default) + @$(call targetinfo, $@) + @$(call touch, $@) + +$(XCB_PROTO_SOURCE): + @$(call targetinfo, $@) + @$(call get, XCB_PROTO) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +xcb-proto_extract: $(STATEDIR)/xcb-proto.extract + +$(STATEDIR)/xcb-proto.extract: $(xcb-proto_extract_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(XCB_PROTO_DIR)) + @$(call extract, XCB_PROTO) + @$(call patchin, XCB_PROTO) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +xcb-proto_prepare: $(STATEDIR)/xcb-proto.prepare + +XCB_PROTO_PATH := PATH=$(CROSS_PATH) +XCB_PROTO_ENV := $(CROSS_ENV) + +# +# autoconf +# +XCB_PROTO_AUTOCONF := $(CROSS_AUTOCONF_USR) + +$(STATEDIR)/xcb-proto.prepare: $(xcb-proto_prepare_deps_default) + @$(call targetinfo, $@) + @$(call clean, $(XCB_PROTO_DIR)/config.cache) + cd $(XCB_PROTO_DIR) && \ + $(XCB_PROTO_PATH) $(XCB_PROTO_ENV) \ + ./configure $(XCB_PROTO_AUTOCONF) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +xcb-proto_compile: $(STATEDIR)/xcb-proto.compile + +$(STATEDIR)/xcb-proto.compile: $(xcb-proto_compile_deps_default) + @$(call targetinfo, $@) + cd $(XCB_PROTO_DIR) && $(XCB_PROTO_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +xcb-proto_install: $(STATEDIR)/xcb-proto.install + +$(STATEDIR)/xcb-proto.install: $(xcb-proto_install_deps_default) + @$(call targetinfo, $@) + @$(call install, XCB_PROTO) + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +xcb-proto_targetinstall: $(STATEDIR)/xcb-proto.targetinstall + +$(STATEDIR)/xcb-proto.targetinstall: $(xcb-proto_targetinstall_deps_default) + @$(call targetinfo, $@) + + @$(call install_init, xcb-proto) + @$(call install_fixup, xcb-proto,PACKAGE,xcb-proto) + @$(call install_fixup, xcb-proto,PRIORITY,optional) + @$(call install_fixup, xcb-proto,VERSION,$(XCB_PROTO_VERSION)) + @$(call install_fixup, xcb-proto,SECTION,base) + @$(call install_fixup, xcb-proto,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, xcb-proto,DEPENDS,) + @$(call install_fixup, xcb-proto,DESCRIPTION,missing) + + @$(call install_finish, xcb-proto) + + @$(call touch, $@) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +xcb-proto_clean: + rm -rf $(STATEDIR)/xcb-proto.* + rm -rf $(IMAGEDIR)/xcb-proto_* + rm -rf $(XCB_PROTO_DIR) + +# vim: syntax=make diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make index a84bf04b1..e65c504cf 100644 --- a/rules/xorg-app-mkfontdir.make +++ b/rules/xorg-app-mkfontdir.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTDIR) += xorg-app-mkfontdir # # Paths and names # -XORG_APP_MKFONTDIR_VERSION := 1.0.2 -XORG_APP_MKFONTDIR := mkfontdir-X11R7.1-$(XORG_APP_MKFONTDIR_VERSION) +XORG_APP_MKFONTDIR_VERSION := 1.0.3 +XORG_APP_MKFONTDIR := mkfontdir-$(XORG_APP_MKFONTDIR_VERSION) XORG_APP_MKFONTDIR_SUFFIX := tar.bz2 -XORG_APP_MKFONTDIR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) +XORG_APP_MKFONTDIR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) XORG_APP_MKFONTDIR_SOURCE := $(SRCDIR)/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX) XORG_APP_MKFONTDIR_DIR := $(BUILDDIR)/$(XORG_APP_MKFONTDIR) diff --git a/rules/xorg-app-mkfontscale.make b/rules/xorg-app-mkfontscale.make index a308cd382..34c3397d9 100644 --- a/rules/xorg-app-mkfontscale.make +++ b/rules/xorg-app-mkfontscale.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTSCALE) += xorg-app-mkfontscale # # Paths and names # -XORG_APP_MKFONTSCALE_VERSION := 1.0.1 -XORG_APP_MKFONTSCALE := mkfontscale-X11R7.0-$(XORG_APP_MKFONTSCALE_VERSION) +XORG_APP_MKFONTSCALE_VERSION := 1.0.3 +XORG_APP_MKFONTSCALE := mkfontscale-$(XORG_APP_MKFONTSCALE_VERSION) XORG_APP_MKFONTSCALE_SUFFIX := tar.bz2 -XORG_APP_MKFONTSCALE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX) +XORG_APP_MKFONTSCALE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX) XORG_APP_MKFONTSCALE_SOURCE := $(SRCDIR)/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX) XORG_APP_MKFONTSCALE_DIR := $(BUILDDIR)/$(XORG_APP_MKFONTSCALE) diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make index b61def5ea..77a875491 100644 --- a/rules/xorg-app-rgb.make +++ b/rules/xorg-app-rgb.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_APP_RGB) += xorg-app-rgb # Paths and names # XORG_APP_RGB_VERSION := 1.0.1 -XORG_APP_RGB := rgb-X11R7.1-$(XORG_APP_RGB_VERSION) +XORG_APP_RGB := rgb-$(XORG_APP_RGB_VERSION) XORG_APP_RGB_SUFFIX := tar.bz2 -XORG_APP_RGB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX) +XORG_APP_RGB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX) XORG_APP_RGB_SOURCE := $(SRCDIR)/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX) XORG_APP_RGB_DIR := $(BUILDDIR)/$(XORG_APP_RGB) diff --git a/rules/xorg-app-setxkbmap.make b/rules/xorg-app-setxkbmap.make index 9c5788d39..6acaa39d8 100644 --- a/rules/xorg-app-setxkbmap.make +++ b/rules/xorg-app-setxkbmap.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_SETXKBMAP) += xorg-app-setxkbmap # # Paths and names # -XORG_APP_SETXKBMAP_VERSION := 1.0.2 -XORG_APP_SETXKBMAP := setxkbmap-X11R7.1-$(XORG_APP_SETXKBMAP_VERSION) +XORG_APP_SETXKBMAP_VERSION := 1.0.4 +XORG_APP_SETXKBMAP := setxkbmap-$(XORG_APP_SETXKBMAP_VERSION) XORG_APP_SETXKBMAP_SUFFIX := tar.bz2 -XORG_APP_SETXKBMAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app//$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX) +XORG_APP_SETXKBMAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX) XORG_APP_SETXKBMAP_SOURCE := $(SRCDIR)/$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX) XORG_APP_SETXKBMAP_DIR := $(BUILDDIR)/$(XORG_APP_SETXKBMAP) diff --git a/rules/xorg-app-xdm.in b/rules/xorg-app-xdm.in index 93f0276bf..4045232ec 100644 --- a/rules/xorg-app-xdm.in +++ b/rules/xorg-app-xdm.in @@ -5,6 +5,7 @@ config XORG_APP_XDM select XORG_LIB_XPM select XORG_LIB_XMU select XORG_LIB_XAW + select XORG_LIB_XAW_V7 # FIX: When the X server supports Xinerama, this package needs # the library ready for use! select XORG_LIB_XINERAMA if XORG_SERVER_EXT_XINERAMA diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make index cfcd0b0d4..24bcd5b7e 100644 --- a/rules/xorg-app-xdm.make +++ b/rules/xorg-app-xdm.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XDM) += xorg-app-xdm # # Paths and names # -XORG_APP_XDM_VERSION := 1.0.4 -XORG_APP_XDM := xdm-X11R7.1-$(XORG_APP_XDM_VERSION) +XORG_APP_XDM_VERSION := 1.1.6 +XORG_APP_XDM := xdm-$(XORG_APP_XDM_VERSION) XORG_APP_XDM_SUFFIX := tar.bz2 -XORG_APP_XDM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX) +XORG_APP_XDM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX) XORG_APP_XDM_SOURCE := $(SRCDIR)/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX) XORG_APP_XDM_DIR := $(BUILDDIR)/$(XORG_APP_XDM) diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make index 31e7b6b1e..004aa65b0 100644 --- a/rules/xorg-app-xeyes.make +++ b/rules/xorg-app-xeyes.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_APP_XEYES) += xorg-app-xeyes # Paths and names # XORG_APP_XEYES_VERSION := 1.0.1 -XORG_APP_XEYES := xeyes-X11R7.0-$(XORG_APP_XEYES_VERSION) +XORG_APP_XEYES := xeyes-$(XORG_APP_XEYES_VERSION) XORG_APP_XEYES_SUFFIX := tar.bz2 -XORG_APP_XEYES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX) +XORG_APP_XEYES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX) XORG_APP_XEYES_SOURCE := $(SRCDIR)/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX) XORG_APP_XEYES_DIR := $(BUILDDIR)/$(XORG_APP_XEYES) diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make index a56f92747..c6b150403 100644 --- a/rules/xorg-app-xhost.make +++ b/rules/xorg-app-xhost.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XHOST) += xorg-app-xhost # # Paths and names # -XORG_APP_XHOST_VERSION := 1.0.1 -XORG_APP_XHOST := xhost-X11R7.1-$(XORG_APP_XHOST_VERSION) +XORG_APP_XHOST_VERSION := 1.0.2 +XORG_APP_XHOST := xhost-$(XORG_APP_XHOST_VERSION) XORG_APP_XHOST_SUFFIX := tar.bz2 -XORG_APP_XHOST_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX) +XORG_APP_XHOST_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX) XORG_APP_XHOST_SOURCE := $(SRCDIR)/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX) XORG_APP_XHOST_DIR := $(BUILDDIR)/$(XORG_APP_XHOST) diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make index c502473ee..3a4b759db 100644 --- a/rules/xorg-app-xinit.make +++ b/rules/xorg-app-xinit.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XINIT) += xorg-app-xinit # # Paths and names # -XORG_APP_XINIT_VERSION := 1.0.2 -XORG_APP_XINIT := xinit-X11R7.1-$(XORG_APP_XINIT_VERSION) +XORG_APP_XINIT_VERSION := 1.0.5 +XORG_APP_XINIT := xinit-$(XORG_APP_XINIT_VERSION) XORG_APP_XINIT_SUFFIX := tar.bz2 -XORG_APP_XINIT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX) +XORG_APP_XINIT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX) XORG_APP_XINIT_SOURCE := $(SRCDIR)/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX) XORG_APP_XINIT_DIR := $(BUILDDIR)/$(XORG_APP_XINIT) diff --git a/rules/xorg-app-xkbcomp.make b/rules/xorg-app-xkbcomp.make index 38637630a..9c41d3cd8 100644 --- a/rules/xorg-app-xkbcomp.make +++ b/rules/xorg-app-xkbcomp.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XKBCOMP) += xorg-app-xkbcomp # # Paths and names # -XORG_APP_XKBCOMP_VERSION := 1.0.2 -XORG_APP_XKBCOMP := xkbcomp-X11R7.1-$(XORG_APP_XKBCOMP_VERSION) +XORG_APP_XKBCOMP_VERSION := 1.0.3 +XORG_APP_XKBCOMP := xkbcomp-$(XORG_APP_XKBCOMP_VERSION) XORG_APP_XKBCOMP_SUFFIX := tar.bz2 -XORG_APP_XKBCOMP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app//$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX) +XORG_APP_XKBCOMP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX) XORG_APP_XKBCOMP_SOURCE := $(SRCDIR)/$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX) XORG_APP_XKBCOMP_DIR := $(BUILDDIR)/$(XORG_APP_XKBCOMP) diff --git a/rules/xorg-app-xrdb.make b/rules/xorg-app-xrdb.make index ab1eed0b1..47eacfa12 100644 --- a/rules/xorg-app-xrdb.make +++ b/rules/xorg-app-xrdb.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XRDB) += xorg-app-xrdb # # Paths and names # -XORG_APP_XRDB_VERSION := 1.0.2 -XORG_APP_XRDB := xrdb-X11R7.1-$(XORG_APP_XRDB_VERSION) +XORG_APP_XRDB_VERSION := 1.0.4 +XORG_APP_XRDB := xrdb-$(XORG_APP_XRDB_VERSION) XORG_APP_XRDB_SUFFIX := tar.bz2 -XORG_APP_XRDB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX) +XORG_APP_XRDB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX) XORG_APP_XRDB_SOURCE := $(SRCDIR)/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX) XORG_APP_XRDB_DIR := $(BUILDDIR)/$(XORG_APP_XRDB) diff --git a/rules/xorg-app-xset.make b/rules/xorg-app-xset.make index 7f2895e6f..e6a6420ac 100644 --- a/rules/xorg-app-xset.make +++ b/rules/xorg-app-xset.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XSET) += xorg-app-xset # # Paths and names # -XORG_APP_XSET_VERSION := 1.0.2 -XORG_APP_XSET := xset-X11R7.1-$(XORG_APP_XSET_VERSION) +XORG_APP_XSET_VERSION := 1.0.3 +XORG_APP_XSET := xset-$(XORG_APP_XSET_VERSION) XORG_APP_XSET_SUFFIX := tar.bz2 -XORG_APP_XSET_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX) +XORG_APP_XSET_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX) XORG_APP_XSET_SOURCE := $(SRCDIR)/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX) XORG_APP_XSET_DIR := $(BUILDDIR)/$(XORG_APP_XSET) diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make index 35299081d..0f4c54639 100644 --- a/rules/xorg-app-xsetroot.make +++ b/rules/xorg-app-xsetroot.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XSETROOT) += xorg-app-xsetroot # # Paths and names # -XORG_APP_XSETROOT_VERSION := 1.0.1 -XORG_APP_XSETROOT := xsetroot-X11R7.0-$(XORG_APP_XSETROOT_VERSION) +XORG_APP_XSETROOT_VERSION := 1.0.2 +XORG_APP_XSETROOT := xsetroot-$(XORG_APP_XSETROOT_VERSION) XORG_APP_XSETROOT_SUFFIX := tar.bz2 -XORG_APP_XSETROOT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app//$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX) +XORG_APP_XSETROOT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX) XORG_APP_XSETROOT_SOURCE := $(SRCDIR)/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX) XORG_APP_XSETROOT_DIR := $(BUILDDIR)/$(XORG_APP_XSETROOT) diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make index 36ee73a4e..8822806c9 100644 --- a/rules/xorg-app-xvinfo.make +++ b/rules/xorg-app-xvinfo.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XVINFO) += xorg-app-xvinfo # # Paths and names # -XORG_APP_XVINFO_VERSION := 1.0.1 -XORG_APP_XVINFO := xvinfo-X11R7.0-$(XORG_APP_XVINFO_VERSION) +XORG_APP_XVINFO_VERSION := 1.0.2 +XORG_APP_XVINFO := xvinfo-$(XORG_APP_XVINFO_VERSION) XORG_APP_XVINFO_SUFFIX := tar.bz2 -XORG_APP_XVINFO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app//$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX) +XORG_APP_XVINFO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX) XORG_APP_XVINFO_SOURCE := $(SRCDIR)/$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX) XORG_APP_XVINFO_DIR := $(BUILDDIR)/$(XORG_APP_XVINFO) diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make index b2fc0645c..b51364fae 100644 --- a/rules/xorg-data-xbitmaps.make +++ b/rules/xorg-data-xbitmaps.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DATA_XBITMAPS) += xorg-data-xbitmaps # Paths and names # XORG_DATA_XBITMAPS_VERSION := 1.0.1 -XORG_DATA_XBITMAPS := xbitmaps-X11R7.0-$(XORG_DATA_XBITMAPS_VERSION) +XORG_DATA_XBITMAPS := xbitmaps-$(XORG_DATA_XBITMAPS_VERSION) XORG_DATA_XBITMAPS_SUFFIX := tar.bz2 -XORG_DATA_XBITMAPS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/data/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX) +XORG_DATA_XBITMAPS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/data/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX) XORG_DATA_XBITMAPS_SOURCE := $(SRCDIR)/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX) XORG_DATA_XBITMAPS_DIR := $(BUILDDIR)/$(XORG_DATA_XBITMAPS) diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make index c856f1337..17641f5bd 100644 --- a/rules/xorg-driver-input-evdev.make +++ b/rules/xorg-driver-input-evdev.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_EVDEV) += xorg-driver-input-evdev # # Paths and names # -XORG_DRIVER_INPUT_EVDEV_VERSION := 1.1.2 -XORG_DRIVER_INPUT_EVDEV := xf86-input-evdev-X11R7.1-$(XORG_DRIVER_INPUT_EVDEV_VERSION) +XORG_DRIVER_INPUT_EVDEV_VERSION := 1.1.5 +XORG_DRIVER_INPUT_EVDEV := xf86-input-evdev-$(XORG_DRIVER_INPUT_EVDEV_VERSION) XORG_DRIVER_INPUT_EVDEV_SUFFIX := tar.bz2 -XORG_DRIVER_INPUT_EVDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX) +XORG_DRIVER_INPUT_EVDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX) XORG_DRIVER_INPUT_EVDEV_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX) XORG_DRIVER_INPUT_EVDEV_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_EVDEV) diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make index f62f6790d..527f5c0ca 100644 --- a/rules/xorg-driver-input-keyboard.make +++ b/rules/xorg-driver-input-keyboard.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_KEYBOARD) += xorg-driver-input-keyboard # # Paths and names # -XORG_DRIVER_INPUT_KEYBOARD_VERSION := 1.1.0 -XORG_DRIVER_INPUT_KEYBOARD := xf86-input-keyboard-X11R7.1-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION) +XORG_DRIVER_INPUT_KEYBOARD_VERSION := 1.2.2 +XORG_DRIVER_INPUT_KEYBOARD := xf86-input-keyboard-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION) XORG_DRIVER_INPUT_KEYBOARD_SUFFIX := tar.bz2 -XORG_DRIVER_INPUT_KEYBOARD_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX) +XORG_DRIVER_INPUT_KEYBOARD_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX) XORG_DRIVER_INPUT_KEYBOARD_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX) XORG_DRIVER_INPUT_KEYBOARD_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_KEYBOARD) @@ -114,7 +114,6 @@ $(STATEDIR)/xorg-driver-input-keyboard.targetinstall: $(xorg-driver-input-keyboa @$(call install_fixup, xorg-driver-input-keyboard,DEPENDS,) @$(call install_fixup, xorg-driver-input-keyboard,DESCRIPTION,missing) - @$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/keyboard_drv.so, /usr/lib/xorg/modules/keyboard_drv.so) @$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/kbd_drv.so, /usr/lib/xorg/modules/kbd_drv.so) @$(call install_finish, xorg-driver-input-keyboard) diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make index 7191fa8bd..4e3e292b6 100644 --- a/rules/xorg-driver-input-mouse.make +++ b/rules/xorg-driver-input-mouse.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_MOUSE) += xorg-driver-input-mouse # # Paths and names # -XORG_DRIVER_INPUT_MOUSE_VERSION := 1.1.0 -XORG_DRIVER_INPUT_MOUSE := xf86-input-mouse-X11R7.1-$(XORG_DRIVER_INPUT_MOUSE_VERSION) +XORG_DRIVER_INPUT_MOUSE_VERSION := 1.2.2 +XORG_DRIVER_INPUT_MOUSE := xf86-input-mouse-$(XORG_DRIVER_INPUT_MOUSE_VERSION) XORG_DRIVER_INPUT_MOUSE_SUFFIX := tar.bz2 -XORG_DRIVER_INPUT_MOUSE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX) +XORG_DRIVER_INPUT_MOUSE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX) XORG_DRIVER_INPUT_MOUSE_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX) XORG_DRIVER_INPUT_MOUSE_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_MOUSE) @@ -59,7 +59,8 @@ $(STATEDIR)/xorg-driver-input-mouse.extract: $(xorg-driver-input-mouse_extract_d xorg-driver-input-mouse_prepare: $(STATEDIR)/xorg-driver-input-mouse.prepare XORG_DRIVER_INPUT_MOUSE_PATH := PATH=$(CROSS_PATH) -XORG_DRIVER_INPUT_MOUSE_ENV := $(CROSS_ENV) +XORG_DRIVER_INPUT_MOUSE_ENV := $(CROSS_ENV) \ + ac_cv_file__usr_share_sgml_X11_defs_ent=no # # autoconf diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make index 9ef6d8153..3cd6f1266 100644 --- a/rules/xorg-driver-input-tslib.make +++ b/rules/xorg-driver-input-tslib.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_TSLIB) += xorg-driver-input-tslib # # Paths and names # -XORG_DRIVER_INPUT_TSLIB_VERSION := 0.0.3 +XORG_DRIVER_INPUT_TSLIB_VERSION := 0.0.4 XORG_DRIVER_INPUT_TSLIB := xf86-input-tslib-$(XORG_DRIVER_INPUT_TSLIB_VERSION) XORG_DRIVER_INPUT_TSLIB_SUFFIX := tar.bz2 XORG_DRIVER_INPUT_TSLIB_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(XORG_DRIVER_INPUT_TSLIB).$(XORG_DRIVER_INPUT_TSLIB_SUFFIX) diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make index dca11fd0c..d1822e681 100644 --- a/rules/xorg-driver-input-void.make +++ b/rules/xorg-driver-input-void.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_VOID) += xorg-driver-input-void # Paths and names # XORG_DRIVER_INPUT_VOID_VERSION := 1.1.0 -XORG_DRIVER_INPUT_VOID := xf86-input-void-X11R7.1-$(XORG_DRIVER_INPUT_VOID_VERSION) +XORG_DRIVER_INPUT_VOID := xf86-input-void-$(XORG_DRIVER_INPUT_VOID_VERSION) XORG_DRIVER_INPUT_VOID_SUFFIX := tar.bz2 -XORG_DRIVER_INPUT_VOID_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX) +XORG_DRIVER_INPUT_VOID_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX) XORG_DRIVER_INPUT_VOID_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX) XORG_DRIVER_INPUT_VOID_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_VOID) diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make index be47c2094..0fc71b68f 100644 --- a/rules/xorg-driver-video-apm.make +++ b/rules/xorg-driver-video-apm.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_APM) += xorg-driver-video-apm # Paths and names # XORG_DRIVER_VIDEO_APM_VERSION := 1.1.1 -XORG_DRIVER_VIDEO_APM := xf86-video-apm-X11R7.1-$(XORG_DRIVER_VIDEO_APM_VERSION) +XORG_DRIVER_VIDEO_APM := xf86-video-apm-$(XORG_DRIVER_VIDEO_APM_VERSION) XORG_DRIVER_VIDEO_APM_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_APM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX) +XORG_DRIVER_VIDEO_APM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX) XORG_DRIVER_VIDEO_APM_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX) XORG_DRIVER_VIDEO_APM_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_APM) diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make index 0208e370e..e68d069ce 100644 --- a/rules/xorg-driver-video-dummy.make +++ b/rules/xorg-driver-video-dummy.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_DUMMY) += xorg-driver-video-dummy # Paths and names # XORG_DRIVER_VIDEO_DUMMY_VERSION := 0.2.0 -XORG_DRIVER_VIDEO_DUMMY := xf86-video-dummy-X11R7.1-$(XORG_DRIVER_VIDEO_DUMMY_VERSION) +XORG_DRIVER_VIDEO_DUMMY := xf86-video-dummy-$(XORG_DRIVER_VIDEO_DUMMY_VERSION) XORG_DRIVER_VIDEO_DUMMY_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_DUMMY_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX) +XORG_DRIVER_VIDEO_DUMMY_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX) XORG_DRIVER_VIDEO_DUMMY_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX) XORG_DRIVER_VIDEO_DUMMY_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_DUMMY) diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make index 4b08a527c..02b6a9b0c 100644 --- a/rules/xorg-driver-video-fbdev.make +++ b/rules/xorg-driver-video-fbdev.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_FBDEV) += xorg-driver-video-fbdev # # Paths and names # -XORG_DRIVER_VIDEO_FBDEV_VERSION := 0.3.0 -XORG_DRIVER_VIDEO_FBDEV := xf86-video-fbdev-X11R7.1-$(XORG_DRIVER_VIDEO_FBDEV_VERSION) +XORG_DRIVER_VIDEO_FBDEV_VERSION := 0.3.1 +XORG_DRIVER_VIDEO_FBDEV := xf86-video-fbdev-$(XORG_DRIVER_VIDEO_FBDEV_VERSION) XORG_DRIVER_VIDEO_FBDEV_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_FBDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX) +XORG_DRIVER_VIDEO_FBDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX) XORG_DRIVER_VIDEO_FBDEV_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX) XORG_DRIVER_VIDEO_FBDEV_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_FBDEV) diff --git a/rules/xorg-driver-video-nsc.make b/rules/xorg-driver-video-nsc.make index 85e2612e3..070b3e04c 100644 --- a/rules/xorg-driver-video-nsc.make +++ b/rules/xorg-driver-video-nsc.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_NSC) += xorg-driver-video-nsc # # Paths and names # -XORG_DRIVER_VIDEO_NSC_VERSION := 2.8.1 -XORG_DRIVER_VIDEO_NSC := xf86-video-nsc-X11R7.1-$(XORG_DRIVER_VIDEO_NSC_VERSION) +XORG_DRIVER_VIDEO_NSC_VERSION := 2.8.3 +XORG_DRIVER_VIDEO_NSC := xf86-video-nsc-$(XORG_DRIVER_VIDEO_NSC_VERSION) XORG_DRIVER_VIDEO_NSC_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_NSC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX) +XORG_DRIVER_VIDEO_NSC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX) XORG_DRIVER_VIDEO_NSC_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX) XORG_DRIVER_VIDEO_NSC_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_NSC) diff --git a/rules/xorg-driver-video-v4l.make b/rules/xorg-driver-video-v4l.make index 46a566048..29231c905 100644 --- a/rules/xorg-driver-video-v4l.make +++ b/rules/xorg-driver-video-v4l.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_V4L) += xorg-driver-video-v4l # Paths and names # XORG_DRIVER_VIDEO_V4L_VERSION := 0.1.1 -XORG_DRIVER_VIDEO_V4L := xf86-video-v4l-X11R7.1-$(XORG_DRIVER_VIDEO_V4L_VERSION) +XORG_DRIVER_VIDEO_V4L := xf86-video-v4l-$(XORG_DRIVER_VIDEO_V4L_VERSION) XORG_DRIVER_VIDEO_V4L_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_V4L_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX) +XORG_DRIVER_VIDEO_V4L_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX) XORG_DRIVER_VIDEO_V4L_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX) XORG_DRIVER_VIDEO_V4L_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_V4L) diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make index 9cfd73246..7f31fad25 100644 --- a/rules/xorg-driver-video-vesa.make +++ b/rules/xorg-driver-video-vesa.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_VESA) += xorg-driver-video-vesa # # Paths and names # -XORG_DRIVER_VIDEO_VESA_VERSION := 1.2.0 -XORG_DRIVER_VIDEO_VESA := xf86-video-vesa-X11R7.1-$(XORG_DRIVER_VIDEO_VESA_VERSION) +XORG_DRIVER_VIDEO_VESA_VERSION := 1.3.0 +XORG_DRIVER_VIDEO_VESA := xf86-video-vesa-$(XORG_DRIVER_VIDEO_VESA_VERSION) XORG_DRIVER_VIDEO_VESA_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_VESA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX) +XORG_DRIVER_VIDEO_VESA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX) XORG_DRIVER_VIDEO_VESA_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX) XORG_DRIVER_VIDEO_VESA_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VESA) diff --git a/rules/xorg-driver-video-vga.make b/rules/xorg-driver-video-vga.make index 674301f04..9f92a8239 100644 --- a/rules/xorg-driver-video-vga.make +++ b/rules/xorg-driver-video-vga.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_VGA) += xorg-driver-video-vga # Paths and names # XORG_DRIVER_VIDEO_VGA_VERSION := 4.1.0 -XORG_DRIVER_VIDEO_VGA := xf86-video-vga-X11R7.1-$(XORG_DRIVER_VIDEO_VGA_VERSION) +XORG_DRIVER_VIDEO_VGA := xf86-video-vga-$(XORG_DRIVER_VIDEO_VGA_VERSION) XORG_DRIVER_VIDEO_VGA_SUFFIX := tar.bz2 -XORG_DRIVER_VIDEO_VGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX) +XORG_DRIVER_VIDEO_VGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX) XORG_DRIVER_VIDEO_VGA_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX) XORG_DRIVER_VIDEO_VGA_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VGA) diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make index ce99aa6b9..a5021cb1f 100644 --- a/rules/xorg-font-adobe-100dpi.make +++ b/rules/xorg-font-adobe-100dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_100DPI) += xorg-font-adobe-100dpi # Paths and names # XORG_FONT_ADOBE_100DPI_VERSION := 1.0.0 -XORG_FONT_ADOBE_100DPI := font-adobe-100dpi-X11R7.0-$(XORG_FONT_ADOBE_100DPI_VERSION) +XORG_FONT_ADOBE_100DPI := font-adobe-100dpi-$(XORG_FONT_ADOBE_100DPI_VERSION) XORG_FONT_ADOBE_100DPI_SUFFIX := tar.bz2 -XORG_FONT_ADOBE_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX) +XORG_FONT_ADOBE_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX) XORG_FONT_ADOBE_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX) XORG_FONT_ADOBE_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_100DPI) diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make index e9e8b801b..fb2f0cb6f 100644 --- a/rules/xorg-font-adobe-75dpi.make +++ b/rules/xorg-font-adobe-75dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_75DPI) += xorg-font-adobe-75dpi # Paths and names # XORG_FONT_ADOBE_75DPI_VERSION := 1.0.0 -XORG_FONT_ADOBE_75DPI := font-adobe-75dpi-X11R7.0-$(XORG_FONT_ADOBE_75DPI_VERSION) +XORG_FONT_ADOBE_75DPI := font-adobe-75dpi-$(XORG_FONT_ADOBE_75DPI_VERSION) XORG_FONT_ADOBE_75DPI_SUFFIX := tar.bz2 -XORG_FONT_ADOBE_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX) +XORG_FONT_ADOBE_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX) XORG_FONT_ADOBE_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX) XORG_FONT_ADOBE_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_75DPI) diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make index ad17e493a..2e7cde0aa 100644 --- a/rules/xorg-font-adobe-utopia-100dpi.make +++ b/rules/xorg-font-adobe-utopia-100dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI) += xorg-font-adobe-utopia-100d # Paths and names # XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION := 1.0.1 -XORG_FONT_ADOBE_UTOPIA_100DPI := font-adobe-utopia-100dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION) +XORG_FONT_ADOBE_UTOPIA_100DPI := font-adobe-utopia-100dpi-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION) XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX := tar.bz2 -XORG_FONT_ADOBE_UTOPIA_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX) +XORG_FONT_ADOBE_UTOPIA_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX) XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX) XORG_FONT_ADOBE_UTOPIA_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI) diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make index 8cee0a666..451a1147e 100644 --- a/rules/xorg-font-adobe-utopia-75dpi.make +++ b/rules/xorg-font-adobe-utopia-75dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI) += xorg-font-adobe-utopia-75dpi # Paths and names # XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION := 1.0.1 -XORG_FONT_ADOBE_UTOPIA_75DPI := font-adobe-utopia-75dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION) +XORG_FONT_ADOBE_UTOPIA_75DPI := font-adobe-utopia-75dpi-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION) XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX := tar.bz2 -XORG_FONT_ADOBE_UTOPIA_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX) +XORG_FONT_ADOBE_UTOPIA_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX) XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX) XORG_FONT_ADOBE_UTOPIA_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI) diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make index 32fdbc1c5..edc1e5fac 100644 --- a/rules/xorg-font-adobe-utopia-type1.make +++ b/rules/xorg-font-adobe-utopia-type1.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_TYPE1) += xorg-font-adobe-utopia-type1 # Paths and names # XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION := 1.0.1 -XORG_FONT_ADOBE_UTOPIA_TYPE1 := font-adobe-utopia-type1-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION) +XORG_FONT_ADOBE_UTOPIA_TYPE1 := font-adobe-utopia-type1-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION) XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX := tar.bz2 -XORG_FONT_ADOBE_UTOPIA_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX) +XORG_FONT_ADOBE_UTOPIA_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX) XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX) XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1) diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make index d7bd8c6cb..56156fcb7 100644 --- a/rules/xorg-font-alias.make +++ b/rules/xorg-font-alias.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias # Paths and names # XORG_FONT_ALIAS_VERSION := 1.0.1 -XORG_FONT_ALIAS := font-alias-X11R7.0-$(XORG_FONT_ALIAS_VERSION) +XORG_FONT_ALIAS := font-alias-$(XORG_FONT_ALIAS_VERSION) XORG_FONT_ALIAS_SUFFIX := tar.bz2 -XORG_FONT_ALIAS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX) +XORG_FONT_ALIAS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX) XORG_FONT_ALIAS_SOURCE := $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX) XORG_FONT_ALIAS_DIR := $(BUILDDIR)/$(XORG_FONT_ALIAS) diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make index 46d13edfd..27de86807 100644 --- a/rules/xorg-font-arabic-misc.make +++ b/rules/xorg-font-arabic-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ARABIC_MISC) += xorg-font-arabic-misc # Paths and names # XORG_FONT_ARABIC_MISC_VERSION := 1.0.0 -XORG_FONT_ARABIC_MISC := font-arabic-misc-X11R7.0-$(XORG_FONT_ARABIC_MISC_VERSION) +XORG_FONT_ARABIC_MISC := font-arabic-misc-$(XORG_FONT_ARABIC_MISC_VERSION) XORG_FONT_ARABIC_MISC_SUFFIX := tar.bz2 -XORG_FONT_ARABIC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX) +XORG_FONT_ARABIC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX) XORG_FONT_ARABIC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX) XORG_FONT_ARABIC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_ARABIC_MISC) diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make index 3e894e541..a45c1cc00 100644 --- a/rules/xorg-font-bh-100dpi.make +++ b/rules/xorg-font-bh-100dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_100DPI) += xorg-font-bh-100dpi # Paths and names # XORG_FONT_BH_100DPI_VERSION := 1.0.0 -XORG_FONT_BH_100DPI := font-bh-100dpi-X11R7.0-$(XORG_FONT_BH_100DPI_VERSION) +XORG_FONT_BH_100DPI := font-bh-100dpi-$(XORG_FONT_BH_100DPI_VERSION) XORG_FONT_BH_100DPI_SUFFIX := tar.bz2 -XORG_FONT_BH_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX) +XORG_FONT_BH_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX) XORG_FONT_BH_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX) XORG_FONT_BH_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_100DPI) diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make index 16d977aad..7505fdfbb 100644 --- a/rules/xorg-font-bh-75dpi.make +++ b/rules/xorg-font-bh-75dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_75DPI) += xorg-font-bh-75dpi # Paths and names # XORG_FONT_BH_75DPI_VERSION := 1.0.0 -XORG_FONT_BH_75DPI := font-bh-75dpi-X11R7.0-$(XORG_FONT_BH_75DPI_VERSION) +XORG_FONT_BH_75DPI := font-bh-75dpi-$(XORG_FONT_BH_75DPI_VERSION) XORG_FONT_BH_75DPI_SUFFIX := tar.bz2 -XORG_FONT_BH_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX) +XORG_FONT_BH_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX) XORG_FONT_BH_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX) XORG_FONT_BH_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_75DPI) diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make index 71037b1c4..8caf7799b 100644 --- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) += xorg-font-bh-lucidat # Paths and names # XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION := 1.0.0 -XORG_FONT_BH_LUCIDATYPEWRITER_100DPI := font-bh-lucidatypewriter-100dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION) +XORG_FONT_BH_LUCIDATYPEWRITER_100DPI := font-bh-lucidatypewriter-100dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION) XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX := tar.bz2 -XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX) +XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX) XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX) XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make index 3c6c2171a..5929bbcd5 100644 --- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) += xorg-font-bh-lucidaty # Paths and names # XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION := 1.0.0 -XORG_FONT_BH_LUCIDATYPEWRITER_75DPI := font-bh-lucidatypewriter-75dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION) +XORG_FONT_BH_LUCIDATYPEWRITER_75DPI := font-bh-lucidatypewriter-75dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION) XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX := tar.bz2 -XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX) +XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX) XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX) XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make index 6d7139ccd..739cefe1c 100644 --- a/rules/xorg-font-bh-ttf.make +++ b/rules/xorg-font-bh-ttf.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_TTF) += xorg-font-bh-ttf # Paths and names # XORG_FONT_BH_TTF_VERSION := 1.0.0 -XORG_FONT_BH_TTF := font-bh-ttf-X11R7.0-$(XORG_FONT_BH_TTF_VERSION) +XORG_FONT_BH_TTF := font-bh-ttf-$(XORG_FONT_BH_TTF_VERSION) XORG_FONT_BH_TTF_SUFFIX := tar.bz2 -XORG_FONT_BH_TTF_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX) +XORG_FONT_BH_TTF_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX) XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX) XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF) diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make index f0315a439..22e6a3142 100644 --- a/rules/xorg-font-bitstream-100dpi.make +++ b/rules/xorg-font-bitstream-100dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_100DPI) += xorg-font-bitstream-100dpi # Paths and names # XORG_FONT_BITSTREAM_100DPI_VERSION := 1.0.0 -XORG_FONT_BITSTREAM_100DPI := font-bitstream-100dpi-X11R7.0-$(XORG_FONT_BITSTREAM_100DPI_VERSION) +XORG_FONT_BITSTREAM_100DPI := font-bitstream-100dpi-$(XORG_FONT_BITSTREAM_100DPI_VERSION) XORG_FONT_BITSTREAM_100DPI_SUFFIX := tar.bz2 -XORG_FONT_BITSTREAM_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX) +XORG_FONT_BITSTREAM_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX) XORG_FONT_BITSTREAM_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX) XORG_FONT_BITSTREAM_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_100DPI) diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make index 20bfaa05f..820eef297 100644 --- a/rules/xorg-font-bitstream-75dpi.make +++ b/rules/xorg-font-bitstream-75dpi.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_75DPI) += xorg-font-bitstream-75dpi # Paths and names # XORG_FONT_BITSTREAM_75DPI_VERSION := 1.0.0 -XORG_FONT_BITSTREAM_75DPI := font-bitstream-75dpi-X11R7.0-$(XORG_FONT_BITSTREAM_75DPI_VERSION) +XORG_FONT_BITSTREAM_75DPI := font-bitstream-75dpi-$(XORG_FONT_BITSTREAM_75DPI_VERSION) XORG_FONT_BITSTREAM_75DPI_SUFFIX := tar.bz2 -XORG_FONT_BITSTREAM_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX) +XORG_FONT_BITSTREAM_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX) XORG_FONT_BITSTREAM_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX) XORG_FONT_BITSTREAM_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_75DPI) diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make index 83414ab7e..4e77d81d5 100644 --- a/rules/xorg-font-bitstream-speedo.make +++ b/rules/xorg-font-bitstream-speedo.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_SPEEDO) += xorg-font-bitstream-speedo # Paths and names # XORG_FONT_BITSTREAM_SPEEDO_VERSION := 1.0.0 -XORG_FONT_BITSTREAM_SPEEDO := font-bitstream-speedo-X11R7.0-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION) +XORG_FONT_BITSTREAM_SPEEDO := font-bitstream-speedo-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION) XORG_FONT_BITSTREAM_SPEEDO_SUFFIX := tar.bz2 -XORG_FONT_BITSTREAM_SPEEDO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX) +XORG_FONT_BITSTREAM_SPEEDO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX) XORG_FONT_BITSTREAM_SPEEDO_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX) XORG_FONT_BITSTREAM_SPEEDO_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_SPEEDO) diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make index 3f5b7d0fa..4cefb1851 100644 --- a/rules/xorg-font-bitstream-type1.make +++ b/rules/xorg-font-bitstream-type1.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_TYPE1) += xorg-font-bitstream-type1 # Paths and names # XORG_FONT_BITSTREAM_TYPE1_VERSION := 1.0.0 -XORG_FONT_BITSTREAM_TYPE1 := font-bitstream-type1-X11R7.0-$(XORG_FONT_BITSTREAM_TYPE1_VERSION) +XORG_FONT_BITSTREAM_TYPE1 := font-bitstream-type1-$(XORG_FONT_BITSTREAM_TYPE1_VERSION) XORG_FONT_BITSTREAM_TYPE1_SUFFIX := tar.bz2 -XORG_FONT_BITSTREAM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) +XORG_FONT_BITSTREAM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) XORG_FONT_BITSTREAM_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX) XORG_FONT_BITSTREAM_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_TYPE1) diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make index fe8c63ef8..cd016e25c 100644 --- a/rules/xorg-font-cronyx-cyrillic.make +++ b/rules/xorg-font-cronyx-cyrillic.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_CRONYX_CYRILLIC) += xorg-font-cronyx-cyrillic # Paths and names # XORG_FONT_CRONYX_CYRILLIC_VERSION := 1.0.0 -XORG_FONT_CRONYX_CYRILLIC := font-cronyx-cyrillic-X11R7.0-$(XORG_FONT_CRONYX_CYRILLIC_VERSION) +XORG_FONT_CRONYX_CYRILLIC := font-cronyx-cyrillic-$(XORG_FONT_CRONYX_CYRILLIC_VERSION) XORG_FONT_CRONYX_CYRILLIC_SUFFIX := tar.bz2 -XORG_FONT_CRONYX_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX) +XORG_FONT_CRONYX_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX) XORG_FONT_CRONYX_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX) XORG_FONT_CRONYX_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_CRONYX_CYRILLIC) diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make index 4105bcac9..e5d4bd800 100644 --- a/rules/xorg-font-cursor-misc.make +++ b/rules/xorg-font-cursor-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_CURSOR_MISC) += xorg-font-cursor-misc # Paths and names # XORG_FONT_CURSOR_MISC_VERSION := 1.0.0 -XORG_FONT_CURSOR_MISC := font-cursor-misc-X11R7.0-$(XORG_FONT_CURSOR_MISC_VERSION) +XORG_FONT_CURSOR_MISC := font-cursor-misc-$(XORG_FONT_CURSOR_MISC_VERSION) XORG_FONT_CURSOR_MISC_SUFFIX := tar.bz2 -XORG_FONT_CURSOR_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX) +XORG_FONT_CURSOR_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font//$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX) XORG_FONT_CURSOR_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX) XORG_FONT_CURSOR_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_CURSOR_MISC) diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make index cae3cd3d3..ce1750874 100644 --- a/rules/xorg-font-daewoo-misc.make +++ b/rules/xorg-font-daewoo-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_DAEWOO_MISC) += xorg-font-daewoo-misc # Paths and names # XORG_FONT_DAEWOO_MISC_VERSION := 1.0.0 -XORG_FONT_DAEWOO_MISC := font-daewoo-misc-X11R7.0-$(XORG_FONT_DAEWOO_MISC_VERSION) +XORG_FONT_DAEWOO_MISC := font-daewoo-misc-$(XORG_FONT_DAEWOO_MISC_VERSION) XORG_FONT_DAEWOO_MISC_SUFFIX := tar.bz2 -XORG_FONT_DAEWOO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX) +XORG_FONT_DAEWOO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX) XORG_FONT_DAEWOO_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX) XORG_FONT_DAEWOO_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_DAEWOO_MISC) diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make index 5d61cd498..2b86b6077 100644 --- a/rules/xorg-font-dec-misc.make +++ b/rules/xorg-font-dec-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_DEC_MISC) += xorg-font-dec-misc # Paths and names # XORG_FONT_DEC_MISC_VERSION := 1.0.0 -XORG_FONT_DEC_MISC := font-dec-misc-X11R7.0-$(XORG_FONT_DEC_MISC_VERSION) +XORG_FONT_DEC_MISC := font-dec-misc-$(XORG_FONT_DEC_MISC_VERSION) XORG_FONT_DEC_MISC_SUFFIX := tar.bz2 -XORG_FONT_DEC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX) +XORG_FONT_DEC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX) XORG_FONT_DEC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX) XORG_FONT_DEC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_DEC_MISC) diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make index 9cba979dd..91a283959 100644 --- a/rules/xorg-font-encodings.make +++ b/rules/xorg-font-encodings.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_FONT_ENCODINGS) += xorg-font-encodings # # Paths and names # -XORG_FONT_ENCODINGS_VERSION := 1.0.0 -XORG_FONT_ENCODINGS := encodings-X11R7.0-$(XORG_FONT_ENCODINGS_VERSION) +XORG_FONT_ENCODINGS_VERSION := 1.0.2 +XORG_FONT_ENCODINGS := encodings-$(XORG_FONT_ENCODINGS_VERSION) XORG_FONT_ENCODINGS_SUFFIX := tar.bz2 -XORG_FONT_ENCODINGS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX) +XORG_FONT_ENCODINGS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX) XORG_FONT_ENCODINGS_SOURCE := $(SRCDIR)/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX) XORG_FONT_ENCODINGS_DIR := $(BUILDDIR)/$(XORG_FONT_ENCODINGS) diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make index 1f0698e76..8303af360 100644 --- a/rules/xorg-font-ibm-type1.make +++ b/rules/xorg-font-ibm-type1.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_IBM_TYPE1) += xorg-font-ibm-type1 # Paths and names # XORG_FONT_IBM_TYPE1_VERSION := 1.0.0 -XORG_FONT_IBM_TYPE1 := font-ibm-type1-X11R7.0-$(XORG_FONT_IBM_TYPE1_VERSION) +XORG_FONT_IBM_TYPE1 := font-ibm-type1-$(XORG_FONT_IBM_TYPE1_VERSION) XORG_FONT_IBM_TYPE1_SUFFIX := tar.bz2 -XORG_FONT_IBM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX) +XORG_FONT_IBM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX) XORG_FONT_IBM_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX) XORG_FONT_IBM_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_IBM_TYPE1) diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make index 8d11c1dee..e300cf7b1 100644 --- a/rules/xorg-font-isas-misc.make +++ b/rules/xorg-font-isas-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ISAS_MISC) += xorg-font-isas-misc # Paths and names # XORG_FONT_ISAS_MISC_VERSION := 1.0.0 -XORG_FONT_ISAS_MISC := font-isas-misc-X11R7.0-$(XORG_FONT_ISAS_MISC_VERSION) +XORG_FONT_ISAS_MISC := font-isas-misc-$(XORG_FONT_ISAS_MISC_VERSION) XORG_FONT_ISAS_MISC_SUFFIX := tar.bz2 -XORG_FONT_ISAS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX) +XORG_FONT_ISAS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX) XORG_FONT_ISAS_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX) XORG_FONT_ISAS_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_ISAS_MISC) diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make index 8556658bd..54894c317 100644 --- a/rules/xorg-font-jis-misc.make +++ b/rules/xorg-font-jis-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_JIS_MISC) += xorg-font-jis-misc # Paths and names # XORG_FONT_JIS_MISC_VERSION := 1.0.0 -XORG_FONT_JIS_MISC := font-jis-misc-X11R7.0-$(XORG_FONT_JIS_MISC_VERSION) +XORG_FONT_JIS_MISC := font-jis-misc-$(XORG_FONT_JIS_MISC_VERSION) XORG_FONT_JIS_MISC_SUFFIX := tar.bz2 -XORG_FONT_JIS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX) +XORG_FONT_JIS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX) XORG_FONT_JIS_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX) XORG_FONT_JIS_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_JIS_MISC) diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make index 6e5dfd718..5b057cccd 100644 --- a/rules/xorg-font-micro-misc.make +++ b/rules/xorg-font-micro-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MICRO_MISC) += xorg-font-micro-misc # Paths and names # XORG_FONT_MICRO_MISC_VERSION := 1.0.0 -XORG_FONT_MICRO_MISC := font-micro-misc-X11R7.0-$(XORG_FONT_MICRO_MISC_VERSION) +XORG_FONT_MICRO_MISC := font-micro-misc-$(XORG_FONT_MICRO_MISC_VERSION) XORG_FONT_MICRO_MISC_SUFFIX := tar.bz2 -XORG_FONT_MICRO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX) +XORG_FONT_MICRO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX) XORG_FONT_MICRO_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX) XORG_FONT_MICRO_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MICRO_MISC) diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make index eccbeb83e..f5be29381 100644 --- a/rules/xorg-font-misc-cyrillic.make +++ b/rules/xorg-font-misc-cyrillic.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_CYRILLIC) += xorg-font-misc-cyrillic # Paths and names # XORG_FONT_MISC_CYRILLIC_VERSION := 1.0.0 -XORG_FONT_MISC_CYRILLIC := font-misc-cyrillic-X11R7.0-$(XORG_FONT_MISC_CYRILLIC_VERSION) +XORG_FONT_MISC_CYRILLIC := font-misc-cyrillic-$(XORG_FONT_MISC_CYRILLIC_VERSION) XORG_FONT_MISC_CYRILLIC_SUFFIX := tar.bz2 -XORG_FONT_MISC_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX) +XORG_FONT_MISC_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX) XORG_FONT_MISC_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX) XORG_FONT_MISC_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_CYRILLIC) diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make index d51993adb..78cde247b 100644 --- a/rules/xorg-font-misc-ethiopic.make +++ b/rules/xorg-font-misc-ethiopic.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_ETHIOPIC) += xorg-font-misc-ethiopic # Paths and names # XORG_FONT_MISC_ETHIOPIC_VERSION := 1.0.0 -XORG_FONT_MISC_ETHIOPIC := font-misc-ethiopic-X11R7.0-$(XORG_FONT_MISC_ETHIOPIC_VERSION) +XORG_FONT_MISC_ETHIOPIC := font-misc-ethiopic-$(XORG_FONT_MISC_ETHIOPIC_VERSION) XORG_FONT_MISC_ETHIOPIC_SUFFIX := tar.bz2 -XORG_FONT_MISC_ETHIOPIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX) +XORG_FONT_MISC_ETHIOPIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX) XORG_FONT_MISC_ETHIOPIC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX) XORG_FONT_MISC_ETHIOPIC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_ETHIOPIC) diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make index e0fec3d59..30349046b 100644 --- a/rules/xorg-font-misc-meltho.make +++ b/rules/xorg-font-misc-meltho.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MELTHO) += xorg-font-misc-meltho # Paths and names # XORG_FONT_MISC_MELTHO_VERSION := 1.0.0 -XORG_FONT_MISC_MELTHO := font-misc-meltho-X11R7.0-$(XORG_FONT_MISC_MELTHO_VERSION) +XORG_FONT_MISC_MELTHO := font-misc-meltho-$(XORG_FONT_MISC_MELTHO_VERSION) XORG_FONT_MISC_MELTHO_SUFFIX := tar.bz2 -XORG_FONT_MISC_MELTHO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX) +XORG_FONT_MISC_MELTHO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX) XORG_FONT_MISC_MELTHO_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX) XORG_FONT_MISC_MELTHO_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_MELTHO) diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make index 713ccf8c1..f6ae9f684 100644 --- a/rules/xorg-font-misc-misc.make +++ b/rules/xorg-font-misc-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MISC) += xorg-font-misc-misc # Paths and names # XORG_FONT_MISC_MISC_VERSION := 1.0.0 -XORG_FONT_MISC_MISC := font-misc-misc-X11R7.0-$(XORG_FONT_MISC_MISC_VERSION) +XORG_FONT_MISC_MISC := font-misc-misc-$(XORG_FONT_MISC_MISC_VERSION) XORG_FONT_MISC_MISC_SUFFIX := tar.bz2 -XORG_FONT_MISC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX) +XORG_FONT_MISC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX) XORG_FONT_MISC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX) XORG_FONT_MISC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_MISC) diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make index 7005df51a..b459e1275 100644 --- a/rules/xorg-font-mutt-misc.make +++ b/rules/xorg-font-mutt-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MUTT_MISC) += xorg-font-mutt-misc # Paths and names # XORG_FONT_MUTT_MISC_VERSION := 1.0.0 -XORG_FONT_MUTT_MISC := font-mutt-misc-X11R7.0-$(XORG_FONT_MUTT_MISC_VERSION) +XORG_FONT_MUTT_MISC := font-mutt-misc-$(XORG_FONT_MUTT_MISC_VERSION) XORG_FONT_MUTT_MISC_SUFFIX := tar.bz2 -XORG_FONT_MUTT_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX) +XORG_FONT_MUTT_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX) XORG_FONT_MUTT_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX) XORG_FONT_MUTT_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MUTT_MISC) diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make index a4b2dfdc0..021a90632 100644 --- a/rules/xorg-font-schumacher-misc.make +++ b/rules/xorg-font-schumacher-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCHUMACHER_MISC) += xorg-font-schumacher-misc # Paths and names # XORG_FONT_SCHUMACHER_MISC_VERSION := 1.0.0 -XORG_FONT_SCHUMACHER_MISC := font-schumacher-misc-X11R7.0-$(XORG_FONT_SCHUMACHER_MISC_VERSION) +XORG_FONT_SCHUMACHER_MISC := font-schumacher-misc-$(XORG_FONT_SCHUMACHER_MISC_VERSION) XORG_FONT_SCHUMACHER_MISC_SUFFIX := tar.bz2 -XORG_FONT_SCHUMACHER_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX) +XORG_FONT_SCHUMACHER_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX) XORG_FONT_SCHUMACHER_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX) XORG_FONT_SCHUMACHER_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SCHUMACHER_MISC) diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make index 90a27f7d5..8dc349674 100644 --- a/rules/xorg-font-screen-cyrillic.make +++ b/rules/xorg-font-screen-cyrillic.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCREEN_CYRILLIC) += xorg-font-screen-cyrillic # # Paths and names # -XORG_FONT_SCREEN_CYRILLIC_VERSION := 1.0.0 -XORG_FONT_SCREEN_CYRILLIC := font-screen-cyrillic-X11R7.0-$(XORG_FONT_SCREEN_CYRILLIC_VERSION) +XORG_FONT_SCREEN_CYRILLIC_VERSION := 1.0.1 +XORG_FONT_SCREEN_CYRILLIC := font-screen-cyrillic-$(XORG_FONT_SCREEN_CYRILLIC_VERSION) XORG_FONT_SCREEN_CYRILLIC_SUFFIX := tar.bz2 -XORG_FONT_SCREEN_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX) +XORG_FONT_SCREEN_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX) XORG_FONT_SCREEN_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX) XORG_FONT_SCREEN_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_SCREEN_CYRILLIC) diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make index 49e344d9b..e7d496e7d 100644 --- a/rules/xorg-font-sony-misc.make +++ b/rules/xorg-font-sony-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SONY_MISC) += xorg-font-sony-misc # Paths and names # XORG_FONT_SONY_MISC_VERSION := 1.0.0 -XORG_FONT_SONY_MISC := font-sony-misc-X11R7.0-$(XORG_FONT_SONY_MISC_VERSION) +XORG_FONT_SONY_MISC := font-sony-misc-$(XORG_FONT_SONY_MISC_VERSION) XORG_FONT_SONY_MISC_SUFFIX := tar.bz2 -XORG_FONT_SONY_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX) +XORG_FONT_SONY_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX) XORG_FONT_SONY_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX) XORG_FONT_SONY_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SONY_MISC) diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make index 8a0fe2435..bb7f5a2a3 100644 --- a/rules/xorg-font-sun-misc.make +++ b/rules/xorg-font-sun-misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SUN_MISC) += xorg-font-sun-misc # Paths and names # XORG_FONT_SUN_MISC_VERSION := 1.0.0 -XORG_FONT_SUN_MISC := font-sun-misc-X11R7.0-$(XORG_FONT_SUN_MISC_VERSION) +XORG_FONT_SUN_MISC := font-sun-misc-$(XORG_FONT_SUN_MISC_VERSION) XORG_FONT_SUN_MISC_SUFFIX := tar.bz2 -XORG_FONT_SUN_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX) +XORG_FONT_SUN_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX) XORG_FONT_SUN_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX) XORG_FONT_SUN_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SUN_MISC) diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make index 044b8a709..bee5ba305 100644 --- a/rules/xorg-font-util.make +++ b/rules/xorg-font-util.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_UTIL) += xorg-font-util # Paths and names # XORG_FONT_UTIL_VERSION := 1.0.1 -XORG_FONT_UTIL := font-util-X11R7.1-$(XORG_FONT_UTIL_VERSION) +XORG_FONT_UTIL := font-util-$(XORG_FONT_UTIL_VERSION) XORG_FONT_UTIL_SUFFIX := tar.bz2 -XORG_FONT_UTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX) +XORG_FONT_UTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX) XORG_FONT_UTIL_SOURCE := $(SRCDIR)/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX) XORG_FONT_UTIL_DIR := $(BUILDDIR)/$(XORG_FONT_UTIL) diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make index e880d8429..598c0d8b6 100644 --- a/rules/xorg-font-winitzki-cyrillic.make +++ b/rules/xorg-font-winitzki-cyrillic.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_WINITZKI_CYRILLIC) += xorg-font-winitzki-cyrillic # Paths and names # XORG_FONT_WINITZKI_CYRILLIC_VERSION := 1.0.0 -XORG_FONT_WINITZKI_CYRILLIC := font-winitzki-cyrillic-X11R7.0-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION) +XORG_FONT_WINITZKI_CYRILLIC := font-winitzki-cyrillic-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION) XORG_FONT_WINITZKI_CYRILLIC_SUFFIX := tar.bz2 -XORG_FONT_WINITZKI_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX) +XORG_FONT_WINITZKI_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX) XORG_FONT_WINITZKI_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX) XORG_FONT_WINITZKI_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_WINITZKI_CYRILLIC) diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make index e49771b13..3f8ad71a8 100644 --- a/rules/xorg-font-xfree86-type1.make +++ b/rules/xorg-font-xfree86-type1.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_XFREE86_TYPE1) += xorg-font-xfree86-type1 # Paths and names # XORG_FONT_XFREE86_TYPE1_VERSION := 1.0.0 -XORG_FONT_XFREE86_TYPE1 := font-xfree86-type1-X11R7.0-$(XORG_FONT_XFREE86_TYPE1_VERSION) +XORG_FONT_XFREE86_TYPE1 := font-xfree86-type1-$(XORG_FONT_XFREE86_TYPE1_VERSION) XORG_FONT_XFREE86_TYPE1_SUFFIX := tar.bz2 -XORG_FONT_XFREE86_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX) +XORG_FONT_XFREE86_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX) XORG_FONT_XFREE86_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX) XORG_FONT_XFREE86_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_XFREE86_TYPE1) diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make index 9c4e09de7..5dc241d44 100644 --- a/rules/xorg-lib-AppleWM.make +++ b/rules/xorg-lib-AppleWM.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_APPLEWM) += xorg-lib-AppleWM # Paths and names # XORG_LIB_APPLEWM_VERSION := 1.0.0 -XORG_LIB_APPLEWM := libAppleWM-X11R7.0-$(XORG_LIB_APPLEWM_VERSION) +XORG_LIB_APPLEWM := libAppleWM-$(XORG_LIB_APPLEWM_VERSION) XORG_LIB_APPLEWM_SUFFIX := tar.bz2 -XORG_LIB_APPLEWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX) +XORG_LIB_APPLEWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX) XORG_LIB_APPLEWM_SOURCE := $(SRCDIR)/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX) XORG_LIB_APPLEWM_DIR := $(BUILDDIR)/$(XORG_LIB_APPLEWM) diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make index c241611ae..381ba67b3 100644 --- a/rules/xorg-lib-FS.make +++ b/rules/xorg-lib-FS.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_FS) += xorg-lib-FS # Paths and names # XORG_LIB_FS_VERSION := 1.0.0 -XORG_LIB_FS := libFS-X11R7.0-$(XORG_LIB_FS_VERSION) +XORG_LIB_FS := libFS-$(XORG_LIB_FS_VERSION) XORG_LIB_FS_SUFFIX := tar.bz2 -XORG_LIB_FS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX) +XORG_LIB_FS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX) XORG_LIB_FS_SOURCE := $(SRCDIR)/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX) XORG_LIB_FS_DIR := $(BUILDDIR)/$(XORG_LIB_FS) diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make index 0ab8ece6d..9bab765a8 100644 --- a/rules/xorg-lib-ICE.make +++ b/rules/xorg-lib-ICE.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_ICE) += xorg-lib-ICE # # Paths and names # -XORG_LIB_ICE_VERSION := 1.0.1 -XORG_LIB_ICE := libICE-X11R7.1-$(XORG_LIB_ICE_VERSION) +XORG_LIB_ICE_VERSION := 1.0.4 +XORG_LIB_ICE := libICE-$(XORG_LIB_ICE_VERSION) XORG_LIB_ICE_SUFFIX := tar.bz2 -XORG_LIB_ICE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX) +XORG_LIB_ICE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX) XORG_LIB_ICE_SOURCE := $(SRCDIR)/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX) XORG_LIB_ICE_DIR := $(BUILDDIR)/$(XORG_LIB_ICE) diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make index 990121695..dbc2de587 100644 --- a/rules/xorg-lib-SM.make +++ b/rules/xorg-lib-SM.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_SM) += xorg-lib-SM # # Paths and names # -XORG_LIB_SM_VERSION := 1.0.1 -XORG_LIB_SM := libSM-X11R7.1-$(XORG_LIB_SM_VERSION) +XORG_LIB_SM_VERSION := 1.0.3 +XORG_LIB_SM := libSM-$(XORG_LIB_SM_VERSION) XORG_LIB_SM_SUFFIX := tar.bz2 -XORG_LIB_SM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX) +XORG_LIB_SM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX) XORG_LIB_SM_SOURCE := $(SRCDIR)/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX) XORG_LIB_SM_DIR := $(BUILDDIR)/$(XORG_LIB_SM) diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make index df86cd378..c0d23b2a3 100644 --- a/rules/xorg-lib-WindowsWM.make +++ b/rules/xorg-lib-WindowsWM.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_WINDOWSWM) += xorg-lib-WindowsWM # Paths and names # XORG_LIB_WINDOWSWM_VERSION := 1.0.0 -XORG_LIB_WINDOWSWM := libWindowsWM-X11R7.0-$(XORG_LIB_WINDOWSWM_VERSION) +XORG_LIB_WINDOWSWM := libWindowsWM-$(XORG_LIB_WINDOWSWM_VERSION) XORG_LIB_WINDOWSWM_SUFFIX := tar.bz2 -XORG_LIB_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX) +XORG_LIB_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX) XORG_LIB_WINDOWSWM_SOURCE := $(SRCDIR)/$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX) XORG_LIB_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_LIB_WINDOWSWM) diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in index 9f23f3636..af9e238ac 100644 --- a/rules/xorg-lib-X11.in +++ b/rules/xorg-lib-X11.in @@ -2,6 +2,7 @@ menuconfig XORG_LIB_X11 bool prompt "libX11 " # always required: + select LIBXCB select XORG_PROTO_X select XORG_LIB_XAU select XORG_PROTO_BIGREQS # FIXME Why always? diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make index 250a28d8e..a49e0b730 100644 --- a/rules/xorg-lib-X11.make +++ b/rules/xorg-lib-X11.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-X11 # # Paths and names # -XORG_LIB_X11_VERSION := 1.0.1 -XORG_LIB_X11 := libX11-X11R7.1-$(XORG_LIB_X11_VERSION) +XORG_LIB_X11_VERSION := 1.1.3 +XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION) XORG_LIB_X11_SUFFIX := tar.bz2 -XORG_LIB_X11_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX) +XORG_LIB_X11_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX) XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX) XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11) diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make index 0745e2ab6..b7180f447 100644 --- a/rules/xorg-lib-XScrnSaver.make +++ b/rules/xorg-lib-XScrnSaver.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XSCRNSAVER) += xorg-lib-XScrnSaver # # Paths and names # -XORG_LIB_XSCRNSAVER_VERSION := 1.1.0 -XORG_LIB_XSCRNSAVER := libXScrnSaver-X11R7.1-$(XORG_LIB_XSCRNSAVER_VERSION) +XORG_LIB_XSCRNSAVER_VERSION := 1.1.2 +XORG_LIB_XSCRNSAVER := libXScrnSaver-$(XORG_LIB_XSCRNSAVER_VERSION) XORG_LIB_XSCRNSAVER_SUFFIX := tar.bz2 -XORG_LIB_XSCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX) +XORG_LIB_XSCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX) XORG_LIB_XSCRNSAVER_SOURCE := $(SRCDIR)/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX) XORG_LIB_XSCRNSAVER_DIR := $(BUILDDIR)/$(XORG_LIB_XSCRNSAVER) diff --git a/rules/xorg-lib-XTrap.make b/rules/xorg-lib-XTrap.make index fab9fb69c..9d704be2d 100644 --- a/rules/xorg-lib-XTrap.make +++ b/rules/xorg-lib-XTrap.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRAP) += xorg-lib-XTrap # Paths and names # XORG_LIB_XTRAP_VERSION := 1.0.0 -XORG_LIB_XTRAP := libXTrap-X11R7.0-$(XORG_LIB_XTRAP_VERSION) +XORG_LIB_XTRAP := libXTrap-$(XORG_LIB_XTRAP_VERSION) XORG_LIB_XTRAP_SUFFIX := tar.bz2 -XORG_LIB_XTRAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX) +XORG_LIB_XTRAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX) XORG_LIB_XTRAP_SOURCE := $(SRCDIR)/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX) XORG_LIB_XTRAP_DIR := $(BUILDDIR)/$(XORG_LIB_XTRAP) diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make index 5ab2dcbda..b1427d553 100644 --- a/rules/xorg-lib-Xau.make +++ b/rules/xorg-lib-Xau.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XAU) += xorg-lib-Xau # # Paths and names # -XORG_LIB_XAU_VERSION := 1.0.1 -XORG_LIB_XAU := libXau-X11R7.1-$(XORG_LIB_XAU_VERSION) +XORG_LIB_XAU_VERSION := 1.0.3 +XORG_LIB_XAU := libXau-$(XORG_LIB_XAU_VERSION) XORG_LIB_XAU_SUFFIX := tar.bz2 -XORG_LIB_XAU_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX) +XORG_LIB_XAU_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX) XORG_LIB_XAU_SOURCE := $(SRCDIR)/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX) XORG_LIB_XAU_DIR := $(BUILDDIR)/$(XORG_LIB_XAU) diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make index d8c7a54bf..22ac17d57 100644 --- a/rules/xorg-lib-Xaw.make +++ b/rules/xorg-lib-Xaw.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XAW) += xorg-lib-Xaw # # Paths and names # -XORG_LIB_XAW_VERSION := 1.0.2 -XORG_LIB_XAW := libXaw-X11R7.1-$(XORG_LIB_XAW_VERSION) +XORG_LIB_XAW_VERSION := 1.0.4 +XORG_LIB_XAW := libXaw-$(XORG_LIB_XAW_VERSION) XORG_LIB_XAW_SUFFIX := tar.bz2 -XORG_LIB_XAW_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) +XORG_LIB_XAW_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) XORG_LIB_XAW_SOURCE := $(SRCDIR)/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) XORG_LIB_XAW_DIR := $(BUILDDIR)/$(XORG_LIB_XAW) diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make index f7e184e44..d5e430aa8 100644 --- a/rules/xorg-lib-Xcomposite.make +++ b/rules/xorg-lib-Xcomposite.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XCOMPOSITE) += xorg-lib-Xcomposite # # Paths and names # -XORG_LIB_XCOMPOSITE_VERSION := 0.3 -XORG_LIB_XCOMPOSITE := libXcomposite-X11R7.1-$(XORG_LIB_XCOMPOSITE_VERSION) +XORG_LIB_XCOMPOSITE_VERSION := 0.4.0 +XORG_LIB_XCOMPOSITE := libXcomposite-$(XORG_LIB_XCOMPOSITE_VERSION) XORG_LIB_XCOMPOSITE_SUFFIX := tar.bz2 -XORG_LIB_XCOMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX) +XORG_LIB_XCOMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX) XORG_LIB_XCOMPOSITE_SOURCE := $(SRCDIR)/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX) XORG_LIB_XCOMPOSITE_DIR := $(BUILDDIR)/$(XORG_LIB_XCOMPOSITE) diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make index eb23c0244..f9ad3341f 100644 --- a/rules/xorg-lib-Xcursor.make +++ b/rules/xorg-lib-Xcursor.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XCURSOR) += xorg-lib-Xcursor # # Paths and names # -XORG_LIB_XCURSOR_VERSION := 1.1.6 -XORG_LIB_XCURSOR := libXcursor-X11R7.1-$(XORG_LIB_XCURSOR_VERSION) +XORG_LIB_XCURSOR_VERSION := 1.1.9 +XORG_LIB_XCURSOR := libXcursor-$(XORG_LIB_XCURSOR_VERSION) XORG_LIB_XCURSOR_SUFFIX := tar.bz2 -XORG_LIB_XCURSOR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX) +XORG_LIB_XCURSOR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX) XORG_LIB_XCURSOR_SOURCE := $(SRCDIR)/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX) XORG_LIB_XCURSOR_DIR := $(BUILDDIR)/$(XORG_LIB_XCURSOR) diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make index dd7deb1ca..8fcc27f0f 100644 --- a/rules/xorg-lib-Xdamage.make +++ b/rules/xorg-lib-Xdamage.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XDAMAGE) += xorg-lib-Xdamage # # Paths and names # -XORG_LIB_XDAMAGE_VERSION := 1.0.3 -XORG_LIB_XDAMAGE := libXdamage-X11R7.1-$(XORG_LIB_XDAMAGE_VERSION) +XORG_LIB_XDAMAGE_VERSION := 1.0.4 +XORG_LIB_XDAMAGE := libXdamage-$(XORG_LIB_XDAMAGE_VERSION) XORG_LIB_XDAMAGE_SUFFIX := tar.bz2 -XORG_LIB_XDAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX) +XORG_LIB_XDAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX) XORG_LIB_XDAMAGE_SOURCE := $(SRCDIR)/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX) XORG_LIB_XDAMAGE_DIR := $(BUILDDIR)/$(XORG_LIB_XDAMAGE) diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make index b62e2d208..f89bcf177 100644 --- a/rules/xorg-lib-Xdmcp.make +++ b/rules/xorg-lib-Xdmcp.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XDMCP) += xorg-lib-Xdmcp # # Paths and names # -XORG_LIB_XDMCP_VERSION := 1.0.1 -XORG_LIB_XDMCP := libXdmcp-X11R7.1-$(XORG_LIB_XDMCP_VERSION) +XORG_LIB_XDMCP_VERSION := 1.0.2 +XORG_LIB_XDMCP := libXdmcp-$(XORG_LIB_XDMCP_VERSION) XORG_LIB_XDMCP_SUFFIX := tar.bz2 -XORG_LIB_XDMCP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX) +XORG_LIB_XDMCP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX) XORG_LIB_XDMCP_SOURCE := $(SRCDIR)/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX) XORG_LIB_XDMCP_DIR := $(BUILDDIR)/$(XORG_LIB_XDMCP) diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make index e614bae97..33f25ac08 100644 --- a/rules/xorg-lib-Xevie.make +++ b/rules/xorg-lib-Xevie.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XEVIE) += xorg-lib-Xevie # # Paths and names # -XORG_LIB_XEVIE_VERSION := 1.0.1 -XORG_LIB_XEVIE := libXevie-X11R7.1-$(XORG_LIB_XEVIE_VERSION) +XORG_LIB_XEVIE_VERSION := 1.0.2 +XORG_LIB_XEVIE := libXevie-$(XORG_LIB_XEVIE_VERSION) XORG_LIB_XEVIE_SUFFIX := tar.bz2 -XORG_LIB_XEVIE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX) +XORG_LIB_XEVIE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX) XORG_LIB_XEVIE_SOURCE := $(SRCDIR)/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX) XORG_LIB_XEVIE_DIR := $(BUILDDIR)/$(XORG_LIB_XEVIE) diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make index c6659e41a..48803c261 100644 --- a/rules/xorg-lib-Xext.make +++ b/rules/xorg-lib-Xext.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XEXT) += xorg-lib-Xext # # Paths and names # -XORG_LIB_XEXT_VERSION := 1.0.1 -XORG_LIB_XEXT := libXext-X11R7.1-$(XORG_LIB_XEXT_VERSION) +XORG_LIB_XEXT_VERSION := 1.0.2 +XORG_LIB_XEXT := libXext-$(XORG_LIB_XEXT_VERSION) XORG_LIB_XEXT_SUFFIX := tar.bz2 -XORG_LIB_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX) +XORG_LIB_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX) XORG_LIB_XEXT_SOURCE := $(SRCDIR)/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX) XORG_LIB_XEXT_DIR := $(BUILDDIR)/$(XORG_LIB_XEXT) diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make index 32ab22728..4398da45e 100644 --- a/rules/xorg-lib-Xfixes.make +++ b/rules/xorg-lib-Xfixes.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFIXES) += xorg-lib-Xfixes # # Paths and names # -XORG_LIB_XFIXES_VERSION := 4.0.1 -XORG_LIB_XFIXES := libXfixes-X11R7.1-$(XORG_LIB_XFIXES_VERSION) +XORG_LIB_XFIXES_VERSION := 4.0.3 +XORG_LIB_XFIXES := libXfixes-$(XORG_LIB_XFIXES_VERSION) XORG_LIB_XFIXES_SUFFIX := tar.bz2 -XORG_LIB_XFIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX) +XORG_LIB_XFIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX) XORG_LIB_XFIXES_SOURCE := $(SRCDIR)/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX) XORG_LIB_XFIXES_DIR := $(BUILDDIR)/$(XORG_LIB_XFIXES) diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make index ce824e2cf..c30e196d9 100644 --- a/rules/xorg-lib-Xfontcache.make +++ b/rules/xorg-lib-Xfontcache.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONTCACHE) += xorg-lib-Xfontcache # # Paths and names # -XORG_LIB_XFONTCACHE_VERSION := 1.0.2 -XORG_LIB_XFONTCACHE := libXfontcache-X11R7.1-$(XORG_LIB_XFONTCACHE_VERSION) +XORG_LIB_XFONTCACHE_VERSION := 1.0.4 +XORG_LIB_XFONTCACHE := libXfontcache-$(XORG_LIB_XFONTCACHE_VERSION) XORG_LIB_XFONTCACHE_SUFFIX := tar.bz2 -XORG_LIB_XFONTCACHE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX) +XORG_LIB_XFONTCACHE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX) XORG_LIB_XFONTCACHE_SOURCE := $(SRCDIR)/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX) XORG_LIB_XFONTCACHE_DIR := $(BUILDDIR)/$(XORG_LIB_XFONTCACHE) diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make index 5748683aa..146418e42 100644 --- a/rules/xorg-lib-Xft.make +++ b/rules/xorg-lib-Xft.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFT) += xorg-lib-Xft # # Paths and names # -XORG_LIB_XFT_VERSION := 2.1.8.2 -XORG_LIB_XFT := libXft-X11R7.0-$(XORG_LIB_XFT_VERSION) +XORG_LIB_XFT_VERSION := 2.1.12 +XORG_LIB_XFT := libXft-$(XORG_LIB_XFT_VERSION) XORG_LIB_XFT_SUFFIX := tar.bz2 -XORG_LIB_XFT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX) +XORG_LIB_XFT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX) XORG_LIB_XFT_SOURCE := $(SRCDIR)/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX) XORG_LIB_XFT_DIR := $(BUILDDIR)/$(XORG_LIB_XFT) diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make index aaf7ec458..c9836fe25 100644 --- a/rules/xorg-lib-Xi.make +++ b/rules/xorg-lib-Xi.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XI) += xorg-lib-Xi # # Paths and names # -XORG_LIB_XI_VERSION := 1.0.1 -XORG_LIB_XI := libXi-X11R7.1-$(XORG_LIB_XI_VERSION) +XORG_LIB_XI_VERSION := 1.1.3 +XORG_LIB_XI := libXi-$(XORG_LIB_XI_VERSION) XORG_LIB_XI_SUFFIX := tar.bz2 -XORG_LIB_XI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX) +XORG_LIB_XI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX) XORG_LIB_XI_SOURCE := $(SRCDIR)/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX) XORG_LIB_XI_DIR := $(BUILDDIR)/$(XORG_LIB_XI) diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make index 2ba8bd530..b582f8565 100644 --- a/rules/xorg-lib-Xinerama.make +++ b/rules/xorg-lib-Xinerama.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XINERAMA) += xorg-lib-Xinerama # # Paths and names # -XORG_LIB_XINERAMA_VERSION := 1.0.1 -XORG_LIB_XINERAMA := libXinerama-X11R7.0-$(XORG_LIB_XINERAMA_VERSION) +XORG_LIB_XINERAMA_VERSION := 1.0.2 +XORG_LIB_XINERAMA := libXinerama-$(XORG_LIB_XINERAMA_VERSION) XORG_LIB_XINERAMA_SUFFIX := tar.bz2 -XORG_LIB_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX) +XORG_LIB_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX) XORG_LIB_XINERAMA_SOURCE := $(SRCDIR)/$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX) XORG_LIB_XINERAMA_DIR := $(BUILDDIR)/$(XORG_LIB_XINERAMA) diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make index 54483a1ae..6d2b4f358 100644 --- a/rules/xorg-lib-Xmu.make +++ b/rules/xorg-lib-Xmu.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XMU) += xorg-lib-Xmu # # Paths and names # -XORG_LIB_XMU_VERSION := 1.0.1 -XORG_LIB_XMU := libXmu-X11R7.1-$(XORG_LIB_XMU_VERSION) +XORG_LIB_XMU_VERSION := 1.0.3 +XORG_LIB_XMU := libXmu-$(XORG_LIB_XMU_VERSION) XORG_LIB_XMU_SUFFIX := tar.bz2 -XORG_LIB_XMU_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX) +XORG_LIB_XMU_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX) XORG_LIB_XMU_SOURCE := $(SRCDIR)/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX) XORG_LIB_XMU_DIR := $(BUILDDIR)/$(XORG_LIB_XMU) diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make index d3865728e..3cfc9ef43 100644 --- a/rules/xorg-lib-Xp.make +++ b/rules/xorg-lib-Xp.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XP) += xorg-lib-Xp # Paths and names # XORG_LIB_XP_VERSION := 1.0.0 -XORG_LIB_XP := libXp-X11R7.0-$(XORG_LIB_XP_VERSION) +XORG_LIB_XP := libXp-$(XORG_LIB_XP_VERSION) XORG_LIB_XP_SUFFIX := tar.bz2 -XORG_LIB_XP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX) +XORG_LIB_XP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX) XORG_LIB_XP_SOURCE := $(SRCDIR)/$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX) XORG_LIB_XP_DIR := $(BUILDDIR)/$(XORG_LIB_XP) diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make index f9a4379bf..56216e5d1 100644 --- a/rules/xorg-lib-Xpm.make +++ b/rules/xorg-lib-Xpm.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPM) += xorg-lib-Xpm # # Paths and names # -XORG_LIB_XPM_VERSION := 3.5.5 -XORG_LIB_XPM := libXpm-X11R7.1-$(XORG_LIB_XPM_VERSION) +XORG_LIB_XPM_VERSION := 3.5.7 +XORG_LIB_XPM := libXpm-$(XORG_LIB_XPM_VERSION) XORG_LIB_XPM_SUFFIX := tar.bz2 -XORG_LIB_XPM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX) +XORG_LIB_XPM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX) XORG_LIB_XPM_SOURCE := $(SRCDIR)/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX) XORG_LIB_XPM_DIR := $(BUILDDIR)/$(XORG_LIB_XPM) diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make index 205fa8c6d..129b4d853 100644 --- a/rules/xorg-lib-XprintAppUtil.make +++ b/rules/xorg-lib-XprintAppUtil.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTAPPUTIL) += xorg-lib-XprintAppUtil # Paths and names # XORG_LIB_XPRINTAPPUTIL_VERSION := 1.0.1 -XORG_LIB_XPRINTAPPUTIL := libXprintAppUtil-X11R7.0-$(XORG_LIB_XPRINTAPPUTIL_VERSION) +XORG_LIB_XPRINTAPPUTIL := libXprintAppUtil-$(XORG_LIB_XPRINTAPPUTIL_VERSION) XORG_LIB_XPRINTAPPUTIL_SUFFIX := tar.bz2 -XORG_LIB_XPRINTAPPUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX) +XORG_LIB_XPRINTAPPUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX) XORG_LIB_XPRINTAPPUTIL_SOURCE := $(SRCDIR)/$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX) XORG_LIB_XPRINTAPPUTIL_DIR := $(BUILDDIR)/$(XORG_LIB_XPRINTAPPUTIL) diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make index 10b4c3eb7..e0f2bd93e 100644 --- a/rules/xorg-lib-XprintUtil.make +++ b/rules/xorg-lib-XprintUtil.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTUTIL) += xorg-lib-XprintUtil # Paths and names # XORG_LIB_XPRINTUTIL_VERSION := 1.0.1 -XORG_LIB_XPRINTUTIL := libXprintUtil-X11R7.0-$(XORG_LIB_XPRINTUTIL_VERSION) +XORG_LIB_XPRINTUTIL := libXprintUtil-$(XORG_LIB_XPRINTUTIL_VERSION) XORG_LIB_XPRINTUTIL_SUFFIX := tar.bz2 -XORG_LIB_XPRINTUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX) +XORG_LIB_XPRINTUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX) XORG_LIB_XPRINTUTIL_SOURCE := $(SRCDIR)/$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX) XORG_LIB_XPRINTUTIL_DIR := $(BUILDDIR)/$(XORG_LIB_XPRINTUTIL) diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make index 595606638..d9b7932df 100644 --- a/rules/xorg-lib-Xrandr.make +++ b/rules/xorg-lib-Xrandr.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRANDR) += xorg-lib-Xrandr # # Paths and names # -XORG_LIB_XRANDR_VERSION := 1.1.1 -XORG_LIB_XRANDR := libXrandr-X11R7.1-$(XORG_LIB_XRANDR_VERSION) +XORG_LIB_XRANDR_VERSION := 1.2.2 +XORG_LIB_XRANDR := libXrandr-$(XORG_LIB_XRANDR_VERSION) XORG_LIB_XRANDR_SUFFIX := tar.bz2 -XORG_LIB_XRANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX) +XORG_LIB_XRANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX) XORG_LIB_XRANDR_SOURCE := $(SRCDIR)/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX) XORG_LIB_XRANDR_DIR := $(BUILDDIR)/$(XORG_LIB_XRANDR) @@ -116,15 +116,15 @@ $(STATEDIR)/xorg-lib-Xrandr.targetinstall: $(xorg-lib-Xrandr_targetinstall_deps_ @$(call install_fixup, xorg-lib-Xrandr,DESCRIPTION,missing) @$(call install_copy, xorg-lib-Xrandr, 0, 0, 0644, \ - $(XORG_LIB_XRANDR_DIR)/src/.libs/libXrandr.so.2.0.0, \ - $(XORG_LIBDIR)/libXrandr.so.2.0.0) + $(XORG_LIB_XRANDR_DIR)/src/.libs/libXrandr.so.2.1.0, \ + $(XORG_LIBDIR)/libXrandr.so.2.1.0) @$(call install_link, xorg-lib-Xrandr, \ - libXrandr.so.2.0.0, \ + libXrandr.so.2.1.0, \ $(XORG_LIBDIR)/libXrandr.so.2) @$(call install_link, xorg-lib-Xrandr, \ - libXrandr.so.2.0.0, \ + libXrandr.so.2.1.0, \ $(XORG_LIBDIR)/libXrandr.so) @$(call install_finish, xorg-lib-Xrandr) diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make index dfa9874fd..aa4008e31 100644 --- a/rules/xorg-lib-Xrender.make +++ b/rules/xorg-lib-Xrender.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRENDER) += xorg-lib-Xrender # # Paths and names # -XORG_LIB_XRENDER_VERSION := 0.9.1 -XORG_LIB_XRENDER := libXrender-X11R7.1-$(XORG_LIB_XRENDER_VERSION) +XORG_LIB_XRENDER_VERSION := 0.9.4 +XORG_LIB_XRENDER := libXrender-$(XORG_LIB_XRENDER_VERSION) XORG_LIB_XRENDER_SUFFIX := tar.bz2 -XORG_LIB_XRENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX) +XORG_LIB_XRENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX) XORG_LIB_XRENDER_SOURCE := $(SRCDIR)/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX) XORG_LIB_XRENDER_DIR := $(BUILDDIR)/$(XORG_LIB_XRENDER) diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make index 06667c480..5cf08d9a8 100644 --- a/rules/xorg-lib-Xres.make +++ b/rules/xorg-lib-Xres.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRES) += xorg-lib-Xres # # Paths and names # -XORG_LIB_XRES_VERSION := 1.0.1 -XORG_LIB_XRES := libXres-X11R7.1-$(XORG_LIB_XRES_VERSION) +XORG_LIB_XRES_VERSION := 1.0.3 +XORG_LIB_XRES := libXres-$(XORG_LIB_XRES_VERSION) XORG_LIB_XRES_SUFFIX := tar.bz2 -XORG_LIB_XRES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX) +XORG_LIB_XRES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX) XORG_LIB_XRES_SOURCE := $(SRCDIR)/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX) XORG_LIB_XRES_DIR := $(BUILDDIR)/$(XORG_LIB_XRES) diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make index 330a5be02..e65683f20 100644 --- a/rules/xorg-lib-Xt.make +++ b/rules/xorg-lib-Xt.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XT) += xorg-lib-Xt # # Paths and names # -XORG_LIB_XT_VERSION := 1.0.2 -XORG_LIB_XT := libXt-X11R7.1-$(XORG_LIB_XT_VERSION) +XORG_LIB_XT_VERSION := 1.0.4 +XORG_LIB_XT := libXt-$(XORG_LIB_XT_VERSION) XORG_LIB_XT_SUFFIX := tar.bz2 -XORG_LIB_XT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX) +XORG_LIB_XT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX) XORG_LIB_XT_SOURCE := $(SRCDIR)/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX) XORG_LIB_XT_DIR := $(BUILDDIR)/$(XORG_LIB_XT) diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make index 4401ef80a..a5be899f1 100644 --- a/rules/xorg-lib-Xtst.make +++ b/rules/xorg-lib-Xtst.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTST) += xorg-lib-Xtst # # Paths and names # -XORG_LIB_XTST_VERSION := 1.0.1 -XORG_LIB_XTST := libXtst-X11R7.0-$(XORG_LIB_XTST_VERSION) +XORG_LIB_XTST_VERSION := 1.0.3 +XORG_LIB_XTST := libXtst-$(XORG_LIB_XTST_VERSION) XORG_LIB_XTST_SUFFIX := tar.bz2 -XORG_LIB_XTST_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX) +XORG_LIB_XTST_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX) XORG_LIB_XTST_SOURCE := $(SRCDIR)/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX) XORG_LIB_XTST_DIR := $(BUILDDIR)/$(XORG_LIB_XTST) diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make index 59b65945e..c0d6407fa 100644 --- a/rules/xorg-lib-Xv.make +++ b/rules/xorg-lib-Xv.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XV) += xorg-lib-Xv # # Paths and names # -XORG_LIB_XV_VERSION := 1.0.1 -XORG_LIB_XV := libXv-X11R7.0-$(XORG_LIB_XV_VERSION) +XORG_LIB_XV_VERSION := 1.0.3 +XORG_LIB_XV := libXv-$(XORG_LIB_XV_VERSION) XORG_LIB_XV_SUFFIX := tar.bz2 -XORG_LIB_XV_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX) +XORG_LIB_XV_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX) XORG_LIB_XV_SOURCE := $(SRCDIR)/$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX) XORG_LIB_XV_DIR := $(BUILDDIR)/$(XORG_LIB_XV) diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make index b4865a672..0f22fc7d5 100644 --- a/rules/xorg-lib-XvMC.make +++ b/rules/xorg-lib-XvMC.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XVMC) += xorg-lib-XvMC # # Paths and names # -XORG_LIB_XVMC_VERSION := 1.0.2 -XORG_LIB_XVMC := libXvMC-X11R7.1-$(XORG_LIB_XVMC_VERSION) +XORG_LIB_XVMC_VERSION := 1.0.4 +XORG_LIB_XVMC := libXvMC-$(XORG_LIB_XVMC_VERSION) XORG_LIB_XVMC_SUFFIX := tar.bz2 -XORG_LIB_XVMC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX) +XORG_LIB_XVMC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX) XORG_LIB_XVMC_SOURCE := $(SRCDIR)/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX) XORG_LIB_XVMC_DIR := $(BUILDDIR)/$(XORG_LIB_XVMC) diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make index a5f658319..2d5c11a11 100644 --- a/rules/xorg-lib-Xxf86dga.make +++ b/rules/xorg-lib-Xxf86dga.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86DGA) += xorg-lib-Xxf86dga # # Paths and names # -XORG_LIB_XXF86DGA_VERSION := 1.0.1 -XORG_LIB_XXF86DGA := libXxf86dga-X11R7.1-$(XORG_LIB_XXF86DGA_VERSION) +XORG_LIB_XXF86DGA_VERSION := 1.0.2 +XORG_LIB_XXF86DGA := libXxf86dga-$(XORG_LIB_XXF86DGA_VERSION) XORG_LIB_XXF86DGA_SUFFIX := tar.bz2 -XORG_LIB_XXF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX) +XORG_LIB_XXF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX) XORG_LIB_XXF86DGA_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX) XORG_LIB_XXF86DGA_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86DGA) diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make index 8f3077e48..b0a276fdd 100644 --- a/rules/xorg-lib-Xxf86misc.make +++ b/rules/xorg-lib-Xxf86misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86MISC) += xorg-lib-Xxf86misc # Paths and names # XORG_LIB_XXF86MISC_VERSION := 1.0.1 -XORG_LIB_XXF86MISC := libXxf86misc-X11R7.1-$(XORG_LIB_XXF86MISC_VERSION) +XORG_LIB_XXF86MISC := libXxf86misc-$(XORG_LIB_XXF86MISC_VERSION) XORG_LIB_XXF86MISC_SUFFIX := tar.bz2 -XORG_LIB_XXF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX) +XORG_LIB_XXF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX) XORG_LIB_XXF86MISC_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX) XORG_LIB_XXF86MISC_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86MISC) diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make index ce9b18974..555d17cec 100644 --- a/rules/xorg-lib-Xxf86vm.make +++ b/rules/xorg-lib-Xxf86vm.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86VM) += xorg-lib-Xxf86vm # Paths and names # XORG_LIB_XXF86VM_VERSION := 1.0.1 -XORG_LIB_XXF86VM := libXxf86vm-X11R7.1-$(XORG_LIB_XXF86VM_VERSION) +XORG_LIB_XXF86VM := libXxf86vm-$(XORG_LIB_XXF86VM_VERSION) XORG_LIB_XXF86VM_SUFFIX := tar.bz2 -XORG_LIB_XXF86VM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX) +XORG_LIB_XXF86VM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX) XORG_LIB_XXF86VM_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX) XORG_LIB_XXF86VM_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86VM) diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make index bddec0be0..80b95a50b 100644 --- a/rules/xorg-lib-dmx.make +++ b/rules/xorg-lib-dmx.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_DMX) += xorg-lib-dmx # Paths and names # XORG_LIB_DMX_VERSION := 1.0.2 -XORG_LIB_DMX := libdmx-X11R7.1-$(XORG_LIB_DMX_VERSION) +XORG_LIB_DMX := libdmx-$(XORG_LIB_DMX_VERSION) XORG_LIB_DMX_SUFFIX := tar.bz2 -XORG_LIB_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX) +XORG_LIB_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX) XORG_LIB_DMX_SOURCE := $(SRCDIR)/$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX) XORG_LIB_DMX_DIR := $(BUILDDIR)/$(XORG_LIB_DMX) diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make index e0c9fd53d..475564f46 100644 --- a/rules/xorg-lib-fontenc.make +++ b/rules/xorg-lib-fontenc.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_FONTENC) += xorg-lib-fontenc # # Paths and names # -XORG_LIB_FONTENC_VERSION := 1.0.2 -XORG_LIB_FONTENC := libfontenc-X11R7.1-$(XORG_LIB_FONTENC_VERSION) +XORG_LIB_FONTENC_VERSION := 1.0.4 +XORG_LIB_FONTENC := libfontenc-$(XORG_LIB_FONTENC_VERSION) XORG_LIB_FONTENC_SUFFIX := tar.bz2 -XORG_LIB_FONTENC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX) +XORG_LIB_FONTENC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX) XORG_LIB_FONTENC_SOURCE := $(SRCDIR)/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX) XORG_LIB_FONTENC_DIR := $(BUILDDIR)/$(XORG_LIB_FONTENC) diff --git a/rules/xorg-lib-lbxutil.make b/rules/xorg-lib-lbxutil.make index 174df242c..8acb0674b 100644 --- a/rules/xorg-lib-lbxutil.make +++ b/rules/xorg-lib-lbxutil.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_LBXUTIL) += xorg-lib-lbxutil # Paths and names # XORG_LIB_LBXUTIL_VERSION := 1.0.1 -XORG_LIB_LBXUTIL := liblbxutil-X11R7.1-$(XORG_LIB_LBXUTIL_VERSION) +XORG_LIB_LBXUTIL := liblbxutil-$(XORG_LIB_LBXUTIL_VERSION) XORG_LIB_LBXUTIL_SUFFIX := tar.bz2 -XORG_LIB_LBXUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX) +XORG_LIB_LBXUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX) XORG_LIB_LBXUTIL_SOURCE := $(SRCDIR)/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX) XORG_LIB_LBXUTIL_DIR := $(BUILDDIR)/$(XORG_LIB_LBXUTIL) diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make index c03e58aff..2751be465 100644 --- a/rules/xorg-lib-oldX.make +++ b/rules/xorg-lib-oldX.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_OLDX) += xorg-lib-oldX # Paths and names # XORG_LIB_OLDX_VERSION := 1.0.1 -XORG_LIB_OLDX := liboldX-X11R7.0-$(XORG_LIB_OLDX_VERSION) +XORG_LIB_OLDX := liboldX-$(XORG_LIB_OLDX_VERSION) XORG_LIB_OLDX_SUFFIX := tar.bz2 -XORG_LIB_OLDX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX) +XORG_LIB_OLDX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX) XORG_LIB_OLDX_SOURCE := $(SRCDIR)/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX) XORG_LIB_OLDX_DIR := $(BUILDDIR)/$(XORG_LIB_OLDX) diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make index e73ed1b9b..8a171e870 100644 --- a/rules/xorg-lib-xkbfile.make +++ b/rules/xorg-lib-xkbfile.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XKBFILE) += xorg-lib-xkbfile # # Paths and names # -XORG_LIB_XKBFILE_VERSION := 1.0.3 -XORG_LIB_XKBFILE := libxkbfile-X11R7.1-$(XORG_LIB_XKBFILE_VERSION) +XORG_LIB_XKBFILE_VERSION := 1.0.4 +XORG_LIB_XKBFILE := libxkbfile-$(XORG_LIB_XKBFILE_VERSION) XORG_LIB_XKBFILE_SUFFIX := tar.bz2 -XORG_LIB_XKBFILE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX) +XORG_LIB_XKBFILE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX) XORG_LIB_XKBFILE_SOURCE := $(SRCDIR)/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX) XORG_LIB_XKBFILE_DIR := $(BUILDDIR)/$(XORG_LIB_XKBFILE) diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make index 1ff036650..52054376e 100644 --- a/rules/xorg-lib-xkbui.make +++ b/rules/xorg-lib-xkbui.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XKBUI) += xorg-lib-xkbui # Paths and names # XORG_LIB_XKBUI_VERSION := 1.0.2 -XORG_LIB_XKBUI := libxkbui-X11R7.1-$(XORG_LIB_XKBUI_VERSION) +XORG_LIB_XKBUI := libxkbui-$(XORG_LIB_XKBUI_VERSION) XORG_LIB_XKBUI_SUFFIX := tar.bz2 -XORG_LIB_XKBUI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX) +XORG_LIB_XKBUI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX) XORG_LIB_XKBUI_SOURCE := $(SRCDIR)/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX) XORG_LIB_XKBUI_DIR := $(BUILDDIR)/$(XORG_LIB_XKBUI) diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make index 41382de8d..954fb8465 100644 --- a/rules/xorg-lib-xtrans.make +++ b/rules/xorg-lib-xtrans.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRANS) += xorg-lib-xtrans # # Paths and names # -XORG_LIB_XTRANS_VERSION := 1.0.0 -XORG_LIB_XTRANS := xtrans-X11R7.0-$(XORG_LIB_XTRANS_VERSION) +XORG_LIB_XTRANS_VERSION := 1.0.4 +XORG_LIB_XTRANS := xtrans-$(XORG_LIB_XTRANS_VERSION) XORG_LIB_XTRANS_SUFFIX := tar.bz2 -XORG_LIB_XTRANS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX) +XORG_LIB_XTRANS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX) XORG_LIB_XTRANS_SOURCE := $(SRCDIR)/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX) XORG_LIB_XTRANS_DIR := $(BUILDDIR)/$(XORG_LIB_XTRANS) diff --git a/rules/xorg-lib.in b/rules/xorg-lib.in index db73a8b06..9aa0cb24c 100644 --- a/rules/xorg-lib.in +++ b/rules/xorg-lib.in @@ -2,6 +2,9 @@ menu "xorg libs " +source "rules/pixman.in" +source "rules/libpthread-stubs.in" +source "rules/libxcb.in" source "rules/xorg-lib-AppleWM.in" source "rules/xorg-lib-FS.in" source "rules/xorg-lib-ICE.in" diff --git a/rules/xorg-proto-applewm.make b/rules/xorg-proto-applewm.make index 1424b6984..d65e205d5 100644 --- a/rules/xorg-proto-applewm.make +++ b/rules/xorg-proto-applewm.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_APPLEWM) += xorg-proto-applewm # Paths and names # XORG_PROTO_APPLEWM_VERSION := 1.0.3 -XORG_PROTO_APPLEWM := applewmproto-X11R7.0-$(XORG_PROTO_APPLEWM_VERSION) +XORG_PROTO_APPLEWM := applewmproto-$(XORG_PROTO_APPLEWM_VERSION) XORG_PROTO_APPLEWM_SUFFIX := tar.bz2 -XORG_PROTO_APPLEWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX) +XORG_PROTO_APPLEWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX) XORG_PROTO_APPLEWM_SOURCE := $(SRCDIR)/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX) XORG_PROTO_APPLEWM_DIR := $(BUILDDIR)/$(XORG_PROTO_APPLEWM) diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make index 29423c9c6..a85c6a7b5 100644 --- a/rules/xorg-proto-bigreqs.make +++ b/rules/xorg-proto-bigreqs.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_BIGREQS) += xorg-proto-bigreqs # Paths and names # XORG_PROTO_BIGREQS_VERSION := 1.0.2 -XORG_PROTO_BIGREQS := bigreqsproto-X11R7.0-$(XORG_PROTO_BIGREQS_VERSION) +XORG_PROTO_BIGREQS := bigreqsproto-$(XORG_PROTO_BIGREQS_VERSION) XORG_PROTO_BIGREQS_SUFFIX := tar.bz2 -XORG_PROTO_BIGREQS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX) +XORG_PROTO_BIGREQS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX) XORG_PROTO_BIGREQS_SOURCE := $(SRCDIR)/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX) XORG_PROTO_BIGREQS_DIR := $(BUILDDIR)/$(XORG_PROTO_BIGREQS) diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make index 622455d4d..77a6fdc95 100644 --- a/rules/xorg-proto-composite.make +++ b/rules/xorg-proto-composite.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_COMPOSITE) += xorg-proto-composite # # Paths and names # -XORG_PROTO_COMPOSITE_VERSION := 0.3.1 -XORG_PROTO_COMPOSITE := compositeproto-X11R7.1-$(XORG_PROTO_COMPOSITE_VERSION) +XORG_PROTO_COMPOSITE_VERSION := 0.4 +XORG_PROTO_COMPOSITE := compositeproto-$(XORG_PROTO_COMPOSITE_VERSION) XORG_PROTO_COMPOSITE_SUFFIX := tar.bz2 -XORG_PROTO_COMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX) +XORG_PROTO_COMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX) XORG_PROTO_COMPOSITE_SOURCE := $(SRCDIR)/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX) XORG_PROTO_COMPOSITE_DIR := $(BUILDDIR)/$(XORG_PROTO_COMPOSITE) diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make index 37c6ab05c..f87238455 100644 --- a/rules/xorg-proto-damage.make +++ b/rules/xorg-proto-damage.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DAMAGE) += xorg-proto-damage # # Paths and names # -XORG_PROTO_DAMAGE_VERSION := 1.0.3 -XORG_PROTO_DAMAGE := damageproto-X11R7.0-$(XORG_PROTO_DAMAGE_VERSION) +XORG_PROTO_DAMAGE_VERSION := 1.1.0 +XORG_PROTO_DAMAGE := damageproto-$(XORG_PROTO_DAMAGE_VERSION) XORG_PROTO_DAMAGE_SUFFIX := tar.bz2 -XORG_PROTO_DAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX) +XORG_PROTO_DAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX) XORG_PROTO_DAMAGE_SOURCE := $(SRCDIR)/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX) XORG_PROTO_DAMAGE_DIR := $(BUILDDIR)/$(XORG_PROTO_DAMAGE) diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make index f1059e7c2..ed6609d73 100644 --- a/rules/xorg-proto-dmx.make +++ b/rules/xorg-proto-dmx.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DMX) += xorg-proto-dmx # Paths and names # XORG_PROTO_DMX_VERSION := 2.2.2 -XORG_PROTO_DMX := dmxproto-X11R7.0-$(XORG_PROTO_DMX_VERSION) +XORG_PROTO_DMX := dmxproto-$(XORG_PROTO_DMX_VERSION) XORG_PROTO_DMX_SUFFIX := tar.bz2 -XORG_PROTO_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX) +XORG_PROTO_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX) XORG_PROTO_DMX_SOURCE := $(SRCDIR)/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX) XORG_PROTO_DMX_DIR := $(BUILDDIR)/$(XORG_PROTO_DMX) diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make index 1210e47df..95ed3ed52 100644 --- a/rules/xorg-proto-evieext.make +++ b/rules/xorg-proto-evieext.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_EVIEEXT) += xorg-proto-evieext # Paths and names # XORG_PROTO_EVIEEXT_VERSION := 1.0.2 -XORG_PROTO_EVIEEXT := evieext-X11R7.0-$(XORG_PROTO_EVIEEXT_VERSION) +XORG_PROTO_EVIEEXT := evieext-$(XORG_PROTO_EVIEEXT_VERSION) XORG_PROTO_EVIEEXT_SUFFIX := tar.bz2 -XORG_PROTO_EVIEEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX) +XORG_PROTO_EVIEEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX) XORG_PROTO_EVIEEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX) XORG_PROTO_EVIEEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_EVIEEXT) diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make index 5e7ea3b68..62fd54dda 100644 --- a/rules/xorg-proto-fixes.make +++ b/rules/xorg-proto-fixes.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FIXES) += xorg-proto-fixes # Paths and names # XORG_PROTO_FIXES_VERSION := 4.0 -XORG_PROTO_FIXES := fixesproto-X11R7.1-$(XORG_PROTO_FIXES_VERSION) +XORG_PROTO_FIXES := fixesproto-$(XORG_PROTO_FIXES_VERSION) XORG_PROTO_FIXES_SUFFIX := tar.bz2 -XORG_PROTO_FIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX) +XORG_PROTO_FIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX) XORG_PROTO_FIXES_SOURCE := $(SRCDIR)/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX) XORG_PROTO_FIXES_DIR := $(BUILDDIR)/$(XORG_PROTO_FIXES) diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make index 1d086b0e9..3b2885362 100644 --- a/rules/xorg-proto-fontcache.make +++ b/rules/xorg-proto-fontcache.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTCACHE) += xorg-proto-fontcache # Paths and names # XORG_PROTO_FONTCACHE_VERSION := 0.1.2 -XORG_PROTO_FONTCACHE := fontcacheproto-X11R7.0-$(XORG_PROTO_FONTCACHE_VERSION) +XORG_PROTO_FONTCACHE := fontcacheproto-$(XORG_PROTO_FONTCACHE_VERSION) XORG_PROTO_FONTCACHE_SUFFIX := tar.bz2 -XORG_PROTO_FONTCACHE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX) +XORG_PROTO_FONTCACHE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX) XORG_PROTO_FONTCACHE_SOURCE := $(SRCDIR)/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX) XORG_PROTO_FONTCACHE_DIR := $(BUILDDIR)/$(XORG_PROTO_FONTCACHE) diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make index 2fc6b7c39..a7727618c 100644 --- a/rules/xorg-proto-fonts.make +++ b/rules/xorg-proto-fonts.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTS) += xorg-proto-fonts # Paths and names # XORG_PROTO_FONTS_VERSION := 2.0.2 -XORG_PROTO_FONTS := fontsproto-X11R7.0-$(XORG_PROTO_FONTS_VERSION) +XORG_PROTO_FONTS := fontsproto-$(XORG_PROTO_FONTS_VERSION) XORG_PROTO_FONTS_SUFFIX := tar.bz2 -XORG_PROTO_FONTS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX) +XORG_PROTO_FONTS_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX) XORG_PROTO_FONTS_SOURCE := $(SRCDIR)/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX) XORG_PROTO_FONTS_DIR := $(BUILDDIR)/$(XORG_PROTO_FONTS) diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make index 502c9e422..72f3f11eb 100644 --- a/rules/xorg-proto-gl.make +++ b/rules/xorg-proto-gl.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_GL) += xorg-proto-gl # # Paths and names # -XORG_PROTO_GL_VERSION := 1.4.7 -XORG_PROTO_GL := glproto-X11R7.1-$(XORG_PROTO_GL_VERSION) +XORG_PROTO_GL_VERSION := 1.4.8 +XORG_PROTO_GL := glproto-$(XORG_PROTO_GL_VERSION) XORG_PROTO_GL_SUFFIX := tar.bz2 -XORG_PROTO_GL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX) +XORG_PROTO_GL_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX) XORG_PROTO_GL_SOURCE := $(SRCDIR)/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX) XORG_PROTO_GL_DIR := $(BUILDDIR)/$(XORG_PROTO_GL) diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make index 61280ee7a..8dddbd052 100644 --- a/rules/xorg-proto-input.make +++ b/rules/xorg-proto-input.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_INPUT) += xorg-proto-input # # Paths and names # -XORG_PROTO_INPUT_VERSION:= 1.3.2 -XORG_PROTO_INPUT := inputproto-X11R7.0-$(XORG_PROTO_INPUT_VERSION) +XORG_PROTO_INPUT_VERSION:= 1.4.2.1 +XORG_PROTO_INPUT := inputproto-$(XORG_PROTO_INPUT_VERSION) XORG_PROTO_INPUT_SUFFIX := tar.bz2 -XORG_PROTO_INPUT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX) +XORG_PROTO_INPUT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX) XORG_PROTO_INPUT_SOURCE := $(SRCDIR)/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX) XORG_PROTO_INPUT_DIR := $(BUILDDIR)/$(XORG_PROTO_INPUT) diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make index 20e963b7f..ab8142c71 100644 --- a/rules/xorg-proto-kb.make +++ b/rules/xorg-proto-kb.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_KB) += xorg-proto-kb # # Paths and names # -XORG_PROTO_KB_VERSION := 1.0.2 -XORG_PROTO_KB := kbproto-X11R7.0-$(XORG_PROTO_KB_VERSION) +XORG_PROTO_KB_VERSION := 1.0.3 +XORG_PROTO_KB := kbproto-$(XORG_PROTO_KB_VERSION) XORG_PROTO_KB_SUFFIX := tar.bz2 -XORG_PROTO_KB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX) +XORG_PROTO_KB_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX) XORG_PROTO_KB_SOURCE := $(SRCDIR)/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX) XORG_PROTO_KB_DIR := $(BUILDDIR)/$(XORG_PROTO_KB) diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make index d7533ca84..2b875e116 100644 --- a/rules/xorg-proto-print.make +++ b/rules/xorg-proto-print.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_PRINT) += xorg-proto-print # Paths and names # XORG_PROTO_PRINT_VERSION:= 1.0.3 -XORG_PROTO_PRINT := printproto-X11R7.0-$(XORG_PROTO_PRINT_VERSION) +XORG_PROTO_PRINT := printproto-$(XORG_PROTO_PRINT_VERSION) XORG_PROTO_PRINT_SUFFIX := tar.bz2 -XORG_PROTO_PRINT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX) +XORG_PROTO_PRINT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX) XORG_PROTO_PRINT_SOURCE := $(SRCDIR)/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX) XORG_PROTO_PRINT_DIR := $(BUILDDIR)/$(XORG_PROTO_PRINT) diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make index 619df2ca5..f24c66998 100644 --- a/rules/xorg-proto-randr.make +++ b/rules/xorg-proto-randr.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RANDR) += xorg-proto-randr # # Paths and names # -XORG_PROTO_RANDR_VERSION:= 1.1.2 -XORG_PROTO_RANDR := randrproto-X11R7.0-$(XORG_PROTO_RANDR_VERSION) +XORG_PROTO_RANDR_VERSION:= 1.2.1 +XORG_PROTO_RANDR := randrproto-$(XORG_PROTO_RANDR_VERSION) XORG_PROTO_RANDR_SUFFIX := tar.bz2 -XORG_PROTO_RANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX) +XORG_PROTO_RANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX) XORG_PROTO_RANDR_SOURCE := $(SRCDIR)/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX) XORG_PROTO_RANDR_DIR := $(BUILDDIR)/$(XORG_PROTO_RANDR) diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make index 1249bb5ba..b7a0dcaa2 100644 --- a/rules/xorg-proto-record.make +++ b/rules/xorg-proto-record.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RECORD) += xorg-proto-record # Paths and names # XORG_PROTO_RECORD_VERSION := 1.13.2 -XORG_PROTO_RECORD := recordproto-X11R7.0-$(XORG_PROTO_RECORD_VERSION) +XORG_PROTO_RECORD := recordproto-$(XORG_PROTO_RECORD_VERSION) XORG_PROTO_RECORD_SUFFIX := tar.bz2 -XORG_PROTO_RECORD_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX) +XORG_PROTO_RECORD_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX) XORG_PROTO_RECORD_SOURCE := $(SRCDIR)/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX) XORG_PROTO_RECORD_DIR := $(BUILDDIR)/$(XORG_PROTO_RECORD) diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make index a9f70cada..0fb5221e9 100644 --- a/rules/xorg-proto-render.make +++ b/rules/xorg-proto-render.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RENDER) += xorg-proto-render # # Paths and names # -XORG_PROTO_RENDER_VERSION := 0.9.2 -XORG_PROTO_RENDER := renderproto-X11R7.0-$(XORG_PROTO_RENDER_VERSION) +XORG_PROTO_RENDER_VERSION := 0.9.3 +XORG_PROTO_RENDER := renderproto-$(XORG_PROTO_RENDER_VERSION) XORG_PROTO_RENDER_SUFFIX := tar.bz2 -XORG_PROTO_RENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX) +XORG_PROTO_RENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX) XORG_PROTO_RENDER_SOURCE := $(SRCDIR)/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX) XORG_PROTO_RENDER_DIR := $(BUILDDIR)/$(XORG_PROTO_RENDER) diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make index 0a994a8db..28fb45bde 100644 --- a/rules/xorg-proto-resource.make +++ b/rules/xorg-proto-resource.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RESOURCE) += xorg-proto-resource # Paths and names # XORG_PROTO_RESOURCE_VERSION := 1.0.2 -XORG_PROTO_RESOURCE := resourceproto-X11R7.0-$(XORG_PROTO_RESOURCE_VERSION) +XORG_PROTO_RESOURCE := resourceproto-$(XORG_PROTO_RESOURCE_VERSION) XORG_PROTO_RESOURCE_SUFFIX := tar.bz2 -XORG_PROTO_RESOURCE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX) +XORG_PROTO_RESOURCE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX) XORG_PROTO_RESOURCE_SOURCE := $(SRCDIR)/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX) XORG_PROTO_RESOURCE_DIR := $(BUILDDIR)/$(XORG_PROTO_RESOURCE) diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make index f6b2ebdac..6dafa322c 100644 --- a/rules/xorg-proto-scrnsaver.make +++ b/rules/xorg-proto-scrnsaver.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_SCRNSAVER) += xorg-proto-scrnsaver # Paths and names # XORG_PROTO_SCRNSAVER_VERSION := 1.1.0 -XORG_PROTO_SCRNSAVER := scrnsaverproto-X11R7.1-$(XORG_PROTO_SCRNSAVER_VERSION) +XORG_PROTO_SCRNSAVER := scrnsaverproto-$(XORG_PROTO_SCRNSAVER_VERSION) XORG_PROTO_SCRNSAVER_SUFFIX := tar.bz2 -XORG_PROTO_SCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX) +XORG_PROTO_SCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX) XORG_PROTO_SCRNSAVER_SOURCE := $(SRCDIR)/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX) XORG_PROTO_SCRNSAVER_DIR := $(BUILDDIR)/$(XORG_PROTO_SCRNSAVER) diff --git a/rules/xorg-proto-trap.make b/rules/xorg-proto-trap.make index 6da46678e..95bf3d780 100644 --- a/rules/xorg-proto-trap.make +++ b/rules/xorg-proto-trap.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_TRAP) += xorg-proto-trap # Paths and names # XORG_PROTO_TRAP_VERSION := 3.4.3 -XORG_PROTO_TRAP := trapproto-X11R7.0-$(XORG_PROTO_TRAP_VERSION) +XORG_PROTO_TRAP := trapproto-$(XORG_PROTO_TRAP_VERSION) XORG_PROTO_TRAP_SUFFIX := tar.bz2 -XORG_PROTO_TRAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX) +XORG_PROTO_TRAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX) XORG_PROTO_TRAP_SOURCE := $(SRCDIR)/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX) XORG_PROTO_TRAP_DIR := $(BUILDDIR)/$(XORG_PROTO_TRAP) diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make index 9e1bc0915..f41d9ace9 100644 --- a/rules/xorg-proto-video.make +++ b/rules/xorg-proto-video.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_VIDEO) += xorg-proto-video # Paths and names # XORG_PROTO_VIDEO_VERSION:= 2.2.2 -XORG_PROTO_VIDEO := videoproto-X11R7.0-$(XORG_PROTO_VIDEO_VERSION) +XORG_PROTO_VIDEO := videoproto-$(XORG_PROTO_VIDEO_VERSION) XORG_PROTO_VIDEO_SUFFIX := tar.bz2 -XORG_PROTO_VIDEO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX) +XORG_PROTO_VIDEO_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX) XORG_PROTO_VIDEO_SOURCE := $(SRCDIR)/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX) XORG_PROTO_VIDEO_DIR := $(BUILDDIR)/$(XORG_PROTO_VIDEO) diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make index 97a93bc91..1b9b83127 100644 --- a/rules/xorg-proto-windowswm.make +++ b/rules/xorg-proto-windowswm.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_WINDOWSWM) += xorg-proto-windowswm # Paths and names # XORG_PROTO_WINDOWSWM_VERSION := 1.0.3 -XORG_PROTO_WINDOWSWM := windowswmproto-X11R7.0-$(XORG_PROTO_WINDOWSWM_VERSION) +XORG_PROTO_WINDOWSWM := windowswmproto-$(XORG_PROTO_WINDOWSWM_VERSION) XORG_PROTO_WINDOWSWM_SUFFIX := tar.bz2 -XORG_PROTO_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX) +XORG_PROTO_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX) XORG_PROTO_WINDOWSWM_SOURCE := $(SRCDIR)/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX) XORG_PROTO_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_PROTO_WINDOWSWM) diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make index e7d67dba7..20324866e 100644 --- a/rules/xorg-proto-x.make +++ b/rules/xorg-proto-x.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_X) += xorg-proto-x # # Paths and names # -XORG_PROTO_X_VERSION := 7.0.5 -XORG_PROTO_X := xproto-X11R7.1-$(XORG_PROTO_X_VERSION) +XORG_PROTO_X_VERSION := 7.0.10 +XORG_PROTO_X := xproto-$(XORG_PROTO_X_VERSION) XORG_PROTO_X_SUFFIX := tar.bz2 -XORG_PROTO_X_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX) +XORG_PROTO_X_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX) XORG_PROTO_X_SOURCE := $(SRCDIR)/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX) XORG_PROTO_X_DIR := $(BUILDDIR)/$(XORG_PROTO_X) diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make index 176dd1769..03710af83 100644 --- a/rules/xorg-proto-xcmisc.make +++ b/rules/xorg-proto-xcmisc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XCMISC) += xorg-proto-xcmisc # Paths and names # XORG_PROTO_XCMISC_VERSION := 1.1.2 -XORG_PROTO_XCMISC := xcmiscproto-X11R7.0-$(XORG_PROTO_XCMISC_VERSION) +XORG_PROTO_XCMISC := xcmiscproto-$(XORG_PROTO_XCMISC_VERSION) XORG_PROTO_XCMISC_SUFFIX := tar.bz2 -XORG_PROTO_XCMISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX) +XORG_PROTO_XCMISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX) XORG_PROTO_XCMISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX) XORG_PROTO_XCMISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XCMISC) diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make index b7276236f..de8628759 100644 --- a/rules/xorg-proto-xext.make +++ b/rules/xorg-proto-xext.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XEXT) += xorg-proto-xext # Paths and names # XORG_PROTO_XEXT_VERSION := 7.0.2 -XORG_PROTO_XEXT := xextproto-X11R7.0-$(XORG_PROTO_XEXT_VERSION) +XORG_PROTO_XEXT := xextproto-$(XORG_PROTO_XEXT_VERSION) XORG_PROTO_XEXT_SUFFIX := tar.bz2 -XORG_PROTO_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX) +XORG_PROTO_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX) XORG_PROTO_XEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX) XORG_PROTO_XEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_XEXT) diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make index 0343cae4a..c6af32f5b 100644 --- a/rules/xorg-proto-xf86bigfont.make +++ b/rules/xorg-proto-xf86bigfont.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86BIGFONT) += xorg-proto-xf86bigfont # Paths and names # XORG_PROTO_XF86BIGFONT_VERSION := 1.1.2 -XORG_PROTO_XF86BIGFONT := xf86bigfontproto-X11R7.0-$(XORG_PROTO_XF86BIGFONT_VERSION) +XORG_PROTO_XF86BIGFONT := xf86bigfontproto-$(XORG_PROTO_XF86BIGFONT_VERSION) XORG_PROTO_XF86BIGFONT_SUFFIX := tar.bz2 -XORG_PROTO_XF86BIGFONT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX) +XORG_PROTO_XF86BIGFONT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX) XORG_PROTO_XF86BIGFONT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX) XORG_PROTO_XF86BIGFONT_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86BIGFONT) diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make index 8e3577373..7a6947e78 100644 --- a/rules/xorg-proto-xf86dga.make +++ b/rules/xorg-proto-xf86dga.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DGA) += xorg-proto-xf86dga # # Paths and names # -XORG_PROTO_XF86DGA_VERSION := 2.0.2 -XORG_PROTO_XF86DGA := xf86dgaproto-X11R7.0-$(XORG_PROTO_XF86DGA_VERSION) +XORG_PROTO_XF86DGA_VERSION := 2.0.3 +XORG_PROTO_XF86DGA := xf86dgaproto-$(XORG_PROTO_XF86DGA_VERSION) XORG_PROTO_XF86DGA_SUFFIX := tar.bz2 -XORG_PROTO_XF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX) +XORG_PROTO_XF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX) XORG_PROTO_XF86DGA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX) XORG_PROTO_XF86DGA_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DGA) diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make index dbe1747ed..24438b086 100644 --- a/rules/xorg-proto-xf86dri.make +++ b/rules/xorg-proto-xf86dri.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DRI) += xorg-proto-xf86dri # Paths and names # XORG_PROTO_XF86DRI_VERSION := 2.0.3 -XORG_PROTO_XF86DRI := xf86driproto-X11R7.0-$(XORG_PROTO_XF86DRI_VERSION) +XORG_PROTO_XF86DRI := xf86driproto-$(XORG_PROTO_XF86DRI_VERSION) XORG_PROTO_XF86DRI_SUFFIX := tar.bz2 -XORG_PROTO_XF86DRI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX) +XORG_PROTO_XF86DRI_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX) XORG_PROTO_XF86DRI_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX) XORG_PROTO_XF86DRI_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DRI) diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make index 51f0412b8..33749564a 100644 --- a/rules/xorg-proto-xf86misc.make +++ b/rules/xorg-proto-xf86misc.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86MISC) += xorg-proto-xf86misc # Paths and names # XORG_PROTO_XF86MISC_VERSION := 0.9.2 -XORG_PROTO_XF86MISC := xf86miscproto-X11R7.0-$(XORG_PROTO_XF86MISC_VERSION) +XORG_PROTO_XF86MISC := xf86miscproto-$(XORG_PROTO_XF86MISC_VERSION) XORG_PROTO_XF86MISC_SUFFIX := tar.bz2 -XORG_PROTO_XF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX) +XORG_PROTO_XF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX) XORG_PROTO_XF86MISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX) XORG_PROTO_XF86MISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86MISC) diff --git a/rules/xorg-proto-xf86rush.make b/rules/xorg-proto-xf86rush.make index d4b061f98..a83f21e81 100644 --- a/rules/xorg-proto-xf86rush.make +++ b/rules/xorg-proto-xf86rush.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86RUSH) += xorg-proto-xf86rush # Paths and names # XORG_PROTO_XF86RUSH_VERSION := 1.1.2 -XORG_PROTO_XF86RUSH := xf86rushproto-X11R7.0-$(XORG_PROTO_XF86RUSH_VERSION) +XORG_PROTO_XF86RUSH := xf86rushproto-$(XORG_PROTO_XF86RUSH_VERSION) XORG_PROTO_XF86RUSH_SUFFIX := tar.bz2 -XORG_PROTO_XF86RUSH_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX) +XORG_PROTO_XF86RUSH_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX) XORG_PROTO_XF86RUSH_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX) XORG_PROTO_XF86RUSH_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86RUSH) diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make index abbf73aed..29a144cf5 100644 --- a/rules/xorg-proto-xf86vidmode.make +++ b/rules/xorg-proto-xf86vidmode.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86VIDMODE) += xorg-proto-xf86vidmode # Paths and names # XORG_PROTO_XF86VIDMODE_VERSION := 2.2.2 -XORG_PROTO_XF86VIDMODE := xf86vidmodeproto-X11R7.0-$(XORG_PROTO_XF86VIDMODE_VERSION) +XORG_PROTO_XF86VIDMODE := xf86vidmodeproto-$(XORG_PROTO_XF86VIDMODE_VERSION) XORG_PROTO_XF86VIDMODE_SUFFIX := tar.bz2 -XORG_PROTO_XF86VIDMODE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX) +XORG_PROTO_XF86VIDMODE_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX) XORG_PROTO_XF86VIDMODE_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX) XORG_PROTO_XF86VIDMODE_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86VIDMODE) diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make index b4841b67b..22990c8f5 100644 --- a/rules/xorg-proto-xinerama.make +++ b/rules/xorg-proto-xinerama.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XINERAMA) += xorg-proto-xinerama # Paths and names # XORG_PROTO_XINERAMA_VERSION := 1.1.2 -XORG_PROTO_XINERAMA := xineramaproto-X11R7.0-$(XORG_PROTO_XINERAMA_VERSION) +XORG_PROTO_XINERAMA := xineramaproto-$(XORG_PROTO_XINERAMA_VERSION) XORG_PROTO_XINERAMA_SUFFIX := tar.bz2 -XORG_PROTO_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX) +XORG_PROTO_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX) XORG_PROTO_XINERAMA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX) XORG_PROTO_XINERAMA_DIR := $(BUILDDIR)/$(XORG_PROTO_XINERAMA) diff --git a/rules/xorg-proto-xproxymanagement.make b/rules/xorg-proto-xproxymanagement.make index 0cb87e3b6..fae4958b7 100644 --- a/rules/xorg-proto-xproxymanagement.make +++ b/rules/xorg-proto-xproxymanagement.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XPROXYMANAGEMENT) += xorg-proto-xproxymanagement # Paths and names # XORG_PROTO_XPROXYMANAGEMENT_VERSION := 1.0.2 -XORG_PROTO_XPROXYMANAGEMENT := xproxymanagementprotocol-X11R7.0-$(XORG_PROTO_XPROXYMANAGEMENT_VERSION) +XORG_PROTO_XPROXYMANAGEMENT := xproxymanagementprotocol-$(XORG_PROTO_XPROXYMANAGEMENT_VERSION) XORG_PROTO_XPROXYMANAGEMENT_SUFFIX := tar.bz2 -XORG_PROTO_XPROXYMANAGEMENT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX) +XORG_PROTO_XPROXYMANAGEMENT_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX) XORG_PROTO_XPROXYMANAGEMENT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX) XORG_PROTO_XPROXYMANAGEMENT_DIR := $(BUILDDIR)/$(XORG_PROTO_XPROXYMANAGEMENT) diff --git a/rules/xorg-proto.in b/rules/xorg-proto.in index 1f09a31ba..76c720159 100644 --- a/rules/xorg-proto.in +++ b/rules/xorg-proto.in @@ -1,5 +1,6 @@ # xorg proto configuration +source "rules/xcb-proto.in" source "rules/xorg-proto-applewm.in" source "rules/xorg-proto-bigreqs.in" source "rules/xorg-proto-composite.in" diff --git a/rules/xorg-server.in b/rules/xorg-server.in index ce3d46b59..fdb3c07da 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -35,6 +35,7 @@ menuconfig XORG_SERVER select XORG_LIB_XKBFILE select GLIBC_DL + select PIXMAN # # Required on demand # diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 86ec7b17b..2104cac8b 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server # # Paths and names # -XORG_SERVER_VERSION := 1.1.0 -XORG_SERVER := xorg-server-X11R7.1-$(XORG_SERVER_VERSION) +XORG_SERVER_VERSION := 1.4 +XORG_SERVER := xorg-server-$(XORG_SERVER_VERSION) XORG_SERVER_SUFFIX := tar.bz2 -XORG_SERVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX) +XORG_SERVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX) XORG_SERVER_SOURCE := $(SRCDIR)/$(XORG_SERVER).$(XORG_SERVER_SUFFIX) XORG_SERVER_DIR := $(BUILDDIR)/$(XORG_SERVER) @@ -60,7 +60,7 @@ xorg-server_prepare: $(STATEDIR)/xorg-server.prepare XORG_SERVER_PATH := PATH=$(CROSS_PATH) XORG_SERVER_ENV := $(CROSS_ENV) \ ac_cv_sys_linker_h=yes \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no + ac_cv_file__usr_share_sgml_X11_defs_ent=no # FIXME: not all processors upports MTRR. Geode GX1 not for example. But it # is a 586 clone. configure decides always to support mtrr! @@ -73,8 +73,7 @@ XORG_SERVER_ENV := $(CROSS_ENV) \ XORG_SERVER_AUTOCONF = $(CROSS_AUTOCONF_USR) \ $(XORG_OPTIONS_TRANS) \ --disable-dependency-tracking \ - --localstatedir=/var \ - --disable-builddocs + --localstatedir=/var # # if no value is given ignore the "--datadir" switch # @@ -462,20 +461,20 @@ endif ifdef PTXCONF_XORG_DRIVER_VIDEO @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/fbdevhw/.libs/libfbdevhw.so, $(XORG_PREFIX)/lib/xorg/modules/linux/libfbdevhw.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libafb.so, $(XORG_PREFIX)/lib/xorg/modules/libafb.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb16.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb16.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb16.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb16.so) # @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb24.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb24.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb32.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb32.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ddc/.libs/libddc.so, $(XORG_PREFIX)/lib/xorg/modules/libddc.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ddc/.libs/libddc.so, $(XORG_PREFIX)/lib/xorg/modules/libddc.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/exa/.libs/libexa.so, $(XORG_PREFIX)/lib/xorg/modules/libexa.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfb.so, $(XORG_PREFIX)/lib/xorg/modules/libfb.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/i2c/.libs/libi2c.so, $(XORG_PREFIX)/lib/xorg/modules/libi2c.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/i2c/.libs/libi2c.so, $(XORG_PREFIX)/lib/xorg/modules/libi2c.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/int10/.libs/libint10.so, $(XORG_PREFIX)/lib/xorg/modules/libint10.so) # @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/liblayer.so, $(XORG_PREFIX)/lib/xorg/modules/liblayer.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libmfb.so, $(XORG_PREFIX)/lib/xorg/modules/libmfb.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libpcidata.so, $(XORG_PREFIX)/lib/xorg/modules/libpcidata.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/rac/.libs/librac.so, $(XORG_PREFIX)/lib/xorg/modules/librac.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ramdac/.libs/libramdac.so, $(XORG_PREFIX)/lib/xorg/modules/libramdac.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/rac/.libs/librac.so, $(XORG_PREFIX)/lib/xorg/modules/librac.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ramdac/.libs/libramdac.so, $(XORG_PREFIX)/lib/xorg/modules/libramdac.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libscanpci.so, $(XORG_PREFIX)/lib/xorg/modules/libscanpci.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/shadowfb/.libs/libshadowfb.so, $(XORG_PREFIX)/lib/xorg/modules/libshadowfb.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libshadow.so, $(XORG_PREFIX)/lib/xorg/modules/libshadow.so) @@ -491,7 +490,7 @@ endif @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/extmod/.libs/libextmod.so ,/usr/lib/xorg/modules/extensions/libextmod.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libdbe.so ,/usr/lib/xorg/modules/extensions/libdbe.so) - @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so ,/usr/lib/xorg/modules/fonts/libbitmap.so) +# @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so ,/usr/lib/xorg/modules/fonts/libbitmap.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfreetype.so ,/usr/lib/xorg/modules/fonts/libfreetype.so) @$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libtype1.so ,/usr/lib/xorg/modules/fonts/libtype1.so) |