Ray Kelm - Fri, 04 Aug 2000 20:58:00 -0400
authorSam Lantinga <slouken@lokigames.com>
Thu, 10 Aug 2000 06:12:39 +0000
changeset 2e273b0e38b8b
parent 1 f40c95f0b795
child 3 242657bf16f3
Ray Kelm - Fri, 04 Aug 2000 20:58:00 -0400
* Added support for cross-compiling Windows DLL from Linux
CHANGES
Makefile.in
acinclude.m4
aclocal.m4
config.guess
config.sub
configure
configure.in
ltconfig
ltmain.sh
     1.1 --- a/CHANGES	Thu Aug 10 06:06:57 2000 +0000
     1.2 +++ b/CHANGES	Thu Aug 10 06:12:39 2000 +0000
     1.3 @@ -1,3 +1,7 @@
     1.4 +
     1.5 +1.0.10:
     1.6 +Ray Kelm - Fri, 04 Aug 2000 20:58:00 -0400
     1.7 + * Added support for cross-compiling Windows DLL from Linux
     1.8  
     1.9  1.0.9:
    1.10  Mattias Engdegård - Sat Jul  1 17:57:37 PDT 2000
     2.1 --- a/Makefile.in	Thu Aug 10 06:06:57 2000 +0000
     2.2 +++ b/Makefile.in	Thu Aug 10 06:12:39 2000 +0000
     2.3 @@ -67,7 +67,6 @@
     2.4  DLLTOOL = @DLLTOOL@
     2.5  IMG_LIBS = @IMG_LIBS@
     2.6  INTERFACE_AGE = @INTERFACE_AGE@
     2.7 -LD = @LD@
     2.8  LIBTOOL = @LIBTOOL@
     2.9  LN_S = @LN_S@
    2.10  LT_AGE = @LT_AGE@
    2.11 @@ -78,7 +77,6 @@
    2.12  MAKEINFO = @MAKEINFO@
    2.13  MICRO_VERSION = @MICRO_VERSION@
    2.14  MINOR_VERSION = @MINOR_VERSION@
    2.15 -NM = @NM@
    2.16  OBJDUMP = @OBJDUMP@
    2.17  PACKAGE = @PACKAGE@
    2.18  RANLIB = @RANLIB@
    2.19 @@ -141,6 +139,9 @@
    2.20  
    2.21  TAR = gtar
    2.22  GZIP_ENV = --best
    2.23 +DEP_FILES =  .deps/IMG.P .deps/IMG_bmp.P .deps/IMG_gif.P .deps/IMG_jpg.P \
    2.24 +.deps/IMG_pcx.P .deps/IMG_png.P .deps/IMG_ppm.P .deps/IMG_tga.P \
    2.25 +.deps/IMG_tif.P .deps/showimage.P
    2.26  SOURCES = $(libSDL_image_la_SOURCES) showimage.c
    2.27  OBJECTS = $(libSDL_image_la_OBJECTS) showimage.o
    2.28  
    2.29 @@ -148,9 +149,9 @@
    2.30  .SUFFIXES:
    2.31  .SUFFIXES: .S .c .lo .o .s
    2.32  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
    2.33 -	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
    2.34 +	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
    2.35  
    2.36 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
    2.37 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
    2.38  	cd $(top_builddir) \
    2.39  	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
    2.40  
    2.41 @@ -189,9 +190,6 @@
    2.42  	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
    2.43  	done
    2.44  
    2.45 -.c.o:
    2.46 -	$(COMPILE) -c $<
    2.47 -
    2.48  .s.o:
    2.49  	$(COMPILE) -c $<
    2.50  
    2.51 @@ -208,9 +206,6 @@
    2.52  
    2.53  maintainer-clean-compile:
    2.54  
    2.55 -.c.lo:
    2.56 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
    2.57 -
    2.58  .s.lo:
    2.59  	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
    2.60  
    2.61 @@ -341,6 +336,11 @@
    2.62  	-rm -rf $(distdir)
    2.63  	mkdir $(distdir)
    2.64  	-chmod 777 $(distdir)
    2.65 +	here=`cd $(top_builddir) && pwd`; \
    2.66 +	top_distdir=`cd $(distdir) && pwd`; \
    2.67 +	distdir=`cd $(distdir) && pwd`; \
    2.68 +	cd $(top_srcdir) \
    2.69 +	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
    2.70  	@for file in $(DISTFILES); do \
    2.71  	  d=$(srcdir); \
    2.72  	  if test -d $$d/$$file; then \
    2.73 @@ -351,17 +351,38 @@
    2.74  	    || cp -p $$d/$$file $(distdir)/$$file || :; \
    2.75  	  fi; \
    2.76  	done
    2.77 -IMG_bmp.lo IMG_bmp.o : IMG_bmp.c SDL_image.h
    2.78 -IMG_gif.lo IMG_gif.o : IMG_gif.c SDL_image.h
    2.79 -IMG_jpg.lo IMG_jpg.o : IMG_jpg.c SDL_image.h
    2.80 -IMG.lo IMG.o : IMG.c SDL_image.h
    2.81 -IMG_pcx.lo IMG_pcx.o : IMG_pcx.c SDL_image.h
    2.82 -IMG_png.lo IMG_png.o : IMG_png.c SDL_image.h
    2.83 -IMG_ppm.lo IMG_ppm.o : IMG_ppm.c SDL_image.h
    2.84 -IMG_tga.lo IMG_tga.o : IMG_tga.c SDL_image.h
    2.85 -IMG_tif.lo IMG_tif.o : IMG_tif.c SDL_image.h
    2.86 -showimage.o: showimage.c SDL_image.h
    2.87  
    2.88 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
    2.89 +
    2.90 +-include $(DEP_FILES)
    2.91 +
    2.92 +mostlyclean-depend:
    2.93 +
    2.94 +clean-depend:
    2.95 +
    2.96 +distclean-depend:
    2.97 +	-rm -rf .deps
    2.98 +
    2.99 +maintainer-clean-depend:
   2.100 +
   2.101 +%.o: %.c
   2.102 +	@echo '$(COMPILE) -c $<'; \
   2.103 +	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
   2.104 +	@-cp .deps/$(*F).pp .deps/$(*F).P; \
   2.105 +	tr ' ' '\012' < .deps/$(*F).pp \
   2.106 +	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
   2.107 +	    >> .deps/$(*F).P; \
   2.108 +	rm .deps/$(*F).pp
   2.109 +
   2.110 +%.lo: %.c
   2.111 +	@echo '$(LTCOMPILE) -c $<'; \
   2.112 +	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
   2.113 +	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
   2.114 +	  < .deps/$(*F).pp > .deps/$(*F).P; \
   2.115 +	tr ' ' '\012' < .deps/$(*F).pp \
   2.116 +	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
   2.117 +	    >> .deps/$(*F).P; \
   2.118 +	rm -f .deps/$(*F).pp
   2.119  info-am:
   2.120  info: info-am
   2.121  dvi-am:
   2.122 @@ -402,19 +423,19 @@
   2.123  maintainer-clean-generic:
   2.124  mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
   2.125  		mostlyclean-libtool mostlyclean-binPROGRAMS \
   2.126 -		mostlyclean-tags mostlyclean-generic
   2.127 +		mostlyclean-tags mostlyclean-depend mostlyclean-generic
   2.128  
   2.129  mostlyclean: mostlyclean-am
   2.130  
   2.131  clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
   2.132 -		clean-binPROGRAMS clean-tags clean-generic \
   2.133 +		clean-binPROGRAMS clean-tags clean-depend clean-generic \
   2.134  		mostlyclean-am
   2.135  
   2.136  clean: clean-am
   2.137  
   2.138  distclean-am:  distclean-libLTLIBRARIES distclean-compile \
   2.139  		distclean-libtool distclean-binPROGRAMS distclean-tags \
   2.140 -		distclean-generic clean-am
   2.141 +		distclean-depend distclean-generic clean-am
   2.142  	-rm -f libtool
   2.143  
   2.144  distclean: distclean-am
   2.145 @@ -423,7 +444,8 @@
   2.146  maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
   2.147  		maintainer-clean-compile maintainer-clean-libtool \
   2.148  		maintainer-clean-binPROGRAMS maintainer-clean-tags \
   2.149 -		maintainer-clean-generic distclean-am
   2.150 +		maintainer-clean-depend maintainer-clean-generic \
   2.151 +		distclean-am
   2.152  	@echo "This command is intended for maintainers to use;"
   2.153  	@echo "it deletes files that may require special tools to rebuild."
   2.154  
   2.155 @@ -439,12 +461,13 @@
   2.156  clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
   2.157  install-binPROGRAMS uninstall-libSDL_imageincludeHEADERS \
   2.158  install-libSDL_imageincludeHEADERS tags mostlyclean-tags distclean-tags \
   2.159 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
   2.160 -check-am installcheck-am installcheck install-exec-am install-exec \
   2.161 -install-data-am install-data install-am install uninstall-am uninstall \
   2.162 -all-redirect all-am all installdirs mostlyclean-generic \
   2.163 -distclean-generic clean-generic maintainer-clean-generic clean \
   2.164 -mostlyclean distclean maintainer-clean
   2.165 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
   2.166 +distclean-depend clean-depend maintainer-clean-depend info-am info \
   2.167 +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
   2.168 +install-exec install-data-am install-data install-am install \
   2.169 +uninstall-am uninstall all-redirect all-am all installdirs \
   2.170 +mostlyclean-generic distclean-generic clean-generic \
   2.171 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
   2.172  
   2.173  
   2.174  # Rule to build tar-gzipped distribution package
     3.1 --- a/acinclude.m4	Thu Aug 10 06:06:57 2000 +0000
     3.2 +++ b/acinclude.m4	Thu Aug 10 06:12:39 2000 +0000
     3.3 @@ -62,7 +62,7 @@
     3.4  #include <stdio.h>
     3.5  #include <stdlib.h>
     3.6  #include <string.h>
     3.7 -#include <SDL/SDL.h>
     3.8 +#include "SDL.h"
     3.9  
    3.10  char*
    3.11  my_strdup (char *str)
    3.12 @@ -71,7 +71,7 @@
    3.13    
    3.14    if (str)
    3.15      {
    3.16 -      new_str = malloc ((strlen (str) + 1) * sizeof(char));
    3.17 +      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
    3.18        strcpy (new_str, str);
    3.19      }
    3.20    else
    3.21 @@ -80,12 +80,15 @@
    3.22    return new_str;
    3.23  }
    3.24  
    3.25 -int main ()
    3.26 +int main (int argc, char *argv[])
    3.27  {
    3.28    int major, minor, micro;
    3.29    char *tmp_version;
    3.30  
    3.31 +  /* This hangs on some systems (?)
    3.32    system ("touch conf.sdltest");
    3.33 +  */
    3.34 +  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
    3.35  
    3.36    /* HP/UX 9 (%@#!) writes to sscanf strings */
    3.37    tmp_version = my_strdup("$min_sdl_version");
    3.38 @@ -136,7 +139,7 @@
    3.39            LIBS="$LIBS $SDL_LIBS"
    3.40            AC_TRY_LINK([
    3.41  #include <stdio.h>
    3.42 -#include <SDL/SDL.h>
    3.43 +#include "SDL.h"
    3.44  ],      [ return 0; ],
    3.45          [ echo "*** The test program compiled, but did not run. This usually means"
    3.46            echo "*** that the run-time linker is not finding SDL or finding the wrong"
    3.47 @@ -164,7 +167,7 @@
    3.48    rm -f conf.sdltest
    3.49  ])
    3.50  ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
    3.51 -## Copyright (C) 1996-1999 Free Software Foundation, Inc.
    3.52 +## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
    3.53  ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    3.54  ##
    3.55  ## This program is free software; you can redistribute it and/or modify
    3.56 @@ -186,7 +189,7 @@
    3.57  ## configuration script generated by Autoconf, you may include it under
    3.58  ## the same distribution terms that you use for the rest of that program.
    3.59  
    3.60 -# serial 41 AC_PROG_LIBTOOL
    3.61 +# serial 40 AC_PROG_LIBTOOL
    3.62  AC_DEFUN(AC_PROG_LIBTOOL,
    3.63  [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
    3.64  
    3.65 @@ -199,7 +202,7 @@
    3.66  LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
    3.67  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
    3.68  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
    3.69 -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
    3.70 +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
    3.71  || AC_MSG_ERROR([libtool configure failed])
    3.72  
    3.73  # Reload cache, that may have been modified by ltconfig
    3.74 @@ -224,13 +227,17 @@
    3.75  AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
    3.76  AC_REQUIRE([AC_CANONICAL_HOST])dnl
    3.77  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
    3.78 +AC_REQUIRE([AC_PROG_RANLIB])dnl
    3.79  AC_REQUIRE([AC_PROG_CC])dnl
    3.80  AC_REQUIRE([AC_PROG_LD])dnl
    3.81  AC_REQUIRE([AC_PROG_NM])dnl
    3.82  AC_REQUIRE([AC_PROG_LN_S])dnl
    3.83  dnl
    3.84  
    3.85 -AC_CHECK_TOOL(RANLIB, ranlib, :)
    3.86 +case "$target" in
    3.87 +NONE) lt_target="$host" ;;
    3.88 +*) lt_target="$target" ;;
    3.89 +esac
    3.90  
    3.91  # Check for any special flags to pass to ltconfig.
    3.92  libtool_flags="--cache-file=$cache_file"
    3.93 @@ -248,15 +255,9 @@
    3.94  test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
    3.95  test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
    3.96  
    3.97 -AC_ARG_WITH(pic,
    3.98 -  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
    3.99 -     pic_mode="$withval", pic_mode=default)
   3.100 -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
   3.101 -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
   3.102 -
   3.103  # Some flags need to be propagated to the compiler or linker for good
   3.104  # libtool support.
   3.105 -case "$host" in
   3.106 +case "$lt_target" in
   3.107  *-*-irix6*)
   3.108    # Find out which ABI we are using.
   3.109    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   3.110 @@ -293,30 +294,8 @@
   3.111    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   3.112    AC_CHECK_TOOL(AS, as, false)
   3.113    AC_CHECK_TOOL(OBJDUMP, objdump, false)
   3.114 -
   3.115 -  # recent cygwin and mingw systems supply a stub DllMain which the user
   3.116 -  # can override, but on older systems we have to supply one
   3.117 -  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
   3.118 -    [AC_TRY_LINK([DllMain (0, 0, 0);],
   3.119 -      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);],
   3.120 -      [lt_cv_need_dllmain=yes],[lt_cv_need_dllmain=no])])
   3.121 -
   3.122 -  case $host in
   3.123 -  *-*-cygwin*)
   3.124 -    # cygwin systems need to pass --dll to the linker, and not link
   3.125 -    # crt.o which will require a WinMain@16 definition.
   3.126 -    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
   3.127 -  *-*-mingw*)
   3.128 -    # old mingw systems require "-dll" to link a DLL, while more recent ones
   3.129 -    # require "-mdll"
   3.130 -    SAVE_CFLAGS="$CFLAGS"
   3.131 -    CFLAGS="$CFLAGS -mdll"
   3.132 -    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
   3.133 -      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
   3.134 -    CFLAGS="$SAVE_CFLAGS" ;;
   3.135 -  esac
   3.136    ;;
   3.137 -  ])
   3.138 +])
   3.139  esac
   3.140  ])
   3.141  
   3.142 @@ -438,13 +417,7 @@
   3.143  if test "$ac_cv_prog_gcc" = yes; then
   3.144    # Check if gcc -print-prog-name=ld gives a path.
   3.145    AC_MSG_CHECKING([for ld used by GCC])
   3.146 -  case $host in
   3.147 -  *-*-mingw*)
   3.148 -    # gcc leaves a trailing carriage return which upsets mingw
   3.149 -    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   3.150 -  *)
   3.151 -    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   3.152 -  esac
   3.153 +  ac_prog=`($CC -print-prog-name=ld) 2>&5`
   3.154    case "$ac_prog" in
   3.155      # Accept absolute paths.
   3.156  changequote(,)dnl
   3.157 @@ -500,7 +473,6 @@
   3.158    AC_MSG_RESULT(no)
   3.159  fi
   3.160  test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
   3.161 -AC_SUBST(LD)
   3.162  AC_PROG_LD_GNU
   3.163  ])
   3.164  
   3.165 @@ -546,14 +518,13 @@
   3.166  fi])
   3.167  NM="$ac_cv_path_NM"
   3.168  AC_MSG_RESULT([$NM])
   3.169 -AC_SUBST(NM)
   3.170  ])
   3.171  
   3.172  # AC_CHECK_LIBM - check for math library
   3.173  AC_DEFUN(AC_CHECK_LIBM,
   3.174  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
   3.175  LIBM=
   3.176 -case "$host" in
   3.177 +case "$lt_target" in
   3.178  *-*-beos* | *-*-cygwin*)
   3.179    # These system don't have libm
   3.180    ;;
   3.181 @@ -568,31 +539,35 @@
   3.182  ])
   3.183  
   3.184  # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
   3.185 -# the libltdl convenience library, adds --enable-ltdl-convenience to
   3.186 -# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
   3.187 -# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
   3.188 -# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
   3.189 -# '${top_builddir}/' (note the single quotes!) if your package is not
   3.190 -# flat, and, if you're not using automake, define top_builddir as
   3.191 -# appropriate in the Makefiles.
   3.192 +# the libltdl convenience library and INCLTDL to the include flags for
   3.193 +# the libltdl header and adds --enable-ltdl-convenience to the
   3.194 +# configure arguments.  Note that LIBLTDL and INCLTDL are not
   3.195 +# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
   3.196 +# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
   3.197 +# with '${top_builddir}/' and INCLTDL will be prefixed with
   3.198 +# '${top_srcdir}/' (note the single quotes!).  If your package is not
   3.199 +# flat and you're not using automake, define top_builddir and
   3.200 +# top_srcdir appropriately in the Makefiles.
   3.201  AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   3.202    case "$enable_ltdl_convenience" in
   3.203    no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   3.204    "") enable_ltdl_convenience=yes
   3.205        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   3.206    esac
   3.207 -  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
   3.208 -  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   3.209 +  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
   3.210 +  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   3.211  ])
   3.212  
   3.213  # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
   3.214 -# the libltdl installable library, and adds --enable-ltdl-install to
   3.215 -# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
   3.216 -# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
   3.217 -# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
   3.218 -# '${top_builddir}/' (note the single quotes!) if your package is not
   3.219 -# flat, and, if you're not using automake, define top_builddir as
   3.220 -# appropriate in the Makefiles.
   3.221 +# the libltdl installable library and INCLTDL to the include flags for
   3.222 +# the libltdl header and adds --enable-ltdl-install to the configure
   3.223 +# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
   3.224 +# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
   3.225 +# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
   3.226 +# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
   3.227 +# with '${top_srcdir}/' (note the single quotes!).  If your package is
   3.228 +# not flat and you're not using automake, define top_builddir and
   3.229 +# top_srcdir appropriately in the Makefiles.
   3.230  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
   3.231  AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   3.232    AC_CHECK_LIB(ltdl, main,
   3.233 @@ -605,8 +580,8 @@
   3.234    ])
   3.235    if test x"$enable_ltdl_install" = x"yes"; then
   3.236      ac_configure_args="$ac_configure_args --enable-ltdl-install"
   3.237 -    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
   3.238 -    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   3.239 +    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
   3.240 +    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   3.241    else
   3.242      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
   3.243      LIBLTDL="-lltdl"
     4.1 --- a/aclocal.m4	Thu Aug 10 06:06:57 2000 +0000
     4.2 +++ b/aclocal.m4	Thu Aug 10 06:12:39 2000 +0000
     4.3 @@ -74,7 +74,7 @@
     4.4  #include <stdio.h>
     4.5  #include <stdlib.h>
     4.6  #include <string.h>
     4.7 -#include <SDL/SDL.h>
     4.8 +#include "SDL.h"
     4.9  
    4.10  char*
    4.11  my_strdup (char *str)
    4.12 @@ -83,7 +83,7 @@
    4.13    
    4.14    if (str)
    4.15      {
    4.16 -      new_str = malloc ((strlen (str) + 1) * sizeof(char));
    4.17 +      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
    4.18        strcpy (new_str, str);
    4.19      }
    4.20    else
    4.21 @@ -92,12 +92,15 @@
    4.22    return new_str;
    4.23  }
    4.24  
    4.25 -int main ()
    4.26 +int main (int argc, char *argv[])
    4.27  {
    4.28    int major, minor, micro;
    4.29    char *tmp_version;
    4.30  
    4.31 +  /* This hangs on some systems (?)
    4.32    system ("touch conf.sdltest");
    4.33 +  */
    4.34 +  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
    4.35  
    4.36    /* HP/UX 9 (%@#!) writes to sscanf strings */
    4.37    tmp_version = my_strdup("$min_sdl_version");
    4.38 @@ -148,7 +151,7 @@
    4.39            LIBS="$LIBS $SDL_LIBS"
    4.40            AC_TRY_LINK([
    4.41  #include <stdio.h>
    4.42 -#include <SDL/SDL.h>
    4.43 +#include "SDL.h"
    4.44  ],      [ return 0; ],
    4.45          [ echo "*** The test program compiled, but did not run. This usually means"
    4.46            echo "*** that the run-time linker is not finding SDL or finding the wrong"
    4.47 @@ -176,7 +179,7 @@
    4.48    rm -f conf.sdltest
    4.49  ])
    4.50  
    4.51 -# serial 41 AC_PROG_LIBTOOL
    4.52 +# serial 40 AC_PROG_LIBTOOL
    4.53  AC_DEFUN(AC_PROG_LIBTOOL,
    4.54  [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
    4.55  
    4.56 @@ -189,7 +192,7 @@
    4.57  LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
    4.58  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
    4.59  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
    4.60 -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
    4.61 +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
    4.62  || AC_MSG_ERROR([libtool configure failed])
    4.63  
    4.64  # Reload cache, that may have been modified by ltconfig
    4.65 @@ -214,13 +217,17 @@
    4.66  AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
    4.67  AC_REQUIRE([AC_CANONICAL_HOST])dnl
    4.68  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
    4.69 +AC_REQUIRE([AC_PROG_RANLIB])dnl
    4.70  AC_REQUIRE([AC_PROG_CC])dnl
    4.71  AC_REQUIRE([AC_PROG_LD])dnl
    4.72  AC_REQUIRE([AC_PROG_NM])dnl
    4.73  AC_REQUIRE([AC_PROG_LN_S])dnl
    4.74  dnl
    4.75  
    4.76 -AC_CHECK_TOOL(RANLIB, ranlib, :)
    4.77 +case "$target" in
    4.78 +NONE) lt_target="$host" ;;
    4.79 +*) lt_target="$target" ;;
    4.80 +esac
    4.81  
    4.82  # Check for any special flags to pass to ltconfig.
    4.83  libtool_flags="--cache-file=$cache_file"
    4.84 @@ -238,15 +245,9 @@
    4.85  test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
    4.86  test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
    4.87  
    4.88 -AC_ARG_WITH(pic,
    4.89 -  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
    4.90 -     pic_mode="$withval", pic_mode=default)
    4.91 -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
    4.92 -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
    4.93 -
    4.94  # Some flags need to be propagated to the compiler or linker for good
    4.95  # libtool support.
    4.96 -case "$host" in
    4.97 +case "$lt_target" in
    4.98  *-*-irix6*)
    4.99    # Find out which ABI we are using.
   4.100    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   4.101 @@ -283,30 +284,8 @@
   4.102    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   4.103    AC_CHECK_TOOL(AS, as, false)
   4.104    AC_CHECK_TOOL(OBJDUMP, objdump, false)
   4.105 -
   4.106 -  # recent cygwin and mingw systems supply a stub DllMain which the user
   4.107 -  # can override, but on older systems we have to supply one
   4.108 -  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
   4.109 -    [AC_TRY_LINK([DllMain (0, 0, 0);],
   4.110 -      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);],
   4.111 -      [lt_cv_need_dllmain=yes],[lt_cv_need_dllmain=no])])
   4.112 -
   4.113 -  case $host in
   4.114 -  *-*-cygwin*)
   4.115 -    # cygwin systems need to pass --dll to the linker, and not link
   4.116 -    # crt.o which will require a WinMain@16 definition.
   4.117 -    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
   4.118 -  *-*-mingw*)
   4.119 -    # old mingw systems require "-dll" to link a DLL, while more recent ones
   4.120 -    # require "-mdll"
   4.121 -    SAVE_CFLAGS="$CFLAGS"
   4.122 -    CFLAGS="$CFLAGS -mdll"
   4.123 -    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
   4.124 -      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
   4.125 -    CFLAGS="$SAVE_CFLAGS" ;;
   4.126 -  esac
   4.127    ;;
   4.128 -  ])
   4.129 +])
   4.130  esac
   4.131  ])
   4.132  
   4.133 @@ -428,13 +407,7 @@
   4.134  if test "$ac_cv_prog_gcc" = yes; then
   4.135    # Check if gcc -print-prog-name=ld gives a path.
   4.136    AC_MSG_CHECKING([for ld used by GCC])
   4.137 -  case $host in
   4.138 -  *-*-mingw*)
   4.139 -    # gcc leaves a trailing carriage return which upsets mingw
   4.140 -    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   4.141 -  *)
   4.142 -    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   4.143 -  esac
   4.144 +  ac_prog=`($CC -print-prog-name=ld) 2>&5`
   4.145    case "$ac_prog" in
   4.146      # Accept absolute paths.
   4.147  changequote(,)dnl
   4.148 @@ -490,7 +463,6 @@
   4.149    AC_MSG_RESULT(no)
   4.150  fi
   4.151  test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
   4.152 -AC_SUBST(LD)
   4.153  AC_PROG_LD_GNU
   4.154  ])
   4.155  
   4.156 @@ -536,14 +508,13 @@
   4.157  fi])
   4.158  NM="$ac_cv_path_NM"
   4.159  AC_MSG_RESULT([$NM])
   4.160 -AC_SUBST(NM)
   4.161  ])
   4.162  
   4.163  # AC_CHECK_LIBM - check for math library
   4.164  AC_DEFUN(AC_CHECK_LIBM,
   4.165  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
   4.166  LIBM=
   4.167 -case "$host" in
   4.168 +case "$lt_target" in
   4.169  *-*-beos* | *-*-cygwin*)
   4.170    # These system don't have libm
   4.171    ;;
   4.172 @@ -558,31 +529,35 @@
   4.173  ])
   4.174  
   4.175  # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
   4.176 -# the libltdl convenience library, adds --enable-ltdl-convenience to
   4.177 -# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
   4.178 -# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
   4.179 -# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
   4.180 -# '${top_builddir}/' (note the single quotes!) if your package is not
   4.181 -# flat, and, if you're not using automake, define top_builddir as
   4.182 -# appropriate in the Makefiles.
   4.183 +# the libltdl convenience library and INCLTDL to the include flags for
   4.184 +# the libltdl header and adds --enable-ltdl-convenience to the
   4.185 +# configure arguments.  Note that LIBLTDL and INCLTDL are not
   4.186 +# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
   4.187 +# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
   4.188 +# with '${top_builddir}/' and INCLTDL will be prefixed with
   4.189 +# '${top_srcdir}/' (note the single quotes!).  If your package is not
   4.190 +# flat and you're not using automake, define top_builddir and
   4.191 +# top_srcdir appropriately in the Makefiles.
   4.192  AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   4.193    case "$enable_ltdl_convenience" in
   4.194    no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   4.195    "") enable_ltdl_convenience=yes
   4.196        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   4.197    esac
   4.198 -  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
   4.199 -  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   4.200 +  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
   4.201 +  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   4.202  ])
   4.203  
   4.204  # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
   4.205 -# the libltdl installable library, and adds --enable-ltdl-install to
   4.206 -# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
   4.207 -# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
   4.208 -# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
   4.209 -# '${top_builddir}/' (note the single quotes!) if your package is not
   4.210 -# flat, and, if you're not using automake, define top_builddir as
   4.211 -# appropriate in the Makefiles.
   4.212 +# the libltdl installable library and INCLTDL to the include flags for
   4.213 +# the libltdl header and adds --enable-ltdl-install to the configure
   4.214 +# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
   4.215 +# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
   4.216 +# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
   4.217 +# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
   4.218 +# with '${top_srcdir}/' (note the single quotes!).  If your package is
   4.219 +# not flat and you're not using automake, define top_builddir and
   4.220 +# top_srcdir appropriately in the Makefiles.
   4.221  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
   4.222  AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   4.223    AC_CHECK_LIB(ltdl, main,
   4.224 @@ -595,8 +570,8 @@
   4.225    ])
   4.226    if test x"$enable_ltdl_install" = x"yes"; then
   4.227      ac_configure_args="$ac_configure_args --enable-ltdl-install"
   4.228 -    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
   4.229 -    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   4.230 +    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
   4.231 +    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   4.232    else
   4.233      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
   4.234      LIBLTDL="-lltdl"
     5.1 --- a/config.guess	Thu Aug 10 06:06:57 2000 +0000
     5.2 +++ b/config.guess	Thu Aug 10 06:12:39 2000 +0000
     5.3 @@ -1,8 +1,10 @@
     5.4  #! /bin/sh
     5.5  # Attempt to guess a canonical system name.
     5.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
     5.7 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
     5.8  #   Free Software Foundation, Inc.
     5.9 -#
    5.10 +
    5.11 +version='2000-07-27'
    5.12 +
    5.13  # This file is free software; you can redistribute it and/or modify it
    5.14  # under the terms of the GNU General Public License as published by
    5.15  # the Free Software Foundation; either version 2 of the License, or
    5.16 @@ -23,8 +25,7 @@
    5.17  # the same distribution terms that you use for the rest of that program.
    5.18  
    5.19  # Written by Per Bothner <bothner@cygnus.com>.
    5.20 -# The master version of this file is at the FSF in /home/gd/gnu/lib.
    5.21 -# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
    5.22 +# Please send patches to <config-patches@gnu.org>.
    5.23  #
    5.24  # This script attempts to guess a canonical system name similar to
    5.25  # config.sub.  If it succeeds, it prints the system name on stdout, and
    5.26 @@ -37,6 +38,46 @@
    5.27  # (but try to keep the structure clean).
    5.28  #
    5.29  
    5.30 +me=`echo "$0" | sed -e 's,.*/,,'`
    5.31 +
    5.32 +usage="\
    5.33 +Usage: $0 [OPTION]
    5.34 +
    5.35 +Output the configuration name of this system.
    5.36 +
    5.37 +Operation modes:
    5.38 +  -h, --help               print this help, then exit
    5.39 +  -V, --version            print version number, then exit"
    5.40 +
    5.41 +help="
    5.42 +Try \`$me --help' for more information."
    5.43 +
    5.44 +# Parse command line
    5.45 +while test $# -gt 0 ; do
    5.46 +  case "$1" in
    5.47 +    --version | --vers* | -V )
    5.48 +       echo "$version" ; exit 0 ;;
    5.49 +    --help | --h* | -h )
    5.50 +       echo "$usage"; exit 0 ;;
    5.51 +    -- )     # Stop option processing
    5.52 +       shift; break ;;
    5.53 +    - )	# Use stdin as input.
    5.54 +       break ;;
    5.55 +    -* )
    5.56 +       exec >&2
    5.57 +       echo "$me: invalid option $1"
    5.58 +       echo "$help"
    5.59 +       exit 1 ;;
    5.60 +    * )
    5.61 +       break ;;
    5.62 +  esac
    5.63 +done
    5.64 +
    5.65 +if test $# != 0; then
    5.66 +  echo "$me: too many arguments$help" >&2
    5.67 +  exit 1
    5.68 +fi
    5.69 +
    5.70  # Use $HOST_CC if defined. $CC may point to a cross-compiler
    5.71  if test x"$CC_FOR_BUILD" = x; then
    5.72    if test x"$HOST_CC" != x; then
    5.73 @@ -68,6 +109,43 @@
    5.74  # Note: order is significant - the case branches are not exclusive.
    5.75  
    5.76  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    5.77 +    *:NetBSD:*:*)
    5.78 +	# Netbsd (nbsd) targets should (where applicable) match one or
    5.79 +	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
    5.80 +	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
    5.81 +	# switched to ELF, *-*-netbsd* would select the old
    5.82 +	# object file format.  This provides both forward
    5.83 +	# compatibility and a consistent mechanism for selecting the
    5.84 +	# object file format.
    5.85 +	# Determine the machine/vendor (is the vendor relevant).
    5.86 +	case "${UNAME_MACHINE}" in
    5.87 +	    amiga) machine=m68k-unknown ;;
    5.88 +	    arm32) machine=arm-unknown ;;
    5.89 +	    atari*) machine=m68k-atari ;;
    5.90 +	    sun3*) machine=m68k-sun ;;
    5.91 +	    mac68k) machine=m68k-apple ;;
    5.92 +	    macppc) machine=powerpc-apple ;;
    5.93 +	    hp3[0-9][05]) machine=m68k-hp ;;
    5.94 +	    ibmrt|romp-ibm) machine=romp-ibm ;;
    5.95 +	    *) machine=${UNAME_MACHINE}-unknown ;;
    5.96 +	esac
    5.97 +	# The Operating System including object format.
    5.98 +	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    5.99 +		| grep __ELF__ >/dev/null
   5.100 +	then
   5.101 +	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
   5.102 +	    # Return netbsd for either.  FIX?
   5.103 +	    os=netbsd
   5.104 +	else
   5.105 +	    os=netbsdelf
   5.106 +	fi
   5.107 +	# The OS release
   5.108 +	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   5.109 +	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   5.110 +	# contains redundant information, the shorter form:
   5.111 +	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   5.112 +	echo "${machine}-${os}${release}"
   5.113 +	exit 0 ;;
   5.114      alpha:OSF1:*:*)
   5.115  	if test $UNAME_RELEASE = "V4.0"; then
   5.116  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   5.117 @@ -77,41 +155,51 @@
   5.118  	# A Xn.n version is an unreleased experimental baselevel.
   5.119  	# 1.2 uses "1.2" for uname -r.
   5.120  	cat <<EOF >$dummy.s
   5.121 +	.data
   5.122 +\$Lformat:
   5.123 +	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   5.124 +
   5.125 +	.text
   5.126  	.globl main
   5.127 +	.align 4
   5.128  	.ent main
   5.129  main:
   5.130 -	.frame \$30,0,\$26,0
   5.131 -	.prologue 0
   5.132 -	.long 0x47e03d80 # implver $0
   5.133 -	lda \$2,259
   5.134 -	.long 0x47e20c21 # amask $2,$1
   5.135 -	srl \$1,8,\$2
   5.136 -	sll \$2,2,\$2
   5.137 -	sll \$0,3,\$0
   5.138 -	addl \$1,\$0,\$0
   5.139 -	addl \$2,\$0,\$0
   5.140 -	ret \$31,(\$26),1
   5.141 +	.frame \$30,16,\$26,0
   5.142 +	ldgp \$29,0(\$27)
   5.143 +	.prologue 1
   5.144 +	.long 0x47e03d80 # implver \$0
   5.145 +	lda \$2,-1
   5.146 +	.long 0x47e20c21 # amask \$2,\$1
   5.147 +	lda \$16,\$Lformat
   5.148 +	mov \$0,\$17
   5.149 +	not \$1,\$18
   5.150 +	jsr \$26,printf
   5.151 +	ldgp \$29,0(\$26)
   5.152 +	mov 0,\$16
   5.153 +	jsr \$26,exit
   5.154  	.end main
   5.155  EOF
   5.156  	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   5.157  	if test "$?" = 0 ; then
   5.158 -		./$dummy
   5.159 -		case "$?" in
   5.160 -			7)
   5.161 +		case `./$dummy` in
   5.162 +			0-0)
   5.163  				UNAME_MACHINE="alpha"
   5.164  				;;
   5.165 -			15)
   5.166 +			1-0)
   5.167  				UNAME_MACHINE="alphaev5"
   5.168  				;;
   5.169 -			14)
   5.170 +			1-1)
   5.171  				UNAME_MACHINE="alphaev56"
   5.172  				;;
   5.173 -			10)
   5.174 +			1-101)
   5.175  				UNAME_MACHINE="alphapca56"
   5.176  				;;
   5.177 -			16)
   5.178 +			2-303)
   5.179  				UNAME_MACHINE="alphaev6"
   5.180  				;;
   5.181 +			2-307)
   5.182 +				UNAME_MACHINE="alphaev67"
   5.183 +				;;
   5.184  		esac
   5.185  	fi
   5.186  	rm -f $dummy.s $dummy
   5.187 @@ -127,11 +215,8 @@
   5.188  	echo alpha-dec-winnt3.5
   5.189  	exit 0 ;;
   5.190      Amiga*:UNIX_System_V:4.0:*)
   5.191 -	echo m68k-cbm-sysv4
   5.192 +	echo m68k-unknown-sysv4
   5.193  	exit 0;;
   5.194 -    amiga:NetBSD:*:*)
   5.195 -      echo m68k-cbm-netbsd${UNAME_RELEASE}
   5.196 -      exit 0 ;;
   5.197      amiga:OpenBSD:*:*)
   5.198  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   5.199  	exit 0 ;;
   5.200 @@ -156,12 +241,12 @@
   5.201      wgrisc:OpenBSD:*:*)
   5.202  	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   5.203  	exit 0 ;;
   5.204 +    *:OS/390:*:*)
   5.205 +	echo i370-ibm-openedition
   5.206 +	exit 0 ;;
   5.207      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   5.208  	echo arm-acorn-riscix${UNAME_RELEASE}
   5.209  	exit 0;;
   5.210 -    arm32:NetBSD:*:*)
   5.211 -	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   5.212 -	exit 0 ;;
   5.213      SR2?01:HI-UX/MPP:*:*)
   5.214  	echo hppa1.1-hitachi-hiuxmpp
   5.215  	exit 0;;
   5.216 @@ -218,15 +303,12 @@
   5.217      aushp:SunOS:*:*)
   5.218  	echo sparc-auspex-sunos${UNAME_RELEASE}
   5.219  	exit 0 ;;
   5.220 -    atari*:NetBSD:*:*)
   5.221 -	echo m68k-atari-netbsd${UNAME_RELEASE}
   5.222 -	exit 0 ;;
   5.223      atari*:OpenBSD:*:*)
   5.224  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   5.225  	exit 0 ;;
   5.226      # The situation for MiNT is a little confusing.  The machine name
   5.227      # can be virtually everything (everything which is not
   5.228 -    # "atarist" or "atariste" at least should have a processor 
   5.229 +    # "atarist" or "atariste" at least should have a processor
   5.230      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
   5.231      # to the lowercase version "mint" (or "freemint").  Finally
   5.232      # the system name "TOS" denotes a system which is actually not
   5.233 @@ -250,15 +332,9 @@
   5.234      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   5.235          echo m68k-unknown-mint${UNAME_RELEASE}
   5.236          exit 0 ;;
   5.237 -    sun3*:NetBSD:*:*)
   5.238 -	echo m68k-sun-netbsd${UNAME_RELEASE}
   5.239 -	exit 0 ;;
   5.240      sun3*:OpenBSD:*:*)
   5.241  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   5.242  	exit 0 ;;
   5.243 -    mac68k:NetBSD:*:*)
   5.244 -	echo m68k-apple-netbsd${UNAME_RELEASE}
   5.245 -	exit 0 ;;
   5.246      mac68k:OpenBSD:*:*)
   5.247  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   5.248  	exit 0 ;;
   5.249 @@ -271,9 +347,6 @@
   5.250      powerpc:machten:*:*)
   5.251  	echo powerpc-apple-machten${UNAME_RELEASE}
   5.252  	exit 0 ;;
   5.253 -    macppc:NetBSD:*:*)
   5.254 -        echo powerpc-apple-netbsd${UNAME_RELEASE}
   5.255 -        exit 0 ;;
   5.256      RISC*:Mach:*:*)
   5.257  	echo mips-dec-mach_bsd4.3
   5.258  	exit 0 ;;
   5.259 @@ -289,6 +362,7 @@
   5.260      mips:*:*:UMIPS | mips:*:*:RISCos)
   5.261  	sed 's/^	//' << EOF >$dummy.c
   5.262  #ifdef __cplusplus
   5.263 +#include <stdio.h>  /* for printf() prototype */
   5.264  	int main (int argc, char *argv[]) {
   5.265  #else
   5.266  	int main (argc, argv) int argc; char *argv[]; {
   5.267 @@ -328,15 +402,18 @@
   5.268      AViiON:dgux:*:*)
   5.269          # DG/UX returns AViiON for all architectures
   5.270          UNAME_PROCESSOR=`/usr/bin/uname -p`
   5.271 -        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
   5.272 -	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
   5.273 -	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
   5.274 +	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   5.275 +	then
   5.276 +	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   5.277 +	       [ ${TARGET_BINARY_INTERFACE}x = x ]
   5.278 +	    then
   5.279  		echo m88k-dg-dgux${UNAME_RELEASE}
   5.280 +	    else
   5.281 +		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   5.282 +	    fi
   5.283  	else
   5.284 -		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   5.285 +	    echo i586-dg-dgux${UNAME_RELEASE}
   5.286  	fi
   5.287 -        else echo i586-dg-dgux${UNAME_RELEASE}
   5.288 -        fi
   5.289   	exit 0 ;;
   5.290      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   5.291  	echo m88k-dolphin-sysv3
   5.292 @@ -402,7 +479,7 @@
   5.293      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   5.294  	echo romp-ibm-bsd4.4
   5.295  	exit 0 ;;
   5.296 -    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
   5.297 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
   5.298  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
   5.299  	exit 0 ;;                           # report: romp-ibm BSD 4.3
   5.300      *:BOSX:*:*)
   5.301 @@ -423,6 +500,8 @@
   5.302  	    9000/[34]?? )         HP_ARCH=m68k ;;
   5.303  	    9000/[678][0-9][0-9])
   5.304                sed 's/^              //' << EOF >$dummy.c
   5.305 +
   5.306 +              #define _HPUX_SOURCE
   5.307                #include <stdlib.h>
   5.308                #include <unistd.h>
   5.309  
   5.310 @@ -453,7 +532,7 @@
   5.311                    exit (0);
   5.312                }
   5.313  EOF
   5.314 -	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   5.315 +	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
   5.316  	rm -f $dummy.c $dummy
   5.317  	esac
   5.318  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   5.319 @@ -547,10 +626,13 @@
   5.320  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
   5.321  	exit 0 ;;
   5.322      CRAY*TS:*:*:*)
   5.323 -	echo t90-cray-unicos${UNAME_RELEASE}
   5.324 +	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   5.325  	exit 0 ;;
   5.326      CRAY*T3E:*:*:*)
   5.327 -	echo t3e-cray-unicosmk${UNAME_RELEASE}
   5.328 +	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   5.329 +	exit 0 ;;
   5.330 +    CRAY*SV1:*:*:*)
   5.331 +	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   5.332  	exit 0 ;;
   5.333      CRAY-2:*:*:*)
   5.334  	echo cray2-cray-unicos
   5.335 @@ -563,13 +645,10 @@
   5.336      F301:UNIX_System_V:*:*)
   5.337         echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
   5.338         exit 0 ;;
   5.339 -    hp3[0-9][05]:NetBSD:*:*)
   5.340 -	echo m68k-hp-netbsd${UNAME_RELEASE}
   5.341 -	exit 0 ;;
   5.342      hp300:OpenBSD:*:*)
   5.343  	echo m68k-unknown-openbsd${UNAME_RELEASE}
   5.344  	exit 0 ;;
   5.345 -    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
   5.346 +    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   5.347  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   5.348  	exit 0 ;;
   5.349      sparc*:BSD/OS:*:*)
   5.350 @@ -579,17 +658,8 @@
   5.351  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   5.352  	exit 0 ;;
   5.353      *:FreeBSD:*:*)
   5.354 -	if test -x /usr/bin/objformat; then
   5.355 -	    if test "elf" = "`/usr/bin/objformat`"; then
   5.356 -		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
   5.357 -		exit 0
   5.358 -	    fi
   5.359 -	fi
   5.360  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   5.361  	exit 0 ;;
   5.362 -    *:NetBSD:*:*)
   5.363 -	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   5.364 -	exit 0 ;;
   5.365      *:OpenBSD:*:*)
   5.366  	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   5.367  	exit 0 ;;
   5.368 @@ -617,13 +687,10 @@
   5.369      *:GNU:*:*)
   5.370  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   5.371  	exit 0 ;;
   5.372 +    i*86:Minix:*:*)
   5.373 +	echo ${UNAME_MACHINE}-pc-minix
   5.374 +	exit 0 ;;
   5.375      *:Linux:*:*)
   5.376 -	# uname on the ARM produces all sorts of strangeness, and we need to
   5.377 -	# filter it out.
   5.378 -	case "$UNAME_MACHINE" in
   5.379 -	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
   5.380 -	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
   5.381 -	esac
   5.382  
   5.383  	# The BFD linker knows what the default object file format is, so
   5.384  	# first see if it will tell us. cd to the root directory to prevent
   5.385 @@ -636,12 +703,42 @@
   5.386  				    s/ .*//
   5.387  				    p'`
   5.388          case "$ld_supported_emulations" in
   5.389 -	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
   5.390 -	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
   5.391 -	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   5.392 -	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   5.393 -	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
   5.394 -	  elf32ppc)
   5.395 +	  *ia64)
   5.396 +		echo "${UNAME_MACHINE}-unknown-linux"
   5.397 +		exit 0
   5.398 +		;;
   5.399 +	  i?86linux)
   5.400 +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
   5.401 +		exit 0
   5.402 +		;;
   5.403 +	  elf_i?86)
   5.404 +		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
   5.405 +		;;
   5.406 +	  i?86coff)
   5.407 +		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
   5.408 +		exit 0
   5.409 +		;;
   5.410 +	  sparclinux)
   5.411 +		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   5.412 +		exit 0
   5.413 +		;;
   5.414 +	  armlinux)
   5.415 +		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   5.416 +		exit 0
   5.417 +		;;
   5.418 +	  elf32arm*)
   5.419 +		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
   5.420 +		exit 0
   5.421 +		;;
   5.422 +	  armelf_linux*)
   5.423 +		echo "${UNAME_MACHINE}-unknown-linux-gnu"
   5.424 +		exit 0
   5.425 +		;;
   5.426 +	  m68klinux)
   5.427 +		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
   5.428 +		exit 0
   5.429 +		;;
   5.430 +	  elf32ppc | elf32ppclinux)
   5.431  		# Determine Lib Version
   5.432  		cat >$dummy.c <<EOF
   5.433  #include <features.h>
   5.434 @@ -668,49 +765,65 @@
   5.435  			if test "$?" = 0 ; then
   5.436  				LIBC="libc1"
   5.437  			fi
   5.438 -		fi	
   5.439 +		fi
   5.440  		rm -f $dummy.c $dummy
   5.441 -		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
   5.442 +		echo powerpc-unknown-linux-gnu${LIBC}
   5.443 +		exit 0
   5.444 +		;;
   5.445 +	  shelf_linux)
   5.446 +		echo "${UNAME_MACHINE}-unknown-linux-gnu"
   5.447 +		exit 0
   5.448 +		;;
   5.449  	esac
   5.450  
   5.451  	if test "${UNAME_MACHINE}" = "alpha" ; then
   5.452 -		sed 's/^	//'  <<EOF >$dummy.s
   5.453 -		.globl main
   5.454 -		.ent main
   5.455 -	main:
   5.456 -		.frame \$30,0,\$26,0
   5.457 -		.prologue 0
   5.458 -		.long 0x47e03d80 # implver $0
   5.459 -		lda \$2,259
   5.460 -		.long 0x47e20c21 # amask $2,$1
   5.461 -		srl \$1,8,\$2
   5.462 -		sll \$2,2,\$2
   5.463 -		sll \$0,3,\$0
   5.464 -		addl \$1,\$0,\$0
   5.465 -		addl \$2,\$0,\$0
   5.466 -		ret \$31,(\$26),1
   5.467 -		.end main
   5.468 +		cat <<EOF >$dummy.s
   5.469 +			.data
   5.470 +		\$Lformat:
   5.471 +			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
   5.472 +
   5.473 +			.text
   5.474 +			.globl main
   5.475 +			.align 4
   5.476 +			.ent main
   5.477 +		main:
   5.478 +			.frame \$30,16,\$26,0
   5.479 +			ldgp \$29,0(\$27)
   5.480 +			.prologue 1
   5.481 +			.long 0x47e03d80 # implver \$0
   5.482 +			lda \$2,-1
   5.483 +			.long 0x47e20c21 # amask \$2,\$1
   5.484 +			lda \$16,\$Lformat
   5.485 +			mov \$0,\$17
   5.486 +			not \$1,\$18
   5.487 +			jsr \$26,printf
   5.488 +			ldgp \$29,0(\$26)
   5.489 +			mov 0,\$16
   5.490 +			jsr \$26,exit
   5.491 +			.end main
   5.492  EOF
   5.493  		LIBC=""
   5.494  		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
   5.495  		if test "$?" = 0 ; then
   5.496 -			./$dummy
   5.497 -			case "$?" in
   5.498 -			7)
   5.499 +			case `./$dummy` in
   5.500 +			0-0)
   5.501  				UNAME_MACHINE="alpha"
   5.502  				;;
   5.503 -			15)
   5.504 +			1-0)
   5.505  				UNAME_MACHINE="alphaev5"
   5.506  				;;
   5.507 -			14)
   5.508 +			1-1)
   5.509  				UNAME_MACHINE="alphaev56"
   5.510  				;;
   5.511 -			10)
   5.512 +			1-101)
   5.513  				UNAME_MACHINE="alphapca56"
   5.514  				;;
   5.515 -			16)
   5.516 +			2-303)
   5.517  				UNAME_MACHINE="alphaev6"
   5.518  				;;
   5.519 +			2-307)
   5.520 +				UNAME_MACHINE="alphaev67"
   5.521 +				;;
   5.522  			esac
   5.523  
   5.524  			objdump --private-headers $dummy | \
   5.525 @@ -724,6 +837,7 @@
   5.526  	elif test "${UNAME_MACHINE}" = "mips" ; then
   5.527  	  cat >$dummy.c <<EOF
   5.528  #ifdef __cplusplus
   5.529 +#include <stdio.h>  /* for printf() prototype */
   5.530  	int main (int argc, char *argv[]) {
   5.531  #else
   5.532  	int main (argc, argv) int argc; char *argv[]; {
   5.533 @@ -739,6 +853,8 @@
   5.534  EOF
   5.535  	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   5.536  	  rm -f $dummy.c $dummy
   5.537 +	elif test "${UNAME_MACHINE}" = "s390"; then
   5.538 +	  echo s390-ibm-linux && exit 0
   5.539  	else
   5.540  	  # Either a pre-BFD a.out linker (linux-gnuoldld)
   5.541  	  # or one that does not give us useful --help.
   5.542 @@ -760,6 +876,7 @@
   5.543  	  cat >$dummy.c <<EOF
   5.544  #include <features.h>
   5.545  #ifdef __cplusplus
   5.546 +#include <stdio.h>  /* for printf() prototype */
   5.547  	int main (int argc, char *argv[]) {
   5.548  #else
   5.549  	int main (argc, argv) int argc; char *argv[]; {
   5.550 @@ -782,6 +899,7 @@
   5.551  EOF
   5.552  	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
   5.553  	  rm -f $dummy.c $dummy
   5.554 +	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   5.555  	fi ;;
   5.556  # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
   5.557  # are messed up and put the nodename in both sysname and nodename.
   5.558 @@ -797,19 +915,21 @@
   5.559  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   5.560  	exit 0 ;;
   5.561      i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
   5.562 +	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
   5.563  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
   5.564 -		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
   5.565 +		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
   5.566  	else
   5.567 -		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   5.568 +		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   5.569  	fi
   5.570  	exit 0 ;;
   5.571      i?86:*:5:7*)
   5.572 -	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
   5.573 -	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
   5.574 -	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
   5.575 -	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
   5.576 -	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
   5.577 -	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
   5.578 +        # Fixed at (any) Pentium or better
   5.579 +        UNAME_MACHINE=i586
   5.580 +        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
   5.581 +	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
   5.582 +	else
   5.583 +	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   5.584 +	fi
   5.585  	exit 0 ;;
   5.586      i?86:*:3.2:*)
   5.587  	if test -f /usr/options/cb.name; then
   5.588 @@ -829,7 +949,11 @@
   5.589  		echo ${UNAME_MACHINE}-pc-sysv32
   5.590  	fi
   5.591  	exit 0 ;;
   5.592 +    i?86:*DOS:*:*)
   5.593 +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
   5.594 +	exit 0 ;;
   5.595      pc:*:*:*)
   5.596 +	# Left here for compatibility:
   5.597          # uname -m prints for DJGPP always 'pc', but it prints nothing about
   5.598          # the processor, so we play safe by assuming i386.
   5.599  	echo i386-pc-msdosdjgpp
   5.600 @@ -943,6 +1067,38 @@
   5.601      *:Rhapsody:*:*)
   5.602  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
   5.603  	exit 0 ;;
   5.604 +    *:Darwin:*:*)
   5.605 +	echo `uname -p`-apple-darwin${UNAME_RELEASE}
   5.606 +	exit 0 ;;
   5.607 +    *:procnto*:*:* | *:QNX:[0123456789]*:*)
   5.608 +	if test "${UNAME_MACHINE}" = "x86pc"; then
   5.609 +		UNAME_MACHINE=pc
   5.610 +	fi
   5.611 +	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
   5.612 +	exit 0 ;;
   5.613 +    *:QNX:*:4*)
   5.614 +	echo i386-pc-qnx
   5.615 +	exit 0 ;;
   5.616 +    NSR-W:NONSTOP_KERNEL:*:*)
   5.617 +	echo nsr-tandem-nsk${UNAME_RELEASE}
   5.618 +	exit 0 ;;
   5.619 +    BS2000:POSIX*:*:*)
   5.620 +	echo bs2000-siemens-sysv
   5.621 +	exit 0 ;;
   5.622 +    DS/*:UNIX_System_V:*:*)
   5.623 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
   5.624 +	exit 0 ;;
   5.625 +    *:Plan9:*:*)
   5.626 +	# "uname -m" is not consistent, so use $cputype instead. 386
   5.627 +	# is converted to i386 for consistency with other x86
   5.628 +	# operating systems.
   5.629 +	if test "$cputype" = "386"; then
   5.630 +	    UNAME_MACHINE=i386
   5.631 +	else
   5.632 +	    UNAME_MACHINE="$cputype"
   5.633 +	fi
   5.634 +	echo ${UNAME_MACHINE}-unknown-plan9
   5.635 +	exit 0 ;;
   5.636  esac
   5.637  
   5.638  #echo '(No uname command or uname output not recognized.)' 1>&2
   5.639 @@ -1082,6 +1238,47 @@
   5.640      esac
   5.641  fi
   5.642  
   5.643 -#echo '(Unable to guess system type)' 1>&2
   5.644 +cat >&2 <<EOF
   5.645 +$0: unable to guess system type
   5.646 +
   5.647 +The $version version of this script cannot recognize your system type.
   5.648 +Please download the most up to date version of the config scripts:
   5.649 +
   5.650 +    ftp://ftp.gnu.org/pub/gnu/config/
   5.651 +
   5.652 +If the version you run ($0) is already up to date, please
   5.653 +send the following data and any information you think might be
   5.654 +pertinent to <config-patches@gnu.org> in order to provide the needed
   5.655 +information to handle your system.
   5.656 +
   5.657 +config.guess version = $version
   5.658 +
   5.659 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
   5.660 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
   5.661 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
   5.662 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
   5.663 +
   5.664 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
   5.665 +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
   5.666 +
   5.667 +hostinfo               = `(hostinfo) 2>/dev/null`
   5.668 +/bin/universe          = `(/bin/universe) 2>/dev/null`
   5.669 +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
   5.670 +/bin/arch              = `(/bin/arch) 2>/dev/null`
   5.671 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
   5.672 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
   5.673 +
   5.674 +UNAME_MACHINE = ${UNAME_MACHINE}
   5.675 +UNAME_RELEASE = ${UNAME_RELEASE}
   5.676 +UNAME_SYSTEM  = ${UNAME_SYSTEM}
   5.677 +UNAME_VERSION = ${UNAME_VERSION}
   5.678 +EOF
   5.679  
   5.680  exit 1
   5.681 +
   5.682 +# Local variables:
   5.683 +# eval: (add-hook 'write-file-hooks 'time-stamp)
   5.684 +# time-stamp-start: "version='"
   5.685 +# time-stamp-format: "%:y-%02m-%02d"
   5.686 +# time-stamp-end: "'"
   5.687 +# End:
     6.1 --- a/config.sub	Thu Aug 10 06:06:57 2000 +0000
     6.2 +++ b/config.sub	Thu Aug 10 06:12:39 2000 +0000
     6.3 @@ -1,6 +1,10 @@
     6.4  #! /bin/sh
     6.5  # Configuration validation subroutine script, version 1.1.
     6.6 -#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
     6.7 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
     6.8 +#   Free Software Foundation, Inc.
     6.9 +
    6.10 +version='2000-07-27'
    6.11 +
    6.12  # This file is (in principle) common to ALL GNU software.
    6.13  # The presence of a machine in this file suggests that SOME GNU software
    6.14  # can handle that machine.  It does not imply ALL GNU software can.
    6.15 @@ -25,6 +29,8 @@
    6.16  # configuration script generated by Autoconf, you may include it under
    6.17  # the same distribution terms that you use for the rest of that program.
    6.18  
    6.19 +# Please send patches to <config-patches@gnu.org>.
    6.20 +#
    6.21  # Configuration subroutine to validate and canonicalize a configuration type.
    6.22  # Supply the specified configuration type as an argument.
    6.23  # If it is invalid, we print an error message on stderr and exit with code 1.
    6.24 @@ -45,30 +51,61 @@
    6.25  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
    6.26  # It is wrong to echo any other type of specification.
    6.27  
    6.28 -if [ x$1 = x ]
    6.29 -then
    6.30 -	echo Configuration name missing. 1>&2
    6.31 -	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
    6.32 -	echo "or     $0 ALIAS" 1>&2
    6.33 -	echo where ALIAS is a recognized configuration type. 1>&2
    6.34 -	exit 1
    6.35 -fi
    6.36 +me=`echo "$0" | sed -e 's,.*/,,'`
    6.37  
    6.38 -# First pass through any local machine types.
    6.39 -case $1 in
    6.40 -	*local*)
    6.41 -		echo $1
    6.42 -		exit 0
    6.43 -		;;
    6.44 -	*)
    6.45 -	;;
    6.46 +usage="\
    6.47 +Usage: $0 [OPTION] CPU-MFR-OPSYS
    6.48 +       $0 [OPTION] ALIAS
    6.49 +
    6.50 +Canonicalize a configuration name.
    6.51 +
    6.52 +Operation modes:
    6.53 +  -h, --help               print this help, then exit
    6.54 +  -V, --version            print version number, then exit"
    6.55 +
    6.56 +help="
    6.57 +Try \`$me --help' for more information."
    6.58 +
    6.59 +# Parse command line
    6.60 +while test $# -gt 0 ; do
    6.61 +  case "$1" in
    6.62 +    --version | --vers* | -V )
    6.63 +       echo "$version" ; exit 0 ;;
    6.64 +    --help | --h* | -h )
    6.65 +       echo "$usage"; exit 0 ;;
    6.66 +    -- )     # Stop option processing
    6.67 +       shift; break ;;
    6.68 +    - )	# Use stdin as input.
    6.69 +       break ;;
    6.70 +    -* )
    6.71 +       exec >&2
    6.72 +       echo "$me: invalid option $1"
    6.73 +       echo "$help"
    6.74 +       exit 1 ;;
    6.75 +
    6.76 +    *local*)
    6.77 +       # First pass through any local machine types.
    6.78 +       echo $1
    6.79 +       exit 0;;
    6.80 +
    6.81 +    * )
    6.82 +       break ;;
    6.83 +  esac
    6.84 +done
    6.85 +
    6.86 +case $# in
    6.87 + 0) echo "$me: missing argument$help" >&2
    6.88 +    exit 1;;
    6.89 + 1) ;;
    6.90 + *) echo "$me: too many arguments$help" >&2
    6.91 +    exit 1;;
    6.92  esac
    6.93  
    6.94  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
    6.95  # Here we must recognize all the valid KERNEL-OS combinations.
    6.96  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    6.97  case $maybe_os in
    6.98 -  linux-gnu*)
    6.99 +  nto-qnx* | linux-gnu*)
   6.100      os=-$maybe_os
   6.101      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   6.102      ;;
   6.103 @@ -94,7 +131,7 @@
   6.104  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   6.105  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   6.106  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   6.107 -	-apple)
   6.108 +	-apple | -axis)
   6.109  		os=
   6.110  		basic_machine=$1
   6.111  		;;
   6.112 @@ -105,7 +142,7 @@
   6.113  	-scout)
   6.114  		;;
   6.115  	-wrs)
   6.116 -		os=vxworks
   6.117 +		os=-vxworks
   6.118  		basic_machine=$1
   6.119  		;;
   6.120  	-hiux*)
   6.121 @@ -156,33 +193,46 @@
   6.122  	-psos*)
   6.123  		os=-psos
   6.124  		;;
   6.125 +	-mint | -mint[0-9]*)
   6.126 +		basic_machine=m68k-atari
   6.127 +		os=-mint
   6.128 +		;;
   6.129  esac
   6.130  
   6.131  # Decode aliases for certain CPU-COMPANY combinations.
   6.132  case $basic_machine in
   6.133  	# Recognize the basic CPU types without company name.
   6.134  	# Some are omitted here because they have special meanings below.
   6.135 -	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   6.136 +	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
   6.137  		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
   6.138  		| 580 | i960 | h8300 \
   6.139 +		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
   6.140  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
   6.141 -		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
   6.142 -		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
   6.143 +		| hppa64 \
   6.144 +		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
   6.145 +		| alphaev6[78] \
   6.146 +		| we32k | ns16k | clipper | i370 | sh | sh[34] \
   6.147 +		| powerpc | powerpcle \
   6.148  		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
   6.149  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
   6.150  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
   6.151 -		| mips64vr5000 | miprs64vr5000el \
   6.152 +		| mips64vr5000 | miprs64vr5000el | mcore \
   6.153  		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
   6.154 -		| thumb | d10v)
   6.155 +		| thumb | d10v | d30v | fr30 | avr)
   6.156  		basic_machine=$basic_machine-unknown
   6.157  		;;
   6.158 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
   6.159 +	m6811 | m68hc11 | m6812 | m68hc12)
   6.160 +		# Motorola 68HC11/12.
   6.161 +		basic_machine=$basic_machine-unknown
   6.162 +		os=-none
   6.163 +		;;
   6.164 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
   6.165  		;;
   6.166  
   6.167  	# We use `pc' rather than `unknown'
   6.168  	# because (1) that's what they normally are, and
   6.169  	# (2) the word "unknown" tends to confuse beginning users.
   6.170 -	i[34567]86)
   6.171 +	i[234567]86)
   6.172  	  basic_machine=$basic_machine-pc
   6.173  	  ;;
   6.174  	# Object if more than one company name word.
   6.175 @@ -191,23 +241,28 @@
   6.176  		exit 1
   6.177  		;;
   6.178  	# Recognize the basic CPU types with company name.
   6.179 -	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
   6.180 +	# FIXME: clean up the formatting here.
   6.181 +	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
   6.182  	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
   6.183  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
   6.184  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
   6.185  	      | xmp-* | ymp-* \
   6.186 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
   6.187 -	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
   6.188 +	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
   6.189 +	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
   6.190 +	      | hppa2.0n-* | hppa64-* \
   6.191 +	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
   6.192 +	      | alphaev6[78]-* \
   6.193  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
   6.194  	      | clipper-* | orion-* \
   6.195  	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
   6.196  	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
   6.197  	      | mips64el-* | mips64orion-* | mips64orionel-* \
   6.198  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
   6.199 -	      | mipstx39-* | mipstx39el-* \
   6.200 -	      | f301-* | armv*-* | t3e-* \
   6.201 +	      | mipstx39-* | mipstx39el-* | mcore-* \
   6.202 +	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
   6.203  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
   6.204 -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
   6.205 +	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
   6.206 +	      | bs2000-* | tic54x-* | c54x-*)
   6.207  		;;
   6.208  	# Recognize the various machine names and aliases which stand
   6.209  	# for a CPU type and a company and sometimes even an OS.
   6.210 @@ -244,14 +299,14 @@
   6.211  		os=-sysv
   6.212  		;;
   6.213  	amiga | amiga-*)
   6.214 -		basic_machine=m68k-cbm
   6.215 +		basic_machine=m68k-unknown
   6.216  		;;
   6.217  	amigaos | amigados)
   6.218 -		basic_machine=m68k-cbm
   6.219 +		basic_machine=m68k-unknown
   6.220  		os=-amigaos
   6.221  		;;
   6.222  	amigaunix | amix)
   6.223 -		basic_machine=m68k-cbm
   6.224 +		basic_machine=m68k-unknown
   6.225  		os=-sysv4
   6.226  		;;
   6.227  	apollo68)
   6.228 @@ -305,6 +360,9 @@
   6.229  	crds | unos)
   6.230  		basic_machine=m68k-crds
   6.231  		;;
   6.232 +	cris | cris-* | etrax*)
   6.233 +		basic_machine=cris-axis
   6.234 +		;;
   6.235  	da30 | da30-*)
   6.236  		basic_machine=m68k-da30
   6.237  		;;
   6.238 @@ -425,7 +483,6 @@
   6.239  		;;
   6.240  	i370-ibm* | ibm*)
   6.241  		basic_machine=i370-ibm
   6.242 -		os=-mvs
   6.243  		;;
   6.244  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   6.245  	i[34567]86v32)
   6.246 @@ -488,7 +545,7 @@
   6.247  	miniframe)
   6.248  		basic_machine=m68000-convergent
   6.249  		;;
   6.250 -	*mint | *MiNT)
   6.251 +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
   6.252  		basic_machine=m68k-atari
   6.253  		os=-mint
   6.254  		;;
   6.255 @@ -506,6 +563,10 @@
   6.256  	mips3*)
   6.257  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   6.258  		;;
   6.259 +	mmix*)
   6.260 +		basic_machine=mmix-knuth
   6.261 +		os=-mmixware
   6.262 +		;;
   6.263  	monitor)
   6.264  		basic_machine=m68k-rom68k
   6.265  		os=-coff
   6.266 @@ -514,6 +575,10 @@
   6.267  		basic_machine=i386-unknown
   6.268  		os=-msdos
   6.269  		;;
   6.270 +	mvs)
   6.271 +		basic_machine=i370-ibm
   6.272 +		os=-mvs
   6.273 +		;;
   6.274  	ncr3000)
   6.275  		basic_machine=i486-ncr
   6.276  		os=-sysv4
   6.277 @@ -523,7 +588,7 @@
   6.278  		os=-netbsd
   6.279  		;;
   6.280  	netwinder)
   6.281 -		basic_machine=armv4l-corel
   6.282 +		basic_machine=armv4l-rebel
   6.283  		os=-linux
   6.284  		;;
   6.285  	news | news700 | news800 | news900)
   6.286 @@ -574,6 +639,9 @@
   6.287  	np1)
   6.288  		basic_machine=np1-gould
   6.289  		;;
   6.290 +	nsr-tandem)
   6.291 +		basic_machine=nsr-tandem
   6.292 +		;;
   6.293  	op50n-* | op60c-*)
   6.294  		basic_machine=hppa1.1-oki
   6.295  		os=-proelf
   6.296 @@ -606,7 +674,7 @@
   6.297  	pentium | p5 | k5 | k6 | nexen)
   6.298  		basic_machine=i586-pc
   6.299  		;;
   6.300 -	pentiumpro | p6 | 6x86)
   6.301 +	pentiumpro | p6 | 6x86 | athlon)
   6.302  		basic_machine=i686-pc
   6.303  		;;
   6.304  	pentiumii | pentium2)
   6.305 @@ -615,7 +683,7 @@
   6.306  	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   6.307  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   6.308  		;;
   6.309 -	pentiumpro-* | p6-* | 6x86-*)
   6.310 +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   6.311  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   6.312  		;;
   6.313  	pentiumii-* | pentium2-*)
   6.314 @@ -718,6 +786,10 @@
   6.315  	sun386 | sun386i | roadrunner)
   6.316  		basic_machine=i386-sun
   6.317  		;;
   6.318 +	sv1)
   6.319 +		basic_machine=sv1-cray
   6.320 +		os=-unicos
   6.321 +		;;
   6.322  	symmetry)
   6.323  		basic_machine=i386-sequent
   6.324  		os=-dynix
   6.325 @@ -726,6 +798,10 @@
   6.326  		basic_machine=t3e-cray
   6.327  		os=-unicos
   6.328  		;;
   6.329 +	tic54x | c54x*)
   6.330 +		basic_machine=tic54x-unknown
   6.331 +		os=-coff
   6.332 +		;;
   6.333  	tx39)
   6.334  		basic_machine=mipstx39-unknown
   6.335  		;;
   6.336 @@ -827,6 +903,9 @@
   6.337  	we32k)
   6.338  		basic_machine=we32k-att
   6.339  		;;
   6.340 +	sh3 | sh4)
   6.341 +		base_machine=sh-unknown
   6.342 +		;;
   6.343  	sparc | sparcv9)
   6.344  		basic_machine=sparc-sun
   6.345  		;;
   6.346 @@ -907,12 +986,25 @@
   6.347  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   6.348  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   6.349  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
   6.350 -	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
   6.351 +	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
   6.352 +	      | -openstep* | -oskit*)
   6.353  	# Remember, each alternative MUST END IN *, to match a version number.
   6.354  		;;
   6.355 +	-qnx*)
   6.356 +		case $basic_machine in
   6.357 +		    x86-* | i[34567]86-*)
   6.358 +			;;
   6.359 +		    *)
   6.360 +			os=-nto$os
   6.361 +			;;
   6.362 +		esac
   6.363 +		;;
   6.364 +	-nto*)
   6.365 +		os=-nto-qnx
   6.366 +		;;
   6.367  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
   6.368  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
   6.369 -	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
   6.370 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
   6.371  		;;
   6.372  	-mac*)
   6.373  		os=`echo $os | sed -e 's|mac|macos|'`
   6.374 @@ -926,6 +1018,12 @@
   6.375  	-sunos6*)
   6.376  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
   6.377  		;;
   6.378 +	-opened*)
   6.379 +		os=-openedition
   6.380 +		;;
   6.381 +	-wince*)
   6.382 +		os=-wince
   6.383 +		;;
   6.384  	-osfrose*)
   6.385  		os=-osfrose
   6.386  		;;
   6.387 @@ -950,6 +1048,9 @@
   6.388  	-ns2 )
   6.389  	        os=-nextstep2
   6.390  		;;
   6.391 +	-nsk)
   6.392 +		os=-nsk
   6.393 +		;;
   6.394  	# Preserve the version number of sinix5.
   6.395  	-sinix5.*)
   6.396  		os=`echo $os | sed -e 's|sinix|sysv|'`
   6.397 @@ -1012,7 +1113,7 @@
   6.398  	*-acorn)
   6.399  		os=-riscix1.2
   6.400  		;;
   6.401 -	arm*-corel)
   6.402 +	arm*-rebel)
   6.403  		os=-linux
   6.404  		;;
   6.405  	arm*-semi)
   6.406 @@ -1186,7 +1287,7 @@
   6.407  			-genix*)
   6.408  				vendor=ns
   6.409  				;;
   6.410 -			-mvs*)
   6.411 +			-mvs* | -opened*)
   6.412  				vendor=ibm
   6.413  				;;
   6.414  			-ptx*)
   6.415 @@ -1213,3 +1314,11 @@
   6.416  esac
   6.417  
   6.418  echo $basic_machine$os
   6.419 +exit 0
   6.420 +
   6.421 +# Local variables:
   6.422 +# eval: (add-hook 'write-file-hooks 'time-stamp)
   6.423 +# time-stamp-start: "version='"
   6.424 +# time-stamp-format: "%:y-%02m-%02d"
   6.425 +# time-stamp-end: "'"
   6.426 +# End:
     7.1 --- a/configure	Thu Aug 10 06:06:57 2000 +0000
     7.2 +++ b/configure	Thu Aug 10 06:12:39 2000 +0000
     7.3 @@ -22,8 +22,6 @@
     7.4  ac_help="$ac_help
     7.5    --disable-libtool-lock  avoid locking (might break parallel builds)"
     7.6  ac_help="$ac_help
     7.7 -  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
     7.8 -ac_help="$ac_help
     7.9    --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)"
    7.10  ac_help="$ac_help
    7.11    --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)"
    7.12 @@ -621,7 +619,7 @@
    7.13  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    7.14  # ./install, which can be erroneously created by make from ./install.sh.
    7.15  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    7.16 -echo "configure:625: checking for a BSD compatible install" >&5
    7.17 +echo "configure:623: checking for a BSD compatible install" >&5
    7.18  if test -z "$INSTALL"; then
    7.19  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    7.20    echo $ac_n "(cached) $ac_c" 1>&6
    7.21 @@ -674,7 +672,7 @@
    7.22  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
    7.23  
    7.24  echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
    7.25 -echo "configure:678: checking whether build environment is sane" >&5
    7.26 +echo "configure:676: checking whether build environment is sane" >&5
    7.27  # Just in case
    7.28  sleep 1
    7.29  echo timestamp > conftestfile
    7.30 @@ -731,7 +729,7 @@
    7.31  test "$program_transform_name" = "" && program_transform_name="s,x,x,"
    7.32  
    7.33  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    7.34 -echo "configure:735: checking whether ${MAKE-make} sets \${MAKE}" >&5
    7.35 +echo "configure:733: checking whether ${MAKE-make} sets \${MAKE}" >&5
    7.36  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    7.37  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    7.38    echo $ac_n "(cached) $ac_c" 1>&6
    7.39 @@ -777,7 +775,7 @@
    7.40  
    7.41  missing_dir=`cd $ac_aux_dir && pwd`
    7.42  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    7.43 -echo "configure:781: checking for working aclocal" >&5
    7.44 +echo "configure:779: checking for working aclocal" >&5
    7.45  # Run test in a subshell; some versions of sh will print an error if
    7.46  # an executable is not found, even if stderr is redirected.
    7.47  # Redirect stdin to placate older versions of autoconf.  Sigh.
    7.48 @@ -790,7 +788,7 @@
    7.49  fi
    7.50  
    7.51  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    7.52 -echo "configure:794: checking for working autoconf" >&5
    7.53 +echo "configure:792: checking for working autoconf" >&5
    7.54  # Run test in a subshell; some versions of sh will print an error if
    7.55  # an executable is not found, even if stderr is redirected.
    7.56  # Redirect stdin to placate older versions of autoconf.  Sigh.
    7.57 @@ -803,7 +801,7 @@
    7.58  fi
    7.59  
    7.60  echo $ac_n "checking for working automake""... $ac_c" 1>&6
    7.61 -echo "configure:807: checking for working automake" >&5
    7.62 +echo "configure:805: checking for working automake" >&5
    7.63  # Run test in a subshell; some versions of sh will print an error if
    7.64  # an executable is not found, even if stderr is redirected.
    7.65  # Redirect stdin to placate older versions of autoconf.  Sigh.
    7.66 @@ -816,7 +814,7 @@
    7.67  fi
    7.68  
    7.69  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    7.70 -echo "configure:820: checking for working autoheader" >&5
    7.71 +echo "configure:818: checking for working autoheader" >&5
    7.72  # Run test in a subshell; some versions of sh will print an error if
    7.73  # an executable is not found, even if stderr is redirected.
    7.74  # Redirect stdin to placate older versions of autoconf.  Sigh.
    7.75 @@ -829,7 +827,7 @@
    7.76  fi
    7.77  
    7.78  echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    7.79 -echo "configure:833: checking for working makeinfo" >&5
    7.80 +echo "configure:831: checking for working makeinfo" >&5
    7.81  # Run test in a subshell; some versions of sh will print an error if
    7.82  # an executable is not found, even if stderr is redirected.
    7.83  # Redirect stdin to placate older versions of autoconf.  Sigh.
    7.84 @@ -844,254 +842,52 @@
    7.85  
    7.86  
    7.87  
    7.88 -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    7.89 -echo "configure:849: checking whether ${MAKE-make} sets \${MAKE}" >&5
    7.90 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    7.91 -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    7.92 -  echo $ac_n "(cached) $ac_c" 1>&6
    7.93 -else
    7.94 -  cat > conftestmake <<\EOF
    7.95 -all:
    7.96 -	@echo 'ac_maketemp="${MAKE}"'
    7.97 -EOF
    7.98 -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    7.99 -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
   7.100 -if test -n "$ac_maketemp"; then
   7.101 -  eval ac_cv_prog_make_${ac_make}_set=yes
   7.102 -else
   7.103 -  eval ac_cv_prog_make_${ac_make}_set=no
   7.104 -fi
   7.105 -rm -f conftestmake
   7.106 -fi
   7.107 -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
   7.108 -  echo "$ac_t""yes" 1>&6
   7.109 -  SET_MAKE=
   7.110 -else
   7.111 -  echo "$ac_t""no" 1>&6
   7.112 -  SET_MAKE="MAKE=${MAKE-make}"
   7.113 +# Make sure we can run config.sub.
   7.114 +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
   7.115 +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
   7.116  fi
   7.117  
   7.118 -# Extract the first word of "gcc", so it can be a program name with args.
   7.119 -set dummy gcc; ac_word=$2
   7.120 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.121 -echo "configure:878: checking for $ac_word" >&5
   7.122 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.123 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.124 -else
   7.125 -  if test -n "$CC"; then
   7.126 -  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.127 -else
   7.128 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.129 -  ac_dummy="$PATH"
   7.130 -  for ac_dir in $ac_dummy; do
   7.131 -    test -z "$ac_dir" && ac_dir=.
   7.132 -    if test -f $ac_dir/$ac_word; then
   7.133 -      ac_cv_prog_CC="gcc"
   7.134 -      break
   7.135 -    fi
   7.136 -  done
   7.137 -  IFS="$ac_save_ifs"
   7.138 -fi
   7.139 -fi
   7.140 -CC="$ac_cv_prog_CC"
   7.141 -if test -n "$CC"; then
   7.142 -  echo "$ac_t""$CC" 1>&6
   7.143 -else
   7.144 -  echo "$ac_t""no" 1>&6
   7.145 -fi
   7.146 +echo $ac_n "checking host system type""... $ac_c" 1>&6
   7.147 +echo "configure:852: checking host system type" >&5
   7.148  
   7.149 -if test -z "$CC"; then
   7.150 -  # Extract the first word of "cc", so it can be a program name with args.
   7.151 -set dummy cc; ac_word=$2
   7.152 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.153 -echo "configure:908: checking for $ac_word" >&5
   7.154 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.155 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.156 -else
   7.157 -  if test -n "$CC"; then
   7.158 -  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.159 -else
   7.160 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.161 -  ac_prog_rejected=no
   7.162 -  ac_dummy="$PATH"
   7.163 -  for ac_dir in $ac_dummy; do
   7.164 -    test -z "$ac_dir" && ac_dir=.
   7.165 -    if test -f $ac_dir/$ac_word; then
   7.166 -      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   7.167 -        ac_prog_rejected=yes
   7.168 -	continue
   7.169 -      fi
   7.170 -      ac_cv_prog_CC="cc"
   7.171 -      break
   7.172 -    fi
   7.173 -  done
   7.174 -  IFS="$ac_save_ifs"
   7.175 -if test $ac_prog_rejected = yes; then
   7.176 -  # We found a bogon in the path, so make sure we never use it.
   7.177 -  set dummy $ac_cv_prog_CC
   7.178 -  shift
   7.179 -  if test $# -gt 0; then
   7.180 -    # We chose a different compiler from the bogus one.
   7.181 -    # However, it has the same basename, so the bogon will be chosen
   7.182 -    # first if we set CC to just the basename; use the full file name.
   7.183 -    shift
   7.184 -    set dummy "$ac_dir/$ac_word" "$@"
   7.185 -    shift
   7.186 -    ac_cv_prog_CC="$@"
   7.187 -  fi
   7.188 -fi
   7.189 -fi
   7.190 -fi
   7.191 -CC="$ac_cv_prog_CC"
   7.192 -if test -n "$CC"; then
   7.193 -  echo "$ac_t""$CC" 1>&6
   7.194 -else
   7.195 -  echo "$ac_t""no" 1>&6
   7.196 -fi
   7.197 +host_alias=$host
   7.198 +case "$host_alias" in
   7.199 +NONE)
   7.200 +  case $nonopt in
   7.201 +  NONE)
   7.202 +    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
   7.203 +    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
   7.204 +    fi ;;
   7.205 +  *) host_alias=$nonopt ;;
   7.206 +  esac ;;
   7.207 +esac
   7.208  
   7.209 -  if test -z "$CC"; then
   7.210 -    case "`uname -s`" in
   7.211 -    *win32* | *WIN32*)
   7.212 -      # Extract the first word of "cl", so it can be a program name with args.
   7.213 -set dummy cl; ac_word=$2
   7.214 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.215 -echo "configure:959: checking for $ac_word" >&5
   7.216 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.217 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.218 -else
   7.219 -  if test -n "$CC"; then
   7.220 -  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.221 -else
   7.222 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.223 -  ac_dummy="$PATH"
   7.224 -  for ac_dir in $ac_dummy; do
   7.225 -    test -z "$ac_dir" && ac_dir=.
   7.226 -    if test -f $ac_dir/$ac_word; then
   7.227 -      ac_cv_prog_CC="cl"
   7.228 -      break
   7.229 -    fi
   7.230 -  done
   7.231 -  IFS="$ac_save_ifs"
   7.232 -fi
   7.233 -fi
   7.234 -CC="$ac_cv_prog_CC"
   7.235 -if test -n "$CC"; then
   7.236 -  echo "$ac_t""$CC" 1>&6
   7.237 -else
   7.238 -  echo "$ac_t""no" 1>&6
   7.239 -fi
   7.240 - ;;
   7.241 -    esac
   7.242 -  fi
   7.243 -  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
   7.244 -fi
   7.245 +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
   7.246 +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
   7.247 +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
   7.248 +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
   7.249 +echo "$ac_t""$host" 1>&6
   7.250  
   7.251 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
   7.252 -echo "configure:991: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
   7.253 +echo $ac_n "checking target system type""... $ac_c" 1>&6
   7.254 +echo "configure:873: checking target system type" >&5
   7.255  
   7.256 -ac_ext=c
   7.257 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   7.258 -ac_cpp='$CPP $CPPFLAGS'
   7.259 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
   7.260 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
   7.261 -cross_compiling=$ac_cv_prog_cc_cross
   7.262 +target_alias=$target
   7.263 +case "$target_alias" in
   7.264 +NONE)
   7.265 +  case $nonopt in
   7.266 +  NONE) target_alias=$host_alias ;;
   7.267 +  *) target_alias=$nonopt ;;
   7.268 +  esac ;;
   7.269 +esac
   7.270  
   7.271 -cat > conftest.$ac_ext << EOF
   7.272 +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
   7.273 +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
   7.274 +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
   7.275 +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
   7.276 +echo "$ac_t""$target" 1>&6
   7.277  
   7.278 -#line 1002 "configure"
   7.279 -#include "confdefs.h"
   7.280  
   7.281 -main(){return(0);}
   7.282 -EOF
   7.283 -if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   7.284 -  ac_cv_prog_cc_works=yes
   7.285 -  # If we can't run a trivial program, we are probably using a cross compiler.
   7.286 -  if (./conftest; exit) 2>/dev/null; then
   7.287 -    ac_cv_prog_cc_cross=no
   7.288 -  else
   7.289 -    ac_cv_prog_cc_cross=yes
   7.290 -  fi
   7.291 -else
   7.292 -  echo "configure: failed program was:" >&5
   7.293 -  cat conftest.$ac_ext >&5
   7.294 -  ac_cv_prog_cc_works=no
   7.295 -fi
   7.296 -rm -fr conftest*
   7.297 -ac_ext=c
   7.298 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   7.299 -ac_cpp='$CPP $CPPFLAGS'
   7.300 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
   7.301 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
   7.302 -cross_compiling=$ac_cv_prog_cc_cross
   7.303  
   7.304 -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
   7.305 -if test $ac_cv_prog_cc_works = no; then
   7.306 -  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   7.307 -fi
   7.308 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
   7.309 -echo "configure:1033: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   7.310 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   7.311 -cross_compiling=$ac_cv_prog_cc_cross
   7.312 -
   7.313 -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
   7.314 -echo "configure:1038: checking whether we are using GNU C" >&5
   7.315 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   7.316 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.317 -else
   7.318 -  cat > conftest.c <<EOF
   7.319 -#ifdef __GNUC__
   7.320 -  yes;
   7.321 -#endif
   7.322 -EOF
   7.323 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   7.324 -  ac_cv_prog_gcc=yes
   7.325 -else
   7.326 -  ac_cv_prog_gcc=no
   7.327 -fi
   7.328 -fi
   7.329 -
   7.330 -echo "$ac_t""$ac_cv_prog_gcc" 1>&6
   7.331 -
   7.332 -if test $ac_cv_prog_gcc = yes; then
   7.333 -  GCC=yes
   7.334 -else
   7.335 -  GCC=
   7.336 -fi
   7.337 -
   7.338 -ac_test_CFLAGS="${CFLAGS+set}"
   7.339 -ac_save_CFLAGS="$CFLAGS"
   7.340 -CFLAGS=
   7.341 -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   7.342 -echo "configure:1066: checking whether ${CC-cc} accepts -g" >&5
   7.343 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   7.344 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.345 -else
   7.346 -  echo 'void f(){}' > conftest.c
   7.347 -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
   7.348 -  ac_cv_prog_cc_g=yes
   7.349 -else
   7.350 -  ac_cv_prog_cc_g=no
   7.351 -fi
   7.352 -rm -f conftest*
   7.353 -
   7.354 -fi
   7.355 -
   7.356 -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   7.357 -if test "$ac_test_CFLAGS" = set; then
   7.358 -  CFLAGS="$ac_save_CFLAGS"
   7.359 -elif test $ac_cv_prog_cc_g = yes; then
   7.360 -  if test "$GCC" = yes; then
   7.361 -    CFLAGS="-g -O2"
   7.362 -  else
   7.363 -    CFLAGS="-g"
   7.364 -  fi
   7.365 -else
   7.366 -  if test "$GCC" = yes; then
   7.367 -    CFLAGS="-O2"
   7.368 -  else
   7.369 -    CFLAGS=
   7.370 -  fi
   7.371 -fi
   7.372  
   7.373  # Check whether --enable-shared or --disable-shared was given.
   7.374  if test "${enable_shared+set}" = set; then
   7.375 @@ -1162,35 +958,8 @@
   7.376    enable_fast_install=yes
   7.377  fi
   7.378  
   7.379 -
   7.380 -# Make sure we can run config.sub.
   7.381 -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
   7.382 -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
   7.383 -fi
   7.384 -
   7.385 -echo $ac_n "checking host system type""... $ac_c" 1>&6
   7.386 -echo "configure:1173: checking host system type" >&5
   7.387 -
   7.388 -host_alias=$host
   7.389 -case "$host_alias" in
   7.390 -NONE)
   7.391 -  case $nonopt in
   7.392 -  NONE)
   7.393 -    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
   7.394 -    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
   7.395 -    fi ;;
   7.396 -  *) host_alias=$nonopt ;;
   7.397 -  esac ;;
   7.398 -esac
   7.399 -
   7.400 -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
   7.401 -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
   7.402 -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
   7.403 -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
   7.404 -echo "$ac_t""$host" 1>&6
   7.405 -
   7.406  echo $ac_n "checking build system type""... $ac_c" 1>&6
   7.407 -echo "configure:1194: checking build system type" >&5
   7.408 +echo "configure:963: checking build system type" >&5
   7.409  
   7.410  build_alias=$build
   7.411  case "$build_alias" in
   7.412 @@ -1207,6 +976,258 @@
   7.413  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
   7.414  echo "$ac_t""$build" 1>&6
   7.415  
   7.416 +# Extract the first word of "ranlib", so it can be a program name with args.
   7.417 +set dummy ranlib; ac_word=$2
   7.418 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.419 +echo "configure:983: checking for $ac_word" >&5
   7.420 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   7.421 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.422 +else
   7.423 +  if test -n "$RANLIB"; then
   7.424 +  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
   7.425 +else
   7.426 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.427 +  ac_dummy="$PATH"
   7.428 +  for ac_dir in $ac_dummy; do
   7.429 +    test -z "$ac_dir" && ac_dir=.
   7.430 +    if test -f $ac_dir/$ac_word; then
   7.431 +      ac_cv_prog_RANLIB="ranlib"
   7.432 +      break
   7.433 +    fi
   7.434 +  done
   7.435 +  IFS="$ac_save_ifs"
   7.436 +  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
   7.437 +fi
   7.438 +fi
   7.439 +RANLIB="$ac_cv_prog_RANLIB"
   7.440 +if test -n "$RANLIB"; then
   7.441 +  echo "$ac_t""$RANLIB" 1>&6
   7.442 +else
   7.443 +  echo "$ac_t""no" 1>&6
   7.444 +fi
   7.445 +
   7.446 +# Extract the first word of "gcc", so it can be a program name with args.
   7.447 +set dummy gcc; ac_word=$2
   7.448 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.449 +echo "configure:1013: checking for $ac_word" >&5
   7.450 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.451 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.452 +else
   7.453 +  if test -n "$CC"; then
   7.454 +  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.455 +else
   7.456 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.457 +  ac_dummy="$PATH"
   7.458 +  for ac_dir in $ac_dummy; do
   7.459 +    test -z "$ac_dir" && ac_dir=.
   7.460 +    if test -f $ac_dir/$ac_word; then
   7.461 +      ac_cv_prog_CC="gcc"
   7.462 +      break
   7.463 +    fi
   7.464 +  done
   7.465 +  IFS="$ac_save_ifs"
   7.466 +fi
   7.467 +fi
   7.468 +CC="$ac_cv_prog_CC"
   7.469 +if test -n "$CC"; then
   7.470 +  echo "$ac_t""$CC" 1>&6
   7.471 +else
   7.472 +  echo "$ac_t""no" 1>&6
   7.473 +fi
   7.474 +
   7.475 +if test -z "$CC"; then
   7.476 +  # Extract the first word of "cc", so it can be a program name with args.
   7.477 +set dummy cc; ac_word=$2
   7.478 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.479 +echo "configure:1043: checking for $ac_word" >&5
   7.480 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.481 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.482 +else
   7.483 +  if test -n "$CC"; then
   7.484 +  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.485 +else
   7.486 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.487 +  ac_prog_rejected=no
   7.488 +  ac_dummy="$PATH"
   7.489 +  for ac_dir in $ac_dummy; do
   7.490 +    test -z "$ac_dir" && ac_dir=.
   7.491 +    if test -f $ac_dir/$ac_word; then
   7.492 +      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   7.493 +        ac_prog_rejected=yes
   7.494 +	continue
   7.495 +      fi
   7.496 +      ac_cv_prog_CC="cc"
   7.497 +      break
   7.498 +    fi
   7.499 +  done
   7.500 +  IFS="$ac_save_ifs"
   7.501 +if test $ac_prog_rejected = yes; then
   7.502 +  # We found a bogon in the path, so make sure we never use it.
   7.503 +  set dummy $ac_cv_prog_CC
   7.504 +  shift
   7.505 +  if test $# -gt 0; then
   7.506 +    # We chose a different compiler from the bogus one.
   7.507 +    # However, it has the same basename, so the bogon will be chosen
   7.508 +    # first if we set CC to just the basename; use the full file name.
   7.509 +    shift
   7.510 +    set dummy "$ac_dir/$ac_word" "$@"
   7.511 +    shift
   7.512 +    ac_cv_prog_CC="$@"
   7.513 +  fi
   7.514 +fi
   7.515 +fi
   7.516 +fi
   7.517 +CC="$ac_cv_prog_CC"
   7.518 +if test -n "$CC"; then
   7.519 +  echo "$ac_t""$CC" 1>&6
   7.520 +else
   7.521 +  echo "$ac_t""no" 1>&6
   7.522 +fi
   7.523 +
   7.524 +  if test -z "$CC"; then
   7.525 +    case "`uname -s`" in
   7.526 +    *win32* | *WIN32*)
   7.527 +      # Extract the first word of "cl", so it can be a program name with args.
   7.528 +set dummy cl; ac_word=$2
   7.529 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.530 +echo "configure:1094: checking for $ac_word" >&5
   7.531 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   7.532 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.533 +else
   7.534 +  if test -n "$CC"; then
   7.535 +  ac_cv_prog_CC="$CC" # Let the user override the test.
   7.536 +else
   7.537 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.538 +  ac_dummy="$PATH"
   7.539 +  for ac_dir in $ac_dummy; do
   7.540 +    test -z "$ac_dir" && ac_dir=.
   7.541 +    if test -f $ac_dir/$ac_word; then
   7.542 +      ac_cv_prog_CC="cl"
   7.543 +      break
   7.544 +    fi
   7.545 +  done
   7.546 +  IFS="$ac_save_ifs"
   7.547 +fi
   7.548 +fi
   7.549 +CC="$ac_cv_prog_CC"
   7.550 +if test -n "$CC"; then
   7.551 +  echo "$ac_t""$CC" 1>&6
   7.552 +else
   7.553 +  echo "$ac_t""no" 1>&6
   7.554 +fi
   7.555 + ;;
   7.556 +    esac
   7.557 +  fi
   7.558 +  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
   7.559 +fi
   7.560 +
   7.561 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
   7.562 +echo "configure:1126: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
   7.563 +
   7.564 +ac_ext=c
   7.565 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   7.566 +ac_cpp='$CPP $CPPFLAGS'
   7.567 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
   7.568 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
   7.569 +cross_compiling=$ac_cv_prog_cc_cross
   7.570 +
   7.571 +cat > conftest.$ac_ext << EOF
   7.572 +
   7.573 +#line 1137 "configure"
   7.574 +#include "confdefs.h"
   7.575 +
   7.576 +main(){return(0);}
   7.577 +EOF
   7.578 +if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   7.579 +  ac_cv_prog_cc_works=yes
   7.580 +  # If we can't run a trivial program, we are probably using a cross compiler.
   7.581 +  if (./conftest; exit) 2>/dev/null; then
   7.582 +    ac_cv_prog_cc_cross=no
   7.583 +  else
   7.584 +    ac_cv_prog_cc_cross=yes
   7.585 +  fi
   7.586 +else
   7.587 +  echo "configure: failed program was:" >&5
   7.588 +  cat conftest.$ac_ext >&5
   7.589 +  ac_cv_prog_cc_works=no
   7.590 +fi
   7.591 +rm -fr conftest*
   7.592 +ac_ext=c
   7.593 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
   7.594 +ac_cpp='$CPP $CPPFLAGS'
   7.595 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
   7.596 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
   7.597 +cross_compiling=$ac_cv_prog_cc_cross
   7.598 +
   7.599 +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
   7.600 +if test $ac_cv_prog_cc_works = no; then
   7.601 +  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   7.602 +fi
   7.603 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
   7.604 +echo "configure:1168: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   7.605 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   7.606 +cross_compiling=$ac_cv_prog_cc_cross
   7.607 +
   7.608 +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
   7.609 +echo "configure:1173: checking whether we are using GNU C" >&5
   7.610 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   7.611 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.612 +else
   7.613 +  cat > conftest.c <<EOF
   7.614 +#ifdef __GNUC__
   7.615 +  yes;
   7.616 +#endif
   7.617 +EOF
   7.618 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   7.619 +  ac_cv_prog_gcc=yes
   7.620 +else
   7.621 +  ac_cv_prog_gcc=no
   7.622 +fi
   7.623 +fi
   7.624 +
   7.625 +echo "$ac_t""$ac_cv_prog_gcc" 1>&6
   7.626 +
   7.627 +if test $ac_cv_prog_gcc = yes; then
   7.628 +  GCC=yes
   7.629 +else
   7.630 +  GCC=
   7.631 +fi
   7.632 +
   7.633 +ac_test_CFLAGS="${CFLAGS+set}"
   7.634 +ac_save_CFLAGS="$CFLAGS"
   7.635 +CFLAGS=
   7.636 +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   7.637 +echo "configure:1201: checking whether ${CC-cc} accepts -g" >&5
   7.638 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   7.639 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.640 +else
   7.641 +  echo 'void f(){}' > conftest.c
   7.642 +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
   7.643 +  ac_cv_prog_cc_g=yes
   7.644 +else
   7.645 +  ac_cv_prog_cc_g=no
   7.646 +fi
   7.647 +rm -f conftest*
   7.648 +
   7.649 +fi
   7.650 +
   7.651 +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   7.652 +if test "$ac_test_CFLAGS" = set; then
   7.653 +  CFLAGS="$ac_save_CFLAGS"
   7.654 +elif test $ac_cv_prog_cc_g = yes; then
   7.655 +  if test "$GCC" = yes; then
   7.656 +    CFLAGS="-g -O2"
   7.657 +  else
   7.658 +    CFLAGS="-g"
   7.659 +  fi
   7.660 +else
   7.661 +  if test "$GCC" = yes; then
   7.662 +    CFLAGS="-O2"
   7.663 +  else
   7.664 +    CFLAGS=
   7.665 +  fi
   7.666 +fi
   7.667 +
   7.668  # Check whether --with-gnu-ld or --without-gnu-ld was given.
   7.669  if test "${with_gnu_ld+set}" = set; then
   7.670    withval="$with_gnu_ld"
   7.671 @@ -1219,14 +1240,8 @@
   7.672  if test "$ac_cv_prog_gcc" = yes; then
   7.673    # Check if gcc -print-prog-name=ld gives a path.
   7.674    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
   7.675 -echo "configure:1223: checking for ld used by GCC" >&5
   7.676 -  case $host in
   7.677 -  *-*-mingw*)
   7.678 -    # gcc leaves a trailing carriage return which upsets mingw
   7.679 -    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   7.680 -  *)
   7.681 -    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   7.682 -  esac
   7.683 +echo "configure:1244: checking for ld used by GCC" >&5
   7.684 +  ac_prog=`($CC -print-prog-name=ld) 2>&5`
   7.685    case "$ac_prog" in
   7.686      # Accept absolute paths.
   7.687      [\\/]* | [A-Za-z]:[\\/]*)
   7.688 @@ -1249,10 +1264,10 @@
   7.689    esac
   7.690  elif test "$with_gnu_ld" = yes; then
   7.691    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
   7.692 -echo "configure:1253: checking for GNU ld" >&5
   7.693 +echo "configure:1268: checking for GNU ld" >&5
   7.694  else
   7.695    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
   7.696 -echo "configure:1256: checking for non-GNU ld" >&5
   7.697 +echo "configure:1271: checking for non-GNU ld" >&5
   7.698  fi
   7.699  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   7.700    echo $ac_n "(cached) $ac_c" 1>&6
   7.701 @@ -1286,9 +1301,8 @@
   7.702    echo "$ac_t""no" 1>&6
   7.703  fi
   7.704  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
   7.705 -
   7.706  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
   7.707 -echo "configure:1292: checking if the linker ($LD) is GNU ld" >&5
   7.708 +echo "configure:1306: checking if the linker ($LD) is GNU ld" >&5
   7.709  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   7.710    echo $ac_n "(cached) $ac_c" 1>&6
   7.711  else
   7.712 @@ -1304,7 +1318,7 @@
   7.713  
   7.714  
   7.715  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
   7.716 -echo "configure:1308: checking for BSD-compatible nm" >&5
   7.717 +echo "configure:1322: checking for BSD-compatible nm" >&5
   7.718  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   7.719    echo $ac_n "(cached) $ac_c" 1>&6
   7.720  else
   7.721 @@ -1339,9 +1353,8 @@
   7.722  NM="$ac_cv_path_NM"
   7.723  echo "$ac_t""$NM" 1>&6
   7.724  
   7.725 -
   7.726  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
   7.727 -echo "configure:1345: checking whether ln -s works" >&5
   7.728 +echo "configure:1358: checking whether ln -s works" >&5
   7.729  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   7.730    echo $ac_n "(cached) $ac_c" 1>&6
   7.731  else
   7.732 @@ -1368,73 +1381,10 @@
   7.733  fi
   7.734  
   7.735  
   7.736 -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
   7.737 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
   7.738 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.739 -echo "configure:1375: checking for $ac_word" >&5
   7.740 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   7.741 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.742 -else
   7.743 -  if test -n "$RANLIB"; then
   7.744 -  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
   7.745 -else
   7.746 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.747 -  ac_dummy="$PATH"
   7.748 -  for ac_dir in $ac_dummy; do
   7.749 -    test -z "$ac_dir" && ac_dir=.
   7.750 -    if test -f $ac_dir/$ac_word; then
   7.751 -      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
   7.752 -      break
   7.753 -    fi
   7.754 -  done
   7.755 -  IFS="$ac_save_ifs"
   7.756 -fi
   7.757 -fi
   7.758 -RANLIB="$ac_cv_prog_RANLIB"
   7.759 -if test -n "$RANLIB"; then
   7.760 -  echo "$ac_t""$RANLIB" 1>&6
   7.761 -else
   7.762 -  echo "$ac_t""no" 1>&6
   7.763 -fi
   7.764 -
   7.765 -
   7.766 -if test -z "$ac_cv_prog_RANLIB"; then
   7.767 -if test -n "$ac_tool_prefix"; then
   7.768 -  # Extract the first word of "ranlib", so it can be a program name with args.
   7.769 -set dummy ranlib; ac_word=$2
   7.770 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.771 -echo "configure:1407: checking for $ac_word" >&5
   7.772 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   7.773 -  echo $ac_n "(cached) $ac_c" 1>&6
   7.774 -else
   7.775 -  if test -n "$RANLIB"; then
   7.776 -  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
   7.777 -else
   7.778 -  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.779 -  ac_dummy="$PATH"
   7.780 -  for ac_dir in $ac_dummy; do
   7.781 -    test -z "$ac_dir" && ac_dir=.
   7.782 -    if test -f $ac_dir/$ac_word; then
   7.783 -      ac_cv_prog_RANLIB="ranlib"
   7.784 -      break
   7.785 -    fi
   7.786 -  done
   7.787 -  IFS="$ac_save_ifs"
   7.788 -  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
   7.789 -fi
   7.790 -fi
   7.791 -RANLIB="$ac_cv_prog_RANLIB"
   7.792 -if test -n "$RANLIB"; then
   7.793 -  echo "$ac_t""$RANLIB" 1>&6
   7.794 -else
   7.795 -  echo "$ac_t""no" 1>&6
   7.796 -fi
   7.797 -
   7.798 -else
   7.799 -  RANLIB=":"
   7.800 -fi
   7.801 -fi
   7.802 -
   7.803 +case "$target" in
   7.804 +NONE) lt_target="$host" ;;
   7.805 +*) lt_target="$target" ;;
   7.806 +esac
   7.807  
   7.808  # Check for any special flags to pass to ltconfig.
   7.809  libtool_flags="--cache-file=$cache_file"
   7.810 @@ -1444,7 +1394,7 @@
   7.811  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
   7.812  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
   7.813  
   7.814 -
   7.815 +libtool_flags="$libtool_flags --enable-win32-dll"
   7.816  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
   7.817  if test "${enable_libtool_lock+set}" = set; then
   7.818    enableval="$enable_libtool_lock"
   7.819 @@ -1454,24 +1404,13 @@
   7.820  test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
   7.821  test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
   7.822  
   7.823 -# Check whether --with-pic or --without-pic was given.
   7.824 -if test "${with_pic+set}" = set; then
   7.825 -  withval="$with_pic"
   7.826 -  pic_mode="$withval"
   7.827 -else
   7.828 -  pic_mode=default
   7.829 -fi
   7.830 -
   7.831 -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
   7.832 -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
   7.833 -
   7.834  # Some flags need to be propagated to the compiler or linker for good
   7.835  # libtool support.
   7.836 -case "$host" in
   7.837 +case "$lt_target" in
   7.838  *-*-irix6*)
   7.839    # Find out which ABI we are using.
   7.840 -  echo '#line 1474 "configure"' > conftest.$ac_ext
   7.841 -  if { (eval echo configure:1475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   7.842 +  echo '#line 1413 "configure"' > conftest.$ac_ext
   7.843 +  if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   7.844      case "`/usr/bin/file conftest.o`" in
   7.845      *32-bit*)
   7.846        LD="${LD-ld} -32"
   7.847 @@ -1492,19 +1431,19 @@
   7.848    SAVE_CFLAGS="$CFLAGS"
   7.849    CFLAGS="$CFLAGS -belf"
   7.850    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
   7.851 -echo "configure:1496: checking whether the C compiler needs -belf" >&5
   7.852 +echo "configure:1435: checking whether the C compiler needs -belf" >&5
   7.853  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   7.854    echo $ac_n "(cached) $ac_c" 1>&6
   7.855  else
   7.856    cat > conftest.$ac_ext <<EOF
   7.857 -#line 1501 "configure"
   7.858 +#line 1440 "configure"
   7.859  #include "confdefs.h"
   7.860  
   7.861  int main() {
   7.862  
   7.863  ; return 0; }
   7.864  EOF
   7.865 -if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   7.866 +if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   7.867    rm -rf conftest*
   7.868    lt_cv_cc_needs_belf=yes
   7.869  else
   7.870 @@ -1523,6 +1462,209 @@
   7.871    fi
   7.872    ;;
   7.873  
   7.874 +*-*-cygwin* | *-*-mingw*)
   7.875 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
   7.876 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
   7.877 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.878 +echo "configure:1470: checking for $ac_word" >&5
   7.879 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   7.880 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.881 +else
   7.882 +  if test -n "$DLLTOOL"; then
   7.883 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
   7.884 +else
   7.885 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.886 +  ac_dummy="$PATH"
   7.887 +  for ac_dir in $ac_dummy; do
   7.888 +    test -z "$ac_dir" && ac_dir=.
   7.889 +    if test -f $ac_dir/$ac_word; then
   7.890 +      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
   7.891 +      break
   7.892 +    fi
   7.893 +  done
   7.894 +  IFS="$ac_save_ifs"
   7.895 +fi
   7.896 +fi
   7.897 +DLLTOOL="$ac_cv_prog_DLLTOOL"
   7.898 +if test -n "$DLLTOOL"; then
   7.899 +  echo "$ac_t""$DLLTOOL" 1>&6
   7.900 +else
   7.901 +  echo "$ac_t""no" 1>&6
   7.902 +fi
   7.903 +
   7.904 +
   7.905 +if test -z "$ac_cv_prog_DLLTOOL"; then
   7.906 +if test -n "$ac_tool_prefix"; then
   7.907 +  # Extract the first word of "dlltool", so it can be a program name with args.
   7.908 +set dummy dlltool; ac_word=$2
   7.909 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.910 +echo "configure:1502: checking for $ac_word" >&5
   7.911 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   7.912 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.913 +else
   7.914 +  if test -n "$DLLTOOL"; then
   7.915 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
   7.916 +else
   7.917 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.918 +  ac_dummy="$PATH"
   7.919 +  for ac_dir in $ac_dummy; do
   7.920 +    test -z "$ac_dir" && ac_dir=.
   7.921 +    if test -f $ac_dir/$ac_word; then
   7.922 +      ac_cv_prog_DLLTOOL="dlltool"
   7.923 +      break
   7.924 +    fi
   7.925 +  done
   7.926 +  IFS="$ac_save_ifs"
   7.927 +  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
   7.928 +fi
   7.929 +fi
   7.930 +DLLTOOL="$ac_cv_prog_DLLTOOL"
   7.931 +if test -n "$DLLTOOL"; then
   7.932 +  echo "$ac_t""$DLLTOOL" 1>&6
   7.933 +else
   7.934 +  echo "$ac_t""no" 1>&6
   7.935 +fi
   7.936 +
   7.937 +else
   7.938 +  DLLTOOL="false"
   7.939 +fi
   7.940 +fi
   7.941 +
   7.942 +  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
   7.943 +set dummy ${ac_tool_prefix}as; ac_word=$2
   7.944 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.945 +echo "configure:1537: checking for $ac_word" >&5
   7.946 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   7.947 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.948 +else
   7.949 +  if test -n "$AS"; then
   7.950 +  ac_cv_prog_AS="$AS" # Let the user override the test.
   7.951 +else
   7.952 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.953 +  ac_dummy="$PATH"
   7.954 +  for ac_dir in $ac_dummy; do
   7.955 +    test -z "$ac_dir" && ac_dir=.
   7.956 +    if test -f $ac_dir/$ac_word; then
   7.957 +      ac_cv_prog_AS="${ac_tool_prefix}as"
   7.958 +      break
   7.959 +    fi
   7.960 +  done
   7.961 +  IFS="$ac_save_ifs"
   7.962 +fi
   7.963 +fi
   7.964 +AS="$ac_cv_prog_AS"
   7.965 +if test -n "$AS"; then
   7.966 +  echo "$ac_t""$AS" 1>&6
   7.967 +else
   7.968 +  echo "$ac_t""no" 1>&6
   7.969 +fi
   7.970 +
   7.971 +
   7.972 +if test -z "$ac_cv_prog_AS"; then
   7.973 +if test -n "$ac_tool_prefix"; then
   7.974 +  # Extract the first word of "as", so it can be a program name with args.
   7.975 +set dummy as; ac_word=$2
   7.976 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   7.977 +echo "configure:1569: checking for $ac_word" >&5
   7.978 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   7.979 +  echo $ac_n "(cached) $ac_c" 1>&6
   7.980 +else
   7.981 +  if test -n "$AS"; then
   7.982 +  ac_cv_prog_AS="$AS" # Let the user override the test.
   7.983 +else
   7.984 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   7.985 +  ac_dummy="$PATH"
   7.986 +  for ac_dir in $ac_dummy; do
   7.987 +    test -z "$ac_dir" && ac_dir=.
   7.988 +    if test -f $ac_dir/$ac_word; then
   7.989 +      ac_cv_prog_AS="as"
   7.990 +      break
   7.991 +    fi
   7.992 +  done
   7.993 +  IFS="$ac_save_ifs"
   7.994 +  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
   7.995 +fi
   7.996 +fi
   7.997 +AS="$ac_cv_prog_AS"
   7.998 +if test -n "$AS"; then
   7.999 +  echo "$ac_t""$AS" 1>&6
  7.1000 +else
  7.1001 +  echo "$ac_t""no" 1>&6
  7.1002 +fi
  7.1003 +
  7.1004 +else
  7.1005 +  AS="false"
  7.1006 +fi
  7.1007 +fi
  7.1008 +
  7.1009 +  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  7.1010 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
  7.1011 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1012 +echo "configure:1604: checking for $ac_word" >&5
  7.1013 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
  7.1014 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1015 +else
  7.1016 +  if test -n "$OBJDUMP"; then
  7.1017 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
  7.1018 +else
  7.1019 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
  7.1020 +  ac_dummy="$PATH"
  7.1021 +  for ac_dir in $ac_dummy; do
  7.1022 +    test -z "$ac_dir" && ac_dir=.
  7.1023 +    if test -f $ac_dir/$ac_word; then
  7.1024 +      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  7.1025 +      break
  7.1026 +    fi
  7.1027 +  done
  7.1028 +  IFS="$ac_save_ifs"
  7.1029 +fi
  7.1030 +fi
  7.1031 +OBJDUMP="$ac_cv_prog_OBJDUMP"
  7.1032 +if test -n "$OBJDUMP"; then
  7.1033 +  echo "$ac_t""$OBJDUMP" 1>&6
  7.1034 +else
  7.1035 +  echo "$ac_t""no" 1>&6
  7.1036 +fi
  7.1037 +
  7.1038 +
  7.1039 +if test -z "$ac_cv_prog_OBJDUMP"; then
  7.1040 +if test -n "$ac_tool_prefix"; then
  7.1041 +  # Extract the first word of "objdump", so it can be a program name with args.
  7.1042 +set dummy objdump; ac_word=$2
  7.1043 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1044 +echo "configure:1636: checking for $ac_word" >&5
  7.1045 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
  7.1046 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1047 +else
  7.1048 +  if test -n "$OBJDUMP"; then
  7.1049 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
  7.1050 +else
  7.1051 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
  7.1052 +  ac_dummy="$PATH"
  7.1053 +  for ac_dir in $ac_dummy; do
  7.1054 +    test -z "$ac_dir" && ac_dir=.
  7.1055 +    if test -f $ac_dir/$ac_word; then
  7.1056 +      ac_cv_prog_OBJDUMP="objdump"
  7.1057 +      break
  7.1058 +    fi
  7.1059 +  done
  7.1060 +  IFS="$ac_save_ifs"
  7.1061 +  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
  7.1062 +fi
  7.1063 +fi
  7.1064 +OBJDUMP="$ac_cv_prog_OBJDUMP"
  7.1065 +if test -n "$OBJDUMP"; then
  7.1066 +  echo "$ac_t""$OBJDUMP" 1>&6
  7.1067 +else
  7.1068 +  echo "$ac_t""no" 1>&6
  7.1069 +fi
  7.1070 +
  7.1071 +else
  7.1072 +  OBJDUMP="false"
  7.1073 +fi
  7.1074 +fi
  7.1075 +
  7.1076 +  ;;
  7.1077  
  7.1078  esac
  7.1079  
  7.1080 @@ -1582,7 +1724,7 @@
  7.1081  LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
  7.1082  DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
  7.1083  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  7.1084 -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
  7.1085 +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
  7.1086  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  7.1087  
  7.1088  # Reload cache, that may have been modified by ltconfig
  7.1089 @@ -1605,6 +1747,255 @@
  7.1090  # clobbered by the next message.
  7.1091  exec 5>>./config.log
  7.1092  
  7.1093 +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  7.1094 +echo "configure:1752: checking whether ${MAKE-make} sets \${MAKE}" >&5
  7.1095 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  7.1096 +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
  7.1097 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1098 +else
  7.1099 +  cat > conftestmake <<\EOF
  7.1100 +all:
  7.1101 +	@echo 'ac_maketemp="${MAKE}"'
  7.1102 +EOF
  7.1103 +# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  7.1104 +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
  7.1105 +if test -n "$ac_maketemp"; then
  7.1106 +  eval ac_cv_prog_make_${ac_make}_set=yes
  7.1107 +else
  7.1108 +  eval ac_cv_prog_make_${ac_make}_set=no
  7.1109 +fi
  7.1110 +rm -f conftestmake
  7.1111 +fi
  7.1112 +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
  7.1113 +  echo "$ac_t""yes" 1>&6
  7.1114 +  SET_MAKE=
  7.1115 +else
  7.1116 +  echo "$ac_t""no" 1>&6
  7.1117 +  SET_MAKE="MAKE=${MAKE-make}"
  7.1118 +fi
  7.1119 +
  7.1120 +# Extract the first word of "gcc", so it can be a program name with args.
  7.1121 +set dummy gcc; ac_word=$2
  7.1122 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1123 +echo "configure:1781: checking for $ac_word" >&5
  7.1124 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  7.1125 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1126 +else
  7.1127 +  if test -n "$CC"; then
  7.1128 +  ac_cv_prog_CC="$CC" # Let the user override the test.
  7.1129 +else
  7.1130 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
  7.1131 +  ac_dummy="$PATH"
  7.1132 +  for ac_dir in $ac_dummy; do
  7.1133 +    test -z "$ac_dir" && ac_dir=.
  7.1134 +    if test -f $ac_dir/$ac_word; then
  7.1135 +      ac_cv_prog_CC="gcc"
  7.1136 +      break
  7.1137 +    fi
  7.1138 +  done
  7.1139 +  IFS="$ac_save_ifs"
  7.1140 +fi
  7.1141 +fi
  7.1142 +CC="$ac_cv_prog_CC"
  7.1143 +if test -n "$CC"; then
  7.1144 +  echo "$ac_t""$CC" 1>&6
  7.1145 +else
  7.1146 +  echo "$ac_t""no" 1>&6
  7.1147 +fi
  7.1148 +
  7.1149 +if test -z "$CC"; then
  7.1150 +  # Extract the first word of "cc", so it can be a program name with args.
  7.1151 +set dummy cc; ac_word=$2
  7.1152 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1153 +echo "configure:1811: checking for $ac_word" >&5
  7.1154 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  7.1155 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1156 +else
  7.1157 +  if test -n "$CC"; then
  7.1158 +  ac_cv_prog_CC="$CC" # Let the user override the test.
  7.1159 +else
  7.1160 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
  7.1161 +  ac_prog_rejected=no
  7.1162 +  ac_dummy="$PATH"
  7.1163 +  for ac_dir in $ac_dummy; do
  7.1164 +    test -z "$ac_dir" && ac_dir=.
  7.1165 +    if test -f $ac_dir/$ac_word; then
  7.1166 +      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
  7.1167 +        ac_prog_rejected=yes
  7.1168 +	continue
  7.1169 +      fi
  7.1170 +      ac_cv_prog_CC="cc"
  7.1171 +      break
  7.1172 +    fi
  7.1173 +  done
  7.1174 +  IFS="$ac_save_ifs"
  7.1175 +if test $ac_prog_rejected = yes; then
  7.1176 +  # We found a bogon in the path, so make sure we never use it.
  7.1177 +  set dummy $ac_cv_prog_CC
  7.1178 +  shift
  7.1179 +  if test $# -gt 0; then
  7.1180 +    # We chose a different compiler from the bogus one.
  7.1181 +    # However, it has the same basename, so the bogon will be chosen
  7.1182 +    # first if we set CC to just the basename; use the full file name.
  7.1183 +    shift
  7.1184 +    set dummy "$ac_dir/$ac_word" "$@"
  7.1185 +    shift
  7.1186 +    ac_cv_prog_CC="$@"
  7.1187 +  fi
  7.1188 +fi
  7.1189 +fi
  7.1190 +fi
  7.1191 +CC="$ac_cv_prog_CC"
  7.1192 +if test -n "$CC"; then
  7.1193 +  echo "$ac_t""$CC" 1>&6
  7.1194 +else
  7.1195 +  echo "$ac_t""no" 1>&6
  7.1196 +fi
  7.1197 +
  7.1198 +  if test -z "$CC"; then
  7.1199 +    case "`uname -s`" in
  7.1200 +    *win32* | *WIN32*)
  7.1201 +      # Extract the first word of "cl", so it can be a program name with args.
  7.1202 +set dummy cl; ac_word=$2
  7.1203 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1204 +echo "configure:1862: checking for $ac_word" >&5
  7.1205 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  7.1206 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1207 +else
  7.1208 +  if test -n "$CC"; then
  7.1209 +  ac_cv_prog_CC="$CC" # Let the user override the test.
  7.1210 +else
  7.1211 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
  7.1212 +  ac_dummy="$PATH"
  7.1213 +  for ac_dir in $ac_dummy; do
  7.1214 +    test -z "$ac_dir" && ac_dir=.
  7.1215 +    if test -f $ac_dir/$ac_word; then
  7.1216 +      ac_cv_prog_CC="cl"
  7.1217 +      break
  7.1218 +    fi
  7.1219 +  done
  7.1220 +  IFS="$ac_save_ifs"
  7.1221 +fi
  7.1222 +fi
  7.1223 +CC="$ac_cv_prog_CC"
  7.1224 +if test -n "$CC"; then
  7.1225 +  echo "$ac_t""$CC" 1>&6
  7.1226 +else
  7.1227 +  echo "$ac_t""no" 1>&6
  7.1228 +fi
  7.1229 + ;;
  7.1230 +    esac
  7.1231 +  fi
  7.1232 +  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  7.1233 +fi
  7.1234 +
  7.1235 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  7.1236 +echo "configure:1894: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  7.1237 +
  7.1238 +ac_ext=c
  7.1239 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  7.1240 +ac_cpp='$CPP $CPPFLAGS'
  7.1241 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  7.1242 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  7.1243 +cross_compiling=$ac_cv_prog_cc_cross
  7.1244 +
  7.1245 +cat > conftest.$ac_ext << EOF
  7.1246 +
  7.1247 +#line 1905 "configure"
  7.1248 +#include "confdefs.h"
  7.1249 +
  7.1250 +main(){return(0);}
  7.1251 +EOF
  7.1252 +if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1253 +  ac_cv_prog_cc_works=yes
  7.1254 +  # If we can't run a trivial program, we are probably using a cross compiler.
  7.1255 +  if (./conftest; exit) 2>/dev/null; then
  7.1256 +    ac_cv_prog_cc_cross=no
  7.1257 +  else
  7.1258 +    ac_cv_prog_cc_cross=yes
  7.1259 +  fi
  7.1260 +else
  7.1261 +  echo "configure: failed program was:" >&5
  7.1262 +  cat conftest.$ac_ext >&5
  7.1263 +  ac_cv_prog_cc_works=no
  7.1264 +fi
  7.1265 +rm -fr conftest*
  7.1266 +ac_ext=c
  7.1267 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  7.1268 +ac_cpp='$CPP $CPPFLAGS'
  7.1269 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
  7.1270 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  7.1271 +cross_compiling=$ac_cv_prog_cc_cross
  7.1272 +
  7.1273 +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  7.1274 +if test $ac_cv_prog_cc_works = no; then
  7.1275 +  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  7.1276 +fi
  7.1277 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  7.1278 +echo "configure:1936: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  7.1279 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  7.1280 +cross_compiling=$ac_cv_prog_cc_cross
  7.1281 +
  7.1282 +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
  7.1283 +echo "configure:1941: checking whether we are using GNU C" >&5
  7.1284 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
  7.1285 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1286 +else
  7.1287 +  cat > conftest.c <<EOF
  7.1288 +#ifdef __GNUC__
  7.1289 +  yes;
  7.1290 +#endif
  7.1291 +EOF
  7.1292 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  7.1293 +  ac_cv_prog_gcc=yes
  7.1294 +else
  7.1295 +  ac_cv_prog_gcc=no
  7.1296 +fi
  7.1297 +fi
  7.1298 +
  7.1299 +echo "$ac_t""$ac_cv_prog_gcc" 1>&6
  7.1300 +
  7.1301 +if test $ac_cv_prog_gcc = yes; then
  7.1302 +  GCC=yes
  7.1303 +else
  7.1304 +  GCC=
  7.1305 +fi
  7.1306 +
  7.1307 +ac_test_CFLAGS="${CFLAGS+set}"
  7.1308 +ac_save_CFLAGS="$CFLAGS"
  7.1309 +CFLAGS=
  7.1310 +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
  7.1311 +echo "configure:1969: checking whether ${CC-cc} accepts -g" >&5
  7.1312 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
  7.1313 +  echo $ac_n "(cached) $ac_c" 1>&6
  7.1314 +else
  7.1315 +  echo 'void f(){}' > conftest.c
  7.1316 +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
  7.1317 +  ac_cv_prog_cc_g=yes
  7.1318 +else
  7.1319 +  ac_cv_prog_cc_g=no
  7.1320 +fi
  7.1321 +rm -f conftest*
  7.1322 +
  7.1323 +fi
  7.1324 +
  7.1325 +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
  7.1326 +if test "$ac_test_CFLAGS" = set; then
  7.1327 +  CFLAGS="$ac_save_CFLAGS"
  7.1328 +elif test $ac_cv_prog_cc_g = yes; then
  7.1329 +  if test "$GCC" = yes; then
  7.1330 +    CFLAGS="-g -O2"
  7.1331 +  else
  7.1332 +    CFLAGS="-g"
  7.1333 +  fi
  7.1334 +else
  7.1335 +  if test "$GCC" = yes; then
  7.1336 +    CFLAGS="-O2"
  7.1337 +  else
  7.1338 +    CFLAGS=
  7.1339 +  fi
  7.1340 +fi
  7.1341 +
  7.1342  # Find a good install program.  We prefer a C program (faster),
  7.1343  # so one script is as good as another.  But avoid the broken or
  7.1344  # incompatible versions:
  7.1345 @@ -1617,7 +2008,7 @@
  7.1346  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  7.1347  # ./install, which can be erroneously created by make from ./install.sh.
  7.1348  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
  7.1349 -echo "configure:1621: checking for a BSD compatible install" >&5
  7.1350 +echo "configure:2012: checking for a BSD compatible install" >&5
  7.1351  if test -z "$INSTALL"; then
  7.1352  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
  7.1353    echo $ac_n "(cached) $ac_c" 1>&6
  7.1354 @@ -1670,28 +2061,15 @@
  7.1355  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  7.1356  
  7.1357  
  7.1358 -echo $ac_n "checking target system type""... $ac_c" 1>&6
  7.1359 -echo "configure:1675: checking target system type" >&5
  7.1360 -
  7.1361 -target_alias=$target
  7.1362 -case "$target_alias" in
  7.1363 -NONE)
  7.1364 -  case $nonopt in
  7.1365 -  NONE) target_alias=$host_alias ;;
  7.1366 -  *) target_alias=$nonopt ;;
  7.1367 -  esac ;;
  7.1368 -esac
  7.1369 -
  7.1370 -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
  7.1371 -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  7.1372 -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  7.1373 -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  7.1374 -echo "$ac_t""$target" 1>&6
  7.1375 -
  7.1376  case "$target" in
  7.1377      alpha*-*-linux*)
  7.1378          CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"
  7.1379          ;;
  7.1380 +    *-*-cygwin* | *-*-mingw32*)
  7.1381 +        if test "$build" != "$target"; then # cross-compiling
  7.1382 +            ac_default_prefix=/usr/local/cross-tools/i386-mingw32msvc
  7.1383 +        fi
  7.1384 +        ;;
  7.1385  esac
  7.1386  
  7.1387  SDL_VERSION=1.1.3
  7.1388 @@ -1736,7 +2114,7 @@
  7.1389    # Extract the first word of "sdl-config", so it can be a program name with args.
  7.1390  set dummy sdl-config; ac_word=$2
  7.1391  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  7.1392 -echo "configure:1740: checking for $ac_word" >&5
  7.1393 +echo "configure:2118: checking for $ac_word" >&5
  7.1394  if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
  7.1395    echo $ac_n "(cached) $ac_c" 1>&6
  7.1396  else
  7.1397 @@ -1771,7 +2149,7 @@
  7.1398  
  7.1399    min_sdl_version=$SDL_VERSION
  7.1400    echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
  7.1401 -echo "configure:1775: checking for SDL - version >= $min_sdl_version" >&5
  7.1402 +echo "configure:2153: checking for SDL - version >= $min_sdl_version" >&5
  7.1403    no_sdl=""
  7.1404    if test "$SDL_CONFIG" = "no" ; then
  7.1405      no_sdl=yes
  7.1406 @@ -1795,13 +2173,13 @@
  7.1407    echo $ac_n "cross compiling; assumed OK... $ac_c"
  7.1408  else
  7.1409    cat > conftest.$ac_ext <<EOF
  7.1410 -#line 1799 "configure"
  7.1411 +#line 2177 "configure"
  7.1412  #include "confdefs.h"
  7.1413  
  7.1414  #include <stdio.h>
  7.1415  #include <stdlib.h>
  7.1416  #include <string.h>
  7.1417 -#include <SDL/SDL.h>
  7.1418 +#include "SDL.h"
  7.1419  
  7.1420  char*
  7.1421  my_strdup (char *str)
  7.1422 @@ -1810,7 +2188,7 @@
  7.1423    
  7.1424    if (str)
  7.1425      {
  7.1426 -      new_str = malloc ((strlen (str) + 1) * sizeof(char));
  7.1427 +      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
  7.1428        strcpy (new_str, str);
  7.1429      }
  7.1430    else
  7.1431 @@ -1819,12 +2197,15 @@
  7.1432    return new_str;
  7.1433  }
  7.1434  
  7.1435 -int main ()
  7.1436 +int main (int argc, char *argv[])
  7.1437  {
  7.1438    int major, minor, micro;
  7.1439    char *tmp_version;
  7.1440  
  7.1441 +  /* This hangs on some systems (?)
  7.1442    system ("touch conf.sdltest");
  7.1443 +  */
  7.1444 +  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
  7.1445  
  7.1446    /* HP/UX 9 (%@#!) writes to sscanf strings */
  7.1447    tmp_version = my_strdup("$min_sdl_version");
  7.1448 @@ -1853,7 +2234,7 @@
  7.1449  
  7.1450  
  7.1451  EOF
  7.1452 -if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  7.1453 +if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  7.1454  then
  7.1455    :
  7.1456  else
  7.1457 @@ -1887,17 +2268,17 @@
  7.1458            CFLAGS="$CFLAGS $SDL_CFLAGS"
  7.1459            LIBS="$LIBS $SDL_LIBS"
  7.1460            cat > conftest.$ac_ext <<EOF
  7.1461 -#line 1891 "configure"
  7.1462 +#line 2272 "configure"
  7.1463  #include "confdefs.h"
  7.1464  
  7.1465  #include <stdio.h>
  7.1466 -#include <SDL/SDL.h>
  7.1467 +#include "SDL.h"
  7.1468  
  7.1469  int main() {
  7.1470   return 0; 
  7.1471  ; return 0; }
  7.1472  EOF
  7.1473 -if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1474 +if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1475    rm -rf conftest*
  7.1476     echo "*** The test program compiled, but did not run. This usually means"
  7.1477            echo "*** that the run-time linker is not finding SDL or finding the wrong"
  7.1478 @@ -1933,6 +2314,7 @@
  7.1479  
  7.1480  CFLAGS="$CFLAGS $SDL_CFLAGS"
  7.1481  IMG_LIBS="$IMG_LIBS $SDL_LIBS"
  7.1482 +LIBS="$SDL_LIBS $LIBS"
  7.1483  
  7.1484  # Check whether --enable-bmp or --disable-bmp was given.
  7.1485  if test "${enable_bmp+set}" = set; then
  7.1486 @@ -1966,7 +2348,7 @@
  7.1487  
  7.1488  if test x$enable_jpg = xyes; then
  7.1489      echo $ac_n "checking for jpeg_CreateDecompress in -ljpeg""... $ac_c" 1>&6
  7.1490 -echo "configure:1970: checking for jpeg_CreateDecompress in -ljpeg" >&5
  7.1491 +echo "configure:2352: checking for jpeg_CreateDecompress in -ljpeg" >&5
  7.1492  ac_lib_var=`echo jpeg'_'jpeg_CreateDecompress | sed 'y%./+-%__p_%'`
  7.1493  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  7.1494    echo $ac_n "(cached) $ac_c" 1>&6
  7.1495 @@ -1974,7 +2356,7 @@
  7.1496    ac_save_LIBS="$LIBS"
  7.1497  LIBS="-ljpeg  $LIBS"
  7.1498  cat > conftest.$ac_ext <<EOF
  7.1499 -#line 1978 "configure"
  7.1500 +#line 2360 "configure"
  7.1501  #include "confdefs.h"
  7.1502  /* Override any gcc2 internal prototype to avoid an error.  */
  7.1503  /* We use char because int might match the return type of a gcc2
  7.1504 @@ -1985,7 +2367,7 @@
  7.1505  jpeg_CreateDecompress()
  7.1506  ; return 0; }
  7.1507  EOF
  7.1508 -if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1509 +if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1510    rm -rf conftest*
  7.1511    eval "ac_cv_lib_$ac_lib_var=yes"
  7.1512  else
  7.1513 @@ -2035,7 +2417,7 @@
  7.1514  
  7.1515  if test x$enable_png = xyes; then
  7.1516      echo $ac_n "checking for png_create_read_struct in -lpng""... $ac_c" 1>&6
  7.1517 -echo "configure:2039: checking for png_create_read_struct in -lpng" >&5
  7.1518 +echo "configure:2421: checking for png_create_read_struct in -lpng" >&5
  7.1519  ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'`
  7.1520  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  7.1521    echo $ac_n "(cached) $ac_c" 1>&6
  7.1522 @@ -2043,7 +2425,7 @@
  7.1523    ac_save_LIBS="$LIBS"
  7.1524  LIBS="-lpng -lz $LIBS"
  7.1525  cat > conftest.$ac_ext <<EOF
  7.1526 -#line 2047 "configure"
  7.1527 +#line 2429 "configure"
  7.1528  #include "confdefs.h"
  7.1529  /* Override any gcc2 internal prototype to avoid an error.  */
  7.1530  /* We use char because int might match the return type of a gcc2
  7.1531 @@ -2054,7 +2436,7 @@
  7.1532  png_create_read_struct()
  7.1533  ; return 0; }
  7.1534  EOF
  7.1535 -if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1536 +if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1537    rm -rf conftest*
  7.1538    eval "ac_cv_lib_$ac_lib_var=yes"
  7.1539  else
  7.1540 @@ -2080,7 +2462,7 @@
  7.1541  " 1>&2
  7.1542      fi
  7.1543      echo $ac_n "checking for uncompress in -lz""... $ac_c" 1>&6
  7.1544 -echo "configure:2084: checking for uncompress in -lz" >&5
  7.1545 +echo "configure:2466: checking for uncompress in -lz" >&5
  7.1546  ac_lib_var=`echo z'_'uncompress | sed 'y%./+-%__p_%'`
  7.1547  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  7.1548    echo $ac_n "(cached) $ac_c" 1>&6
  7.1549 @@ -2088,7 +2470,7 @@
  7.1550    ac_save_LIBS="$LIBS"
  7.1551  LIBS="-lz  $LIBS"
  7.1552  cat > conftest.$ac_ext <<EOF
  7.1553 -#line 2092 "configure"
  7.1554 +#line 2474 "configure"
  7.1555  #include "confdefs.h"
  7.1556  /* Override any gcc2 internal prototype to avoid an error.  */
  7.1557  /* We use char because int might match the return type of a gcc2
  7.1558 @@ -2099,7 +2481,7 @@
  7.1559  uncompress()
  7.1560  ; return 0; }
  7.1561  EOF
  7.1562 -if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1563 +if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1564    rm -rf conftest*
  7.1565    eval "ac_cv_lib_$ac_lib_var=yes"
  7.1566  else
  7.1567 @@ -2163,7 +2545,7 @@
  7.1568  
  7.1569  if test x$enable_tif = xyes; then
  7.1570      echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
  7.1571 -echo "configure:2167: checking for TIFFClientOpen in -ltiff" >&5
  7.1572 +echo "configure:2549: checking for TIFFClientOpen in -ltiff" >&5
  7.1573  ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
  7.1574  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  7.1575    echo $ac_n "(cached) $ac_c" 1>&6
  7.1576 @@ -2171,7 +2553,7 @@
  7.1577    ac_save_LIBS="$LIBS"
  7.1578  LIBS="-ltiff  $LIBS"
  7.1579  cat > conftest.$ac_ext <<EOF
  7.1580 -#line 2175 "configure"
  7.1581 +#line 2557 "configure"
  7.1582  #include "confdefs.h"
  7.1583  /* Override any gcc2 internal prototype to avoid an error.  */
  7.1584  /* We use char because int might match the return type of a gcc2
  7.1585 @@ -2182,7 +2564,7 @@
  7.1586  TIFFClientOpen()
  7.1587  ; return 0; }
  7.1588  EOF
  7.1589 -if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1590 +if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  7.1591    rm -rf conftest*
  7.1592    eval "ac_cv_lib_$ac_lib_var=yes"
  7.1593  else
  7.1594 @@ -2382,27 +2764,28 @@
  7.1595  s%@AUTOHEADER@%$AUTOHEADER%g
  7.1596  s%@MAKEINFO@%$MAKEINFO%g
  7.1597  s%@SET_MAKE@%$SET_MAKE%g
  7.1598 -s%@CC@%$CC%g
  7.1599  s%@host@%$host%g
  7.1600  s%@host_alias@%$host_alias%g
  7.1601  s%@host_cpu@%$host_cpu%g
  7.1602  s%@host_vendor@%$host_vendor%g
  7.1603  s%@host_os@%$host_os%g
  7.1604 +s%@target@%$target%g
  7.1605 +s%@target_alias@%$target_alias%g
  7.1606 +s%@target_cpu@%$target_cpu%g
  7.1607 +s%@target_vendor@%$target_vendor%g
  7.1608 +s%@target_os@%$target_os%g
  7.1609  s%@build@%$build%g
  7.1610  s%@build_alias@%$build_alias%g
  7.1611  s%@build_cpu@%$build_cpu%g
  7.1612  s%@build_vendor@%$build_vendor%g
  7.1613  s%@build_os@%$build_os%g
  7.1614 -s%@LD@%$LD%g
  7.1615 -s%@NM@%$NM%g
  7.1616 +s%@RANLIB@%$RANLIB%g
  7.1617 +s%@CC@%$CC%g
  7.1618  s%@LN_S@%$LN_S%g
  7.1619 -s%@RANLIB@%$RANLIB%g
  7.1620 +s%@DLLTOOL@%$DLLTOOL%g
  7.1621 +s%@AS@%$AS%g
  7.1622 +s%@OBJDUMP@%$OBJDUMP%g
  7.1623  s%@LIBTOOL@%$LIBTOOL%g
  7.1624 -s%@target@%$target%g
  7.1625 -s%@target_alias@%$target_alias%g
  7.1626 -s%@target_cpu@%$target_cpu%g
  7.1627 -s%@target_vendor@%$target_vendor%g
  7.1628 -s%@target_os@%$target_os%g
  7.1629  s%@SDL_CONFIG@%$SDL_CONFIG%g
  7.1630  s%@SDL_CFLAGS@%$SDL_CFLAGS%g
  7.1631  s%@SDL_LIBS@%$SDL_LIBS%g
     8.1 --- a/configure.in	Thu Aug 10 06:06:57 2000 +0000
     8.2 +++ b/configure.in	Thu Aug 10 06:12:39 2000 +0000
     8.3 @@ -39,19 +39,28 @@
     8.4  dnl Setup for automake
     8.5  AM_INIT_AUTOMAKE(SDL_image, $VERSION)
     8.6  
     8.7 +dnl Detect the canonical host and target build environment
     8.8 +AC_CANONICAL_HOST
     8.9 +AC_CANONICAL_TARGET
    8.10 +
    8.11  dnl Check for tools
    8.12  
    8.13 +AC_LIBTOOL_WIN32_DLL
    8.14 +AM_PROG_LIBTOOL
    8.15  AC_PROG_MAKE_SET
    8.16  AC_PROG_CC
    8.17 -AM_PROG_LIBTOOL
    8.18  AC_PROG_INSTALL
    8.19  
    8.20  dnl The alpha architecture needs special flags for binary portability
    8.21 -AC_CANONICAL_TARGET
    8.22  case "$target" in
    8.23      alpha*-*-linux*)
    8.24          CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"
    8.25          ;;
    8.26 +    *-*-cygwin* | *-*-mingw32*)
    8.27 +        if test "$build" != "$target"; then # cross-compiling
    8.28 +            ac_default_prefix=/usr/local/cross-tools/i386-mingw32msvc
    8.29 +        fi
    8.30 +        ;;
    8.31  esac
    8.32  
    8.33  dnl Check for SDL
    8.34 @@ -62,6 +71,7 @@
    8.35  )
    8.36  CFLAGS="$CFLAGS $SDL_CFLAGS"
    8.37  IMG_LIBS="$IMG_LIBS $SDL_LIBS"
    8.38 +LIBS="$SDL_LIBS $LIBS"
    8.39  
    8.40  dnl Check command-line options
    8.41  AC_ARG_ENABLE(bmp,
     9.1 --- a/ltconfig	Thu Aug 10 06:06:57 2000 +0000
     9.2 +++ b/ltconfig	Thu Aug 10 06:12:39 2000 +0000
     9.3 @@ -169,10 +169,10 @@
     9.4  # Constants:
     9.5  PROGRAM=ltconfig
     9.6  PACKAGE=libtool
     9.7 -VERSION=1.3c
     9.8 -TIMESTAMP=" (1.620 1999/10/07 15:40:07)"
     9.9 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
    9.10 -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
    9.11 +VERSION=1.3.5
    9.12 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
    9.13 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    9.14 +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    9.15  rm="rm -f"
    9.16  
    9.17  help="Try \`$progname --help' for more information."
    9.18 @@ -187,15 +187,13 @@
    9.19  enable_fast_install=yes
    9.20  enable_dlopen=unknown
    9.21  enable_win32_dll=no
    9.22 -pic_mode=default
    9.23  ltmain=
    9.24  silent=
    9.25  srcdir=
    9.26  ac_config_guess=
    9.27  ac_config_sub=
    9.28  host=
    9.29 -build=NONE
    9.30 -nonopt=NONE
    9.31 +nonopt=
    9.32  ofile="$default_ofile"
    9.33  verify_host=yes
    9.34  with_gcc=no
    9.35 @@ -244,7 +242,6 @@
    9.36  
    9.37  Generate a system-specific libtool script.
    9.38  
    9.39 -    --build                configure for building on BUILD [BUILD=HOST]
    9.40      --debug                enable verbose shell tracing
    9.41      --disable-shared       do not build shared libraries
    9.42      --disable-static       do not build static libraries
    9.43 @@ -260,8 +257,6 @@
    9.44      --version              output version information and exit
    9.45      --with-gcc             assume that the GNU C compiler will be used
    9.46      --with-gnu-ld          assume that the C compiler uses the GNU linker
    9.47 -    --prefer-pic           try to use only PIC objects
    9.48 -    --prefer-non-pic       try to use only non-PIC objects
    9.49      --disable-lock         disable file locking
    9.50      --cache-file=FILE      configure cache file
    9.51  
    9.52 @@ -273,9 +268,6 @@
    9.53    exit 0
    9.54    ;;
    9.55  
    9.56 -  --build) prev=build ;;
    9.57 -  --build=*) build="$optarg" ;;
    9.58 -
    9.59    --debug)
    9.60      echo "$progname: enabling shell trace mode"
    9.61      set -x
    9.62 @@ -306,9 +298,6 @@
    9.63    --with-gcc) with_gcc=yes ;;
    9.64    --with-gnu-ld) with_gnu_ld=yes ;;
    9.65  
    9.66 -  --prefer-pic) pic_mode=yes ;;
    9.67 -  --prefer-non-pic) pic_mode=no ;;
    9.68 -
    9.69    --disable-lock) need_locks=no ;;
    9.70  
    9.71    --cache-file=*) cache_file="$optarg" ;;
    9.72 @@ -450,38 +439,12 @@
    9.73    # Make sure the host verified.
    9.74    test -z "$host" && exit 1
    9.75  
    9.76 -  # Check for the build system type
    9.77 -  echo $ac_n "checking build system type... $ac_c" 1>&6
    9.78 -
    9.79 -  build_alias=$build
    9.80 -  case "$build_alias" in
    9.81 -  NONE)
    9.82 -    case $nonopt in
    9.83 -    NONE) build_alias=$host_alias ;;
    9.84 -    *) build_alias=$nonopt ;;
    9.85 -    esac ;;
    9.86 -  esac
    9.87 -
    9.88 -  build=`$SHELL $ac_config_sub $build_alias`
    9.89 -  build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    9.90 -  build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
    9.91 -  build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    9.92 -  echo "$ac_t""$build" 1>&6
    9.93 -
    9.94  elif test -z "$host"; then
    9.95    echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
    9.96    echo "$help" 1>&2
    9.97    exit 1
    9.98  else
    9.99    host_alias=$host
   9.100 -  build_alias=$host_alias
   9.101 -  build=$host
   9.102 -fi
   9.103 -
   9.104 -if test x"$host" != x"$build"; then
   9.105 -  ac_tool_prefix=${host_alias}-
   9.106 -else
   9.107 -  ac_tool_prefix=
   9.108  fi
   9.109  
   9.110  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
   9.111 @@ -511,268 +474,341 @@
   9.112  old_postinstall_cmds='chmod 644 $oldlib'
   9.113  old_postuninstall_cmds=
   9.114  
   9.115 -# Set sane defaults for various commands
   9.116 -#   -- these are usually overridden from the command line by make
   9.117 +# Set a sane default for `AR'.
   9.118  test -z "$AR" && AR=ar
   9.119 -test -z "$AS" && AS=
   9.120 -test -z "$DLLTOOL" && DLLTOOL=
   9.121 -test -z "$LN_S" && LN_S=ln -s
   9.122 -test -z "$NM" && NM=/usr/bin/nm -B
   9.123 -test -z "$OBJDUMP" && OBJDUMP=
   9.124 -test -z "$RANLIB" && RANLIB=ranlib
   9.125 -
   9.126 -# Commands probed in libtool.m4
   9.127 -#   -- let the user override the result from configure
   9.128 -test -z "$CC" && CC=gcc
   9.129 -test -z "$FILE" && FILE=file
   9.130 -test -z "$LD" && LD=/usr/bin/ld
   9.131 -test -z "$STRIP" && STRIP=strip
   9.132 -
   9.133 -# Other config vars probed in libtool.m4
   9.134 -test -z "$with_gcc" && with_gcc=yes
   9.135 -test -z "$with_gnu_ld" && with_gnu_ld=yes
   9.136 -objext=o
   9.137 -exeext=
   9.138 -
   9.139 -echo $ac_n "checking for objdir... $ac_c" 1>&6
   9.140 -rm -f .libs 2>/dev/null
   9.141 -mkdir .libs 2>/dev/null
   9.142 -if test -d .libs; then
   9.143 -  objdir=.libs
   9.144 -else
   9.145 -  # MS-DOS does not allow filenames that begin with a dot.
   9.146 -  objdir=_libs
   9.147 +
   9.148 +# Set a sane default for `OBJDUMP'.
   9.149 +test -z "$OBJDUMP" && OBJDUMP=objdump
   9.150 +
   9.151 +# If RANLIB is not set, then run the test.
   9.152 +if test "${RANLIB+set}" != "set"; then
   9.153 +  result=no
   9.154 +
   9.155 +  echo $ac_n "checking for ranlib... $ac_c" 1>&6
   9.156 +  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   9.157 +  for dir in $PATH; do
   9.158 +    test -z "$dir" && dir=.
   9.159 +    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
   9.160 +      RANLIB="ranlib"
   9.161 +      result="ranlib"
   9.162 +      break
   9.163 +    fi
   9.164 +  done
   9.165 +  IFS="$save_ifs"
   9.166 +
   9.167 +  echo "$ac_t$result" 1>&6
   9.168  fi
   9.169 -rmdir .libs 2>/dev/null
   9.170 -echo "$ac_t$objdir" 1>&6
   9.171 +
   9.172 +if test -n "$RANLIB"; then
   9.173 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
   9.174 +  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
   9.175 +fi
   9.176 +
   9.177 +# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
   9.178 +test -z "$DLLTOOL" && DLLTOOL=dlltool
   9.179 +test -z "$OBJDUMP" && OBJDUMP=objdump
   9.180 +test -z "$AS" && AS=as
   9.181 +
   9.182 +# Check to see if we are using GCC.
   9.183 +if test "$with_gcc" != yes || test -z "$CC"; then
   9.184 +  # If CC is not set, then try to find GCC or a usable CC.
   9.185 +  if test -z "$CC"; then
   9.186 +    echo $ac_n "checking for gcc... $ac_c" 1>&6
   9.187 +    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   9.188 +    for dir in $PATH; do
   9.189 +      test -z "$dir" && dir=.
   9.190 +      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
   9.191 +	CC="gcc"
   9.192 +	break
   9.193 +      fi
   9.194 +    done
   9.195 +    IFS="$save_ifs"
   9.196 +
   9.197 +    if test -n "$CC"; then
   9.198 +      echo "$ac_t$CC" 1>&6
   9.199 +    else
   9.200 +      echo "$ac_t"no 1>&6
   9.201 +    fi
   9.202 +  fi
   9.203 +
   9.204 +  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
   9.205 +  if test -z "$CC"; then
   9.206 +    echo $ac_n "checking for cc... $ac_c" 1>&6
   9.207 +    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   9.208 +    cc_rejected=no
   9.209 +    for dir in $PATH; do
   9.210 +      test -z "$dir" && dir=.
   9.211 +      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
   9.212 +	if test "$dir/cc" = "/usr/ucb/cc"; then
   9.213 +	  cc_rejected=yes
   9.214 +	  continue
   9.215 +	fi
   9.216 +	CC="cc"
   9.217 +	break
   9.218 +      fi
   9.219 +    done
   9.220 +    IFS="$save_ifs"
   9.221 +    if test $cc_rejected = yes; then
   9.222 +      # We found a bogon in the path, so make sure we never use it.
   9.223 +      set dummy $CC
   9.224 +      shift
   9.225 +      if test $# -gt 0; then
   9.226 +	# We chose a different compiler from the bogus one.
   9.227 +	# However, it has the same name, so the bogon will be chosen
   9.228 +	# first if we set CC to just the name; use the full file name.
   9.229 +	shift
   9.230 +	set dummy "$dir/cc" "$@"
   9.231 +	shift
   9.232 +	CC="$@"
   9.233 +      fi
   9.234 +    fi
   9.235 +
   9.236 +    if test -n "$CC"; then
   9.237 +      echo "$ac_t$CC" 1>&6
   9.238 +    else
   9.239 +      echo "$ac_t"no 1>&6
   9.240 +    fi
   9.241 +
   9.242 +    if test -z "$CC"; then
   9.243 +      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
   9.244 +      exit 1
   9.245 +    fi
   9.246 +  fi
   9.247 +
   9.248 +  # Now see if the compiler is really GCC.
   9.249 +  with_gcc=no
   9.250 +  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
   9.251 +  echo "$progname:581: checking whether we are using GNU C" >&5
   9.252 +
   9.253 +  $rm conftest.c
   9.254 +  cat > conftest.c <<EOF
   9.255 +#ifdef __GNUC__
   9.256 +  yes;
   9.257 +#endif
   9.258 +EOF
   9.259 +  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   9.260 +    with_gcc=yes
   9.261 +  fi
   9.262 +  $rm conftest.c
   9.263 +  echo "$ac_t$with_gcc" 1>&6
   9.264 +fi
   9.265  
   9.266  # Allow CC to be a program name with arguments.
   9.267  set dummy $CC
   9.268  compiler="$2"
   9.269  
   9.270 -# We assume here that the value for ac_cv_prog_cc_pic will not be cached
   9.271 -# in isolation, and that seeing it set (from the cache) indicates that
   9.272 -# the associated values are set (in the cache) correctly too.
   9.273 -echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
   9.274 -echo "$progname:557:checking for $compiler option to produce PIC" 1>&5
   9.275 -if test "X${ac_cv_prog_cc_pic+set}" = Xset; then
   9.276 +echo $ac_n "checking for object suffix... $ac_c" 1>&6
   9.277 +$rm conftest*
   9.278 +echo 'int i = 1;' > conftest.c
   9.279 +echo "$progname:603: checking for object suffix" >& 5
   9.280 +if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
   9.281 +  # Append any warnings to the config.log.
   9.282 +  cat conftest.err 1>&5
   9.283 +
   9.284 +  for ac_file in conftest.*; do
   9.285 +    case $ac_file in
   9.286 +    *.c) ;;
   9.287 +    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
   9.288 +    esac
   9.289 +  done
   9.290 +else
   9.291 +  cat conftest.err 1>&5
   9.292 +  echo "$progname: failed program was:" >&5
   9.293 +  cat conftest.c >&5
   9.294 +fi
   9.295 +$rm conftest*
   9.296 +echo "$ac_t$objext" 1>&6
   9.297 +
   9.298 +echo $ac_n "checking for executable suffix... $ac_c" 1>&6
   9.299 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   9.300    echo $ac_n "(cached) $ac_c" 1>&6
   9.301  else
   9.302 -  ac_cv_prog_cc_pic=
   9.303 -  ac_cv_prog_cc_shlib=
   9.304 -  ac_cv_prog_cc_wl=
   9.305 -  ac_cv_prog_cc_static=
   9.306 -  ac_cv_prog_cc_no_builtin=
   9.307 -  ac_cv_prog_cc_can_build_shared=$can_build_shared
   9.308 -
   9.309 -  if test "$with_gcc" = yes; then
   9.310 -    ac_cv_prog_cc_wl='-Wl,'
   9.311 -    ac_cv_prog_cc_static='-static'
   9.312 -
   9.313 +  ac_cv_exeext="no"
   9.314 +  $rm conftest*
   9.315 +  echo 'main () { return 0; }' > conftest.c
   9.316 +  echo "$progname:629: checking for executable suffix" >& 5
   9.317 +  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
   9.318 +    # Append any warnings to the config.log.
   9.319 +    cat conftest.err 1>&5
   9.320 +
   9.321 +    for ac_file in conftest.*; do
   9.322 +      case $ac_file in
   9.323 +      *.c | *.err | *.$objext ) ;;
   9.324 +      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
   9.325 +      esac
   9.326 +    done
   9.327 +  else
   9.328 +    cat conftest.err 1>&5
   9.329 +    echo "$progname: failed program was:" >&5
   9.330 +    cat conftest.c >&5
   9.331 +  fi
   9.332 +  $rm conftest*
   9.333 +fi
   9.334 +if test "X$ac_cv_exeext" = Xno; then
   9.335 +  exeext=""
   9.336 +else
   9.337 +  exeext="$ac_cv_exeext"
   9.338 +fi
   9.339 +echo "$ac_t$ac_cv_exeext" 1>&6
   9.340 +
   9.341 +echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
   9.342 +pic_flag=
   9.343 +special_shlib_compile_flags=
   9.344 +wl=
   9.345 +link_static_flag=
   9.346 +no_builtin_flag=
   9.347 +
   9.348 +if test "$with_gcc" = yes; then
   9.349 +  wl='-Wl,'
   9.350 +  link_static_flag='-static'
   9.351 +
   9.352 +  case "$host_os" in
   9.353 +  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
   9.354 +    # PIC is the default for these OSes.
   9.355 +    ;;
   9.356 +  aix*)
   9.357 +    # Below there is a dirty hack to force normal static linking with -ldl
   9.358 +    # The problem is because libdl dynamically linked with both libc and
   9.359 +    # libC (AIX C++ library), which obviously doesn't included in libraries
   9.360 +    # list by gcc. This cause undefined symbols with -static flags.
   9.361 +    # This hack allows C programs to be linked with "-static -ldl", but
   9.362 +    # we not sure about C++ programs.
   9.363 +    link_static_flag="$link_static_flag ${wl}-lC"
   9.364 +    ;;
   9.365 +  cygwin* | mingw* | os2*)
   9.366 +    # We can build DLLs from non-PIC.
   9.367 +    ;;
   9.368 +  amigaos*)
   9.369 +    # FIXME: we need at least 68020 code to build shared libraries, but
   9.370 +    # adding the `-m68020' flag to GCC prevents building anything better,
   9.371 +    # like `-m68040'.
   9.372 +    pic_flag='-m68020 -resident32 -malways-restore-a4'
   9.373 +    ;;
   9.374 +  sysv4*MP*)
   9.375 +    if test -d /usr/nec; then
   9.376 +       pic_flag=-Kconform_pic
   9.377 +    fi
   9.378 +    ;;
   9.379 +  *)
   9.380 +    pic_flag='-fPIC'
   9.381 +    ;;
   9.382 +  esac
   9.383 +else
   9.384 +  # PORTME Check for PIC flags for the system compiler.
   9.385 +  case "$host_os" in
   9.386 +  aix3* | aix4*)
   9.387 +    # All AIX code is PIC.
   9.388 +    link_static_flag='-bnso -bI:/lib/syscalls.exp'
   9.389 +    ;;
   9.390 +
   9.391 +  hpux9* | hpux10* | hpux11*)
   9.392 +    # Is there a better link_static_flag that works with the bundled CC?
   9.393 +    wl='-Wl,'
   9.394 +    link_static_flag="${wl}-a ${wl}archive"
   9.395 +    pic_flag='+Z'
   9.396 +    ;;
   9.397 +
   9.398 +  irix5* | irix6*)
   9.399 +    wl='-Wl,'
   9.400 +    link_static_flag='-non_shared'
   9.401 +    # PIC (with -KPIC) is the default.
   9.402 +    ;;
   9.403 +
   9.404 +  cygwin* | mingw* | os2*)
   9.405 +    # We can build DLLs from non-PIC.
   9.406 +    ;;
   9.407 +
   9.408 +  osf3* | osf4* | osf5*)
   9.409 +    # All OSF/1 code is PIC.
   9.410 +    wl='-Wl,'
   9.411 +    link_static_flag='-non_shared'
   9.412 +    ;;
   9.413 +
   9.414 +  sco3.2v5*)
   9.415 +    pic_flag='-Kpic'
   9.416 +    link_static_flag='-dn'
   9.417 +    special_shlib_compile_flags='-belf'
   9.418 +    ;;
   9.419 +
   9.420 +  solaris*)
   9.421 +    pic_flag='-KPIC'
   9.422 +    link_static_flag='-Bstatic'
   9.423 +    wl='-Wl,'
   9.424 +    ;;
   9.425 +
   9.426 +  sunos4*)
   9.427 +    pic_flag='-PIC'
   9.428 +    link_static_flag='-Bstatic'
   9.429 +    wl='-Qoption ld '
   9.430 +    ;;
   9.431 +
   9.432 +  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   9.433 +    pic_flag='-KPIC'
   9.434 +    link_static_flag='-Bstatic'
   9.435 +    wl='-Wl,'
   9.436 +    ;;
   9.437 +
   9.438 +  uts4*)
   9.439 +    pic_flag='-pic'
   9.440 +    link_static_flag='-Bstatic'
   9.441 +    ;;
   9.442 +  sysv4*MP*)
   9.443 +    if test -d /usr/nec ;then
   9.444 +      pic_flag='-Kconform_pic'
   9.445 +      link_static_flag='-Bstatic'
   9.446 +    fi
   9.447 +    ;;
   9.448 +  *)
   9.449 +    can_build_shared=no
   9.450 +    ;;
   9.451 +  esac
   9.452 +fi
   9.453 +
   9.454 +if test -n "$pic_flag"; then
   9.455 +  echo "$ac_t$pic_flag" 1>&6
   9.456 +
   9.457 +  # Check to make sure the pic_flag actually works.
   9.458 +  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
   9.459 +  $rm conftest*
   9.460 +  echo "int some_variable = 0;" > conftest.c
   9.461 +  save_CFLAGS="$CFLAGS"
   9.462 +  CFLAGS="$CFLAGS $pic_flag -DPIC"
   9.463 +  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
   9.464 +  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
   9.465 +    # Append any warnings to the config.log.
   9.466 +    cat conftest.err 1>&5
   9.467 +    
   9.468      case "$host_os" in
   9.469 -    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
   9.470 -      # PIC is the default for these OSes.
   9.471 -      ;;
   9.472 -    aix*)
   9.473 -      # Below there is a dirty hack to force normal static linking with -ldl
   9.474 -      # The problem is because libdl dynamically linked with both libc and
   9.475 -      # libC (AIX C++ library), which obviously doesn't included in libraries
   9.476 -      # list by gcc. This cause undefined symbols with -static flags.
   9.477 -      # This hack allows C programs to be linked with "-static -ldl", but
   9.478 -      # we not sure about C++ programs.
   9.479 -      ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC"
   9.480 -      ;;
   9.481 -    cygwin* | mingw* | os2*)
   9.482 -      # This hack is so that the source file can tell whether it is being
   9.483 -      # built for inclusion in a dll (and should export symbols for example).
   9.484 -      ac_cv_prog_cc_pic='-DDLL_EXPORT'
   9.485 -      ;;
   9.486 -    amigaos*)
   9.487 -      # FIXME: we need at least 68020 code to build shared libraries, but
   9.488 -      # adding the `-m68020' flag to GCC prevents building anything better,
   9.489 -      # like `-m68040'.
   9.490 -      ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
   9.491 -      ;;
   9.492 -    sysv4*MP*)
   9.493 -      if test -d /usr/nec; then
   9.494 -	 ac_cv_prog_cc_pic=-Kconform_pic
   9.495 +    hpux9* | hpux10* | hpux11*)
   9.496 +      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
   9.497 +      # create non-PIC objects.  So, if there were any warnings, we assume that
   9.498 +      # PIC is not supported.
   9.499 +      if test -s conftest.err; then
   9.500 +	echo "$ac_t"no 1>&6
   9.501 +	can_build_shared=no
   9.502 +	pic_flag=
   9.503 +      else
   9.504 +	echo "$ac_t"yes 1>&6
   9.505 +	pic_flag=" $pic_flag"
   9.506        fi
   9.507        ;;
   9.508      *)
   9.509 -      ac_cv_prog_cc_pic='-fPIC'
   9.510 +      echo "$ac_t"yes 1>&6
   9.511 +      pic_flag=" $pic_flag"
   9.512        ;;
   9.513      esac
   9.514    else
   9.515 -    # PORTME Check for PIC flags for the system compiler.
   9.516 -    case "$host_os" in
   9.517 -    aix3* | aix4*)
   9.518 -     # All AIX code is PIC.
   9.519 -      ac_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
   9.520 -      ;;
   9.521 -
   9.522 -    hpux9* | hpux10* | hpux11*)
   9.523 -      # Is there a better ac_cv_prog_cc_static that works with the bundled CC?
   9.524 -      ac_cv_prog_cc_wl='-Wl,'
   9.525 -      ac_cv_prog_cc_static="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
   9.526 -      ac_cv_prog_cc_pic='+Z'
   9.527 -      ;;
   9.528 -
   9.529 -    irix5* | irix6*)
   9.530 -      ac_cv_prog_cc_wl='-Wl,'
   9.531 -      ac_cv_prog_cc_static='-non_shared'
   9.532 -      # PIC (with -KPIC) is the default.
   9.533 -      ;;
   9.534 -
   9.535 -    cygwin* | mingw* | os2*)
   9.536 -      # This hack is so that the source file can tell whether it is being
   9.537 -      # built for inclusion in a dll (and should export symbols for example).
   9.538 -      ac_cv_prog_cc_pic='-DDLL_EXPORT'
   9.539 -      ;;
   9.540 -
   9.541 -    osf3* | osf4* | osf5*)
   9.542 -      # All OSF/1 code is PIC.
   9.543 -      ac_cv_prog_cc_wl='-Wl,'
   9.544 -      ac_cv_prog_cc_static='-non_shared'
   9.545 -      ;;
   9.546 -
   9.547 -    sco3.2v5*)
   9.548 -      ac_cv_prog_cc_pic='-Kpic'
   9.549 -      ac_cv_prog_cc_static='-dn'
   9.550 -      ac_cv_prog_cc_shlib='-belf'
   9.551 -      ;;
   9.552 -
   9.553 -    solaris*)
   9.554 -      ac_cv_prog_cc_pic='-KPIC'
   9.555 -      ac_cv_prog_cc_static='-Bstatic'
   9.556 -      ac_cv_prog_cc_wl='-Wl,'
   9.557 -      ;;
   9.558 -
   9.559 -    sunos4*)
   9.560 -      ac_cv_prog_cc_pic='-PIC'
   9.561 -      ac_cv_prog_cc_static='-Bstatic'
   9.562 -      ac_cv_prog_cc_wl='-Qoption ld '
   9.563 -      ;;
   9.564 -
   9.565 -    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   9.566 -      ac_cv_prog_cc_pic='-KPIC'
   9.567 -      ac_cv_prog_cc_static='-Bstatic'
   9.568 -      ac_cv_prog_cc_wl='-Wl,'
   9.569 -      ;;
   9.570 -
   9.571 -    uts4*)
   9.572 -      ac_cv_prog_cc_pic='-pic'
   9.573 -      ac_cv_prog_cc_static='-Bstatic'
   9.574 -      ;;
   9.575 -
   9.576 -    sysv4*MP*)
   9.577 -      if test -d /usr/nec ;then
   9.578 -	ac_cv_prog_cc_pic='-Kconform_pic'
   9.579 -	ac_cv_prog_cc_static='-Bstatic'
   9.580 -      fi
   9.581 -      ;;
   9.582 -
   9.583 -    *)
   9.584 -      ac_cv_prog_cc_can_build_shared=no
   9.585 -      ;;
   9.586 -    esac
   9.587 +    # Append any errors to the config.log.
   9.588 +    cat conftest.err 1>&5
   9.589 +    can_build_shared=no
   9.590 +    pic_flag=
   9.591 +    echo "$ac_t"no 1>&6
   9.592    fi
   9.593 +  CFLAGS="$save_CFLAGS"
   9.594 +  $rm conftest*
   9.595 +else
   9.596 +  echo "$ac_t"none 1>&6
   9.597  fi
   9.598 -if test -z "$ac_cv_prog_cc_pic"; then
   9.599 -  echo "$ac_t"none 1>&6
   9.600 -else  
   9.601 -  echo "$ac_t""$ac_cv_prog_cc_pic" 1>&6
   9.602 -
   9.603 -  # Check to make sure the pic_flag actually works.
   9.604 -  echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6
   9.605 -  echo "$progname:687:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5
   9.606 -  if test "X${ac_cv_prog_cc_pic_works+set}" = Xset; then
   9.607 -    echo $ac_n "(cached) $ac_c" 1>&6
   9.608 -  else
   9.609 -    ac_cv_prog_cc_pic_works=yes
   9.610 -    $rm conftest*
   9.611 -    echo "int some_variable = 0;" > conftest.c
   9.612 -    save_CFLAGS="$CFLAGS"
   9.613 -    CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC"
   9.614 -    if { (eval echo $progname:696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
   9.615 -      # Append any warnings to the config.log.
   9.616 -      cat conftest.err 1>&5
   9.617 -    
   9.618 -      case "$host_os" in
   9.619 -      hpux9* | hpux10* | hpux11*)
   9.620 -	# On HP-UX, both CC and GCC only warn that PIC is supported... then
   9.621 -	# they create non-PIC objects.  So, if there were any warnings, we
   9.622 -	# assume that PIC is not supported.
   9.623 -	if test -s conftest.err; then
   9.624 -	  ac_cv_prog_cc_pic_works=no
   9.625 -	  ac_cv_prog_cc_can_build_shared=no
   9.626 -	  ac_cv_prog_cc_pic=
   9.627 -	else
   9.628 -	  ac_cv_prog_cc_pic_works=yes
   9.629 -	  ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
   9.630 -	fi
   9.631 -	;;
   9.632 -      *)
   9.633 -	ac_cv_prog_cc_pic_works=yes
   9.634 -	ac_cv_prog_cc_pic=" $ac_cv_prog_cc_pic"
   9.635 -	;;
   9.636 -      esac
   9.637 -    else
   9.638 -      # Append any errors to the config.log.
   9.639 -      cat conftest.err 1>&5
   9.640 -      ac_cv_prog_cc_pic_works=no
   9.641 -      ac_cv_prog_cc_can_build_shared=no
   9.642 -      ac_cv_prog_cc_pic=
   9.643 -    fi
   9.644 -    CFLAGS="$save_CFLAGS"
   9.645 -    $rm conftest*
   9.646 -  fi
   9.647 -  # Belt *and* braces to stop my trousers falling down:
   9.648 -  if test "X$ac_cv_prog_cc_pic_works" = Xno; then
   9.649 -    ac_cv_prog_cc_pic=
   9.650 -    ac_cv_prog_cc_can_build_shared=no
   9.651 -  fi
   9.652 -  echo "$ac_t""$ac_cv_prog_cc_pic_works" 1>&6
   9.653 -fi
   9.654 -
   9.655 -# Check for any special shared library compilation flags.
   9.656 -if test -n "$ac_cv_prog_cc_shlib"; then
   9.657 -  echo "$progname: warning: \`$CC' requires \`$ac_cv_prog_cc_shlib' to build shared libraries" 1>&2
   9.658 -  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$ac_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   9.659 -  else
   9.660 -    echo "$progname: add \`$ac_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
   9.661 -    ac_cv_prog_cc_can_build_shared=no
   9.662 -  fi
   9.663 -fi
   9.664 -
   9.665 -echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6
   9.666 -echo "$progname:748: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5
   9.667 -if test "X${ac_cv_prog_cc_static_works+set}" = Xset; then
   9.668 -  echo $ac_n "(cached) $ac_c" 1>&6
   9.669 -else
   9.670 -  $rm conftest*
   9.671 -  echo 'main(){return(0);}' > conftest.c
   9.672 -  save_LDFLAGS="$LDFLAGS"
   9.673 -  LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static"
   9.674 -  if { (eval echo $progname:756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   9.675 -    ac_cv_prog_cc_static_works=yes
   9.676 -  else
   9.677 -    ac_cv_prog_cc_static_works=no
   9.678 -    ac_cv_prog_cc_static=
   9.679 -  fi
   9.680 -  LDFLAGS="$save_LDFLAGS"
   9.681 -  $rm conftest*
   9.682 -fi
   9.683 -# Belt *and* braces to stop my trousers falling down:
   9.684 -if test "X$ac_cv_prog_cc_static_works" = Xno; then
   9.685 -  ac_cv_prog_cc_static=
   9.686 -fi
   9.687 -echo "$ac_t""$ac_cv_prog_cc_static_works" 1>&6
   9.688 -pic_flag="$ac_cv_prog_cc_pic"
   9.689 -special_shlib_compile_flags="$ac_cv_prog_cc_shlib"
   9.690 -wl="$ac_cv_prog_cc_wl"
   9.691 -link_static_flag="$ac_cv_prog_cc_static"
   9.692 -no_builtin_flag="$ac_cv_prog_cc_no_builtin"
   9.693 -can_build_shared="$ac_cv_prog_cc_can_build_shared"
   9.694  
   9.695  # Check to see if options -o and -c are simultaneously supported by compiler
   9.696  echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
   9.697 @@ -790,8 +826,8 @@
   9.698  chmod -w .
   9.699  save_CFLAGS="$CFLAGS"
   9.700  CFLAGS="$CFLAGS -o out/conftest2.o"
   9.701 -echo "$progname:793: checking if $compiler supports -c -o file.o" >&5
   9.702 -if { (eval echo $progname:794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
   9.703 +echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
   9.704 +if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
   9.705  
   9.706    # The compiler can only warn and ignore the option if not recognized
   9.707    # So say no if there are warnings
   9.708 @@ -823,8 +859,8 @@
   9.709    echo "int some_variable = 0;" > conftest.c
   9.710    save_CFLAGS="$CFLAGS"
   9.711    CFLAGS="$CFLAGS -c -o conftest.lo"
   9.712 -  echo "$progname:826: checking if $compiler supports -c -o file.lo" >&5
   9.713 -if { (eval echo $progname:827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
   9.714 +  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
   9.715 +if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
   9.716  
   9.717      # The compiler can only warn and ignore the option if not recognized
   9.718      # So say no if there are warnings
   9.719 @@ -875,8 +911,8 @@
   9.720    echo "int some_variable = 0;" > conftest.c
   9.721    save_CFLAGS="$CFLAGS"
   9.722    CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
   9.723 -  echo "$progname:878: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   9.724 -  if { (eval echo $progname:879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
   9.725 +  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
   9.726 +  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
   9.727  
   9.728      # The compiler can only warn and ignore the option if not recognized
   9.729      # So say no if there are warnings
   9.730 @@ -904,6 +940,125 @@
   9.731    
   9.732  fi
   9.733  
   9.734 +# Check for any special shared library compilation flags.
   9.735 +if test -n "$special_shlib_compile_flags"; then
   9.736 +  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
   9.737 +  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
   9.738 +  else
   9.739 +    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
   9.740 +    can_build_shared=no
   9.741 +  fi
   9.742 +fi
   9.743 +
   9.744 +echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
   9.745 +$rm conftest*
   9.746 +echo 'main(){return(0);}' > conftest.c
   9.747 +save_LDFLAGS="$LDFLAGS"
   9.748 +LDFLAGS="$LDFLAGS $link_static_flag"
   9.749 +echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
   9.750 +if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   9.751 +  echo "$ac_t$link_static_flag" 1>&6
   9.752 +else
   9.753 +  echo "$ac_t"none 1>&6
   9.754 +  link_static_flag=
   9.755 +fi
   9.756 +LDFLAGS="$save_LDFLAGS"
   9.757 +$rm conftest*
   9.758 +
   9.759 +if test -z "$LN_S"; then
   9.760 +  # Check to see if we can use ln -s, or we need hard links.
   9.761 +  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
   9.762 +  $rm conftest.dat
   9.763 +  if ln -s X conftest.dat 2>/dev/null; then
   9.764 +    $rm conftest.dat
   9.765 +    LN_S="ln -s"
   9.766 +  else
   9.767 +    LN_S=ln
   9.768 +  fi
   9.769 +  if test "$LN_S" = "ln -s"; then
   9.770 +    echo "$ac_t"yes 1>&6
   9.771 +  else
   9.772 +    echo "$ac_t"no 1>&6
   9.773 +  fi
   9.774 +fi
   9.775 +
   9.776 +# Make sure LD is an absolute path.
   9.777 +if test -z "$LD"; then
   9.778 +  ac_prog=ld
   9.779 +  if test "$with_gcc" = yes; then
   9.780 +    # Check if gcc -print-prog-name=ld gives a path.
   9.781 +    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
   9.782 +    echo "$progname:991: checking for ld used by GCC" >&5
   9.783 +    ac_prog=`($CC -print-prog-name=ld) 2>&5`
   9.784 +    case "$ac_prog" in
   9.785 +    # Accept absolute paths.
   9.786 +    [\\/]* | [A-Za-z]:[\\/]*)
   9.787 +      re_direlt='/[^/][^/]*/\.\./'
   9.788 +      # Canonicalize the path of ld
   9.789 +      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
   9.790 +      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
   9.791 +	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
   9.792 +      done
   9.793 +      test -z "$LD" && LD="$ac_prog"
   9.794 +      ;;
   9.795 +    "")
   9.796 +      # If it fails, then pretend we are not using GCC.
   9.797 +      ac_prog=ld
   9.798 +      ;;
   9.799 +    *)
   9.800 +      # If it is relative, then search for the first ld in PATH.
   9.801 +      with_gnu_ld=unknown
   9.802 +      ;;
   9.803 +    esac
   9.804 +  elif test "$with_gnu_ld" = yes; then
   9.805 +    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
   9.806 +    echo "$progname:1015: checking for GNU ld" >&5
   9.807 +  else
   9.808 +    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
   9.809 +    echo "$progname:1018: checking for non-GNU ld" >&5
   9.810 +  fi
   9.811 +
   9.812 +  if test -z "$LD"; then
   9.813 +    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   9.814 +    for ac_dir in $PATH; do
   9.815 +      test -z "$ac_dir" && ac_dir=.
   9.816 +      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
   9.817 +	LD="$ac_dir/$ac_prog"
   9.818 +	# Check to see if the program is GNU ld.  I'd rather use --version,
   9.819 +	# but apparently some GNU ld's only accept -v.
   9.820 +	# Break only if it was the GNU/non-GNU ld that we prefer.
   9.821 +	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
   9.822 +	  test "$with_gnu_ld" != no && break
   9.823 +	else
   9.824 +	  test "$with_gnu_ld" != yes && break
   9.825 +	fi
   9.826 +      fi
   9.827 +    done
   9.828 +    IFS="$ac_save_ifs"
   9.829 +  fi
   9.830 +
   9.831 +  if test -n "$LD"; then
   9.832 +    echo "$ac_t$LD" 1>&6
   9.833 +  else
   9.834 +    echo "$ac_t"no 1>&6
   9.835 +  fi
   9.836 +
   9.837 +  if test -z "$LD"; then
   9.838 +    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
   9.839 +    exit 1
   9.840 +  fi
   9.841 +fi
   9.842 +
   9.843 +# Check to see if it really is or is not GNU ld.
   9.844 +echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
   9.845 +# I'd rather use --version here, but apparently some GNU ld's only accept -v.
   9.846 +if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   9.847 +  with_gnu_ld=yes
   9.848 +else
   9.849 +  with_gnu_ld=no
   9.850 +fi
   9.851 +echo "$ac_t$with_gnu_ld" 1>&6
   9.852 +
   9.853  # See if the linker supports building shared libraries.
   9.854  echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
   9.855  
   9.856 @@ -916,20 +1071,15 @@
   9.857  archive_cmds=
   9.858  archive_expsym_cmds=
   9.859  old_archive_from_new_cmds=
   9.860 -old_archive_from_expsyms_cmds=
   9.861 -striplib=
   9.862 -old_striplib=
   9.863  export_dynamic_flag_spec=
   9.864  whole_archive_flag_spec=
   9.865  thread_safe_flag_spec=
   9.866 -hardcode_into_libs=no
   9.867  hardcode_libdir_flag_spec=
   9.868  hardcode_libdir_separator=
   9.869  hardcode_direct=no
   9.870  hardcode_minus_L=no
   9.871  hardcode_shlibpath_var=unsupported
   9.872  runpath_var=
   9.873 -link_all_deplibs=unknown
   9.874  always_export_symbols=no
   9.875  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
   9.876  # include_expsyms should be a list of space-separated symbols to be *always*
   9.877 @@ -945,7 +1095,6 @@
   9.878  # the symbol is explicitly referenced.  Since portable code cannot
   9.879  # rely on this symbol name, it's probably fine to never include it in
   9.880  # preloaded symbol tables.
   9.881 -extract_expsyms_cmds=
   9.882  
   9.883  case "$host_os" in
   9.884  cygwin* | mingw*)
   9.885 @@ -999,7 +1148,7 @@
   9.886        #allow_undefined_flag=unsupported
   9.887        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
   9.888        # support --undefined.  This deserves some investigation.  FIXME
   9.889 -      archive_cmds='$CC -nostart $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib'
   9.890 +      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
   9.891      else
   9.892        ld_shlibs=no
   9.893      fi
   9.894 @@ -1009,72 +1158,48 @@
   9.895      # hardcode_libdir_flag_spec is actually meaningless, as there is
   9.896      # no search path for DLLs.
   9.897      hardcode_libdir_flag_spec='-L$libdir'
   9.898 -    allow_undefined_flag=unsupported
   9.899 +#    allow_undefined_flag=unsupported
   9.900      always_export_symbols=yes
   9.901  
   9.902 -    extract_expsyms_cmds='test -f $objdir/impgen.c || \
   9.903 -      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/impgen.c~
   9.904 -      test -f $objdir/impgen.exe || (cd $objdir && \
   9.905 -      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
   9.906 -      else $CC -o impgen impgen.c ; fi)~
   9.907 -      $objdir/impgen $dir/$soname > $objdir/$soname-def'
   9.908 -
   9.909 -    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$newlib'
   9.910 -
   9.911 -    # cygwin and mingw dlls have different entry points and sets of symbols
   9.912 -    # to exclude.
   9.913 -    # FIXME: what about values for MSVC?
   9.914 -    dll_entry=__cygwin_dll_entry@12
   9.915 -    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
   9.916 -    case "$host_os" in
   9.917 -    mingw*)
   9.918 -      # mingw values
   9.919 -      dll_entry=_DllMainCRTStartup@12
   9.920 -      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
   9.921 -      ;;
   9.922 -    esac
   9.923 -
   9.924 -    # mingw and cygwin differ, and it's simplest to just exclude the union
   9.925 -    # of the two symbol sets.
   9.926 -    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
   9.927 -
   9.928 -    # recent cygwin and mingw systems supply a stub DllMain which the user
   9.929 -    # can override, but on older systems we have to supply one (in ltdll.c)
   9.930 -    if test "x$lt_cv_need_dllmain" = "xyes"; then
   9.931 -      ltdll_obj="objdir/$soname-ltdll.$objext "
   9.932 -      ltdll_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
   9.933 -        test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~'
   9.934 -    else
   9.935 -      ltdll_obj=
   9.936 -      ltdll_cmds=
   9.937 -    fi
   9.938 -
   9.939      # Extract the symbol export list from an `--export-all' def file,
   9.940      # then regenerate the def file from the symbol export list, so that
   9.941      # the compiled dll only exports the symbol export list.
   9.942 -    export_symbols_cmds="$ltdll_cmds"'
   9.943 -      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $objdir/$soname-def '$ltdll_obj'$libobjs $convenience~      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ;.*//" < $objdir/$soname-def > $export_symbols'
   9.944 -  
   9.945 +    # Be careful not to strip the DATA tag left by newer dlltools.
   9.946 +    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
   9.947 +      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
   9.948 +      $DLLTOOL --exclude-symbols _DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
   9.949 +      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
   9.950 +
   9.951 +    # If DATA tags from a recent dlltool are present, honour them!
   9.952      archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
   9.953        _lt_hint=1;
   9.954        cat $export_symbols | while read symbol; do
   9.955 -	echo "	\$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
   9.956 +        set dummy \$symbol;
   9.957 +        case \$# in
   9.958 +          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
   9.959 +          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
   9.960 +        esac;
   9.961  	_lt_hint=`expr 1 + \$_lt_hint`;
   9.962        done~
   9.963 -      '"$ltdll_cmds"'
   9.964 -      $CC -Wl,--base-file,$objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~ 
   9.965 -      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
   9.966 -      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags~
   9.967 -      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
   9.968 -      $CC $objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags' 
   9.969 +      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
   9.970 +      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
   9.971 +      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,_DllMain@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
   9.972 +      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols _DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
   9.973 +      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,_DllMain@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
   9.974 +      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols _DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
   9.975 +      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,_DllMain@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
   9.976 +      strip $lib'
   9.977 +
   9.978 +      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
   9.979      ;;
   9.980  
   9.981    netbsd*)
   9.982      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
   9.983 -      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
   9.984 -      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
   9.985 +      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
   9.986 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
   9.987      else
   9.988 -      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
   9.989 +      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
   9.990 +      # can we support soname and/or expsyms with a.out? -oliva
   9.991      fi
   9.992      ;;
   9.993  
   9.994 @@ -1092,15 +1217,15 @@
   9.995  
   9.996  EOF
   9.997      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
   9.998 -      archive_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib'
   9.999 -      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  9.1000 +      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
  9.1001 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  9.1002      else
  9.1003        ld_shlibs=no
  9.1004      fi
  9.1005      ;;      
  9.1006  
  9.1007    sunos4*)
  9.1008 -    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  9.1009 +    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
  9.1010      wlarc=
  9.1011      hardcode_direct=yes
  9.1012      hardcode_shlibpath_var=no
  9.1013 @@ -1108,8 +1233,8 @@
  9.1014  
  9.1015    *)
  9.1016      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
  9.1017 -      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  9.1018 -      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  9.1019 +      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
  9.1020 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  9.1021      else
  9.1022        ld_shlibs=no
  9.1023      fi
  9.1024 @@ -1141,7 +1266,7 @@
  9.1025    aix3*)
  9.1026      allow_undefined_flag=unsupported
  9.1027      always_export_symbols=yes
  9.1028 -    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
  9.1029 +    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
  9.1030      # Note: this linker hardcodes the directories in LIBPATH if there
  9.1031      # are no directories specified by -L.
  9.1032      hardcode_minus_L=yes
  9.1033 @@ -1178,8 +1303,8 @@
  9.1034        hardcode_direct=yes
  9.1035      fi
  9.1036      allow_undefined_flag=' ${wl}-berok'
  9.1037 -    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
  9.1038 -    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
  9.1039 +    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
  9.1040 +    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
  9.1041      case "$host_os" in aix4.[01]|aix4.[01].*)
  9.1042        # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
  9.1043        always_export_symbols=yes ;;
  9.1044 @@ -1200,11 +1325,11 @@
  9.1045      # hardcode_libdir_flag_spec is actually meaningless, as there is
  9.1046      # no search path for DLLs.
  9.1047      hardcode_libdir_flag_spec=' '
  9.1048 -    allow_undefined_flag=unsupported
  9.1049 +#    allow_undefined_flag=unsupported
  9.1050      # Tell ltmain to make .lib files, not .a files.
  9.1051      libext=lib
  9.1052      # FIXME: Setting linknames here is a bad hack.
  9.1053 -    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
  9.1054 +    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
  9.1055      # The linker will automatically build a .lib file if we build a DLL.
  9.1056      old_archive_from_new_cmds='true'
  9.1057      # FIXME: Should let the user specify the lib program.
  9.1058 @@ -1221,7 +1346,7 @@
  9.1059    # does not break anything, and helps significantly (at the cost of a little
  9.1060    # extra space).
  9.1061    freebsd2.2*)
  9.1062 -    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
  9.1063 +    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
  9.1064      hardcode_libdir_flag_spec='-R$libdir'
  9.1065      hardcode_direct=yes
  9.1066      hardcode_shlibpath_var=no
  9.1067 @@ -1229,7 +1354,7 @@
  9.1068  
  9.1069    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  9.1070    freebsd2*)
  9.1071 -    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  9.1072 +    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
  9.1073      hardcode_direct=yes
  9.1074      hardcode_minus_L=yes
  9.1075      hardcode_shlibpath_var=no
  9.1076 @@ -1237,7 +1362,7 @@
  9.1077  
  9.1078    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  9.1079    freebsd*)
  9.1080 -    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  9.1081 +    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
  9.1082      hardcode_libdir_flag_spec='-R$libdir'
  9.1083      hardcode_direct=yes
  9.1084      hardcode_shlibpath_var=no
  9.1085 @@ -1245,8 +1370,8 @@
  9.1086  
  9.1087    hpux9* | hpux10* | hpux11*)
  9.1088      case "$host_os" in
  9.1089 -    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linker_flags~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
  9.1090 -    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
  9.1091 +    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
  9.1092 +    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
  9.1093      esac
  9.1094      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  9.1095      hardcode_libdir_separator=:
  9.1096 @@ -1258,20 +1383,19 @@
  9.1097  
  9.1098    irix5* | irix6*)
  9.1099      if test "$with_gcc" = yes; then
  9.1100 -      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
  9.1101 +      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
  9.1102      else
  9.1103 -      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
  9.1104 +      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
  9.1105      fi
  9.1106      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  9.1107      hardcode_libdir_separator=:
  9.1108 -    link_all_deplibs=yes
  9.1109      ;;
  9.1110  
  9.1111    netbsd*)
  9.1112      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  9.1113 -      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
  9.1114 +      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
  9.1115      else
  9.1116 -      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
  9.1117 +      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
  9.1118      fi
  9.1119      hardcode_libdir_flag_spec='${wl}-R$libdir'
  9.1120      hardcode_direct=yes
  9.1121 @@ -1279,7 +1403,7 @@
  9.1122      ;;
  9.1123  
  9.1124    openbsd*)
  9.1125 -    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  9.1126 +    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
  9.1127      hardcode_libdir_flag_spec='-R$libdir'
  9.1128      hardcode_direct=yes
  9.1129      hardcode_shlibpath_var=no
  9.1130 @@ -1289,24 +1413,42 @@
  9.1131      hardcode_libdir_flag_spec='-L$libdir'
  9.1132      hardcode_minus_L=yes
  9.1133      allow_undefined_flag=unsupported
  9.1134 -    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $objdir/$libname.def'
  9.1135 +    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
  9.1136      old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
  9.1137      ;;
  9.1138  
  9.1139 -  osf3* | osf4* | osf5*)
  9.1140 +  osf3*)
  9.1141      if test "$with_gcc" = yes; then
  9.1142        allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  9.1143 -      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
  9.1144 +      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
  9.1145      else
  9.1146        allow_undefined_flag=' -expect_unresolved \*'
  9.1147 -      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
  9.1148 +      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
  9.1149      fi
  9.1150      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  9.1151      hardcode_libdir_separator=:
  9.1152      ;;
  9.1153  
  9.1154 +  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
  9.1155 +    if test "$with_gcc" = yes; then
  9.1156 +      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  9.1157 +      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
  9.1158 +    else
  9.1159 +      allow_undefined_flag=' -expect_unresolved \*'
  9.1160 +      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
  9.1161 +    fi
  9.1162 +    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  9.1163 +    hardcode_libdir_separator=:
  9.1164 +    ;;
  9.1165 +  rhapsody*)
  9.1166 +    archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts'
  9.1167 +    hardcode_libdir_flags_spec='-L$libdir'
  9.1168 +    hardcode_direct=yes
  9.1169 +    hardcode_shlibpath_var=no
  9.1170 +    ;;
  9.1171 +                                       
  9.1172    sco3.2v5*)
  9.1173 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1174 +    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1175      hardcode_shlibpath_var=no
  9.1176      runpath_var=LD_RUN_PATH
  9.1177      hardcode_runpath_var=yes
  9.1178 @@ -1316,9 +1458,9 @@
  9.1179      no_undefined_flag=' -z text'
  9.1180      # $CC -shared without GNU ld will not create a library from C++
  9.1181      # object files and a static libstdc++, better avoid it by now
  9.1182 -    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1183 +    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1184      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
  9.1185 -		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
  9.1186 +		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
  9.1187      hardcode_libdir_flag_spec='-R$libdir'
  9.1188      hardcode_shlibpath_var=no
  9.1189      case "$host_os" in
  9.1190 @@ -1326,11 +1468,10 @@
  9.1191      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
  9.1192        whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
  9.1193      esac
  9.1194 -    link_all_deplibs=yes
  9.1195      ;;
  9.1196  
  9.1197    sunos4*)
  9.1198 -    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
  9.1199 +    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
  9.1200      hardcode_libdir_flag_spec='-L$libdir'
  9.1201      hardcode_direct=yes
  9.1202      hardcode_minus_L=yes
  9.1203 @@ -1338,14 +1479,20 @@
  9.1204      ;;
  9.1205  
  9.1206    sysv4)
  9.1207 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1208 +    if test "x$host_vendor" = xsequent; then
  9.1209 +      # Use $CC to link under sequent, because it throws in some extra .o 
  9.1210 +      # files that make .init and .fini sections work.
  9.1211 +      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1212 +    else
  9.1213 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1214 +    fi
  9.1215      runpath_var='LD_RUN_PATH'
  9.1216      hardcode_shlibpath_var=no
  9.1217      hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
  9.1218      ;;  
  9.1219  
  9.1220    sysv4.3*)
  9.1221 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1222 +    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1223      hardcode_shlibpath_var=no
  9.1224      export_dynamic_flag_spec='-Bexport'
  9.1225      ;;
  9.1226 @@ -1354,39 +1501,47 @@
  9.1227      no_undefined_flag=' -z text'
  9.1228      # $CC -shared without GNU ld will not create a library from C++
  9.1229      # object files and a static libstdc++, better avoid it by now
  9.1230 -    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1231 +    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1232      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
  9.1233 -		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
  9.1234 +		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
  9.1235      hardcode_libdir_flag_spec=
  9.1236      hardcode_shlibpath_var=no
  9.1237      runpath_var='LD_RUN_PATH'
  9.1238      ;;
  9.1239  
  9.1240    uts4*)
  9.1241 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1242 +    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1243      hardcode_libdir_flag_spec='-L$libdir'
  9.1244      hardcode_shlibpath_var=no
  9.1245      ;;
  9.1246  
  9.1247    dgux*)
  9.1248 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1249 +    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1250      hardcode_libdir_flag_spec='-L$libdir'
  9.1251      hardcode_shlibpath_var=no
  9.1252      ;;
  9.1253  
  9.1254    sysv4*MP*)
  9.1255 -    if test -d /usr/nec ;then
  9.1256 -    # archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
  9.1257 -    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
  9.1258 -    hardcode_shlibpath_var=no
  9.1259 -    runpath_var=LD_RUN_PATH
  9.1260 -    hardcode_runpath_var=yes
  9.1261 -    ld_shlibs=yes
  9.1262 +    if test -d /usr/nec; then
  9.1263 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1264 +      hardcode_shlibpath_var=no
  9.1265 +      runpath_var=LD_RUN_PATH
  9.1266 +      hardcode_runpath_var=yes
  9.1267 +      ld_shlibs=yes
  9.1268      fi
  9.1269      ;;
  9.1270  
  9.1271 -  unixware7* | sysv5*)
  9.1272 -    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
  9.1273 +  sysv4.2uw2*)
  9.1274 +    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
  9.1275 +    hardcode_direct=yes
  9.1276 +    hardcode_minus_L=no
  9.1277 +    hardcode_shlibpath_var=no
  9.1278 +    hardcode_runpath_var=yes
  9.1279 +    runpath_var=LD_RUN_PATH
  9.1280 +    ;;
  9.1281 +
  9.1282 +  unixware7*)
  9.1283 +    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
  9.1284      runpath_var='LD_RUN_PATH'
  9.1285      hardcode_shlibpath_var=no
  9.1286      ;;
  9.1287 @@ -1399,412 +1554,36 @@
  9.1288  echo "$ac_t$ld_shlibs" 1>&6
  9.1289  test "$ld_shlibs" = no && can_build_shared=no
  9.1290  
  9.1291 -# Check hardcoding attributes.
  9.1292 -echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
  9.1293 -hardcode_action=
  9.1294 -if test -n "$hardcode_libdir_flag_spec" || \
  9.1295 -   test -n "$runpath_var"; then
  9.1296 -
  9.1297 -  # We can hardcode non-existant directories.
  9.1298 -  if test "$hardcode_direct" != no &&
  9.1299 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
  9.1300 -     # have to relink, otherwise we might link with an installed library
  9.1301 -     # when we should be linking with a yet-to-be-installed one
  9.1302 -     ## test "$hardcode_shlibpath_var" != no &&
  9.1303 -     test "$hardcode_minus_L" != no; then
  9.1304 -    # Linking always hardcodes the temporary library directory.
  9.1305 -    hardcode_action=relink
  9.1306 -  else
  9.1307 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
  9.1308 -    hardcode_action=immediate
  9.1309 -  fi
  9.1310 -else
  9.1311 -  # We cannot hardcode anything, or else we can only hardcode existing
  9.1312 -  # directories.
  9.1313 -  hardcode_action=unsupported
  9.1314 -fi
  9.1315 -echo "$ac_t$hardcode_action" 1>&6
  9.1316 -
  9.1317 -echo $ac_n "checking whether stripping libraries is possible... $ac_c" 1>&6
  9.1318 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
  9.1319 -  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
  9.1320 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
  9.1321 -  echo "${ac_t}yes" 1>&6
  9.1322 -else
  9.1323 -  echo "${ac_t}no" 1>&6
  9.1324 -fi
  9.1325 -
  9.1326 -reload_flag=
  9.1327 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
  9.1328 -echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
  9.1329 -# PORTME Some linkers may need a different reload flag.
  9.1330 -reload_flag='-r'
  9.1331 -echo "$ac_t$reload_flag" 1>&6
  9.1332 -test -n "$reload_flag" && reload_flag=" $reload_flag"
  9.1333 -
  9.1334 -# PORTME Fill in your ld.so characteristics
  9.1335 -library_names_spec=
  9.1336 -libname_spec='lib$name'
  9.1337 -soname_spec=
  9.1338 -postinstall_cmds=
  9.1339 -postuninstall_cmds=
  9.1340 -finish_cmds=
  9.1341 -finish_eval=
  9.1342 -shlibpath_var=
  9.1343 -shlibpath_overrides_runpath=unknown
  9.1344 -version_type=none
  9.1345 -dynamic_linker="$host_os ld.so"
  9.1346 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
  9.1347 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  9.1348 -file_magic_cmd="$FILE"
  9.1349 -file_magic_test_file=
  9.1350 -deplibs_check_method='unknown'
  9.1351 -# Need to set the preceding variable on all platforms that support
  9.1352 -# interlibrary dependencies.
  9.1353 -# 'none' -- dependencies not supported.
  9.1354 -# `unknown' -- same as none, but documents that we really don't know.
  9.1355 -# 'pass_all' -- all dependencies passed with no checks.
  9.1356 -# 'test_compile' -- check by making test program.
  9.1357 -# 'file_magic [regex]' -- check by looking for files in library path
  9.1358 -# which responds to the $file_magic_cmd with a given egrep regex.
  9.1359 -# If you have `file' or equivalent on your system and you're not sure
  9.1360 -# whether `pass_all' will *always* work, you probably want this one.
  9.1361 -echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
  9.1362 -case "$host_os" in
  9.1363 -aix3*)
  9.1364 -  version_type=linux
  9.1365 -  library_names_spec='${libname}${release}.so$versuffix $libname.a'
  9.1366 -  shlibpath_var=LIBPATH
  9.1367 -
  9.1368 -  # AIX has no versioning support, so we append a major version to the name.
  9.1369 -  soname_spec='${libname}${release}.so$major'
  9.1370 -  ;;
  9.1371 -
  9.1372 -aix4*)
  9.1373 -  version_type=linux
  9.1374 -  # AIX has no versioning support, so currently we can not hardcode correct
  9.1375 -  # soname into executable. Probably we can add versioning support to
  9.1376 -  # collect2, so additional links can be useful in future.
  9.1377 -  # We preserve .a as extension for shared libraries though AIX4.2
  9.1378 -  # and later linker supports .so
  9.1379 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
  9.1380 -  shlibpath_var=LIBPATH
  9.1381 -  deplibs_check_method=pass_all
  9.1382 -  ;;
  9.1383 -
  9.1384 -amigaos*)
  9.1385 -  library_names_spec='$libname.ixlibrary $libname.a'
  9.1386 -  # Create ${libname}_ixlibrary.a entries in /sys/libs.
  9.1387 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
  9.1388 -  ;;
  9.1389 -
  9.1390 -beos*)
  9.1391 -  library_names_spec='${libname}.so'
  9.1392 -  dynamic_linker="$host_os ld.so"
  9.1393 -  shlibpath_var=LIBRARY_PATH
  9.1394 -  deplibs_check_method=pass_all
  9.1395 -  lt_cv_dlopen="load_add_on"
  9.1396 -  lt_cv_dlopen_libs=
  9.1397 -  lt_cv_dlopen_self=yes
  9.1398 -  ;;
  9.1399 -
  9.1400 -bsdi4*)
  9.1401 -  version_type=linux
  9.1402 -  need_version=no
  9.1403 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1404 -  soname_spec='${libname}${release}.so$major'
  9.1405 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
  9.1406 -  shlibpath_var=LD_LIBRARY_PATH
  9.1407 -  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
  9.1408 -  file_magic_test_file=/shlib/libc.so
  9.1409 -  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
  9.1410 -  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
  9.1411 -  export_dynamic_flag_spec=-rdynamic
  9.1412 -  # the default ld.so.conf also contains /usr/contrib/lib and
  9.1413 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
  9.1414 -  # libtool to hard-code these into programs
  9.1415 -  ;;
  9.1416 -
  9.1417 -cygwin* | mingw*)
  9.1418 -  version_type=windows
  9.1419 -  need_version=no
  9.1420 -  need_lib_prefix=no
  9.1421 -  if test "$with_gcc" = yes; then
  9.1422 -    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
  9.1423 -  else
  9.1424 -    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
  9.1425 -  fi
  9.1426 -  dynamic_linker='Win32 ld.exe'
  9.1427 -  # FIXME: mingw32 cross-compiler doesn't see shared versions of libs
  9.1428 -  #deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  9.1429 -  deplibs_check_method=pass_all
  9.1430 -  file_magic_cmd='${OBJDUMP} -f'
  9.1431 -  # FIXME: first we should search . and the directory the executable is in
  9.1432 -  shlibpath_var=PATH
  9.1433 -  lt_cv_dlopen="LoadLibrary"
  9.1434 -  lt_cv_dlopen_libs=
  9.1435 -  ;;
  9.1436 -
  9.1437 -freebsd1*)
  9.1438 -  dynamic_linker=no
  9.1439 -  ;;
  9.1440 -  
  9.1441 -freebsd*)
  9.1442 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
  9.1443 -  version_type=freebsd-$objformat
  9.1444 -  case "$version_type" in
  9.1445 -    freebsd-elf*)
  9.1446 -      deplibs_check_method=pass_all
  9.1447 -      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
  9.1448 -      need_version=no
  9.1449 -      need_lib_prefix=no
  9.1450 -      ;;
  9.1451 -    freebsd-*)
  9.1452 -      deplibs_check_method=unknown
  9.1453 -      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
  9.1454 -      need_version=yes
  9.1455 -      ;;
  9.1456 -  esac
  9.1457 -  shlibpath_var=LD_LIBRARY_PATH
  9.1458 -  case "$host_os" in
  9.1459 -  freebsd2*)
  9.1460 -    shlibpath_overrides_runpath=yes
  9.1461 -    ;;
  9.1462 -  freebsd3.[01]* | freebsdelf3.[01]*)
  9.1463 -    shlibpath_overrides_runpath=yes
  9.1464 -    hardcode_into_libs=yes
  9.1465 -    ;;
  9.1466 -  *) # from 3.2 on
  9.1467 -    shlibpath_overrides_runpath=no
  9.1468 -    hardcode_into_libs=yes
  9.1469 +if test -z "$NM"; then
  9.1470 +  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
  9.1471 +  case "$NM" in
  9.1472 +  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
  9.1473 +  *)
  9.1474 +    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
  9.1475 +    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
  9.1476 +      test -z "$ac_dir" && ac_dir=.
  9.1477 +      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
  9.1478 +	# Check to see if the nm accepts a BSD-compat flag.
  9.1479 +	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
  9.1480 +	#   nm: unknown option "B" ignored
  9.1481 +	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  9.1482 +	  NM="$ac_dir/nm -B"
  9.1483 +	  break
  9.1484 +	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  9.1485 +	  NM="$ac_dir/nm -p"
  9.1486 +	  break
  9.1487 +	else
  9.1488 +	  NM=${NM="$ac_dir/nm"} # keep the first match, but
  9.1489 +	  continue # so that we can try to find one that supports BSD flags
  9.1490 +	fi
  9.1491 +      fi
  9.1492 +    done
  9.1493 +    IFS="$ac_save_ifs"
  9.1494 +    test -z "$NM" && NM=nm
  9.1495      ;;
  9.1496    esac
  9.1497 -  ;;
  9.1498 -
  9.1499 -gnu*)
  9.1500 -  version_type=linux
  9.1501 -  need_lib_prefix=no
  9.1502 -  need_version=no
  9.1503 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
  9.1504 -  soname_spec='${libname}${release}.so$major'
  9.1505 -  shlibpath_var=LD_LIBRARY_PATH
  9.1506 -  deplibs_check_method=pass_all
  9.1507 -  ;;
  9.1508 -
  9.1509 -hpux9* | hpux10* | hpux11*)
  9.1510 -  # Give a soname corresponding to the major version so that dld.sl refuses to
  9.1511 -  # link against other versions.
  9.1512 -  dynamic_linker="$host_os dld.sl"
  9.1513 -  version_type=sunos
  9.1514 -  need_lib_prefix=no
  9.1515 -  need_version=no
  9.1516 -  shlibpath_var=SHLIB_PATH
  9.1517 -  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
  9.1518 -  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
  9.1519 -  soname_spec='${libname}${release}.sl$major'
  9.1520 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
  9.1521 -  postinstall_cmds='chmod 555 $lib'
  9.1522 -  ;;
  9.1523 -
  9.1524 -irix5* | irix6*)
  9.1525 -  version_type=irix
  9.1526 -  need_lib_prefix=no
  9.1527 -  need_version=no
  9.1528 -  soname_spec='${libname}${release}.so.$major'
  9.1529 -  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
  9.1530 -  case "$host_os" in
  9.1531 -  irix5*)
  9.1532 -    libsuff= shlibsuff=
  9.1533 -    # this will be overridden with pass_all, but let us keep it just in case
  9.1534 -    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
  9.1535 -    ;;
  9.1536 -  *)
  9.1537 -    case "$LD" in # libtool.m4 will add one of these switches to LD
  9.1538 -    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
  9.1539 -    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
  9.1540 -    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
  9.1541 -    *) libsuff= shlibsuff= libmagic=never-match;;
  9.1542 -    esac
  9.1543 -    # this will be overridden with pass_all, but let us keep it just in case
  9.1544 -    deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
  9.1545 -    ;;
  9.1546 -  esac
  9.1547 -  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
  9.1548 -  shlibpath_overrides_runpath=no
  9.1549 -  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
  9.1550 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
  9.1551 -  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
  9.1552 -  deplibs_check_method=pass_all
  9.1553 -  ;;
  9.1554 -
  9.1555 -# No shared lib support for Linux oldld, aout, or coff.
  9.1556 -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
  9.1557 -  dynamic_linker=no
  9.1558 -  ;;
  9.1559 -
  9.1560 -# This must be Linux ELF.
  9.1561 -linux-gnu*)
  9.1562 -  version_type=linux
  9.1563 -  need_lib_prefix=no
  9.1564 -  need_version=no
  9.1565 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1566 -  soname_spec='${libname}${release}.so$major'
  9.1567 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
  9.1568 -  shlibpath_var=LD_LIBRARY_PATH
  9.1569 -  shlibpath_overrides_runpath=no
  9.1570 -
  9.1571 -  case "$host_cpu" in
  9.1572 -  alpha* | i*86 | sparc* | powerpc* )
  9.1573 -    deplibs_check_method=pass_all ;;
  9.1574 -  *)
  9.1575 -    # glibc up to 2.1.1 does not perform some relocations on ARM
  9.1576 -    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
  9.1577 -  esac
  9.1578 -  file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
  9.1579 -
  9.1580 -  if test -f /lib/ld.so.1; then
  9.1581 -    dynamic_linker='GNU ld.so'
  9.1582 -  else
  9.1583 -    # Only the GNU ld.so supports shared libraries on MkLinux.
  9.1584 -    case "$host_cpu" in
  9.1585 -    powerpc*) dynamic_linker=no ;;
  9.1586 -    *) dynamic_linker='Linux ld.so' ;;
  9.1587 -    esac
  9.1588 -  fi
  9.1589 -  ;;
  9.1590 -
  9.1591 -netbsd*)
  9.1592 -  version_type=sunos
  9.1593 -  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  9.1594 -    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.1595 -    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  9.1596 -    dynamic_linker='NetBSD (a.out) ld.so'
  9.1597 -  else
  9.1598 -    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
  9.1599 -    soname_spec='${libname}${release}.so$major'
  9.1600 -    dynamic_linker='NetBSD ld.elf_so'
  9.1601 -  fi
  9.1602 -  shlibpath_var=LD_LIBRARY_PATH
  9.1603 -  ;;
  9.1604 -
  9.1605 -openbsd*)
  9.1606 -  version_type=sunos
  9.1607 -  if test "$with_gnu_ld" = yes; then
  9.1608 -    need_lib_prefix=no
  9.1609 -    need_version=no
  9.1610 -  fi
  9.1611 -  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.1612 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  9.1613 -  shlibpath_var=LD_LIBRARY_PATH
  9.1614 -  ;;
  9.1615 -
  9.1616 -os2*)
  9.1617 -  libname_spec='$name'
  9.1618 -  need_lib_prefix=no
  9.1619 -  library_names_spec='$libname.dll $libname.a'
  9.1620 -  dynamic_linker='OS/2 ld.exe'
  9.1621 -  shlibpath_var=LIBPATH
  9.1622 -  ;;
  9.1623 -
  9.1624 -osf3* | osf4* | osf5*)
  9.1625 -  version_type=osf
  9.1626 -  need_version=no
  9.1627 -  soname_spec='${libname}${release}.so'
  9.1628 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
  9.1629 -  shlibpath_var=LD_LIBRARY_PATH
  9.1630 -  # this will be overridden with pass_all, but let us keep it just in case
  9.1631 -  deplibs_check_method='file_magic COFF format alpha shared library'
  9.1632 -  file_magic_test_file=/shlib/libc.so
  9.1633 -  deplibs_check_method=pass_all
  9.1634 -  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
  9.1635 -  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
  9.1636 -  ;;
  9.1637 -
  9.1638 -sco3.2v5*)
  9.1639 -  version_type=osf
  9.1640 -  soname_spec='${libname}${release}.so$major'
  9.1641 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1642 -  shlibpath_var=LD_LIBRARY_PATH
  9.1643 -  deplibs_check_method=pass_all
  9.1644 -  ;;
  9.1645 -
  9.1646 -solaris*)
  9.1647 -  version_type=linux
  9.1648 -  need_lib_prefix=no
  9.1649 -  need_version=no
  9.1650 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1651 -  soname_spec='${libname}${release}.so$major'
  9.1652 -  shlibpath_var=LD_LIBRARY_PATH
  9.1653 -  shlibpath_overrides_runpath=yes
  9.1654 -  # ldd complains unless libraries are executable
  9.1655 -  postinstall_cmds='chmod +x $lib'
  9.1656 -  deplibs_check_method=pass_all
  9.1657 -  file_magic_test_file=/lib/libc.so
  9.1658 -  ;;
  9.1659 -
  9.1660 -sunos4*)
  9.1661 -  version_type=sunos
  9.1662 -  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.1663 -  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
  9.1664 -  shlibpath_var=LD_LIBRARY_PATH
  9.1665 -  shlibpath_overrides_runpath=yes
  9.1666 -  if test "$with_gnu_ld" = yes; then
  9.1667 -    need_lib_prefix=no
  9.1668 -  fi
  9.1669 -  need_version=yes
  9.1670 -  ;;
  9.1671 -
  9.1672 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
  9.1673 -  version_type=linux
  9.1674 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1675 -  soname_spec='${libname}${release}.so$major'
  9.1676 -  shlibpath_var=LD_LIBRARY_PATH
  9.1677 -  case "$host_vendor" in
  9.1678 -    ncr)
  9.1679 -      deplibs_check_method=pass_all
  9.1680 -      ;;
  9.1681 -    motorola)
  9.1682 -      need_lib_prefix=no
  9.1683 -      need_version=no
  9.1684 -      shlibpath_overrides_runpath=no
  9.1685 -      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
  9.1686 -      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
  9.1687 -      file_magic_test_file=`echo /usr/lib/libc.so*`
  9.1688 -      ;;
  9.1689 -  esac
  9.1690 -  ;;
  9.1691 -
  9.1692 -uts4*)
  9.1693 -  version_type=linux
  9.1694 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1695 -  soname_spec='${libname}${release}.so$major'
  9.1696 -  shlibpath_var=LD_LIBRARY_PATH
  9.1697 -  ;;
  9.1698 -
  9.1699 -dgux*)
  9.1700 -  version_type=linux
  9.1701 -  need_lib_prefix=no
  9.1702 -  need_version=no
  9.1703 -  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1704 -  soname_spec='${libname}${release}.so$major'
  9.1705 -  shlibpath_var=LD_LIBRARY_PATH
  9.1706 -  ;;
  9.1707 -
  9.1708 -sysv4*MP*)
  9.1709 -  if test -d /usr/nec ;then
  9.1710 -    version_type=linux
  9.1711 -    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
  9.1712 -    soname_spec='$libname.so.$major'
  9.1713 -    shlibpath_var=LD_LIBRARY_PATH
  9.1714 -  fi
  9.1715 -  ;;
  9.1716 -
  9.1717 -*)
  9.1718 -  dynamic_linker=no
  9.1719 -  ;;
  9.1720 -esac
  9.1721 -echo "$ac_t$dynamic_linker" 1>&6
  9.1722 -test "$dynamic_linker" = no && can_build_shared=no
  9.1723 +  echo "$ac_t$NM" 1>&6
  9.1724 +fi
  9.1725  
  9.1726  # Check for command to grab the raw symbol name followed by C symbol from nm.
  9.1727  echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
  9.1728 @@ -1838,7 +1617,7 @@
  9.1729  irix*)
  9.1730    symcode='[BCDEGRST]'
  9.1731    ;;
  9.1732 -solaris* | sysv5*)
  9.1733 +solaris*)
  9.1734    symcode='[BDT]'
  9.1735    ;;
  9.1736  sysv4)
  9.1737 @@ -1872,11 +1651,11 @@
  9.1738  main(){nm_test_var='a';nm_test_func();return(0);}
  9.1739  EOF
  9.1740  
  9.1741 -  echo "$progname:1873: checking if global_symbol_pipe works" >&5
  9.1742 -  if { (eval echo $progname:1874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
  9.1743 +  echo "$progname:1653: checking if global_symbol_pipe works" >&5
  9.1744 +  if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
  9.1745      # Now try to grab the symbols.
  9.1746      nlist=conftest.nm
  9.1747 -    if { echo "$progname:1877: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
  9.1748 +    if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
  9.1749  
  9.1750        # Try sorting and uniquifying the output.
  9.1751        if sort "$nlist" | uniq > "$nlist"T; then
  9.1752 @@ -1928,7 +1707,7 @@
  9.1753  	  save_CFLAGS="$CFLAGS"
  9.1754  	  LIBS="conftstm.$objext"
  9.1755  	  CFLAGS="$CFLAGS$no_builtin_flag"
  9.1756 -	  if { (eval echo $progname:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  9.1757 +	  if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  9.1758  	    pipe_works=yes
  9.1759  	  else
  9.1760  	    echo "$progname: failed program was:" >&5
  9.1761 @@ -1967,6 +1746,414 @@
  9.1762    global_symbol_to_cdecl=
  9.1763  fi
  9.1764  
  9.1765 +# Check hardcoding attributes.
  9.1766 +echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
  9.1767 +hardcode_action=
  9.1768 +if test -n "$hardcode_libdir_flag_spec" || \
  9.1769 +   test -n "$runpath_var"; then
  9.1770 +
  9.1771 +  # We can hardcode non-existant directories.
  9.1772 +  if test "$hardcode_direct" != no &&
  9.1773 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
  9.1774 +     # have to relink, otherwise we might link with an installed library
  9.1775 +     # when we should be linking with a yet-to-be-installed one
  9.1776 +     ## test "$hardcode_shlibpath_var" != no &&
  9.1777 +     test "$hardcode_minus_L" != no; then
  9.1778 +    # Linking always hardcodes the temporary library directory.
  9.1779 +    hardcode_action=relink
  9.1780 +  else
  9.1781 +    # We can link without hardcoding, and we can hardcode nonexisting dirs.
  9.1782 +    hardcode_action=immediate
  9.1783 +  fi
  9.1784 +else
  9.1785 +  # We cannot hardcode anything, or else we can only hardcode existing
  9.1786 +  # directories.
  9.1787 +  hardcode_action=unsupported
  9.1788 +fi
  9.1789 +echo "$ac_t$hardcode_action" 1>&6
  9.1790 +
  9.1791 +
  9.1792 +reload_flag=
  9.1793 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
  9.1794 +echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
  9.1795 +# PORTME Some linkers may need a different reload flag.
  9.1796 +reload_flag='-r'
  9.1797 +echo "$ac_t$reload_flag" 1>&6
  9.1798 +test -n "$reload_flag" && reload_flag=" $reload_flag"
  9.1799 +
  9.1800 +# PORTME Fill in your ld.so characteristics
  9.1801 +library_names_spec=
  9.1802 +libname_spec='lib$name'
  9.1803 +soname_spec=
  9.1804 +postinstall_cmds=
  9.1805 +postuninstall_cmds=
  9.1806 +finish_cmds=
  9.1807 +finish_eval=
  9.1808 +shlibpath_var=
  9.1809 +shlibpath_overrides_runpath=unknown
  9.1810 +version_type=none
  9.1811 +dynamic_linker="$host_os ld.so"
  9.1812 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
  9.1813 +sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  9.1814 +file_magic_cmd=
  9.1815 +file_magic_test_file=
  9.1816 +deplibs_check_method='unknown'
  9.1817 +# Need to set the preceding variable on all platforms that support
  9.1818 +# interlibrary dependencies.
  9.1819 +# 'none' -- dependencies not supported.
  9.1820 +# `unknown' -- same as none, but documents that we really don't know.
  9.1821 +# 'pass_all' -- all dependencies passed with no checks.
  9.1822 +# 'test_compile' -- check by making test program.
  9.1823 +# 'file_magic [regex]' -- check by looking for files in library path
  9.1824 +# which responds to the $file_magic_cmd with a given egrep regex.
  9.1825 +# If you have `file' or equivalent on your system and you're not sure
  9.1826 +# whether `pass_all' will *always* work, you probably want this one.
  9.1827 +echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
  9.1828 +case "$host_os" in
  9.1829 +aix3*)
  9.1830 +  version_type=linux
  9.1831 +  library_names_spec='${libname}${release}.so$versuffix $libname.a'
  9.1832 +  shlibpath_var=LIBPATH
  9.1833 +
  9.1834 +  # AIX has no versioning support, so we append a major version to the name.
  9.1835 +  soname_spec='${libname}${release}.so$major'
  9.1836 +  ;;
  9.1837 +
  9.1838 +aix4*)
  9.1839 +  version_type=linux
  9.1840 +  # AIX has no versioning support, so currently we can not hardcode correct
  9.1841 +  # soname into executable. Probably we can add versioning support to
  9.1842 +  # collect2, so additional links can be useful in future.
  9.1843 +  # We preserve .a as extension for shared libraries though AIX4.2
  9.1844 +  # and later linker supports .so
  9.1845 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
  9.1846 +  shlibpath_var=LIBPATH
  9.1847 +  deplibs_check_method=pass_all
  9.1848 +  ;;
  9.1849 +
  9.1850 +amigaos*)
  9.1851 +  library_names_spec='$libname.ixlibrary $libname.a'
  9.1852 +  # Create ${libname}_ixlibrary.a entries in /sys/libs.
  9.1853 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
  9.1854 +  ;;
  9.1855 +
  9.1856 +beos*)
  9.1857 +  library_names_spec='${libname}.so'
  9.1858 +  dynamic_linker="$host_os ld.so"
  9.1859 +  shlibpath_var=LIBRARY_PATH
  9.1860 +  deplibs_check_method=pass_all
  9.1861 +  lt_cv_dlopen="load_add_on"
  9.1862 +  lt_cv_dlopen_libs=
  9.1863 +  lt_cv_dlopen_self=yes
  9.1864 +  ;;
  9.1865 +
  9.1866 +bsdi4*)
  9.1867 +  version_type=linux
  9.1868 +  need_version=no
  9.1869 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.1870 +  soname_spec='${libname}${release}.so$major'
  9.1871 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
  9.1872 +  shlibpath_var=LD_LIBRARY_PATH
  9.1873 +  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
  9.1874 +  file_magic_cmd=/usr/bin/file
  9.1875 +  file_magic_test_file=/shlib/libc.so
  9.1876 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
  9.1877 +  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
  9.1878 +  export_dynamic_flag_spec=-rdynamic
  9.1879 +  # the default ld.so.conf also contains /usr/contrib/lib and
  9.1880 +  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
  9.1881 +  # libtool to hard-code these into programs
  9.1882 +  ;;
  9.1883 +
  9.1884 +cygwin* | mingw*)
  9.1885 +  version_type=windows
  9.1886 +  need_version=no
  9.1887 +  need_lib_prefix=no
  9.1888 +  if test "$with_gcc" = yes; then
  9.1889 +    library_names_spec='`echo ${libname} | sed -e 's/^lib//g'`.dll $libname.a'
  9.1890 +  else
  9.1891 +    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
  9.1892 +  fi
  9.1893 +  dynamic_linker='Win32 ld.exe'
  9.1894 +  deplibs_check_method='file_magic file format pe-i386(.*architecture: i386)?'
  9.1895 +  file_magic_cmd='${OBJDUMP} -f'
  9.1896 +  # FIXME: first we should search . and the directory the executable is in
  9.1897 +  shlibpath_var=PATH
  9.1898 +  lt_cv_dlopen="LoadLibrary"
  9.1899 +  lt_cv_dlopen_libs=
  9.1900 +  ;;
  9.1901 +
  9.1902 +freebsd1*)
  9.1903 +  dynamic_linker=no
  9.1904 +  ;;
  9.1905 +  
  9.1906 +freebsd*)
  9.1907 +  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
  9.1908 +  version_type=freebsd-$objformat
  9.1909 +  case "$version_type" in
  9.1910 +    freebsd-elf*)
  9.1911 +      deplibs_check_method='pass_all'
  9.1912 +    
  9.1913 +      file_magic_cmd=/usr/bin/file
  9.1914 +      file_magic_test_file=`echo /usr/lib/libc.so*`
  9.1915 +      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
  9.1916 +      need_version=no
  9.1917 +      need_lib_prefix=no
  9.1918 +      ;;
  9.1919 +    freebsd-*)
  9.1920 +      deplibs_check_method=unknown
  9.1921 +      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
  9.1922 +      need_version=yes
  9.1923 +      ;;
  9.1924 +  esac
  9.1925 +  shlibpath_var=LD_LIBRARY_PATH
  9.1926 +  case "$host_os" in
  9.1927 +  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
  9.1928 +    shlibpath_overrides_runpath=yes
  9.1929 +    ;;
  9.1930 +  *) # from 3.2 on
  9.1931 +    shlibpath_overrides_runpath=no
  9.1932 +    ;;
  9.1933 +  esac
  9.1934 +  ;;
  9.1935 +
  9.1936 +gnu*)
  9.1937 +  version_type=linux
  9.1938 +  need_lib_prefix=no
  9.1939 +  need_version=no
  9.1940 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
  9.1941 +  soname_spec='${libname}${release}.so$major'
  9.1942 +  shlibpath_var=LD_LIBRARY_PATH
  9.1943 +  ;;
  9.1944 +
  9.1945 +hpux9* | hpux10* | hpux11*)
  9.1946 +  # Give a soname corresponding to the major version so that dld.sl refuses to
  9.1947 +  # link against other versions.
  9.1948 +  dynamic_linker="$host_os dld.sl"
  9.1949 +  version_type=sunos
  9.1950 +  need_lib_prefix=no
  9.1951 +  need_version=no
  9.1952 +  shlibpath_var=SHLIB_PATH
  9.1953 +  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
  9.1954 +  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
  9.1955 +  soname_spec='${libname}${release}.sl$major'
  9.1956 +  # HP-UX runs *really* slowly unless shared libraries are mode 555.
  9.1957 +  postinstall_cmds='chmod 555 $lib'
  9.1958 +  case "$host_os" in
  9.1959 +  hpux10.20*)
  9.1960 +    # TODO:  Does this work for hpux-11 too?
  9.1961 +    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
  9.1962 +    file_magic_cmd=/usr/bin/file
  9.1963 +    file_magic_test_file=/usr/lib/libc.sl
  9.1964 +    ;;
  9.1965 +  esac
  9.1966 +  ;;
  9.1967 +
  9.1968 +irix5* | irix6*)
  9.1969 +  version_type=irix
  9.1970 +  need_lib_prefix=no
  9.1971 +  need_version=no
  9.1972 +  soname_spec='${libname}${release}.so.$major'
  9.1973 +  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
  9.1974 +  case "$host_os" in
  9.1975 +  irix5*)
  9.1976 +    libsuff= shlibsuff=
  9.1977 +    # this will be overridden with pass_all, but let us keep it just in case
  9.1978 +    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
  9.1979 +    ;;
  9.1980 +  *)
  9.1981 +    case "$LD" in # libtool.m4 will add one of these switches to LD
  9.1982 +    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
  9.1983 +    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
  9.1984 +    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
  9.1985 +    *) libsuff= shlibsuff= libmagic=never-match;;
  9.1986 +    esac
  9.1987 +    ;;
  9.1988 +  esac
  9.1989 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
  9.1990 +  shlibpath_overrides_runpath=no
  9.1991 +  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
  9.1992 +  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
  9.1993 +  file_magic_cmd=/usr/bin/file
  9.1994 +  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
  9.1995 +  deplibs_check_method='pass_all'
  9.1996 +  ;;
  9.1997 +
  9.1998 +# No shared lib support for Linux oldld, aout, or coff.
  9.1999 +linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
  9.2000 +  dynamic_linker=no
  9.2001 +  ;;
  9.2002 +
  9.2003 +# This must be Linux ELF.
  9.2004 +linux-gnu*)
  9.2005 +  version_type=linux
  9.2006 +  need_lib_prefix=no
  9.2007 +  need_version=no
  9.2008 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2009 +  soname_spec='${libname}${release}.so$major'
  9.2010 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
  9.2011 +  shlibpath_var=LD_LIBRARY_PATH
  9.2012 +  shlibpath_overrides_runpath=no
  9.2013 +  deplibs_check_method=pass_all
  9.2014 +
  9.2015 +  if test -f /lib/ld.so.1; then
  9.2016 +    dynamic_linker='GNU ld.so'
  9.2017 +  else
  9.2018 +    # Only the GNU ld.so supports shared libraries on MkLinux.
  9.2019 +    case "$host_cpu" in
  9.2020 +    powerpc*) dynamic_linker=no ;;
  9.2021 +    *) dynamic_linker='Linux ld.so' ;;
  9.2022 +    esac
  9.2023 +  fi
  9.2024 +  ;;
  9.2025 +
  9.2026 +netbsd*)
  9.2027 +  version_type=sunos
  9.2028 +  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  9.2029 +    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.2030 +    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  9.2031 +    dynamic_linker='NetBSD (a.out) ld.so'
  9.2032 +  else
  9.2033 +    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
  9.2034 +    soname_spec='${libname}${release}.so$major'
  9.2035 +    dynamic_linker='NetBSD ld.elf_so'
  9.2036 +  fi
  9.2037 +  shlibpath_var=LD_LIBRARY_PATH
  9.2038 +  ;;
  9.2039 +
  9.2040 +openbsd*)
  9.2041 +  version_type=sunos
  9.2042 +  if test "$with_gnu_ld" = yes; then
  9.2043 +    need_lib_prefix=no
  9.2044 +    need_version=no
  9.2045 +  fi
  9.2046 +  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.2047 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
  9.2048 +  shlibpath_var=LD_LIBRARY_PATH
  9.2049 +  ;;
  9.2050 +
  9.2051 +os2*)
  9.2052 +  libname_spec='$name'
  9.2053 +  need_lib_prefix=no
  9.2054 +  library_names_spec='$libname.dll $libname.a'
  9.2055 +  dynamic_linker='OS/2 ld.exe'
  9.2056 +  shlibpath_var=LIBPATH
  9.2057 +  ;;
  9.2058 +
  9.2059 +osf3* | osf4* | osf5*)
  9.2060 +  version_type=osf
  9.2061 +  need_version=no
  9.2062 +  soname_spec='${libname}${release}.so'
  9.2063 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
  9.2064 +  shlibpath_var=LD_LIBRARY_PATH
  9.2065 +  # this will be overridden with pass_all, but let us keep it just in case
  9.2066 +  deplibs_check_method='file_magic COFF format alpha shared library'
  9.2067 +  file_magic_cmd=/usr/bin/file
  9.2068 +  file_magic_test_file=/shlib/libc.so
  9.2069 +  deplibs_check_method='pass_all'
  9.2070 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
  9.2071 +  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
  9.2072 +  ;;
  9.2073 +
  9.2074 +rhapsody*)
  9.2075 +  version_type=sunos
  9.2076 +  library_names_spec='${libname}.so'
  9.2077 +  soname_spec='${libname}.so'
  9.2078 +  shlibpath_var=DYLD_LIBRARY_PATH
  9.2079 +  deplibs_check_method=pass_all
  9.2080 +  ;;
  9.2081 +
  9.2082 +sco3.2v5*)
  9.2083 +  version_type=osf
  9.2084 +  soname_spec='${libname}${release}.so$major'
  9.2085 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2086 +  shlibpath_var=LD_LIBRARY_PATH
  9.2087 +  ;;
  9.2088 +
  9.2089 +solaris*)
  9.2090 +  version_type=linux
  9.2091 +  need_lib_prefix=no
  9.2092 +  need_version=no
  9.2093 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2094 +  soname_spec='${libname}${release}.so$major'
  9.2095 +  shlibpath_var=LD_LIBRARY_PATH
  9.2096 +  shlibpath_overrides_runpath=yes
  9.2097 +  # ldd complains unless libraries are executable
  9.2098 +  postinstall_cmds='chmod +x $lib'
  9.2099 +  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
  9.2100 +  file_magic_cmd=/usr/bin/file
  9.2101 +  file_magic_test_file=/lib/libc.so
  9.2102 +  ;;
  9.2103 +
  9.2104 +sunos4*)
  9.2105 +  version_type=sunos
  9.2106 +  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
  9.2107 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
  9.2108 +  shlibpath_var=LD_LIBRARY_PATH
  9.2109 +  shlibpath_overrides_runpath=yes
  9.2110 +  if test "$with_gnu_ld" = yes; then
  9.2111 +    need_lib_prefix=no
  9.2112 +  fi
  9.2113 +  need_version=yes
  9.2114 +  ;;
  9.2115 +
  9.2116 +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
  9.2117 +  version_type=linux
  9.2118 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2119 +  soname_spec='${libname}${release}.so$major'
  9.2120 +  shlibpath_var=LD_LIBRARY_PATH
  9.2121 +  case "$host_vendor" in
  9.2122 +    sequent)
  9.2123 +      file_magic_cmd='/bin/file'
  9.2124 +      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
  9.2125 +      ;;
  9.2126 +    ncr)
  9.2127 +      deplibs_check_method='pass_all'
  9.2128 +      ;;
  9.2129 +    motorola)
  9.2130 +      need_lib_prefix=no
  9.2131 +      need_version=no
  9.2132 +      shlibpath_overrides_runpath=no
  9.2133 +      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
  9.2134 +      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
  9.2135 +      file_magic_cmd=/usr/bin/file
  9.2136 +      file_magic_test_file=`echo /usr/lib/libc.so*`
  9.2137 +      ;;
  9.2138 +  esac
  9.2139 +  ;;
  9.2140 +
  9.2141 +uts4*)
  9.2142 +  version_type=linux
  9.2143 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2144 +  soname_spec='${libname}${release}.so$major'
  9.2145 +  shlibpath_var=LD_LIBRARY_PATH
  9.2146 +  ;;
  9.2147 +
  9.2148 +dgux*)
  9.2149 +  version_type=linux
  9.2150 +  need_lib_prefix=no
  9.2151 +  need_version=no
  9.2152 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
  9.2153 +  soname_spec='${libname}${release}.so$major'
  9.2154 +  shlibpath_var=LD_LIBRARY_PATH
  9.2155 +  ;;
  9.2156 +
  9.2157 +sysv4*MP*)
  9.2158 +  if test -d /usr/nec ;then
  9.2159 +    version_type=linux
  9.2160 +    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
  9.2161 +    soname_spec='$libname.so.$major'
  9.2162 +    shlibpath_var=LD_LIBRARY_PATH
  9.2163 +  fi
  9.2164 +  ;;
  9.2165 +
  9.2166 +*)
  9.2167 +  dynamic_linker=no
  9.2168 +  ;;
  9.2169 +esac
  9.2170 +echo "$ac_t$dynamic_linker" 1>&6
  9.2171 +test "$dynamic_linker" = no && can_build_shared=no
  9.2172 +
  9.2173  # Report the final consequences.
  9.2174  echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
  9.2175  
  9.2176 @@ -1981,7 +2168,7 @@
  9.2177  ;;
  9.2178  esac
  9.2179  
  9.2180 -if test -n "$file_magic_test_file"; then
  9.2181 +if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
  9.2182    case "$deplibs_check_method" in
  9.2183    "file_magic "*)
  9.2184      file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
  9.2185 @@ -2031,7 +2218,7 @@
  9.2186  
  9.2187  echo "checking whether to build static libraries... $enable_static" 1>&6
  9.2188  
  9.2189 -if test "$hardcode_action" = relink || test "$hardcode_into_libs" = yes; then
  9.2190 +if test "$hardcode_action" = relink; then
  9.2191    # Fast installation is not supported
  9.2192    enable_fast_install=no
  9.2193  elif test "$shlibpath_overrides_runpath" = yes ||
  9.2194 @@ -2040,75 +2227,81 @@
  9.2195    enable_fast_install=needless
  9.2196  fi
  9.2197  
  9.2198 -# Check whether we must set pic_mode to default
  9.2199 -test -z "$pic_flag" && pic_mode=default
  9.2200 -# On Cygwin there's no "real" PIC flag so we must build both object types
  9.2201 -case "$host_os" in
  9.2202 -cygwin* | mingw* | os2*)
  9.2203 -  pic_mode=default
  9.2204 -  ;;
  9.2205 -esac
  9.2206 -if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
  9.2207 -  # non-PIC code in shared libraries is not supported
  9.2208 -  pic_mode=default
  9.2209 +echo $ac_n "checking for objdir... $ac_c" 1>&6
  9.2210 +rm -f .libs 2>/dev/null
  9.2211 +mkdir .libs 2>/dev/null
  9.2212 +if test -d .libs; then
  9.2213 +  objdir=.libs
  9.2214 +else
  9.2215 +  # MS-DOS does not allow filenames that begin with a dot.
  9.2216 +  objdir=_libs
  9.2217  fi
  9.2218 +rmdir .libs 2>/dev/null
  9.2219 +echo "$ac_t$objdir" 1>&6
  9.2220  
  9.2221  if test "x$enable_dlopen" != xyes; then
  9.2222    enable_dlopen=unknown
  9.2223    enable_dlopen_self=unknown
  9.2224    enable_dlopen_self_static=unknown
  9.2225  else
  9.2226 -if test "X${lt_cv_dlopen+set}" != Xset; then
  9.2227 +if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
  9.2228    lt_cv_dlopen=no lt_cv_dlopen_libs=
  9.2229  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
  9.2230 -echo "$progname:2062: checking for dlopen in -ldl" >&5
  9.2231 -if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then
  9.2232 +echo "$progname:2248: checking for dlopen in -ldl" >&5
  9.2233 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  9.2234 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  9.2235    echo $ac_n "(cached) $ac_c" 1>&6
  9.2236  else
  9.2237    ac_save_LIBS="$LIBS"
  9.2238  LIBS="-ldl  $LIBS"
  9.2239  cat > conftest.$ac_ext <<EOF
  9.2240 -#line 2069 "ltconfig"
  9.2241 +#line 2256 "ltconfig"
  9.2242  /* Override any gcc2 internal prototype to avoid an error.  */
  9.2243  /* We use char because int might match the return type of a gcc2
  9.2244      builtin and then its argument prototype would still apply.  */
  9.2245 +#ifdef __cplusplus
  9.2246 +extern "C"
  9.2247 +#endif
  9.2248  char dlopen();
  9.2249  
  9.2250  int main() {
  9.2251  dlopen()
  9.2252  ; return 0; }
  9.2253  EOF
  9.2254 -if { (eval echo $progname:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2255 +if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2256    rm -rf conftest*
  9.2257 -  ac_cv_lib_dl_dlopen=yes
  9.2258 +  eval "ac_cv_lib_$ac_lib_var=yes"
  9.2259  else
  9.2260    echo "$progname: failed program was:" >&5
  9.2261    cat conftest.$ac_ext >&5
  9.2262    rm -rf conftest*
  9.2263 -  ac_cv_lib_dl_dlopen=no
  9.2264 +  eval "ac_cv_lib_$ac_lib_var=no"
  9.2265  fi
  9.2266  rm -f conftest*
  9.2267  LIBS="$ac_save_LIBS"
  9.2268  
  9.2269  fi
  9.2270 -if test "X$ac_cv_lib_dl_dlopen" = Xyes; then
  9.2271 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  9.2272    echo "$ac_t""yes" 1>&6
  9.2273    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  9.2274  else
  9.2275    echo "$ac_t""no" 1>&6
  9.2276  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
  9.2277 -echo "$progname:2098: checking for dlopen" >&5
  9.2278 -if test "X${ac_cv_func_dlopen+set}" = Xset; then
  9.2279 +echo "$progname:2288: checking for dlopen" >&5
  9.2280 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
  9.2281    echo $ac_n "(cached) $ac_c" 1>&6
  9.2282  else
  9.2283    cat > conftest.$ac_ext <<EOF
  9.2284 -#line 2103 "ltconfig"
  9.2285 +#line 2293 "ltconfig"
  9.2286  /* System header to define __stub macros and hopefully few prototypes,
  9.2287      which can conflict with char dlopen(); below.  */
  9.2288  #include <assert.h>
  9.2289  /* Override any gcc2 internal prototype to avoid an error.  */
  9.2290  /* We use char because int might match the return type of a gcc2
  9.2291      builtin and then its argument prototype would still apply.  */
  9.2292 +#ifdef __cplusplus
  9.2293 +extern "C"
  9.2294 +#endif
  9.2295  char dlopen();
  9.2296  
  9.2297  int main() {
  9.2298 @@ -2124,71 +2317,78 @@
  9.2299  
  9.2300  ; return 0; }
  9.2301  EOF
  9.2302 -if { (eval echo $progname:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2303 +if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2304    rm -rf conftest*
  9.2305 -  ac_cv_func_dlopen=yes
  9.2306 +  eval "ac_cv_func_dlopen=yes"
  9.2307  else
  9.2308    echo "$progname: failed program was:" >&5
  9.2309    cat conftest.$ac_ext >&5
  9.2310    rm -rf conftest*
  9.2311 -  ac_cv_func_dlopen=no
  9.2312 +  eval "ac_cv_func_dlopen=no"
  9.2313  fi
  9.2314  rm -f conftest*
  9.2315  fi
  9.2316 -if test "X$ac_cv_func_dlopen" = Xyes; then
  9.2317 +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
  9.2318    echo "$ac_t""yes" 1>&6
  9.2319    lt_cv_dlopen="dlopen"
  9.2320  else
  9.2321    echo "$ac_t""no" 1>&6
  9.2322  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
  9.2323 -echo "$progname:2142: checking for dld_link in -ldld" >&5
  9.2324 -if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then
  9.2325 +echo "$progname:2335: checking for dld_link in -ldld" >&5
  9.2326 +ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
  9.2327 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  9.2328    echo $ac_n "(cached) $ac_c" 1>&6
  9.2329  else
  9.2330    ac_save_LIBS="$LIBS"
  9.2331  LIBS="-ldld  $LIBS"
  9.2332  cat > conftest.$ac_ext <<EOF
  9.2333 -#line 2149 "ltconfig"
  9.2334 +#line 2343 "ltconfig"
  9.2335  /* Override any gcc2 internal prototype to avoid an error.  */
  9.2336  /* We use char because int might match the return type of a gcc2
  9.2337      builtin and then its argument prototype would still apply.  */
  9.2338 +#ifdef __cplusplus
  9.2339 +extern "C"
  9.2340 +#endif
  9.2341  char dld_link();
  9.2342  
  9.2343  int main() {
  9.2344  dld_link()
  9.2345  ; return 0; }
  9.2346  EOF
  9.2347 -if { (eval echo $progname:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2348 +if { (eval echo $progname:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2349    rm -rf conftest*
  9.2350 -  ac_cv_lib_dld_dld_link=yes
  9.2351 +  eval "ac_cv_lib_$ac_lib_var=yes"
  9.2352  else
  9.2353    echo "$progname: failed program was:" >&5
  9.2354    cat conftest.$ac_ext >&5
  9.2355    rm -rf conftest*
  9.2356 -  ac_cv_lib_dld_dld_link=no
  9.2357 +  eval "ac_cv_lib_$ac_lib_var=no"
  9.2358  fi
  9.2359  rm -f conftest*
  9.2360  LIBS="$ac_save_LIBS"
  9.2361  
  9.2362  fi
  9.2363 -if test "X$ac_cv_lib_dld_dld_link" = Xyes; then
  9.2364 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  9.2365    echo "$ac_t""yes" 1>&6
  9.2366    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  9.2367  else
  9.2368    echo "$ac_t""no" 1>&6
  9.2369  echo $ac_n "checking for shl_load""... $ac_c" 1>&6
  9.2370 -echo "$progname:2178: checking for shl_load" >&5
  9.2371 -if test "X${ac_cv_func_shl_load+set}" = Xset; then
  9.2372 +echo "$progname:2375: checking for shl_load" >&5
  9.2373 +if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
  9.2374    echo $ac_n "(cached) $ac_c" 1>&6
  9.2375  else
  9.2376    cat > conftest.$ac_ext <<EOF
  9.2377 -#line 2183 "ltconfig"
  9.2378 +#line 2380 "ltconfig"
  9.2379  /* System header to define __stub macros and hopefully few prototypes,
  9.2380      which can conflict with char shl_load(); below.  */
  9.2381  #include <assert.h>
  9.2382  /* Override any gcc2 internal prototype to avoid an error.  */
  9.2383  /* We use char because int might match the return type of a gcc2
  9.2384      builtin and then its argument prototype would still apply.  */
  9.2385 +#ifdef __cplusplus
  9.2386 +extern "C"
  9.2387 +#endif
  9.2388  char shl_load();
  9.2389  
  9.2390  int main() {
  9.2391 @@ -2204,56 +2404,60 @@
  9.2392  
  9.2393  ; return 0; }
  9.2394  EOF
  9.2395 -if { (eval echo $progname:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2396 +if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2397    rm -rf conftest*
  9.2398 -  ac_cv_func_shl_load=yes
  9.2399 +  eval "ac_cv_func_shl_load=yes"
  9.2400  else
  9.2401    echo "$progname: failed program was:" >&5
  9.2402    cat conftest.$ac_ext >&5
  9.2403    rm -rf conftest*
  9.2404 -  ac_cv_func_shl_load=no
  9.2405 +  eval "ac_cv_func_shl_load=no"
  9.2406  fi
  9.2407  rm -f conftest*
  9.2408  fi
  9.2409  
  9.2410 -if test "X$ac_cv_func_shl_load" = Xyes; then
  9.2411 +if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
  9.2412    echo "$ac_t""yes" 1>&6
  9.2413    lt_cv_dlopen="shl_load"
  9.2414  else
  9.2415    echo "$ac_t""no" 1>&6
  9.2416  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
  9.2417 -echo "$progname:2223: checking for shl_load in -ldld" >&5
  9.2418 -if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then
  9.2419 +echo "$progname:2423: checking for shl_load in -ldld" >&5
  9.2420 +ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
  9.2421 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  9.2422    echo $ac_n "(cached) $ac_c" 1>&6
  9.2423  else
  9.2424    ac_save_LIBS="$LIBS"
  9.2425  LIBS="-ldld  $LIBS"
  9.2426  cat > conftest.$ac_ext <<EOF
  9.2427 -#line 2230 "ltconfig"
  9.2428 +#line 2431 "ltconfig"
  9.2429  #include "confdefs.h"
  9.2430  /* Override any gcc2 internal prototype to avoid an error.  */
  9.2431  /* We use char because int might match the return type of a gcc2
  9.2432      builtin and then its argument prototype would still apply.  */
  9.2433 +#ifdef __cplusplus
  9.2434 +extern "C"
  9.2435 +#endif
  9.2436  char shl_load();
  9.2437  
  9.2438  int main() {
  9.2439  shl_load()
  9.2440  ; return 0; }
  9.2441  EOF
  9.2442 -if { (eval echo $progname:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2443 +if { (eval echo $progname:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  9.2444    rm -rf conftest*
  9.2445 -  ac_cv_lib_dld_shl_load=yes
  9.2446 +  eval "ac_cv_lib_$ac_lib_var=yes"
  9.2447  else
  9.2448    echo "$progname: failed program was:" >&5
  9.2449    cat conftest.$ac_ext >&5
  9.2450    rm -rf conftest*
  9.2451 -  ac_cv_lib_dld_shl_load=no
  9.2452 +  eval "ac_cv_lib_$ac_lib_var=no"
  9.2453  fi
  9.2454  rm -f conftest*
  9.2455  LIBS="$ac_save_LIBS"
  9.2456  
  9.2457  fi
  9.2458 -if test "X$ac_cv_lib_dld_shl_load" = Xyes; then
  9.2459 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  9.2460    echo "$ac_t""yes" 1>&6
  9.2461    lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
  9.2462  else
  9.2463 @@ -2283,17 +2487,17 @@
  9.2464  for ac_hdr in dlfcn.h; do
  9.2465  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  9.2466  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  9.2467 -echo "$progname:2284: checking for $ac_hdr" >&5
  9.2468 -if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then
  9.2469 +echo "$progname:2488: checking for $ac_hdr" >&5
  9.2470 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  9.2471    echo $ac_n "(cached) $ac_c" 1>&6
  9.2472  else
  9.2473    cat > conftest.$ac_ext <<EOF
  9.2474 -#line 2289 "ltconfig"
  9.2475 +#line 2493 "ltconfig"
  9.2476  #include <$ac_hdr>
  9.2477  int fnord = 0;
  9.2478  EOF
  9.2479 -ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
  9.2480 -{ (eval echo $progname:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  9.2481 +ac_try="$ac_compile >/dev/null 2>conftest.out"
  9.2482 +{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  9.2483  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  9.2484  if test -z "$ac_err"; then
  9.2485    rm -rf conftest*
  9.2486 @@ -2321,15 +2525,15 @@
  9.2487      LIBS="$lt_cv_dlopen_libs $LIBS"
  9.2488  
  9.2489    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
  9.2490 -echo "$progname:2322: checking whether a program can dlopen itself" >&5
  9.2491 -if test "X${lt_cv_dlopen_self+set}" = Xset; then
  9.2492 +echo "$progname:2526: checking whether a program can dlopen itself" >&5
  9.2493 +if test "${lt_cv_dlopen_self+set}" = set; then
  9.2494    echo $ac_n "(cached) $ac_c" 1>&6
  9.2495  else
  9.2496    if test "$cross_compiling" = yes; then
  9.2497      lt_cv_dlopen_self=cross
  9.2498    else
  9.2499      cat > conftest.c <<EOF
  9.2500 -#line 2330 "ltconfig"
  9.2501 +#line 2534 "ltconfig"
  9.2502  
  9.2503  #if HAVE_DLFCN_H
  9.2504  #include <dlfcn.h>
  9.2505 @@ -2375,7 +2579,7 @@
  9.2506  	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
  9.2507  
  9.2508  EOF
  9.2509 -if { (eval echo $progname:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  9.2510 +if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  9.2511  then
  9.2512    lt_cv_dlopen_self=yes
  9.2513  else
  9.2514 @@ -2394,15 +2598,15 @@
  9.2515    if test "$lt_cv_dlopen_self" = yes; then
  9.2516      LDFLAGS="$LDFLAGS $link_static_flag"
  9.2517    echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
  9.2518 -echo "$progname:2395: checking whether a statically linked program can dlopen itself" >&5
  9.2519 -if test "X${lt_cv_dlopen_self_static+set}" = Xset; then
  9.2520 +echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5
  9.2521 +if test "${lt_cv_dlopen_self_static+set}" = set; then
  9.2522    echo $ac_n "(cached) $ac_c" 1>&6
  9.2523  else
  9.2524    if test "$cross_compiling" = yes; then
  9.2525      lt_cv_dlopen_self_static=cross
  9.2526    else
  9.2527      cat > conftest.c <<EOF
  9.2528 -#line 2403 "ltconfig"
  9.2529 +#line 2607 "ltconfig"
  9.2530  
  9.2531  #if HAVE_DLFCN_H
  9.2532  #include <dlfcn.h>
  9.2533 @@ -2448,7 +2652,7 @@
  9.2534      if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
  9.2535  
  9.2536  EOF
  9.2537 -if { (eval echo $progname:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  9.2538 +if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  9.2539  then
  9.2540    lt_cv_dlopen_self_static=yes
  9.2541  else
  9.2542 @@ -2501,10 +2705,8 @@
  9.2543      thread_safe_flag_spec whole_archive_flag_spec libname_spec \
  9.2544      library_names_spec soname_spec \
  9.2545      RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
  9.2546 -    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
  9.2547 -    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
  9.2548 -    old_striplib striplib file_magic_cmd export_symbols_cmds \
  9.2549 -    deplibs_check_method allow_undefined_flag no_undefined_flag \
  9.2550 +    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
  9.2551 +    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
  9.2552      finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
  9.2553      hardcode_libdir_flag_spec hardcode_libdir_separator  \
  9.2554      sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
  9.2555 @@ -2514,7 +2716,6 @@
  9.2556      reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
  9.2557      old_postinstall_cmds | old_postuninstall_cmds | \
  9.2558      export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
  9.2559 -    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
  9.2560      postinstall_cmds | postuninstall_cmds | \
  9.2561      finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
  9.2562        # Double-quote double-evaled strings.
  9.2563 @@ -2675,7 +2876,6 @@
  9.2564  
  9.2565  # Additional compiler flags for building library objects.
  9.2566  pic_flag=$pic_flag
  9.2567 -pic_mode=$pic_mode
  9.2568  
  9.2569  # Does compiler simultaneously support -c and -o options?
  9.2570  compiler_c_o=$compiler_c_o
  9.2571 @@ -2738,19 +2938,12 @@
  9.2572  # Create an old-style archive from a shared archive.
  9.2573  old_archive_from_new_cmds=$old_archive_from_new_cmds
  9.2574  
  9.2575 -# Create a temporary old-style archive to link instead of a shared archive.
  9.2576 -old_archive_from_expsyms_cmds=$old_archive_from_expsyms_cmds
  9.2577 -
  9.2578  # Commands used to build and install a shared archive.
  9.2579  archive_cmds=$archive_cmds
  9.2580  archive_expsym_cmds=$archive_expsym_cmds
  9.2581  postinstall_cmds=$postinstall_cmds
  9.2582  postuninstall_cmds=$postuninstall_cmds
  9.2583  
  9.2584 -# Commands to strip libraries.
  9.2585 -old_striplib=$old_striplib
  9.2586 -striplib=$striplib
  9.2587 -
  9.2588  # Method to check whether dependent libraries are shared objects.
  9.2589  deplibs_check_method=$deplibs_check_method
  9.2590  
  9.2591 @@ -2787,9 +2980,6 @@
  9.2592  # How to hardcode a shared library path into an executable.
  9.2593  hardcode_action=$hardcode_action
  9.2594  
  9.2595 -# Whether we should hardcode library paths into libraries.
  9.2596 -hardcode_into_libs=$hardcode_into_libs
  9.2597 -
  9.2598  # Flag to hardcode \$libdir into a binary during linking.
  9.2599  # This must work even if \$libdir does not exist.
  9.2600  hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
  9.2601 @@ -2809,9 +2999,6 @@
  9.2602  # the resulting binary.
  9.2603  hardcode_shlibpath_var=$hardcode_shlibpath_var
  9.2604  
  9.2605 -# Whether libtool must link a program against all its dependency libraries.
  9.2606 -link_all_deplibs=$link_all_deplibs
  9.2607 -
  9.2608  # Compile-time system search path for libraries
  9.2609  sys_lib_search_path_spec=$sys_lib_search_path_spec
  9.2610  
  9.2611 @@ -2827,9 +3014,6 @@
  9.2612  # The commands to list exported symbols.
  9.2613  export_symbols_cmds=$export_symbols_cmds
  9.2614  
  9.2615 -# The commands to extract the exported symbol list from a shared archive.
  9.2616 -extract_expsyms_cmds=$extract_expsyms_cmds
  9.2617 -
  9.2618  # Symbols that should not be listed in the preloaded symbols.
  9.2619  exclude_expsyms=$exclude_expsyms
  9.2620  
  9.2621 @@ -2856,186 +3040,6 @@
  9.2622  EOF
  9.2623      ;;
  9.2624    esac
  9.2625 -  case "$host" in
  9.2626 -  *-*-cygwin* | *-*-mingw* | *-*-os2*)
  9.2627 -    cat <<'EOF' >> "$ofile"
  9.2628 -      # This is a source program that is used to create dlls on Windows
  9.2629 -      # Don't remove nor modify the starting and closing comments
  9.2630 -# /* ltdll.c starts here */
  9.2631 -# #define WIN32_LEAN_AND_MEAN
  9.2632 -# #include <windows.h>
  9.2633 -# #undef WIN32_LEAN_AND_MEAN
  9.2634 -# #include <stdio.h>
  9.2635 -#
  9.2636 -# #ifndef __CYGWIN__
  9.2637 -# #  ifdef __CYGWIN32__
  9.2638 -# #    define __CYGWIN__ __CYGWIN32__
  9.2639 -# #  endif
  9.2640 -# #endif
  9.2641 -#
  9.2642 -# #ifdef __cplusplus
  9.2643 -# extern "C" {
  9.2644 -# #endif
  9.2645 -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
  9.2646 -# #ifdef __cplusplus
  9.2647 -# }
  9.2648 -# #endif
  9.2649 -#
  9.2650 -# #ifdef __CYGWIN__
  9.2651 -# #include <cygwin/cygwin_dll.h>
  9.2652 -# DECLARE_CYGWIN_DLL( DllMain );
  9.2653 -# #endif
  9.2654 -# HINSTANCE __hDllInstance_base;
  9.2655 -#
  9.2656 -# BOOL APIENTRY
  9.2657 -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
  9.2658 -# {
  9.2659 -#   __hDllInstance_base = hInst;
  9.2660 -#   return TRUE;
  9.2661 -# }
  9.2662 -# /* ltdll.c ends here */
  9.2663 -      # This is a source program that is used to create import libraries
  9.2664 -      # on Windows for dlls which lack them. Don't remove nor modify the
  9.2665 -      # starting and closing comments
  9.2666 -# /* impgen.c starts here */
  9.2667 -# /*   Copyright (C) 1999 Free Software Foundation, Inc.
  9.2668 -# 
  9.2669 -#  This file is part of GNU libtool.
  9.2670 -# 
  9.2671 -#  This program is free software; you can redistribute it and/or modify
  9.2672 -#  it under the terms of the GNU General Public License as published by
  9.2673 -#  the Free Software Foundation; either version 2 of the License, or
  9.2674 -#  (at your option) any later version.
  9.2675 -# 
  9.2676 -#  This program is distributed in the hope that it will be useful,
  9.2677 -#  but WITHOUT ANY WARRANTY; without even the implied warranty of
  9.2678 -#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  9.2679 -#  GNU General Public License for more details.
  9.2680 -# 
  9.2681 -#  You should have received a copy of the GNU General Public License
  9.2682 -#  along with this program; if not, write to the Free Software
  9.2683 -#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  9.2684 -#  */
  9.2685 -# 
  9.2686 -#  #include <stdio.h>		/* for printf() */
  9.2687 -#  #include <unistd.h>		/* for open(), lseek(), read() */
  9.2688 -#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
  9.2689 -#  #include <string.h>		/* for strdup() */
  9.2690 -# 
  9.2691 -#  /* O_BINARY isn't required (or even defined sometimes) under Unix */
  9.2692 -#  #ifndef O_BINARY
  9.2693 -#  #define O_BINARY 0
  9.2694 -#  #endif
  9.2695 -#
  9.2696 -#  static unsigned int
  9.2697 -#  pe_get16 (fd, offset)
  9.2698 -#       int fd;
  9.2699 -#       int offset;
  9.2700 -#  {
  9.2701 -#    unsigned char b[2];
  9.2702 -#    lseek (fd, offset, SEEK_SET);
  9.2703 -#    read (fd, b, 2);
  9.2704 -#    return b[0] + (b[1]<<8);
  9.2705 -#  }
  9.2706 -# 
  9.2707 -#  static unsigned int
  9.2708 -#  pe_get32 (fd, offset)
  9.2709 -#      int fd;
  9.2710 -#      int offset;
  9.2711 -#  {
  9.2712 -#    unsigned char b[4];
  9.2713 -#    lseek (fd, offset, SEEK_SET);
  9.2714 -#    read (fd, b, 4);
  9.2715 -#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
  9.2716 -#  }
  9.2717 -# 
  9.2718 -#  static unsigned int
  9.2719 -#  pe_as32 (ptr)
  9.2720 -#       void *ptr;
  9.2721 -#  {
  9.2722 -#    unsigned char *b = ptr;
  9.2723 -#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
  9.2724 -#  }
  9.2725 -# 
  9.2726 -#  int
  9.2727 -#  main (argc, argv)
  9.2728 -#      int argc;
  9.2729 -#      char *argv[];
  9.2730 -#  {
  9.2731 -#      int dll;
  9.2732 -#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
  9.2733 -#      unsigned long export_rva, export_size, nsections, secptr, expptr;
  9.2734 -#      unsigned long name_rvas, nexp;
  9.2735 -#      unsigned char *expdata, *erva;
  9.2736 -#      char *filename, *dll_name;
  9.2737 -# 
  9.2738 -#      filename = argv[1];
  9.2739 -# 
  9.2740 -#      dll = open(filename, O_RDONLY|O_BINARY);
  9.2741 -#      if (!dll)
  9.2742 -#  	return 1;
  9.2743 -# 
  9.2744 -#      dll_name = filename;
  9.2745 -#    
  9.2746 -#      for (i=0; filename[i]; i++)
  9.2747 -#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
  9.2748 -#  	    dll_name = filename + i +1;
  9.2749 -# 
  9.2750 -#      pe_header_offset = pe_get32 (dll, 0x3c);
  9.2751 -#      opthdr_ofs = pe_header_offset + 4 + 20;
  9.2752 -#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
  9.2753 -# 
  9.2754 -#      if (num_entries < 1) /* no exports */
  9.2755 -#  	return 1;
  9.2756 -# 
  9.2757 -#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
  9.2758 -#      export_size = pe_get32 (dll, opthdr_ofs + 100);
  9.2759 -#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
  9.2760 -#      secptr = (pe_header_offset + 4 + 20 +
  9.2761 -#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
  9.2762 -# 
  9.2763 -#      expptr = 0;
  9.2764 -#      for (i = 0; i < nsections; i++)
  9.2765 -#      {
  9.2766 -#  	char sname[8];
  9.2767 -#  	unsigned long secptr1 = secptr + 40 * i;
  9.2768 -#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
  9.2769 -#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
  9.2770 -#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
  9.2771 -#  	lseek(dll, secptr1, SEEK_SET);
  9.2772 -#  	read(dll, sname, 8);
  9.2773 -#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
  9.2774 -#  	{
  9.2775 -#  	    expptr = fptr + (export_rva - vaddr);
  9.2776 -#  	    if (export_rva + export_size > vaddr + vsize)
  9.2777 -#  		export_size = vsize - (export_rva - vaddr);
  9.2778 -#  	    break;
  9.2779 -#  	}
  9.2780 -#      }
  9.2781 -# 
  9.2782 -#      expdata = (unsigned char*)malloc(export_size);
  9.2783 -#      lseek (dll, expptr, SEEK_SET);
  9.2784 -#      read (dll, expdata, export_size);
  9.2785 -#      erva = expdata - export_rva;
  9.2786 -# 
  9.2787 -#      nexp = pe_as32 (expdata+24);
  9.2788 -#      name_rvas = pe_as32 (expdata+32);
  9.2789 -# 
  9.2790 -#      printf ("EXPORTS\n");
  9.2791 -#      for (i = 0; i<nexp; i++)
  9.2792 -#      {
  9.2793 -#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
  9.2794 -#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
  9.2795 -#      }
  9.2796 -# 
  9.2797 -#      return 0;
  9.2798 -#  }
  9.2799 -# /* impgen.c ends here */
  9.2800 -
  9.2801 -EOF
  9.2802 -    ;;
  9.2803 -  esac
  9.2804 -
  9.2805  
  9.2806    # Append the ltmain.sh script.
  9.2807    sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
    10.1 --- a/ltmain.sh	Thu Aug 10 06:06:57 2000 +0000
    10.2 +++ b/ltmain.sh	Thu Aug 10 06:12:39 2000 +0000
    10.3 @@ -54,8 +54,8 @@
    10.4  # Constants.
    10.5  PROGRAM=ltmain.sh
    10.6  PACKAGE=libtool
    10.7 -VERSION=1.3c
    10.8 -TIMESTAMP=" (1.620 1999/10/07 15:40:07)"
    10.9 +VERSION=1.3.5
   10.10 +TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
   10.11  
   10.12  default_mode=
   10.13  help="Try \`$progname --help' for more information."
   10.14 @@ -434,13 +434,8 @@
   10.15        # Without this assignment, base_compile gets emptied.
   10.16        fbsd_hideous_sh_bug=$base_compile
   10.17  
   10.18 -      if test "$pic_mode" != no; then
   10.19 -	# All platforms use -DPIC, to notify preprocessed assembler code.
   10.20 -	command="$base_compile $pic_flag -DPIC $srcfile"
   10.21 -      else
   10.22 -	# Don't build PIC code
   10.23 -	command="$base_compile $srcfile"
   10.24 -      fi
   10.25 +      # All platforms use -DPIC, to notify preprocessed assembler code.
   10.26 +      command="$base_compile $srcfile $pic_flag -DPIC"
   10.27        if test "$build_old_libs" = yes; then
   10.28  	lo_libobj="$libobj"
   10.29  	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
   10.30 @@ -511,8 +506,7 @@
   10.31        fi
   10.32  
   10.33        # If we have no pic_flag, then copy the object into place and finish.
   10.34 -      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
   10.35 -	 test "$build_old_libs" = yes; then
   10.36 +      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
   10.37  	# Rename the .lo from within objdir to obj
   10.38  	if test -f $obj; then
   10.39  	  $show $rm $obj
   10.40 @@ -552,13 +546,7 @@
   10.41  
   10.42      # Only build a position-dependent object if we build old libraries.
   10.43      if test "$build_old_libs" = yes; then
   10.44 -      if test "$pic_mode" != yes; then
   10.45 -	# Don't build PIC code
   10.46 -	command="$base_compile $srcfile"
   10.47 -      else
   10.48 -	# All platforms use -DPIC, to notify preprocessed assembler code.
   10.49 -	command="$base_compile $pic_flag -DPIC $srcfile"
   10.50 -      fi
   10.51 +      command="$base_compile $srcfile"
   10.52        if test "$compiler_c_o" = yes; then
   10.53  	command="$command -o $obj"
   10.54  	output_obj="$obj"
   10.55 @@ -631,10 +619,8 @@
   10.56      ;;
   10.57  
   10.58    # libtool link mode
   10.59 -  link | relink)
   10.60 +  link)
   10.61      modename="$modename: link"
   10.62 -    relink=no
   10.63 -    test "$mode" = "relink" && relink=yes
   10.64      case "$host" in
   10.65      *-*-cygwin* | *-*-mingw* | *-*-os2*)
   10.66        # It is impossible to link a dll without this setting, and
   10.67 @@ -649,12 +635,179 @@
   10.68        # -no-undefined on the libtool link line when we can be certain
   10.69        # that all symbols are satisfied, otherwise we get a static library.
   10.70        allow_undefined=yes
   10.71 +
   10.72 +      # This is a source program that is used to create dlls on Windows
   10.73 +      # Don't remove nor modify the starting and closing comments
   10.74 +# /* ltdll.c starts here */
   10.75 +# #define WIN32_LEAN_AND_MEAN
   10.76 +# #include <windows.h>
   10.77 +# #undef WIN32_LEAN_AND_MEAN
   10.78 +# #include <stdio.h>
   10.79 +#
   10.80 +# #ifndef __CYGWIN__
   10.81 +# #  ifdef __CYGWIN32__
   10.82 +# #    define __CYGWIN__ __CYGWIN32__
   10.83 +# #  endif
   10.84 +# #endif
   10.85 +#
   10.86 +# #ifdef __cplusplus
   10.87 +# extern "C" {
   10.88 +# #endif
   10.89 +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
   10.90 +# #ifdef __cplusplus
   10.91 +# }
   10.92 +# #endif
   10.93 +#
   10.94 +# #ifdef __CYGWIN__
   10.95 +# #include <cygwin/cygwin_dll.h>
   10.96 +# DECLARE_CYGWIN_DLL( DllMain );
   10.97 +# #endif
   10.98 +# HINSTANCE __hDllInstance_base;
   10.99 +#
  10.100 +# BOOL APIENTRY
  10.101 +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
  10.102 +# {
  10.103 +#   __hDllInstance_base = hInst;
  10.104 +#   return TRUE;
  10.105 +# }
  10.106 +# /* ltdll.c ends here */
  10.107 +      # This is a source program that is used to create import libraries
  10.108 +      # on Windows for dlls which lack them. Don't remove nor modify the
  10.109 +      # starting and closing comments
  10.110 +# /* impgen.c starts here */
  10.111 +# /*   Copyright (C) 1999 Free Software Foundation, Inc.
  10.112 +# 
  10.113 +#  This file is part of GNU libtool.
  10.114 +# 
  10.115 +#  This program is free software; you can redistribute it and/or modify
  10.116 +#  it under the terms of the GNU General Public License as published by
  10.117 +#  the Free Software Foundation; either version 2 of the License, or
  10.118 +#  (at your option) any later version.
  10.119 +# 
  10.120 +#  This program is distributed in the hope that it will be useful,
  10.121 +#  but WITHOUT ANY WARRANTY; without even the implied warranty of
  10.122 +#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  10.123 +#  GNU General Public License for more details.
  10.124 +# 
  10.125 +#  You should have received a copy of the GNU General Public License
  10.126 +#  along with this program; if not, write to the Free Software
  10.127 +#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  10.128 +#  */
  10.129 +# 
  10.130 +#  #include <stdio.h>		/* for printf() */
  10.131 +#  #include <unistd.h>		/* for open(), lseek(), read() */
  10.132 +#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
  10.133 +#  #include <string.h>		/* for strdup() */
  10.134 +# 
  10.135 +#  static unsigned int
  10.136 +#  pe_get16 (fd, offset)
  10.137 +#       int fd;
  10.138 +#       int offset;
  10.139 +#  {
  10.140 +#    unsigned char b[2];
  10.141 +#    lseek (fd, offset, SEEK_SET);
  10.142 +#    read (fd, b, 2);
  10.143 +#    return b[0] + (b[1]<<8);
  10.144 +#  }
  10.145 +# 
  10.146 +#  static unsigned int
  10.147 +#  pe_get32 (fd, offset)
  10.148 +#      int fd;
  10.149 +#      int offset;
  10.150 +#  {
  10.151 +#    unsigned char b[4];
  10.152 +#    lseek (fd, offset, SEEK_SET);
  10.153 +#    read (fd, b, 4);
  10.154 +#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
  10.155 +#  }
  10.156 +# 
  10.157 +#  static unsigned int
  10.158 +#  pe_as32 (ptr)
  10.159 +#       void *ptr;
  10.160 +#  {
  10.161 +#    unsigned char *b = ptr;
  10.162 +#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
  10.163 +#  }
  10.164 +# 
  10.165 +#  int
  10.166 +#  main (argc, argv)
  10.167 +#      int argc;
  10.168 +#      char *argv[];
  10.169 +#  {
  10.170 +#      int dll;
  10.171 +#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
  10.172 +#      unsigned long export_rva, export_size, nsections, secptr, expptr;
  10.173 +#      unsigned long name_rvas, nexp;
  10.174 +#      unsigned char *expdata, *erva;
  10.175 +#      char *filename, *dll_name;
  10.176 +# 
  10.177 +#      filename = argv[1];
  10.178 +# 
  10.179 +#      dll = open(filename, O_RDONLY|O_BINARY);
  10.180 +#      if (!dll)
  10.181 +#  	return 1;
  10.182 +# 
  10.183 +#      dll_name = filename;
  10.184 +#    
  10.185 +#      for (i=0; filename[i]; i++)
  10.186 +#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
  10.187 +#  	    dll_name = filename + i +1;
  10.188 +# 
  10.189 +#      pe_header_offset = pe_get32 (dll, 0x3c);
  10.190 +#      opthdr_ofs = pe_header_offset + 4 + 20;
  10.191 +#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
  10.192 +# 
  10.193 +#      if (num_entries < 1) /* no exports */
  10.194 +#  	return 1;
  10.195 +# 
  10.196 +#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
  10.197 +#      export_size = pe_get32 (dll, opthdr_ofs + 100);
  10.198 +#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
  10.199 +#      secptr = (pe_header_offset + 4 + 20 +
  10.200 +#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
  10.201 +# 
  10.202 +#      expptr = 0;
  10.203 +#      for (i = 0; i < nsections; i++)
  10.204 +#      {
  10.205 +#  	char sname[8];
  10.206 +#  	unsigned long secptr1 = secptr + 40 * i;
  10.207 +#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
  10.208 +#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
  10.209 +#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
  10.210 +#  	lseek(dll, secptr1, SEEK_SET);
  10.211 +#  	read(dll, sname, 8);
  10.212 +#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
  10.213 +#  	{
  10.214 +#  	    expptr = fptr + (export_rva - vaddr);
  10.215 +#  	    if (export_rva + export_size > vaddr + vsize)
  10.216 +#  		export_size = vsize - (export_rva - vaddr);
  10.217 +#  	    break;
  10.218 +#  	}
  10.219 +#      }
  10.220 +# 
  10.221 +#      expdata = (unsigned char*)malloc(export_size);
  10.222 +#      lseek (dll, expptr, SEEK_SET);
  10.223 +#      read (dll, expdata, export_size);
  10.224 +#      erva = expdata - export_rva;
  10.225 +# 
  10.226 +#      nexp = pe_as32 (expdata+24);
  10.227 +#      name_rvas = pe_as32 (expdata+32);
  10.228 +# 
  10.229 +#      printf ("EXPORTS\n");
  10.230 +#      for (i = 0; i<nexp; i++)
  10.231 +#      {
  10.232 +#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
  10.233 +#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
  10.234 +#      }
  10.235 +# 
  10.236 +#      return 0;
  10.237 +#  }
  10.238 +# /* impgen.c ends here */
  10.239        ;;
  10.240      *)
  10.241        allow_undefined=yes
  10.242        ;;
  10.243      esac
  10.244 -    libtool_args="$nonopt"
  10.245      compile_command="$nonopt"
  10.246      finalize_command="$nonopt"
  10.247  
  10.248 @@ -665,12 +818,18 @@
  10.249      convenience=
  10.250      old_convenience=
  10.251      deplibs=
  10.252 -    old_deplibs=
  10.253 -    compiler_flags=
  10.254 -    linker_flags=
  10.255 -    dllsearchpath=
  10.256 -    lib_search_path=`pwd`
  10.257 -
  10.258 +    linkopts=
  10.259 +
  10.260 +    if test -n "$shlibpath_var"; then
  10.261 +      # get the directories listed in $shlibpath_var
  10.262 +      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
  10.263 +    else
  10.264 +      lib_search_path=
  10.265 +    fi
  10.266 +    # now prepend the system-specific ones
  10.267 +    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
  10.268 +    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
  10.269 +    
  10.270      avoid_version=no
  10.271      dlfiles=
  10.272      dlprefiles=
  10.273 @@ -680,9 +839,9 @@
  10.274      export_symbols_regex=
  10.275      generated=
  10.276      libobjs=
  10.277 +    link_against_libtool_libs=
  10.278      ltlibs=
  10.279      module=no
  10.280 -    no_install=no
  10.281      objs=
  10.282      prefer_static_libs=no
  10.283      preload=no
  10.284 @@ -728,7 +887,6 @@
  10.285      while test $# -gt 0; do
  10.286        arg="$1"
  10.287        shift
  10.288 -      libtool_args="$libtool_args $arg"
  10.289  
  10.290        # If the previous option needs an argument, assign it.
  10.291        if test -n "$prev"; then
  10.292 @@ -821,29 +979,6 @@
  10.293  	  prev=
  10.294  	  continue
  10.295  	  ;;
  10.296 -	xcompiler)
  10.297 -	  arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  10.298 -	  case "$arg" in
  10.299 -	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
  10.300 -	    arg="\"$arg\""
  10.301 -	    ;;
  10.302 -	  esac
  10.303 -	  compiler_flags="$compiler_flags $arg"
  10.304 -	  prev=
  10.305 -	  continue
  10.306 -	  ;;
  10.307 -	xlinker)
  10.308 -	  arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  10.309 -	  case "$arg" in
  10.310 -	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
  10.311 -	    arg="\"$arg\""
  10.312 -	    ;;
  10.313 -	  esac
  10.314 -	  linker_flags="$linker_flags $arg"
  10.315 -	  compiler_flags="$compiler_flags $wl$arg"
  10.316 -	  prev=
  10.317 -	  continue
  10.318 -	  ;;
  10.319  	*)
  10.320  	  eval "$prev=\"\$arg\""
  10.321  	  prev=
  10.322 @@ -910,34 +1045,37 @@
  10.323  	*)
  10.324  	  absdir=`cd "$dir" && pwd`
  10.325  	  if test -z "$absdir"; then
  10.326 -	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
  10.327 -	    exit 1
  10.328 +	    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
  10.329 +	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
  10.330 +	    absdir="$dir"
  10.331  	  fi
  10.332  	  dir="$absdir"
  10.333  	  ;;
  10.334  	esac
  10.335 -	case "$deplibs " in
  10.336 -	*" -L$dir "*) ;;
  10.337 -	*)
  10.338 -	  deplibs="$deplibs -L$dir"
  10.339 -	  lib_search_path="$lib_search_path $dir"
  10.340 -	  ;;
  10.341 +	case " $deplibs " in
  10.342 +	*" $arg "*) ;;
  10.343 +	*) deplibs="$deplibs $arg";;
  10.344 +	esac
  10.345 +	case " $lib_search_path " in
  10.346 +	*" $dir "*) ;;
  10.347 +	*) lib_search_path="$lib_search_path $dir";;
  10.348  	esac
  10.349  	case "$host" in
  10.350  	*-*-cygwin* | *-*-mingw* | *-*-os2*)
  10.351 +	  dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
  10.352  	  case ":$dllsearchpath:" in
  10.353 -	  *":$dir:"*) ;;
  10.354 -	  *) dllsearchpath="$dllsearchpath:$dir";;
  10.355 +	  ::) dllsearchpath="$dllsearchdir";;
  10.356 +	  *":$dllsearchdir:"*) ;;
  10.357 +	  *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
  10.358  	  esac
  10.359  	  ;;
  10.360  	esac
  10.361 -	continue
  10.362  	;;
  10.363  
  10.364        -l*)
  10.365  	if test "$arg" = "-lc"; then
  10.366  	  case "$host" in
  10.367 -	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
  10.368 +	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* |*-*-freebsd* )
  10.369  	    # These systems don't actually have c library (as such)
  10.370  	    continue
  10.371  	    ;;
  10.372 @@ -951,7 +1089,6 @@
  10.373  	  esac
  10.374  	fi
  10.375  	deplibs="$deplibs $arg"
  10.376 -	continue
  10.377  	;;
  10.378  
  10.379        -module)
  10.380 @@ -959,27 +1096,6 @@
  10.381  	continue
  10.382  	;;
  10.383  
  10.384 -      -no-fast-install)
  10.385 -	fast_install=no
  10.386 -	continue
  10.387 -	;;
  10.388 -
  10.389 -      -no-install)
  10.390 -	case "$host" in
  10.391 -	*-*-cygwin* | *-*-mingw* | *-*-os2*)
  10.392 -	  # The PATH hackery in wrapper scripts is required on Windows
  10.393 -	  # in order for the loader to find any dlls it needs.
  10.394 -	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
  10.395 -	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
  10.396 -	  fast_install=no
  10.397 -	  ;;
  10.398 -	*)
  10.399 -	  no_install=yes
  10.400 -	  ;;
  10.401 -	esac
  10.402 -	continue
  10.403 -	;;
  10.404 -
  10.405        -no-undefined)
  10.406  	allow_undefined=no
  10.407  	continue
  10.408 @@ -1037,39 +1153,6 @@
  10.409  	prev=vinfo
  10.410  	continue
  10.411  	;;
  10.412 -	
  10.413 -      -Wc,*)
  10.414 -	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  10.415 -	case "$arg" in
  10.416 -	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
  10.417 -	  arg="\"$arg\""
  10.418 -	  ;;
  10.419 -	esac
  10.420 -	flag=`$echo "X$arg" | $Xsed -e 's/^-Wc,//'`
  10.421 -	compiler_flags="$compiler_flags $flag"
  10.422 -	;;
  10.423 -
  10.424 -      -Wl,*)
  10.425 -	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
  10.426 -	case "$arg" in
  10.427 -	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
  10.428 -	  arg="\"$arg\""
  10.429 -	  ;;
  10.430 -	esac
  10.431 -	flag=`$echo "X$arg" | $Xsed -e 's/^-Wl,//'`
  10.432 -	linker_flags="$linker_flags $flag"
  10.433 -	compiler_flags="$compiler_flags $wl$flag"
  10.434 -	;;
  10.435 -
  10.436 -      -Xcompiler)
  10.437 -	prev=xcompiler
  10.438 -	continue
  10.439 -	;;
  10.440 -
  10.441 -      -Xlinker)
  10.442 -	prev=xlinker
  10.443 -	continue
  10.444 -	;;
  10.445  
  10.446        # Some other compiler flag.
  10.447        -* | +*)
  10.448 @@ -1083,7 +1166,7 @@
  10.449  	esac
  10.450  	;;
  10.451  
  10.452 -      *.o | *.obj)
  10.453 +      *.o | *.obj | *.a | *.lib)
  10.454  	# A standard object.
  10.455  	objs="$objs $arg"
  10.456  	;;
  10.457 @@ -1109,13 +1192,6 @@
  10.458  	libobjs="$libobjs $arg"
  10.459  	;;
  10.460  
  10.461 -      *.a | *.lib)
  10.462 -	# An archive.
  10.463 -	deplibs="$deplibs $arg"
  10.464 -	old_deplibs="$old_deplibs $arg"
  10.465 -	continue
  10.466 -	;;
  10.467 -
  10.468        *.la)
  10.469  	# A libtool-controlled library.
  10.470  
  10.471 @@ -1153,6 +1229,9 @@
  10.472  	  exit 1
  10.473  	fi
  10.474  
  10.475 +	# Find the relevant object directory and library name.
  10.476 +	name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
  10.477 +
  10.478  	if test "X$installed" = Xyes; then
  10.479  	  dir="$libdir"
  10.480  	else
  10.481 @@ -1164,6 +1243,42 @@
  10.482  	  fi
  10.483  	fi
  10.484  
  10.485 +	if test -n "$dependency_libs"; then
  10.486 +	  # Extract -R and -L from dependency_libs
  10.487 +	  temp_deplibs=
  10.488 +	  for deplib in $dependency_libs; do
  10.489 +	    case "$deplib" in
  10.490 +	    -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
  10.491 +		 case " $rpath $xrpath " in
  10.492 +		 *" $temp_xrpath "*) ;;
  10.493 +		 *) xrpath="$xrpath $temp_xrpath";;
  10.494 +		 esac;;
  10.495 +	    -L*) case "$compile_command $temp_deplibs " in
  10.496 +		 *" $deplib "*) ;;
  10.497 +		 *) temp_deplibs="$temp_deplibs $deplib";;
  10.498 +		 esac
  10.499 +		 temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
  10.500 +		 case " $lib_search_path " in
  10.501 +		 *" $temp_dir "*) ;;
  10.502 +		 *) lib_search_path="$lib_search_path $temp_dir";;
  10.503 +		 esac
  10.504 +		 ;;
  10.505 +	    *) temp_deplibs="$temp_deplibs $deplib";;
  10.506 +	    esac
  10.507 +	  done
  10.508 +	  dependency_libs="$temp_deplibs"
  10.509 +	fi
  10.510 +
  10.511 +	if test -z "$libdir"; then
  10.512 +	  # It is a libtool convenience library, so add in its objects.
  10.513 +	  convenience="$convenience $dir/$old_library"
  10.514 +	  old_convenience="$old_convenience $dir/$old_library"
  10.515 +	  deplibs="$deplibs$dependency_libs"
  10.516 +	  compile_command="$compile_command $dir/$old_library$dependency_libs"
  10.517 +	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
  10.518 +	  continue
  10.519 +	fi
  10.520 +
  10.521  	# This library was specified with -dlopen.
  10.522  	if test "$prev" = dlfiles; then
  10.523  	  dlfiles="$dlfiles $arg"
  10.524 @@ -1172,7 +1287,10 @@
  10.525  	    # we need to preload.
  10.526  	    prev=dlprefiles
  10.527  	  else
  10.528 -	    # We should not create a dependency on this library
  10.529 +	    # We should not create a dependency on this library, but we
  10.530 +	    # may need any libraries it requires.
  10.531 +	    compile_command="$compile_command$dependency_libs"
  10.532 +	    finalize_command="$finalize_command$dependency_libs"
  10.533  	    prev=
  10.534  	    continue
  10.535  	  fi
  10.536 @@ -1190,7 +1308,180 @@
  10.537  	  prev=
  10.538  	fi
  10.539  
  10.540 -	deplibs="$deplibs $arg"
  10.541 +	if test -n "$library_names" &&
  10.542 +	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
  10.543 +	  link_against_libtool_libs="$link_against_libtool_libs $arg"
  10.544 +	  if test -n "$shlibpath_var"; then
  10.545 +	    # Make sure the rpath contains only unique directories.
  10.546 +	    case "$temp_rpath " in
  10.547 +	    *" $dir "*) ;;
  10.548 +	    *) temp_rpath="$temp_rpath $dir" ;;
  10.549 +	    esac
  10.550 +	  fi
  10.551 +
  10.552 +	  # We need an absolute path.
  10.553 +	  case "$dir" in
  10.554 +	  [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
  10.555 +	  *)
  10.556 +	    absdir=`cd "$dir" && pwd`
  10.557 +	    if test -z "$absdir"; then
  10.558 +	      $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
  10.559 +	      $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
  10.560 +	      absdir="$dir"
  10.561 +	    fi
  10.562 +	    ;;
  10.563 +	  esac
  10.564 +	  
  10.565 +	  # This is the magic to use -rpath.
  10.566 +	  # Skip directories that are in the system default run-time
  10.567 +	  # search path, unless they have been requested with -R.
  10.568 +	  case " $sys_lib_dlsearch_path " in
  10.569 +	  *" $absdir "*) ;;
  10.570 +	  *)
  10.571 +	    case "$compile_rpath " in
  10.572 +	    *" $absdir "*) ;;
  10.573 +	    *) compile_rpath="$compile_rpath $absdir" 
  10.574 +	    esac
  10.575 +	    ;;
  10.576 +	  esac
  10.577 +
  10.578 +	  case " $sys_lib_dlsearch_path " in
  10.579 +	  *" $libdir "*) ;;
  10.580 +	  *)
  10.581 +	    case "$finalize_rpath " in
  10.582 +	    *" $libdir "*) ;;
  10.583 +	    *) finalize_rpath="$finalize_rpath $libdir"
  10.584 +	    esac
  10.585 +	    ;;
  10.586 +	  esac
  10.587 +
  10.588 +	  lib_linked=yes
  10.589 +	  case "$hardcode_action" in
  10.590 +	  immediate | unsupported)
  10.591 +	    if test "$hardcode_direct" = no; then
  10.592 +	      compile_command="$compile_command $dir/$linklib"
  10.593 +	      deplibs="$deplibs $dir/$linklib"
  10.594 +	      case "$host" in
  10.595 +	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
  10.596 +		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
  10.597 +		if test -n "$dllsearchpath"; then
  10.598 +		  dllsearchpath="$dllsearchpath:$dllsearchdir"
  10.599 +		else
  10.600 +		  dllsearchpath="$dllsearchdir"
  10.601 +		fi
  10.602 +		;;
  10.603 +	      esac
  10.604 +	    elif test "$hardcode_minus_L" = no; then
  10.605 +	      case "$host" in
  10.606 +	      *-*-sunos*)
  10.607 +		compile_shlibpath="$compile_shlibpath$dir:"
  10.608 +		;;
  10.609 +	      esac
  10.610 +	      case "$compile_command " in
  10.611 +	      *" -L$dir "*) ;;
  10.612 +	      *) compile_command="$compile_command -L$dir";;
  10.613 +	      esac
  10.614 +	      compile_command="$compile_command -l$name"
  10.615 +	      deplibs="$deplibs -L$dir -l$name"
  10.616 +	    elif test "$hardcode_shlibpath_var" = no; then
  10.617 +	      case ":$compile_shlibpath:" in
  10.618 +	      *":$dir:"*) ;;
  10.619 +	      *) compile_shlibpath="$compile_shlibpath$dir:";;
  10.620 +	      esac
  10.621 +	      compile_command="$compile_command -l$name"
  10.622 +	      deplibs="$deplibs -l$name"
  10.623 +	    else
  10.624 +	      lib_linked=no
  10.625 +	    fi
  10.626 +	    ;;
  10.627 +
  10.628 +	  relink)
  10.629 +	    if test "$hardcode_direct" = yes; then
  10.630 +	      compile_command="$compile_command $absdir/$linklib"
  10.631 +	      deplibs="$deplibs $absdir/$linklib"
  10.632 +	    elif test "$hardcode_minus_L" = yes; then
  10.633 +	      case "$compile_command " in
  10.634 +	      *" -L$absdir "*) ;;
  10.635 +	      *) compile_command="$compile_command -L$absdir";;
  10.636 +	      esac
  10.637 +	      compile_command="$compile_command -l$name"
  10.638 +	      deplibs="$deplibs -L$absdir -l$name"
  10.639 +	    elif test "$hardcode_shlibpath_var" = yes; then
  10.640 +	      case ":$compile_shlibpath:" in
  10.641 +	      *":$absdir:"*) ;;
  10.642 +	      *) compile_shlibpath="$compile_shlibpath$absdir:";;
  10.643 +	      esac
  10.644 +	      compile_command="$compile_command -l$name"
  10.645 +	      deplibs="$deplibs -l$name"
  10.646 +	    else
  10.647 +	      lib_linked=no
  10.648 +	    fi
  10.649 +	    ;;
  10.650 +
  10.651 +	  *)
  10.652 +	    lib_linked=no
  10.653 +	    ;;
  10.654 +	  esac
  10.655 +
  10.656 +	  if test "$lib_linked" != yes; then
  10.657 +	    $echo "$modename: configuration error: unsupported hardcode properties"
  10.658 +	    exit 1
  10.659 +	  fi
  10.660 +
  10.661 +	  # Finalize command for both is simple: just hardcode it.
  10.662 +	  if test "$hardcode_direct" = yes; then
  10.663 +	    finalize_command="$finalize_command $libdir/$linklib"
  10.664 +	  elif test "$hardcode_minus_L" = yes; then
  10.665 +	    case "$finalize_command " in
  10.666 +	    *" -L$libdir "*) ;;
  10.667 +	    *) finalize_command="$finalize_command -L$libdir";;
  10.668 +	    esac
  10.669 +	    finalize_command="$finalize_command -l$name"
  10.670 +	  elif test "$hardcode_shlibpath_var" = yes; then
  10.671 +	    case ":$finalize_shlibpath:" in
  10.672 +	    *":$libdir:"*) ;;
  10.673 +	    *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
  10.674 +	    esac
  10.675 +	    finalize_command="$finalize_command -l$name"
  10.676 +	  else
  10.677 +	    # We cannot seem to hardcode it, guess we'll fake it.
  10.678 +	    case "$finalize_command " in
  10.679 +	    *" -L$dir "*) ;;
  10.680 +	    *) finalize_command="$finalize_command -L$libdir";;
  10.681 +	    esac
  10.682 +	    finalize_command="$finalize_command -l$name"
  10.683 +	  fi
  10.684 +	else
  10.685 +	  # Transform directly to old archives if we don't build new libraries.
  10.686 +	  if test -n "$pic_flag" && test -z "$old_library"; then
  10.687 +	    $echo "$modename: cannot find static library for \`$arg'" 1>&2
  10.688 +	    exit 1
  10.689 +	  fi
  10.690 +
  10.691 +	  # Here we assume that one of hardcode_direct or hardcode_minus_L
  10.692 +	  # is not unsupported.  This is valid on all known static and
  10.693 +	  # shared platforms.
  10.694 +	  if test "$hardcode_direct" != unsupported; then
  10.695 +	    test -n "$old_library" && linklib="$old_library"
  10.696 +	    compile_command="$compile_command $dir/$linklib"
  10.697 +	    finalize_command="$finalize_command $dir/$linklib"
  10.698 +	  else
  10.699 +	    case "$compile_command " in
  10.700 +	    *" -L$dir "*) ;;
  10.701 +	    *) compile_command="$compile_command -L$dir";;
  10.702 +	    esac
  10.703 +	    compile_command="$compile_command -l$name"
  10.704 +	    case "$finalize_command " in
  10.705 +	    *" -L$dir "*) ;;
  10.706 +	    *) finalize_command="$finalize_command -L$dir";;
  10.707 +	    esac
  10.708 +	    finalize_command="$finalize_command -l$name"
  10.709 +	  fi
  10.710 +	fi
  10.711 +
  10.712 +	# Add in any libraries that this one depends upon.
  10.713 +	compile_command="$compile_command$dependency_libs"
  10.714 +	finalize_command="$finalize_command$dependency_libs"
  10.715  	continue
  10.716  	;;
  10.717  
  10.718 @@ -1231,99 +1522,19 @@
  10.719      outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
  10.720      libobjs_save="$libobjs"
  10.721  
  10.722 -    if test -n "$shlibpath_var"; then
  10.723 -      # get the directories listed in $shlibpath_var
  10.724 -      eval shlib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
  10.725 -    else
  10.726 -      shlib_search_path=
  10.727 -    fi
  10.728 -    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
  10.729 -    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
  10.730 -    lib_search_path="$lib_search_path $sys_lib_search_path $shlib_search_path"
  10.731 -
  10.732      case "$output" in
  10.733      "")
  10.734        $echo "$modename: you must specify an output file" 1>&2
  10.735        $echo "$help" 1>&2
  10.736        exit 1
  10.737        ;;
  10.738 +
  10.739      *.a | *.lib)
  10.740 -      linkmode=oldlib ;;
  10.741 -    *.lo | *.o | *.obj)
  10.742 -      linkmode=obj ;;
  10.743 -    *.la)
  10.744 -      linkmode=lib ;;
  10.745 -    *) # Anything else should be a program.
  10.746 -      linkmode=prog ;;
  10.747 -    esac
  10.748 -    
  10.749 -    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
  10.750 -    if test "X$output_objdir" = "X$output"; then
  10.751 -      output_objdir="$objdir"
  10.752 -    else
  10.753 -      output_objdir="$output_objdir/$objdir"
  10.754 -    fi
  10.755 -
  10.756 -    # Create the object directory.
  10.757 -    if test ! -d $output_objdir; then
  10.758 -      $show "$mkdir $output_objdir"
  10.759 -      $run $mkdir $output_objdir
  10.760 -      status=$?
  10.761 -      if test $status -ne 0 && test ! -d $output_objdir; then
  10.762 -	exit $status
  10.763 +      if test -n "$link_against_libtool_libs"; then
  10.764 +	$echo "$modename: error: cannot link libtool libraries into archives" 1>&2
  10.765 +	exit 1
  10.766        fi
  10.767 -    fi
  10.768 -    if test $linkmode != lib && test $linkmode != prog; then
  10.769 -      # Find libtool convenience libraries
  10.770 -      for deplib in $deplibs; do
  10.771 -	case "$deplib" in
  10.772 -	-l* | -L*)
  10.773 -	  $echo "$modename: warning: \`-l' and \`-L' are ignored for archives/objects" 1>&2
  10.774 -	  continue
  10.775 -	  ;;
  10.776 -	esac
  10.777 -	if test -f "$deplib"; then :
  10.778 -	else
  10.779 -	  $echo "$modename: cannot find the library \`$deplib'" 1>&2
  10.780 -	  exit 1
  10.781 -	fi
  10.782 -	libdir=
  10.783 -	old_library=
  10.784 -
  10.785 -	# Check to see that this really is a libtool archive.
  10.786 -	if (sed -e '2q' $deplib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  10.787 -	else
  10.788 -	  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  10.789 -	  exit 1
  10.790 -	fi
  10.791 -
  10.792 -	ladir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
  10.793 -	test "X$ladir" = "X$deplib" && ladir="."
  10.794 -
  10.795 -	# Read the .la file
  10.796 -	case "$deplib" in
  10.797 -	*/* | *\\*) . $deplib ;;
  10.798 -	*) . ./$deplib ;;
  10.799 -	esac
  10.800 -
  10.801 -	if test -z "$old_library"; then
  10.802 -	  $echo "$modename: cannot find name of link library for \`$deplib'" 1>&2
  10.803 -	  exit 1
  10.804 -	fi
  10.805 -
  10.806 -	if test -n "$libdir"; then
  10.807 -	  $echo "$modename: \`$deplib' is not a convenience library" 1>&2
  10.808 -	  exit 1
  10.809 -	fi
  10.810 -	
  10.811 -	# It is a libtool convenience library, so add in its objects.
  10.812 -	convenience="$convenience $ladir/$objdir/$old_library"
  10.813 -	old_convenience="$old_convenience $ladir/$objdir/$old_library"
  10.814 -      done
  10.815 -    fi
  10.816 -
  10.817 -    case $linkmode in
  10.818 -    oldlib)
  10.819 +
  10.820        if test -n "$deplibs"; then
  10.821  	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
  10.822        fi
  10.823 @@ -1355,10 +1566,9 @@
  10.824        # Now set the variables for building old libraries.
  10.825        build_libtool_libs=no
  10.826        oldlibs="$output"
  10.827 -      objs="$objs$old_deplibs"
  10.828        ;;
  10.829  
  10.830 -    lib)
  10.831 +    *.la)
  10.832        # Make sure we only generate libraries of the form `libNAME.la'.
  10.833        case "$outputname" in
  10.834        lib*)
  10.835 @@ -1381,11 +1591,24 @@
  10.836  	;;
  10.837        esac
  10.838  
  10.839 -      if test -n "$objs$old_deplibs"; then
  10.840 +      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
  10.841 +      if test "X$output_objdir" = "X$output"; then
  10.842 +	output_objdir="$objdir"
  10.843 +      else
  10.844 +	output_objdir="$output_objdir/$objdir"
  10.845 +      fi
  10.846 +
  10.847 +      if test -n "$objs"; then
  10.848  	$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
  10.849  	exit 1
  10.850        fi
  10.851  
  10.852 +      # How the heck are we supposed to write a wrapper for a shared library?
  10.853 +      if test -n "$link_against_libtool_libs"; then
  10.854 +	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
  10.855 +	 exit 1
  10.856 +      fi
  10.857 +
  10.858        if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
  10.859  	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
  10.860        fi
  10.861 @@ -1405,6 +1628,7 @@
  10.862  	  build_libtool_libs=convenience
  10.863  	  build_old_libs=yes
  10.864  	fi
  10.865 +	dependency_libs="$deplibs"
  10.866  
  10.867  	if test -n "$vinfo"; then
  10.868  	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
  10.869 @@ -1565,12 +1789,34 @@
  10.870  	  # Don't allow undefined symbols.
  10.871  	  allow_undefined_flag="$no_undefined_flag"
  10.872  	fi
  10.873 +
  10.874 +	dependency_libs="$deplibs"
  10.875 +	case "$host" in
  10.876 +	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* | *-*-freebsd* )
  10.877 +	  # these systems don't actually have a c library (as such)!
  10.878 +	  ;;
  10.879 +        *-*-rhapsody*)
  10.880 +	  # rhapsody is a little odd...
  10.881 +	  deplibs="$deplibs -framework System"
  10.882 +	  ;;
  10.883 +	*)
  10.884 +	  # Add libc to deplibs on all other systems.
  10.885 +	  deplibs="$deplibs -lc"
  10.886 +	  ;;
  10.887 +	esac
  10.888        fi
  10.889  
  10.890 -      if test "$relink" = no; then
  10.891 -	# Remove our outputs.
  10.892 +      # Create the output directory, or remove our outputs if we need to.
  10.893 +      if test -d $output_objdir; then
  10.894  	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
  10.895  	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
  10.896 +      else
  10.897 +	$show "$mkdir $output_objdir"
  10.898 +	$run $mkdir $output_objdir
  10.899 +	status=$?
  10.900 +	if test $status -ne 0 && test ! -d $output_objdir; then
  10.901 +	  exit $status
  10.902 +	fi
  10.903        fi
  10.904  
  10.905        # Now set the variables for building old libraries.
  10.906 @@ -1581,428 +1827,7 @@
  10.907  	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
  10.908        fi
  10.909  
  10.910 -      # Save some variables
  10.911 -      name_save=$name
  10.912 -      libname_save=$libname
  10.913 -	
  10.914 -      # Find libtool libraries and add their dependencies and directories
  10.915 -      save_deplibs="$deplibs"
  10.916 -      deplibs=            # libraries to link (used in archive_cmds)
  10.917 -      newdependency_libs= # all dependency libraries
  10.918 -      uninst_path=        # paths that contain uninstalled libtool libraries
  10.919 -      new_lib_search_path=
  10.920 -      for deplib in $save_deplibs; do
  10.921 -	lib=
  10.922 -	case "$deplib" in
  10.923 -	-L*)
  10.924 -	  case "$deplibs " in
  10.925 -	  *" $deplib "*) ;;
  10.926 -	  *)
  10.927 -	    deplibs="$deplibs $deplib"
  10.928 -	    newdependency_libs="$newdependency_libs $deplib"
  10.929 -	    new_lib_search_path="$new_lib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
  10.930 -	    ;;
  10.931 -	  esac
  10.932 -	  continue
  10.933 -	  ;;
  10.934 -	-l*)
  10.935 -	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
  10.936 -	  found=no
  10.937 -	  for searchdir in $lib_search_path; do
  10.938 -	    # Search the libtool library
  10.939 -	    lib="$searchdir/lib${name}.la"
  10.940 -	    if test -f "$lib"; then
  10.941 -	      found=yes
  10.942 -	      break
  10.943 -	    fi
  10.944 -	  done
  10.945 -	  if test "$found" != yes; then
  10.946 -	    deplibs="$deplibs $deplib"
  10.947 -	    newdependency_libs="$newdependency_libs $deplib"
  10.948 -	    continue
  10.949 -	  fi
  10.950 -	  ;;
  10.951 -	*)
  10.952 -	  lib="$deplib"
  10.953 -	  if test -f "$lib"; then :
  10.954 -	  else
  10.955 -	    $echo "$modename: cannot find the library \`$lib'" 1>&2
  10.956 -	    exit 1
  10.957 -	  fi
  10.958 -	  ;;
  10.959 -	esac
  10.960 -	libdir=
  10.961 -	library_names=
  10.962 -	old_library=
  10.963 -
  10.964 -	# Check to see that this really is a libtool archive.
  10.965 -	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  10.966 -	else
  10.967 -	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  10.968 -	  exit 1
  10.969 -	fi
  10.970 -
  10.971 -	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
  10.972 -	test "X$ladir" = "X$lib" && ladir="."
  10.973 -	# We need an absolute path.
  10.974 -	case "$ladir" in
  10.975 -	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
  10.976 -	*)
  10.977 -	  abs_ladir=`cd "$ladir" && pwd`
  10.978 -	  if test -z "$abs_ladir"; then
  10.979 -	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
  10.980 -	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
  10.981 -	    abs_ladir="$ladir"
  10.982 -	  fi
  10.983 -	  ;;
  10.984 -	esac
  10.985 -	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
  10.986 -
  10.987 -	# If the library was installed with an old release of libtool,
  10.988 -	# it will not redefine variable installed.
  10.989 -	installed=yes
  10.990 -
  10.991 -	# Read the .la file
  10.992 -	case "$lib" in
  10.993 -	*/* | *\\*) . $lib ;;
  10.994 -	*) . ./$lib ;;
  10.995 -	esac
  10.996 -
  10.997 -	# Get the name of the library we link against.
  10.998 -	linklib=
  10.999 -	for l in $old_library $library_names; do
 10.1000 -	  linklib="$l"
 10.1001 -	done
 10.1002 -
 10.1003 -	if test -z "$linklib"; then
 10.1004 -	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
 10.1005 -	  exit 1
 10.1006 -	fi
 10.1007 -
 10.1008 -	if test -z "$libdir"; then
 10.1009 -	  # It is a libtool convenience library, so add in its objects.
 10.1010 -	  convenience="$convenience $ladir/$objdir/$old_library"
 10.1011 -	  old_convenience="$old_convenience $ladir/$objdir/$old_library"
 10.1012 -	  deplibs="$deplibs $ladir/$objdir/$old_library"
 10.1013 -	  newdependency_libs="$newdependency_libs $dependency_libs"
 10.1014 -	  continue
 10.1015 -	fi
 10.1016 -
 10.1017 -	# Find the relevant object directory and library name.
 10.1018 -	if test "X$installed" = Xyes; then
 10.1019 -	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 10.1020 -	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
 10.1021 -	    dir="$ladir"
 10.1022 -	    absdir="$abs_ladir"
 10.1023 -	    libdir="$abs_ladir"
 10.1024 -	  else
 10.1025 -	    dir="$libdir"
 10.1026 -	    absdir="$libdir"
 10.1027 -	  fi
 10.1028 -	else
 10.1029 -	  dir="$ladir/$objdir"
 10.1030 -	  absdir="$abs_ladir/$objdir"
 10.1031 -	  # Remove this search path later
 10.1032 -	  uninst_path="$uninst_path $abs_ladir"
 10.1033 -	fi
 10.1034 -	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 10.1035 -	link_static=no # Whether this library is linked statically
 10.1036 -
 10.1037 -	if test -n "$library_names" &&
 10.1038 -	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 10.1039 -	  # This is a shared library
 10.1040 -	  if test "$hardcode_into_libs" = yes; then
 10.1041 -	    # Hardcode the library path.
 10.1042 -	    # Skip directories that are in the system default run-time
 10.1043 -	    # search path.
 10.1044 -	    case " $sys_lib_dlsearch_path " in
 10.1045 -	    *" $absdir "*) ;;
 10.1046 -	    *)
 10.1047 -	      case "$compile_rpath " in
 10.1048 -	      *" $absdir "*) ;;
 10.1049 -	      *) compile_rpath="$compile_rpath $absdir" 
 10.1050 -	      esac
 10.1051 -	      ;;
 10.1052 -	    esac
 10.1053 -	    case " $sys_lib_dlsearch_path " in
 10.1054 -	    *" $libdir "*) ;;
 10.1055 -	    *)
 10.1056 -	      case "$finalize_rpath " in
 10.1057 -	      *" $libdir "*) ;;
 10.1058 -	      *) finalize_rpath="$finalize_rpath $libdir"
 10.1059 -	      esac
 10.1060 -	      ;;
 10.1061 -	    esac
 10.1062 -	  fi
 10.1063 -	    
 10.1064 -	  if test -n "$old_archive_from_expsyms_cmds"; then
 10.1065 -	    # figure out the soname
 10.1066 -	    set dummy $library_names
 10.1067 -	    realname="$2"
 10.1068 -	    shift; shift
 10.1069 -	    libname=`eval \\$echo \"$libname_spec\"`
 10.1070 -	    if test -n "$soname_spec"; then
 10.1071 -	      eval soname=\"$soname_spec\"
 10.1072 -	    else
 10.1073 -	      soname="$realname"
 10.1074 -	    fi
 10.1075 -
 10.1076 -	    # Make a new name for the extract_expsyms_cmds to use
 10.1077 -	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
 10.1078 -	  
 10.1079 -	    # If the library has no export list, then create one now
 10.1080 -	    if test -f "$output_objdir/$soname-def"; then :
 10.1081 -	    else
 10.1082 -	      $show "extracting exported symbol list from \`$soname'"
 10.1083 -	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 10.1084 -	      eval cmds=\"$extract_expsyms_cmds\"
 10.1085 -	      for cmd in $cmds; do
 10.1086 -		IFS="$save_ifs"
 10.1087 -		$show "$cmd"
 10.1088 -		$run eval "$cmd" || exit $?
 10.1089 -	      done
 10.1090 -	      IFS="$save_ifs"
 10.1091 -	    fi
 10.1092 - 
 10.1093 -	    # Create $newlib
 10.1094 -	    if test -f "$output_objdir/$newlib"; then :; else
 10.1095 -	      $show "generating import library for \`$soname'"
 10.1096 -	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 10.1097 -	      eval cmds=\"$old_archive_from_expsyms_cmds\"
 10.1098 -	      for cmd in $cmds; do
 10.1099 -		IFS="$save_ifs"
 10.1100 -		$show "$cmd"
 10.1101 -		$run eval "$cmd" || exit $?
 10.1102 -	      done
 10.1103 -	      IFS="$save_ifs"
 10.1104 -	    fi
 10.1105 -	    # make sure the library variables are pointing to the new library
 10.1106 -	    dir=$output_objdir
 10.1107 -	    linklib=$newlib
 10.1108 -	  fi
 10.1109 -
 10.1110 -	  add_dir=
 10.1111 -	  add_shlibpath=
 10.1112 -	  add_name=no
 10.1113 -	  if test "$relink" = no; then
 10.1114 -	    lib_linked=yes
 10.1115 -	    case "$hardcode_action" in
 10.1116 -	    immediate | unsupported)
 10.1117 -	      if test "$hardcode_direct" = no; then
 10.1118 -		deplibs="$deplibs $dir/$linklib"
 10.1119 -	      elif test "$hardcode_minus_L" = no; then
 10.1120 -		case "$host" in
 10.1121 -		*-*-sunos*) add_shlibpath="$dir" ;;
 10.1122 -		esac
 10.1123 -		add_dir="-L$dir"
 10.1124 -		add_name=yes
 10.1125 -	      elif test "$hardcode_shlibpath_var" = no; then
 10.1126 -		add_shlibpath="$dir"
 10.1127 -		add_name=yes
 10.1128 -	      else
 10.1129 -		lib_linked=no
 10.1130 -	      fi
 10.1131 -	      ;;
 10.1132 -	    relink)
 10.1133 -	      if test "$hardcode_direct" = yes; then
 10.1134 -		deplibs="$deplibs $dir/$linklib"
 10.1135 -	      elif test "$hardcode_minus_L" = yes; then
 10.1136 -		add_dir="-L$dir"
 10.1137 -		add_name=yes
 10.1138 -	      elif test "$hardcode_shlibpath_var" = yes; then
 10.1139 -		add_shlibpath="$dir"
 10.1140 -		add_name=yes
 10.1141 -	      else
 10.1142 -		lib_linked=no
 10.1143 -	      fi
 10.1144 -	      ;;
 10.1145 -	    *) lib_linked=no ;;
 10.1146 -	    esac
 10.1147 -
 10.1148 -	    if test "$lib_linked" != yes; then
 10.1149 -	      $echo "$modename: configuration error: unsupported hardcode properties"
 10.1150 -	      exit 1
 10.1151 -	    fi
 10.1152 -	    if test -n "$add_shlibpath"; then
 10.1153 -	      case ":$compile_shlibpath:" in
 10.1154 -	      *":$add_shlibpath:"*) ;;
 10.1155 -	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
 10.1156 -	      esac
 10.1157 -	    fi
 10.1158 -	  else
 10.1159 -	    # Install command for both is simple: just hardcode it.
 10.1160 -	    if test "$hardcode_direct" = yes; then
 10.1161 -	      deplibs="$deplibs $libdir/$linklib"
 10.1162 -	    elif test "$hardcode_minus_L" = yes; then
 10.1163 -	      add_dir="-L$libdir"
 10.1164 -	      add_name=yes
 10.1165 -	    elif test "$hardcode_shlibpath_var" = yes; then
 10.1166 -	      add_name=yes
 10.1167 -	    else
 10.1168 -	      # We cannot seem to hardcode it, guess we'll fake it.
 10.1169 -	      add_dir="-L$libdir"
 10.1170 -	      add_name=yes
 10.1171 -	    fi
 10.1172 -	  fi
 10.1173 -	  if test "$hardcode_direct" != yes && \
 10.1174 -	     test "$hardcode_minus_L" != yes && \
 10.1175 -	     test "$hardcode_shlibpath_var" = yes; then
 10.1176 -	      case ":$finalize_shlibpath:" in
 10.1177 -	      *":$libdir:"*) ;;
 10.1178 -	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
 10.1179 -	      esac
 10.1180 -	  fi
 10.1181 -	  if test -n "$add_dir"; then
 10.1182 -	    case "$deplibs " in
 10.1183 -	    *" $add_dir "*) ;;
 10.1184 -	    *) deplibs="$deplibs $add_dir" ;;
 10.1185 -	    esac
 10.1186 -	  fi
 10.1187 -	  test "$add_name" = yes && deplibs="$deplibs -l$name"
 10.1188 -	elif test "$build_libtool_libs" = yes; then
 10.1189 -	  # Not a shared library
 10.1190 -	  if test "$deplibs_check_method" != pass_all; then
 10.1191 -	    # We're trying link a shared library against a static one
 10.1192 -	    # but the system doesn't support it.
 10.1193 -	    # Just print a warning and add the library to dependency_libs so
 10.1194 -	    # that the program can be linked against the static library.
 10.1195 -	    echo
 10.1196 -	    echo "*** Warning: This library needs some functionality provided by $libname."
 10.1197 -	    echo "*** I have the capability to make that library automatically link in when"
 10.1198 -	    echo "*** you link to this library.  But I can only do this if you have a"
 10.1199 -	    echo "*** shared version of the library, which you do not appear to have."
 10.1200 -	  else
 10.1201 -	    convenience="$convenience $dir/$old_library"
 10.1202 -	    old_convenience="$old_convenience $dir/$old_library"
 10.1203 -	    deplibs="$deplibs $dir/$old_library"
 10.1204 -	    link_static=yes
 10.1205 -	  fi
 10.1206 -	fi
 10.1207 -
 10.1208 -	if test -n "$dependency_libs"; then
 10.1209 -	  # Extract -R from dependency_libs
 10.1210 -	  temp_deplibs=
 10.1211 -	  for libdir in $dependency_libs; do
 10.1212 -	    case "$libdir" in
 10.1213 -	    -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
 10.1214 -		 case " $xrpath " in
 10.1215 -		 *" $temp_xrpath "*) ;;
 10.1216 -		 *) xrpath="$xrpath $temp_xrpath";;
 10.1217 -		 esac;;
 10.1218 -	    *) temp_deplibs="$temp_deplibs $libdir";;
 10.1219 -	    esac
 10.1220 -	  done
 10.1221 -	  dependency_libs="$temp_deplibs"
 10.1222 -	fi
 10.1223 -
 10.1224 -	new_lib_search_path="$new_lib_search_path $absdir"
 10.1225 -	# Link against this library
 10.1226 -	test "$link_static" = no && newdependency_libs="$newdependency_libs $abs_ladir/$laname"
 10.1227 -	# ... and its dependency_libs
 10.1228 -	newdependency_libs="$newdependency_libs $dependency_libs"
 10.1229 -
 10.1230 -	if test $link_all_deplibs != no; then
 10.1231 -	  # Add the search paths of all dependency libraries
 10.1232 -	  for deplib in $dependency_libs; do
 10.1233 -	    case "$deplib" in
 10.1234 -	    -L*) path="$deplib" ;;
 10.1235 -	    *.la) 
 10.1236 -	      if grep "^installed=no" $deplib > /dev/null; then
 10.1237 -		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
 10.1238 -		test "X$dir" = "X$deplib" && dir="."
 10.1239 -		# We need an absolute path.
 10.1240 -		case "$dir" in
 10.1241 -		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
 10.1242 -		*)
 10.1243 -		  absdir=`cd "$dir" && pwd`
 10.1244 -		  if test -z "$absdir"; then
 10.1245 -		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
 10.1246 -		    absdir="$dir"
 10.1247 -		  fi
 10.1248 -		  ;;
 10.1249 -		esac
 10.1250 -		path="-L$absdir/$objdir"
 10.1251 -	      else
 10.1252 -		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 10.1253 -		if test -z "$libdir"; then
 10.1254 -		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
 10.1255 -		  exit 1
 10.1256 -		fi
 10.1257 -		path="-L$libdir"
 10.1258 -	      fi
 10.1259 -	      ;;
 10.1260 -	    *)
 10.1261 -	      continue
 10.1262 -	      ;;
 10.1263 -	    esac
 10.1264 -	    case "$deplibs " in
 10.1265 -	    *" $path "*) ;;
 10.1266 -	    *) deplibs="$path $deplibs" ;;
 10.1267 -	    esac
 10.1268 -	  done
 10.1269 -	fi
 10.1270 -      done
 10.1271 -
 10.1272 -      # Make sure lib_search_path contains only unique directories.
 10.1273 -      lib_search_path=
 10.1274 -      for dir in $new_lib_search_path; do
 10.1275 -	case "$lib_search_path " in
 10.1276 -	*" $dir "*) ;;
 10.1277 -	*) lib_search_path="$lib_search_path $dir" ;;
 10.1278 -	esac
 10.1279 -      done
 10.1280 -      lib_search_path="$lib_search_path $sys_lib_search_path"
 10.1281 -      
 10.1282 -      # Make sure newdependency_libs contains only unique libraries and directories.
 10.1283 -      dependency_libs=
 10.1284 -      for deplib in $newdependency_libs; do
 10.1285 -	case "$dependency_libs " in
 10.1286 -	*" $deplib "*) ;;
 10.1287 -	*) dependency_libs="$dependency_libs $deplib" ;;
 10.1288 -	esac
 10.1289 -      done
 10.1290 -      
 10.1291 -      # Eliminate all temporary directories.
 10.1292 -      for path in $uninst_path; do
 10.1293 -	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
 10.1294 -	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
 10.1295 -	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
 10.1296 -      done
 10.1297 -      
 10.1298 -      if test -n "$xrpath"; then
 10.1299 -	# If the user specified any rpath flags, then add them.
 10.1300 -	temp_xrpath=
 10.1301 -	for libdir in $xrpath; do
 10.1302 -	  temp_xrpath="$temp_xrpath -R$libdir"
 10.1303 -	  case "$compile_rpath " in
 10.1304 -	  *" $libdir "*) ;;
 10.1305 -	  *) compile_rpath="$compile_rpath $libdir" ;;
 10.1306 -	  esac
 10.1307 -	  case "$finalize_rpath " in
 10.1308 -	  *" $libdir "*) ;;
 10.1309 -	  *) finalize_rpath="$finalize_rpath $libdir" ;;
 10.1310 -	  esac
 10.1311 -	done
 10.1312 -	dependency_libs="$temp_xrpath $dependency_libs"
 10.1313 -      fi
 10.1314 -
 10.1315 -      # Restore the variables
 10.1316 -      libname=$libname_save
 10.1317 -      name=$name_save
 10.1318 -
 10.1319        if test "$build_libtool_libs" = yes; then
 10.1320 -	if test -n "$rpath"; then
 10.1321 -	  case "$host" in
 10.1322 -	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
 10.1323 -	    # these systems don't actually have a c library (as such)!
 10.1324 -	    ;;
 10.1325 -	  *)
 10.1326 -	    # Add libc to deplibs on all other systems.
 10.1327 -	    deplibs="$deplibs -lc"
 10.1328 -	    ;;
 10.1329 -	  esac
 10.1330 -	fi
 10.1331 -
 10.1332  	# Transform deplibs into only deplibs that can be linked in shared.
 10.1333  	name_save=$name
 10.1334  	libname_save=$libname
 10.1335 @@ -2213,61 +2038,6 @@
 10.1336        
 10.1337        # Test again, we may have decided not to build it any more
 10.1338        if test "$build_libtool_libs" = yes; then
 10.1339 -	if test "$hardcode_into_libs" = yes; then
 10.1340 -	  # Hardcode the library paths
 10.1341 -	  hardcode_libdirs=
 10.1342 -	  dep_rpath=
 10.1343 -	  rpath="$finalize_rpath"
 10.1344 -	  test "$relink" = no && rpath="$compile_rpath$rpath"
 10.1345 -	  for libdir in $rpath; do
 10.1346 -	    if test -n "$hardcode_libdir_flag_spec"; then
 10.1347 -	      if test -n "$hardcode_libdir_separator"; then
 10.1348 -		if test -z "$hardcode_libdirs"; then
 10.1349 -		  hardcode_libdirs="$libdir"
 10.1350 -		else
 10.1351 -		  # Just accumulate the unique libdirs.
 10.1352 -		  case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
 10.1353 -		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 10.1354 -		    ;;
 10.1355 -		  *)
 10.1356 -		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
 10.1357 -		    ;;
 10.1358 -		  esac
 10.1359 -		fi
 10.1360 -	      else
 10.1361 -		eval flag=\"$hardcode_libdir_flag_spec\"
 10.1362 -		dep_rpath="$dep_rpath $flag"
 10.1363 -	      fi
 10.1364 -	    elif test -n "$runpath_var"; then
 10.1365 -	      case "$perm_rpath " in
 10.1366 -	      *" $libdir "*) ;;
 10.1367 -	      *) perm_rpath="$perm_rpath $libdir" ;;
 10.1368 -	      esac
 10.1369 -	    fi
 10.1370 -	  done
 10.1371 -	  # Substitute the hardcoded libdirs into the rpath.
 10.1372 -	  if test -n "$hardcode_libdir_separator" &&
 10.1373 -	     test -n "$hardcode_libdirs"; then
 10.1374 -	    libdir="$hardcode_libdirs"
 10.1375 -	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 10.1376 -	  fi
 10.1377 -	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 10.1378 -	    # We should set the runpath_var.
 10.1379 -	    rpath=
 10.1380 -	    for dir in $perm_rpath; do
 10.1381 -	      rpath="$rpath$dir:"
 10.1382 -	    done
 10.1383 -	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 10.1384 -	  fi
 10.1385 -	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 10.1386 -	fi
 10.1387 -
 10.1388 -	shlibpath="$finalize_shlibpath"	
 10.1389 -	test "$relink" = no && shlibpath="$compile_shlibpath$shlibpath"	
 10.1390 -	if test -n "$shlibpath"; then
 10.1391 -	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 10.1392 -	fi
 10.1393 -  
 10.1394  	# Get the real and link names of the library.
 10.1395  	eval library_names=\"$library_names_spec\"
 10.1396  	set dummy $library_names
 10.1397 @@ -2287,7 +2057,7 @@
 10.1398  	done
 10.1399  
 10.1400  	# Ensure that we have .o objects for linkers which dislike .lo
 10.1401 -	# (e.g. aix) incase we are running --disable-static
 10.1402 +	# (e.g. aix) in case we are running --disable-static
 10.1403  	for obj in $libobjs; do
 10.1404  	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
 10.1405  	  if test "X$xdir" = "X$obj"; then
 10.1406 @@ -2375,12 +2145,7 @@
 10.1407  
 10.1408  	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 10.1409  	  eval flag=\"$thread_safe_flag_spec\"
 10.1410 -	  linker_flags="$linker_flags $flag"
 10.1411 -	fi
 10.1412 -
 10.1413 -	# Make a backup of the uninstalled library when relinking
 10.1414 -	if test "$relink" = yes && test "$hardcode_into_libs" = yes ; then
 10.1415 -	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
 10.1416 +	  linkopts="$linkopts $flag"
 10.1417  	fi
 10.1418  
 10.1419  	# Do each of the archive commands.
 10.1420 @@ -2397,12 +2162,6 @@
 10.1421  	done
 10.1422  	IFS="$save_ifs"
 10.1423  
 10.1424 -	# Restore the uninstalled library and exit
 10.1425 -	if test "$relink" = yes && test "$hardcode_into_libs" = yes; then
 10.1426 -	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
 10.1427 -	  exit 0
 10.1428 -	fi
 10.1429 -
 10.1430  	# Create links to the real library.
 10.1431  	for linkname in $linknames; do
 10.1432  	  if test "$realname" != "$linkname"; then
 10.1433 @@ -2419,7 +2178,12 @@
 10.1434        fi
 10.1435        ;;
 10.1436  
 10.1437 -    obj)
 10.1438 +    *.lo | *.o | *.obj)
 10.1439 +      if test -n "$link_against_libtool_libs"; then
 10.1440 +	$echo "$modename: error: cannot link libtool libraries into objects" 1>&2
 10.1441 +	exit 1
 10.1442 +      fi
 10.1443 +
 10.1444        if test -n "$deplibs"; then
 10.1445  	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
 10.1446        fi
 10.1447 @@ -2446,7 +2210,7 @@
 10.1448  
 10.1449        case "$output" in
 10.1450        *.lo)
 10.1451 -	if test -n "$objs$old_deplibs"; then
 10.1452 +	if test -n "$objs"; then
 10.1453  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
 10.1454  	  exit 1
 10.1455  	fi
 10.1456 @@ -2513,7 +2277,7 @@
 10.1457        fi
 10.1458  
 10.1459        # Create the old-style object.
 10.1460 -      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
 10.1461 +      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
 10.1462  
 10.1463        output="$obj"
 10.1464        eval cmds=\"$reload_cmds\"
 10.1465 @@ -2548,7 +2312,7 @@
 10.1466  	exit 0
 10.1467        fi
 10.1468  
 10.1469 -      if test -n "$pic_flag" || test "$pic_mode" != default; then
 10.1470 +      if test -n "$pic_flag"; then
 10.1471  	# Only do commands if we really have different PIC objects.
 10.1472  	reload_objs="$libobjs $reload_conv_objs"
 10.1473  	output="$libobj"
 10.1474 @@ -2584,7 +2348,8 @@
 10.1475        exit 0
 10.1476        ;;
 10.1477  
 10.1478 -    prog)
 10.1479 +    # Anything else should be a program.
 10.1480 +    *)
 10.1481        if test -n "$vinfo"; then
 10.1482  	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
 10.1483        fi
 10.1484 @@ -2600,450 +2365,6 @@
 10.1485  	fi 
 10.1486        fi
 10.1487      
 10.1488 -      # Find libtool libraries and add their dependencies
 10.1489 -      save_deplibs="$deplibs"
 10.1490 -      deplibs=
 10.1491 -      newdependency_libs=
 10.1492 -      new_lib_search_path=
 10.1493 -      for deplib in $save_deplibs; do
 10.1494 -	lib=
 10.1495 -	case "$deplib" in
 10.1496 -	*.a | *.lib)
 10.1497 -	  deplibs="$deplibs $deplib"
 10.1498 -	  continue
 10.1499 -	  ;;
 10.1500 -	-L*)
 10.1501 -	  deplibs="$deplibs $deplib"
 10.1502 -	  new_lib_search_path="$new_lib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 10.1503 -	  continue
 10.1504 -	  ;;
 10.1505 -	-l*)
 10.1506 -	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 10.1507 -	  found=no
 10.1508 -	  for searchdir in $lib_search_path; do
 10.1509 -	    # Search the libtool library
 10.1510 -	    lib="$searchdir/lib${name}.la"
 10.1511 -	    if test -f "$lib"; then
 10.1512 -	      found=yes
 10.1513 -	      break
 10.1514 -	    fi
 10.1515 -	  done
 10.1516 -	  if test "$found" != yes; then
 10.1517 -	    deplibs="$deplibs $deplib"
 10.1518 -	    continue
 10.1519 -	  fi
 10.1520 -	  ;;
 10.1521 -	*)
 10.1522 -	  lib="$deplib"
 10.1523 -	  if test -f "$lib"; then :
 10.1524 -	  else
 10.1525 -	    $echo "$modename: cannot find the library \`$lib'" 1>&2
 10.1526 -	    exit 1
 10.1527 -	  fi
 10.1528 -	  ;;
 10.1529 -	esac
 10.1530 -	libdir=
 10.1531 -	library_names=
 10.1532 -	old_library=
 10.1533 -
 10.1534 -	# Check to see that this really is a libtool archive.
 10.1535 -	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 10.1536 -	else
 10.1537 -	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 10.1538 -	  exit 1
 10.1539 -	fi
 10.1540 -
 10.1541 -	# If the library was installed with an old release of libtool,
 10.1542 -	# it will not redefine variable installed.
 10.1543 -	installed=yes
 10.1544 -
 10.1545 -	# Read the .la file
 10.1546 -	case "$lib" in
 10.1547 -	*/* | *\\*) . $lib ;;
 10.1548 -	*) . ./$lib ;;
 10.1549 -	esac
 10.1550 -
 10.1551 -	# Get the name of the library we link against.
 10.1552 -	linklib=
 10.1553 -	for l in $old_library $library_names; do
 10.1554 -	  linklib="$l"
 10.1555 -	done
 10.1556 -
 10.1557 -	if test -z "$linklib"; then
 10.1558 -	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
 10.1559 -	  exit 1
 10.1560 -	fi
 10.1561 -
 10.1562 -	new_lib_search_path="$new_lib_search_path `$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`"
 10.1563 -	deplibs="$deplibs $lib"
 10.1564 -
 10.1565 -	for deplib in $dependency_libs; do
 10.1566 -	  case "$deplib" in
 10.1567 -	  -L*)
 10.1568 -	    new_lib_search_path="$new_lib_search_path `$echo "X$deplib" | $Xsed -e 's/^-L//'`"
 10.1569 -	    ;;
 10.1570 -	  esac
 10.1571 -	  
 10.1572 -	  if test "$link_all_deplibs" != no || \
 10.1573 -	     test "$fast_install" != no || \
 10.1574 -	     test "$build_libtool_libs" = no || \
 10.1575 -	     test -z "$library_names"; then
 10.1576 -	    # Need to link against all dependency_libs
 10.1577 -	    deplibs="$deplibs $deplib"
 10.1578 -	  else
 10.1579 -	    # Need to hardcode shared library paths
 10.1580 -	    # or/and link against static libraries
 10.1581 -	    newdependency_libs="$newdependency_libs $deplib"
 10.1582 -	  fi
 10.1583 -	done
 10.1584 -      done
 10.1585 -      
 10.1586 -      # Eliminate all dependency_libs that are already contained in deplibs
 10.1587 -      dependency_libs=
 10.1588 -      for deplib in $newdependency_libs; do
 10.1589 -	case "$deplibs " in
 10.1590 -	*" $deplib "*) ;;
 10.1591 -	*) dependency_libs="$dependency_libs $deplib" ;;
 10.1592 -	esac
 10.1593 -      done
 10.1594 -
 10.1595 -      # Make sure lib_search_path contains only unique directories.
 10.1596 -      lib_search_path=
 10.1597 -      for dir in $new_lib_search_path; do
 10.1598 -	case "$lib_search_path " in
 10.1599 -	*" $dir "*) ;;
 10.1600 -	*) lib_search_path="$lib_search_path $dir" ;;
 10.1601 -	esac
 10.1602 -      done
 10.1603 -      lib_search_path="$lib_search_path $sys_lib_search_path"
 10.1604 -      
 10.1605 -      # Find libtool libraries and add their directories
 10.1606 -      alldeplibs=no
 10.1607 -      link_against_libtool_libs=
 10.1608 -      
 10.1609 -      for deplib in $deplibs @DEPLIBS@ $dependency_libs; do
 10.1610 -	lib=
 10.1611 -	case "$deplib" in
 10.1612 -	-L* | *.a | *.lib)
 10.1613 -	  compile_command="$compile_command $deplib"
 10.1614 -	  finalize_command="$finalize_command $deplib"
 10.1615 -	  continue
 10.1616 -	  ;;
 10.1617 -	-R*)
 10.1618 -	  dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
 10.1619 -	  # Make sure the xrpath contains only unique directories.
 10.1620 -	  case "$xrpath " in
 10.1621 -	  *" $dir "*) ;;
 10.1622 -	  *) xrpath="$xrpath $dir" ;;
 10.1623 -	  esac
 10.1624 -	  continue
 10.1625 -	  ;;
 10.1626 -	@DEPLIBS@)
 10.1627 -	  alldeplibs=yes
 10.1628 -	  continue
 10.1629 -	  ;;
 10.1630 -	-l*)
 10.1631 -	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 10.1632 -	  found=no
 10.1633 -	  for searchdir in $lib_search_path; do
 10.1634 -	    # Search the libtool library
 10.1635 -	    lib="$searchdir/lib${name}.la"
 10.1636 -	    if test -f "$lib"; then
 10.1637 -	      found=yes
 10.1638 -	      break
 10.1639 -	    fi
 10.1640 -	  done
 10.1641 -	  if test "$found" != yes; then
 10.1642 -	    compile_command="$compile_command $deplib"
 10.1643 -	    finalize_command="$finalize_command $deplib"
 10.1644 -	    continue
 10.1645 -	  fi
 10.1646 -	  ;;
 10.1647 -	*)
 10.1648 -	  lib="$deplib"
 10.1649 -	  if test -f "$lib"; then :
 10.1650 -	  else
 10.1651 -	    $echo "$modename: cannot find the library \`$lib'" 1>&2
 10.1652 -	    exit 1
 10.1653 -	  fi
 10.1654 -	  ;;
 10.1655 -	esac
 10.1656 -	libdir=
 10.1657 -	library_names=
 10.1658 -	old_library=
 10.1659 -
 10.1660 -	# Check to see that this really is a libtool archive.
 10.1661 -	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 10.1662 -	else
 10.1663 -	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 10.1664 -	  exit 1
 10.1665 -	fi
 10.1666 -
 10.1667 -	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
 10.1668 -	test "X$ladir" = "X$lib" && ladir="."
 10.1669 -	# We need an absolute path.
 10.1670 -	case "$ladir" in
 10.1671 -	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
 10.1672 -	*)
 10.1673 -	  abs_ladir=`cd "$ladir" && pwd`
 10.1674 -	  if test -z "$abs_ladir"; then
 10.1675 -	    $echo "$modename: warning: cannot determine absolute directory name of \`$abs_ladir'" 1>&2
 10.1676 -	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
 10.1677 -	    abs_ladir="$ladir"
 10.1678 -	  fi
 10.1679 -	  ;;
 10.1680 -	esac
 10.1681 -	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
 10.1682 -
 10.1683 -	# If the library was installed with an old release of libtool,
 10.1684 -	# it will not redefine variable installed.
 10.1685 -	installed=yes
 10.1686 -
 10.1687 -	# Read the .la file
 10.1688 -	case "$lib" in
 10.1689 -	*/* | *\\*) . $lib ;;
 10.1690 -	*) . ./$lib ;;
 10.1691 -	esac
 10.1692 -
 10.1693 -	# Get the name of the library we link against.
 10.1694 -	linklib=
 10.1695 -	for l in $old_library $library_names; do
 10.1696 -	  linklib="$l"
 10.1697 -	done
 10.1698 -
 10.1699 -	if test -z "$linklib"; then
 10.1700 -	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
 10.1701 -	  exit 1
 10.1702 -	fi
 10.1703 -
 10.1704 -	# Find the relevant object directory and library name.
 10.1705 -	if test "X$installed" = Xyes; then
 10.1706 -	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 10.1707 -	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
 10.1708 -	    dir="$ladir"
 10.1709 -	    absdir="$abs_ladir"
 10.1710 -	    libdir="$abs_ladir"
 10.1711 -	  else
 10.1712 -	    dir="$libdir"
 10.1713 -	    absdir="$libdir"
 10.1714 -	  fi
 10.1715 -	else
 10.1716 -	  dir="$ladir/$objdir"
 10.1717 -	  absdir="$abs_ladir/$objdir"
 10.1718 -	fi
 10.1719 -	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 10.1720 -
 10.1721 -	hardcode=yes
 10.1722 -	test "$hardcode_into_libs" = yes && test "$alldeplibs" = yes && hardcode=no
 10.1723 -	if test "$hardcode" = yes && test -n "$library_names" &&
 10.1724 -	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 10.1725 -	  # We need to hardcode the library path
 10.1726 -	  if test -n "$shlibpath_var"; then
 10.1727 -	    # Make sure the rpath contains only unique directories.
 10.1728 -	    case "$temp_rpath " in
 10.1729 -	    *" $dir "*) ;;
 10.1730 -	    *" $absdir "*) ;;
 10.1731 -	    *) temp_rpath="$temp_rpath $dir" ;;
 10.1732 -	    esac
 10.1733 -	  fi
 10.1734 -
 10.1735 -	  # Hardcode the library path.
 10.1736 -	  # Skip directories that are in the system default run-time
 10.1737 -	  # search path.
 10.1738 -	  case " $sys_lib_dlsearch_path " in
 10.1739 -	  *" $absdir "*) ;;
 10.1740 -	  *)
 10.1741 -	    case "$compile_rpath " in
 10.1742 -	    *" $absdir "*) ;;
 10.1743 -	    *) compile_rpath="$compile_rpath $absdir" 
 10.1744 -	    esac
 10.1745 -	    ;;
 10.1746 -	  esac
 10.1747 -
 10.1748 -	  case " $sys_lib_dlsearch_path " in
 10.1749 -	  *" $libdir "*) ;;
 10.1750 -	  *)
 10.1751 -	    case "$finalize_rpath " in
 10.1752 -	    *" $libdir "*) ;;
 10.1753 -	    *) finalize_rpath="$finalize_rpath $libdir"
 10.1754 -	    esac
 10.1755 -	    ;;
 10.1756 -	  esac
 10.1757 -	fi
 10.1758 -
 10.1759 -	if test "$alldeplibs" = yes &&
 10.1760 -	   { test "$deplibs_check_method" = pass_all ||
 10.1761 -	     { test "$build_libtool_libs" = yes &&
 10.1762 -	       test -n "$library_names"; }; }; then
 10.1763 -	  # Do we only need to link against static libraries?
 10.1764 -	  continue
 10.1765 -	fi
 10.1766 -	
 10.1767 -	if test -z "$libdir"; then
 10.1768 -	  # It is a libtool convenience library, so add in its objects.
 10.1769 -	  convenience="$convenience $dir/$old_library"
 10.1770 -	  old_convenience="$old_convenience $dir/$old_library"
 10.1771 -	  compile_command="$compile_command $dir/$old_library"
 10.1772 -	  finalize_command="$finalize_command $dir/$old_library"
 10.1773 -	  continue
 10.1774 -	fi
 10.1775 -
 10.1776 -	if test -n "$library_names" &&
 10.1777 -	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 10.1778 -	  link_against_libtool_libs="$link_against_libtool_libs $lib"
 10.1779 -
 10.1780 -	  if test -n "$old_archive_from_expsyms_cmds"; then
 10.1781 -	    # figure out the soname
 10.1782 -	    set dummy $library_names
 10.1783 -	    realname="$2"
 10.1784 -	    shift; shift
 10.1785 -	    libname=`eval \\$echo \"$libname_spec\"`
 10.1786 -	    if test -n "$soname_spec"; then
 10.1787 -	      eval soname=\"$soname_spec\"
 10.1788 -	    else
 10.1789 -	      soname="$realname"
 10.1790 -	    fi
 10.1791 -
 10.1792 -	    # Make a new name for the extract_expsyms_cmds to use
 10.1793 -	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
 10.1794 -	  
 10.1795 -	    # If the library has no export list, then create one now
 10.1796 -	    if test -f "$output_objdir/$soname-def"; then :
 10.1797 -	    else
 10.1798 -	      $show "extracting exported symbol list from \`$soname'"
 10.1799 -	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 10.1800 -	      eval cmds=\"$extract_expsyms_cmds\"
 10.1801 -	      for cmd in $cmds; do
 10.1802 -		IFS="$save_ifs"
 10.1803 -		$show "$cmd"
 10.1804 -		$run eval "$cmd" || exit $?
 10.1805 -	      done
 10.1806 -	      IFS="$save_ifs"
 10.1807 -	    fi
 10.1808 - 
 10.1809 -	    # Create $newlib
 10.1810 -	    if test -f "$output_objdir/$newlib"; then :; else
 10.1811 -	      $show "generating import library for \`$soname'"
 10.1812 -	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 10.1813 -	      eval cmds=\"$old_archive_from_expsyms_cmds\"
 10.1814 -	      for cmd in $cmds; do
 10.1815 -		IFS="$save_ifs"
 10.1816 -		$show "$cmd"
 10.1817 -		$run eval "$cmd" || exit $?
 10.1818 -	      done
 10.1819 -	      IFS="$save_ifs"
 10.1820 -	    fi
 10.1821 -	    # make sure the library variables are pointing to the new library
 10.1822 -	    dir=$output_objdir
 10.1823 -	    linklib=$newlib
 10.1824 -	  fi
 10.1825 -
 10.1826 -	  lib_linked=yes
 10.1827 -	  add_dir=
 10.1828 -	  add_shlibpath=
 10.1829 -	  add_name=no
 10.1830 -	  case "$hardcode_action" in
 10.1831 -	  immediate | unsupported)
 10.1832 -	    if test "$hardcode_direct" = no; then
 10.1833 -	      compile_command="$compile_command $dir/$linklib"
 10.1834 -	    elif test "$hardcode_minus_L" = no; then
 10.1835 -	      case "$host" in
 10.1836 -	      *-*-sunos*) add_shlibpath="$dir" ;;
 10.1837 -	      esac
 10.1838 -	      add_dir="-L$dir"
 10.1839 -	      add_name=yes
 10.1840 -	    elif test "$hardcode_shlibpath_var" = no; then
 10.1841 -	      add_shlibpath="$dir"
 10.1842 -	      add_name=yes
 10.1843 -	    else
 10.1844 -	      lib_linked=no
 10.1845 -	    fi
 10.1846 -	    ;;
 10.1847 -
 10.1848 -	  relink)
 10.1849 -	    if test "$hardcode_direct" = yes; then
 10.1850 -	      compile_command="$compile_command $absdir/$linklib"
 10.1851 -	    elif test "$hardcode_minus_L" = yes; then
 10.1852 -	      add_dir="-L$absdir"
 10.1853 -	      add_name=yes
 10.1854 -	    elif test "$hardcode_shlibpath_var" = yes; then
 10.1855 -	      add_shlibpath="$absdir"
 10.1856 -	      add_name=yes
 10.1857 -	    else
 10.1858 -	      lib_linked=no
 10.1859 -	    fi
 10.1860 -	    ;;
 10.1861 -
 10.1862 -	  *) lib_linked=no ;;
 10.1863 -	  esac
 10.1864 -
 10.1865 -	  if test "$lib_linked" != yes; then
 10.1866 -	    $echo "$modename: configuration error: unsupported hardcode properties"
 10.1867 -	    exit 1
 10.1868 -	  fi
 10.1869 -	  if test -n "$add_dir"; then
 10.1870 -	    case "$compile_command " in
 10.1871 -	    *" $add_dir "*) ;;
 10.1872 -	    *) compile_command="$compile_command $add_dir" ;;
 10.1873 -	    esac
 10.1874 -	  fi
 10.1875 -	  if test -n "$add_shlibpath"; then
 10.1876 -	    case ":$compile_shlibpath:" in
 10.1877 -	    *":$add_shlibpath:"*) ;;
 10.1878 -	    *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
 10.1879 -	    esac
 10.1880 -	  fi
 10.1881 -	  test "$add_name" = yes && compile_command="$compile_command -l$name"
 10.1882 -
 10.1883 -	  add_dir=
 10.1884 -	  add_name=no
 10.1885 -	  # Finalize command for both is simple: just hardcode it.
 10.1886 -	  if test "$hardcode_direct" = yes; then
 10.1887 -	    finalize_command="$finalize_command $libdir/$linklib"
 10.1888 -	  elif test "$hardcode_minus_L" = yes; then
 10.1889 -	    add_dir="-L$libdir"
 10.1890 -	    add_name=yes
 10.1891 -	  elif test "$hardcode_shlibpath_var" = yes; then
 10.1892 -	    case ":$finalize_shlibpath:" in
 10.1893 -	    *":$libdir:"*) ;;
 10.1894 -	    *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
 10.1895 -	    esac
 10.1896 -	    add_name=yes
 10.1897 -	  else
 10.1898 -	    # We cannot seem to hardcode it, guess we'll fake it.
 10.1899 -	    add_dir="-L$libdir"
 10.1900 -	    add_name=yes
 10.1901 -	  fi
 10.1902 -	  if test -n "$add_dir"; then
 10.1903 -	    case "$finalize_command " in
 10.1904 -	    *" $add_dir "*) ;;
 10.1905 -	    *) finalize_command="$finalize_command $add_dir" ;;
 10.1906 -	    esac
 10.1907 -	  fi
 10.1908 -	  test "$add_name" = yes && finalize_command="$finalize_command -l$name"
 10.1909 -	else
 10.1910 -	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 10.1911 -	  # is not unsupported.  This is valid on all known static and
 10.1912 -	  # shared platforms.
 10.1913 -	  if test "$hardcode_direct" != unsupported; then
 10.1914 -	    test -n "$old_library" && linklib="$old_library"
 10.1915 -	    compile_command="$compile_command $dir/$linklib"
 10.1916 -	    finalize_command="$finalize_command $dir/$linklib"
 10.1917 -	  else
 10.1918 -	    case "$compile_command " in
 10.1919 -	    *" -L$dir "*) ;;
 10.1920 -	    *) compile_command="$compile_command -L$dir";;
 10.1921 -	    esac
 10.1922 -	    compile_command="$compile_command -l$name"
 10.1923 -	    case "$finalize_command " in
 10.1924 -	    *" -L$dir "*) ;;
 10.1925 -	    *) finalize_command="$finalize_command -L$dir";;
 10.1926 -	    esac
 10.1927 -	    finalize_command="$finalize_command -l$name"
 10.1928 -	  fi
 10.1929 -	fi
 10.1930 -      done
 10.1931 -      
 10.1932        if test -n "$rpath$xrpath"; then
 10.1933  	# If the user specified any rpath flags, then add them.
 10.1934  	for libdir in $rpath $xrpath; do
 10.1935 @@ -3087,14 +2408,6 @@
 10.1936  	  *) perm_rpath="$perm_rpath $libdir" ;;
 10.1937  	  esac
 10.1938  	fi
 10.1939 -	case "$host" in
 10.1940 -	*-*-cygwin* | *-*-mingw* | *-*-os2*)
 10.1941 -	  case ":$dllsearchpath:" in
 10.1942 -	  *":$libdir:"*) ;;
 10.1943 -	  *) dllsearchpath="$dllsearchpath:$libdir";;
 10.1944 -	  esac
 10.1945 -	  ;;
 10.1946 -	esac
 10.1947        done
 10.1948        # Substitute the hardcoded libdirs into the rpath.
 10.1949        if test -n "$hardcode_libdir_separator" &&
 10.1950 @@ -3140,6 +2453,23 @@
 10.1951        fi
 10.1952        finalize_rpath="$rpath"
 10.1953  
 10.1954 +      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
 10.1955 +      if test "X$output_objdir" = "X$output"; then
 10.1956 +	output_objdir="$objdir"
 10.1957 +      else
 10.1958 +	output_objdir="$output_objdir/$objdir"
 10.1959 +      fi
 10.1960 +
 10.1961 +      # Create the binary in the object directory, then wrap it.
 10.1962 +      if test ! -d $output_objdir; then
 10.1963 +	$show "$mkdir $output_objdir"
 10.1964 +	$run $mkdir $output_objdir
 10.1965 +	status=$?
 10.1966 +	if test $status -ne 0 && test ! -d $output_objdir; then
 10.1967 +	  exit $status
 10.1968 +	fi
 10.1969 +      fi
 10.1970 +
 10.1971        if test -n "$libobjs" && test "$build_old_libs" = yes; then
 10.1972  	# Transform all the library objects into standard objects.
 10.1973  	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 10.1974 @@ -3188,7 +2518,7 @@
 10.1975  	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
 10.1976  
 10.1977  	    # Add our own program objects to the symbol list.
 10.1978 -	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 10.1979 +	    progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 10.1980  	    for arg in $progfiles; do
 10.1981  	      $show "extracting global C symbols from \`$arg'"
 10.1982  	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
 10.1983 @@ -3397,20 +2727,7 @@
 10.1984  	fi
 10.1985        fi
 10.1986  
 10.1987 -      if test "$no_install" = yes; then
 10.1988 -	# We don't need to create a wrapper script.
 10.1989 -	link_command="$compile_var$compile_command$compile_rpath"
 10.1990 -	# Replace the output file specification.
 10.1991 -	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 10.1992 -	# Delete the old output file.
 10.1993 -	$run $rm $output
 10.1994 -	# Link the executable and exit
 10.1995 -	$show "$link_command"
 10.1996 -	$run eval "$link_command" || exit $?
 10.1997 -	exit 0
 10.1998 -      fi
 10.1999 -
 10.2000 -      if test "$hardcode_action" = relink || test "$hardcode_into_libs" = yes; then
 10.2001 +      if test "$hardcode_action" = relink; then
 10.2002  	# Fast installation is not supported
 10.2003  	link_command="$compile_var$compile_command$compile_rpath"
 10.2004  	relink_command="$finalize_var$finalize_command$finalize_rpath"
 10.2005 @@ -3614,13 +2931,21 @@
 10.2006        # Run the actual program with our arguments.
 10.2007  "
 10.2008  	case $host in
 10.2009 -	*-*-cygwin* | *-*-mingw | *-*-os2*)
 10.2010  	  # win32 system