Commit 9f8eef93cd6d139d43b2fff1895134105dc4e69e
1 parent
17ee3b2d
add GFitPar dummy and python binding
Showing
32 changed files
with
4242 additions
and
2972 deletions
INSTALL
| 1 | -GammaLib - Gamma-Ray Astronomy Library | |
| 2 | -====================================== | |
| 1 | +Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software | |
| 2 | +Foundation, Inc. | |
| 3 | 3 | |
| 4 | -Installation Instructions | |
| 5 | -========================= | |
| 4 | + This file is free documentation; the Free Software Foundation gives | |
| 5 | +unlimited permission to copy, distribute and modify it. | |
| 6 | 6 | |
| 7 | -GammaLib follows the standard GNU installation procedure. To compile | |
| 8 | -GammaLib you will need an ANSI C++-compiler. After unpacking the | |
| 9 | -distribution the Makefiles can be prepared using the configure command, | |
| 10 | - | |
| 11 | - ./configure | |
| 12 | - | |
| 13 | -You can then build the library by typing, | |
| 14 | - | |
| 15 | - make | |
| 16 | - | |
| 17 | -Both static and shared versions of the libraries will be compiled by | |
| 18 | -default. Compilation of shared libraries can be turned off by | |
| 19 | -specifying the `--disable-shared' option to `configure', e.g. | |
| 20 | - | |
| 21 | - ./configure --disable-shared | |
| 22 | - | |
| 23 | -If you encounter problems building the library try using the above | |
| 24 | -option, because some platforms do not support shared libraries. | |
| 25 | - | |
| 26 | -An extensive test suite is available. After compiling the library | |
| 27 | -with "make", it can be invoked with "make check" at the top level. | |
| 28 | -The test output should be directed to a file rather than a terminal, | |
| 29 | -with the command, | |
| 30 | - | |
| 31 | - | |
| 32 | - make check > log 2>&1 | |
| 33 | - | |
| 34 | -to allow any errors to be examined in detail. | |
| 35 | - | |
| 36 | -The library can be installed using the command, | |
| 37 | - | |
| 38 | - make install | |
| 39 | - | |
| 40 | -The default installation directory prefix is /usr/local. Consult the | |
| 41 | -"Further Information" section below for instructions on installing the | |
| 42 | -library in another location or changing other default compilation | |
| 43 | -options. | |
| 44 | - | |
| 45 | - | |
| 46 | -OPTIONS TO CONFIGURE SCRIPT: | |
| 47 | -============================ | |
| 48 | - | |
| 49 | -Apart form the further down mentioned options, the following | |
| 50 | -options can be used: | |
| 51 | - | |
| 52 | ---enable-range-check performs index range checking (slower code) | |
| 53 | - | |
| 54 | - | |
| 55 | -For example, if index range checking should be performed, use | |
| 56 | - | |
| 57 | -./configure --enable-range-check | |
| 7 | +Basic Installation | |
| 8 | +================== | |
| 58 | 9 | |
| 10 | + These are generic installation instructions. | |
| 11 | + | |
| 12 | + The `configure' shell script attempts to guess correct values for | |
| 13 | +various system-dependent variables used during compilation. It uses | |
| 14 | +those values to create a `Makefile' in each directory of the package. | |
| 15 | +It may also create one or more `.h' files containing system-dependent | |
| 16 | +definitions. Finally, it creates a shell script `config.status' that | |
| 17 | +you can run in the future to recreate the current configuration, and a | |
| 18 | +file `config.log' containing compiler output (useful mainly for | |
| 19 | +debugging `configure'). | |
| 20 | + | |
| 21 | + It can also use an optional file (typically called `config.cache' | |
| 22 | +and enabled with `--cache-file=config.cache' or simply `-C') that saves | |
| 23 | +the results of its tests to speed up reconfiguring. (Caching is | |
| 24 | +disabled by default to prevent problems with accidental use of stale | |
| 25 | +cache files.) | |
| 26 | + | |
| 27 | + If you need to do unusual things to compile the package, please try | |
| 28 | +to figure out how `configure' could check whether to do them, and mail | |
| 29 | +diffs or instructions to the address given in the `README' so they can | |
| 30 | +be considered for the next release. If you are using the cache, and at | |
| 31 | +some point `config.cache' contains results you don't want to keep, you | |
| 32 | +may remove or edit it. | |
| 33 | + | |
| 34 | + The file `configure.ac' (or `configure.in') is used to create | |
| 35 | +`configure' by a program called `autoconf'. You only need | |
| 36 | +`configure.ac' if you want to change it or regenerate `configure' using | |
| 37 | +a newer version of `autoconf'. | |
| 38 | + | |
| 39 | +The simplest way to compile this package is: | |
| 40 | + | |
| 41 | + 1. `cd' to the directory containing the package's source code and type | |
| 42 | + `./configure' to configure the package for your system. If you're | |
| 43 | + using `csh' on an old version of System V, you might need to type | |
| 44 | + `sh ./configure' instead to prevent `csh' from trying to execute | |
| 45 | + `configure' itself. | |
| 46 | + | |
| 47 | + Running `configure' takes awhile. While running, it prints some | |
| 48 | + messages telling which features it is checking for. | |
| 49 | + | |
| 50 | + 2. Type `make' to compile the package. | |
| 51 | + | |
| 52 | + 3. Optionally, type `make check' to run any self-tests that come with | |
| 53 | + the package. | |
| 54 | + | |
| 55 | + 4. Type `make install' to install the programs and any data files and | |
| 56 | + documentation. | |
| 57 | + | |
| 58 | + 5. You can remove the program binaries and object files from the | |
| 59 | + source code directory by typing `make clean'. To also remove the | |
| 60 | + files that `configure' created (so you can compile the package for | |
| 61 | + a different kind of computer), type `make distclean'. There is | |
| 62 | + also a `make maintainer-clean' target, but that is intended mainly | |
| 63 | + for the package's developers. If you use it, you may have to get | |
| 64 | + all sorts of other programs in order to regenerate files that came | |
| 65 | + with the distribution. | |
| 59 | 66 | |
| 60 | 67 | Compilers and Options |
| 61 | 68 | ===================== |
| ... | ... | @@ -72,7 +79,6 @@ is an example: |
| 72 | 79 | |
| 73 | 80 | *Note Defining Variables::, for more details. |
| 74 | 81 | |
| 75 | - | |
| 76 | 82 | Compiling For Multiple Architectures |
| 77 | 83 | ==================================== |
| 78 | 84 | |
| ... | ... | @@ -90,7 +96,6 @@ time in the source code directory. After you have installed the |
| 90 | 96 | package for one architecture, use `make distclean' before reconfiguring |
| 91 | 97 | for another architecture. |
| 92 | 98 | |
| 93 | - | |
| 94 | 99 | Installation Names |
| 95 | 100 | ================== |
| 96 | 101 | |
| ... | ... | @@ -114,7 +119,6 @@ you can set and what kinds of files go in them. |
| 114 | 119 | with an extra prefix or suffix on their names by giving `configure' the |
| 115 | 120 | option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. |
| 116 | 121 | |
| 117 | - | |
| 118 | 122 | Optional Features |
| 119 | 123 | ================= |
| 120 | 124 | |
| ... | ... | @@ -130,7 +134,6 @@ find the X include and library files automatically, but if it doesn't, |
| 130 | 134 | you can use the `configure' options `--x-includes=DIR' and |
| 131 | 135 | `--x-libraries=DIR' to specify their locations. |
| 132 | 136 | |
| 133 | - | |
| 134 | 137 | Specifying the System Type |
| 135 | 138 | ========================== |
| 136 | 139 | |
| ... | ... | @@ -161,7 +164,6 @@ platform different from the build platform, you should specify the |
| 161 | 164 | "host" platform (i.e., that on which the generated programs will |
| 162 | 165 | eventually be run) with `--host=TYPE'. |
| 163 | 166 | |
| 164 | - | |
| 165 | 167 | Sharing Defaults |
| 166 | 168 | ================ |
| 167 | 169 | |
| ... | ... | @@ -173,7 +175,6 @@ default values for variables like `CC', `cache_file', and `prefix'. |
| 173 | 175 | `CONFIG_SITE' environment variable to the location of the site script. |
| 174 | 176 | A warning: not all `configure' scripts look for a site script. |
| 175 | 177 | |
| 176 | - | |
| 177 | 178 | Defining Variables |
| 178 | 179 | ================== |
| 179 | 180 | |
| ... | ... | @@ -188,9 +189,8 @@ them in the `configure' command line, using `VAR=value'. For example: |
| 188 | 189 | will cause the specified gcc to be used as the C compiler (unless it is |
| 189 | 190 | overridden in the site shell script). |
| 190 | 191 | |
| 191 | - | |
| 192 | -Operation Controls | |
| 193 | -================== | |
| 192 | +`configure' Invocation | |
| 193 | +====================== | |
| 194 | 194 | |
| 195 | 195 | `configure' recognizes the following options to control how it |
| 196 | 196 | operates. | ... | ... |
Makefile.am
Makefile.in
| 1 | -# Makefile.in generated by automake 1.9.2 from Makefile.am. | |
| 1 | +# Makefile.in generated by automake 1.6.3 from Makefile.am. | |
| 2 | 2 | # @configure_input@ |
| 3 | 3 | |
| 4 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| 5 | -# 2003, 2004 Free Software Foundation, Inc. | |
| 4 | +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 | |
| 5 | +# Free Software Foundation, Inc. | |
| 6 | 6 | # This Makefile.in is free software; the Free Software Foundation |
| 7 | 7 | # gives unlimited permission to copy and/or distribute it, |
| 8 | 8 | # with or without modifications, as long as this notice is preserved. |
| ... | ... | @@ -13,189 +13,138 @@ |
| 13 | 13 | # PARTICULAR PURPOSE. |
| 14 | 14 | |
| 15 | 15 | @SET_MAKE@ |
| 16 | +SHELL = @SHELL@ | |
| 17 | + | |
| 16 | 18 | srcdir = @srcdir@ |
| 17 | 19 | top_srcdir = @top_srcdir@ |
| 18 | 20 | VPATH = @srcdir@ |
| 21 | +prefix = @prefix@ | |
| 22 | +exec_prefix = @exec_prefix@ | |
| 23 | + | |
| 24 | +bindir = @bindir@ | |
| 25 | +sbindir = @sbindir@ | |
| 26 | +libexecdir = @libexecdir@ | |
| 27 | +datadir = @datadir@ | |
| 28 | +sysconfdir = @sysconfdir@ | |
| 29 | +sharedstatedir = @sharedstatedir@ | |
| 30 | +localstatedir = @localstatedir@ | |
| 31 | +libdir = @libdir@ | |
| 32 | +infodir = @infodir@ | |
| 33 | +mandir = @mandir@ | |
| 34 | +includedir = @includedir@ | |
| 35 | +oldincludedir = /usr/include | |
| 19 | 36 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 20 | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
| 21 | 38 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 22 | 39 | top_builddir = . |
| 40 | + | |
| 41 | +ACLOCAL = @ACLOCAL@ | |
| 42 | +AUTOCONF = @AUTOCONF@ | |
| 43 | +AUTOMAKE = @AUTOMAKE@ | |
| 44 | +AUTOHEADER = @AUTOHEADER@ | |
| 45 | + | |
| 23 | 46 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
| 24 | 47 | INSTALL = @INSTALL@ |
| 48 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 49 | +INSTALL_DATA = @INSTALL_DATA@ | |
| 25 | 50 | install_sh_DATA = $(install_sh) -c -m 644 |
| 26 | 51 | install_sh_PROGRAM = $(install_sh) -c |
| 27 | 52 | install_sh_SCRIPT = $(install_sh) -c |
| 53 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 28 | 54 | INSTALL_HEADER = $(INSTALL_DATA) |
| 29 | -transform = $(program_transform_name) | |
| 55 | +transform = @program_transform_name@ | |
| 30 | 56 | NORMAL_INSTALL = : |
| 31 | 57 | PRE_INSTALL = : |
| 32 | 58 | POST_INSTALL = : |
| 33 | 59 | NORMAL_UNINSTALL = : |
| 34 | 60 | PRE_UNINSTALL = : |
| 35 | 61 | POST_UNINSTALL = : |
| 36 | -build_triplet = @build@ | |
| 62 | +host_alias = @host_alias@ | |
| 37 | 63 | host_triplet = @host@ |
| 38 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | |
| 39 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | |
| 40 | - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | |
| 41 | - config.guess config.sub depcomp install-sh ltmain.sh missing | |
| 42 | -subdir = . | |
| 43 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| 44 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac | |
| 45 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |
| 46 | - $(ACLOCAL_M4) | |
| 47 | -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | |
| 48 | - configure.lineno configure.status.lineno | |
| 49 | -mkinstalldirs = $(install_sh) -d | |
| 50 | -CONFIG_HEADER = config.h | |
| 51 | -CONFIG_CLEAN_FILES = | |
| 52 | -depcomp = | |
| 53 | -am__depfiles_maybe = | |
| 54 | -SOURCES = | |
| 55 | -DIST_SOURCES = | |
| 56 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ | |
| 57 | - html-recursive info-recursive install-data-recursive \ | |
| 58 | - install-exec-recursive install-info-recursive \ | |
| 59 | - install-recursive installcheck-recursive installdirs-recursive \ | |
| 60 | - pdf-recursive ps-recursive uninstall-info-recursive \ | |
| 61 | - uninstall-recursive | |
| 62 | -ETAGS = etags | |
| 63 | -CTAGS = ctags | |
| 64 | -DIST_SUBDIRS = $(SUBDIRS) | |
| 65 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 66 | -distdir = $(PACKAGE)-$(VERSION) | |
| 67 | -top_distdir = $(distdir) | |
| 68 | -am__remove_distdir = \ | |
| 69 | - { test ! -d $(distdir) \ | |
| 70 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ | |
| 71 | - && rm -fr $(distdir); }; } | |
| 72 | -DIST_ARCHIVES = $(distdir).tar.gz | |
| 73 | -GZIP_ENV = --best | |
| 74 | -distuninstallcheck_listfiles = find . -type f -print | |
| 75 | -distcleancheck_listfiles = find . -type f -print | |
| 76 | -ACLOCAL = @ACLOCAL@ | |
| 64 | + | |
| 65 | +EXEEXT = @EXEEXT@ | |
| 66 | +OBJEXT = @OBJEXT@ | |
| 67 | +PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 77 | 68 | AMTAR = @AMTAR@ |
| 78 | 69 | AR = @AR@ |
| 79 | -AUTOCONF = @AUTOCONF@ | |
| 80 | -AUTOHEADER = @AUTOHEADER@ | |
| 81 | -AUTOMAKE = @AUTOMAKE@ | |
| 70 | +AS = @AS@ | |
| 82 | 71 | AWK = @AWK@ |
| 83 | 72 | CC = @CC@ |
| 84 | -CFLAGS = @CFLAGS@ | |
| 85 | -CPP = @CPP@ | |
| 86 | -CPPFLAGS = @CPPFLAGS@ | |
| 87 | 73 | CXX = @CXX@ |
| 88 | 74 | CXXCPP = @CXXCPP@ |
| 89 | -CXXFLAGS = @CXXFLAGS@ | |
| 90 | -CYGPATH_W = @CYGPATH_W@ | |
| 91 | -DEFS = @DEFS@ | |
| 75 | +DEPDIR = @DEPDIR@ | |
| 76 | +DLLTOOL = @DLLTOOL@ | |
| 92 | 77 | ECHO = @ECHO@ |
| 93 | -ECHO_C = @ECHO_C@ | |
| 94 | -ECHO_N = @ECHO_N@ | |
| 95 | -ECHO_T = @ECHO_T@ | |
| 96 | 78 | EGREP = @EGREP@ |
| 97 | -EXEEXT = @EXEEXT@ | |
| 98 | 79 | F77 = @F77@ |
| 99 | -FFLAGS = @FFLAGS@ | |
| 100 | 80 | GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@ |
| 101 | -INSTALL_DATA = @INSTALL_DATA@ | |
| 102 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 103 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 81 | +GCJ = @GCJ@ | |
| 82 | +GCJFLAGS = @GCJFLAGS@ | |
| 104 | 83 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
| 105 | -LDFLAGS = @LDFLAGS@ | |
| 106 | -LIBOBJS = @LIBOBJS@ | |
| 107 | -LIBS = @LIBS@ | |
| 108 | 84 | LIBTOOL = @LIBTOOL@ |
| 109 | 85 | LN_S = @LN_S@ |
| 110 | -LTLIBOBJS = @LTLIBOBJS@ | |
| 111 | -MAKEINFO = @MAKEINFO@ | |
| 112 | -OBJEXT = @OBJEXT@ | |
| 86 | +MAINT = @MAINT@ | |
| 87 | +OBJDUMP = @OBJDUMP@ | |
| 113 | 88 | PACKAGE = @PACKAGE@ |
| 114 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| 115 | -PACKAGE_NAME = @PACKAGE_NAME@ | |
| 116 | -PACKAGE_STRING = @PACKAGE_STRING@ | |
| 117 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ | |
| 118 | -PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| 119 | -PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 89 | +PYTHON = @PYTHON@ | |
| 90 | +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | |
| 91 | +PYTHON_PLATFORM = @PYTHON_PLATFORM@ | |
| 92 | +PYTHON_PREFIX = @PYTHON_PREFIX@ | |
| 93 | +PYTHON_VERSION = @PYTHON_VERSION@ | |
| 120 | 94 | RANLIB = @RANLIB@ |
| 121 | -SET_MAKE = @SET_MAKE@ | |
| 122 | -SHELL = @SHELL@ | |
| 95 | +RC = @RC@ | |
| 123 | 96 | STRIP = @STRIP@ |
| 97 | +SWIG = @SWIG@ | |
| 124 | 98 | VERSION = @VERSION@ |
| 125 | -ac_ct_AR = @ac_ct_AR@ | |
| 126 | -ac_ct_CC = @ac_ct_CC@ | |
| 127 | -ac_ct_CXX = @ac_ct_CXX@ | |
| 128 | -ac_ct_F77 = @ac_ct_F77@ | |
| 129 | -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| 130 | -ac_ct_STRIP = @ac_ct_STRIP@ | |
| 131 | -am__leading_dot = @am__leading_dot@ | |
| 132 | -am__tar = @am__tar@ | |
| 133 | -am__untar = @am__untar@ | |
| 134 | -bindir = @bindir@ | |
| 135 | -build = @build@ | |
| 136 | -build_alias = @build_alias@ | |
| 137 | -build_cpu = @build_cpu@ | |
| 138 | -build_os = @build_os@ | |
| 139 | -build_vendor = @build_vendor@ | |
| 140 | -datadir = @datadir@ | |
| 141 | -exec_prefix = @exec_prefix@ | |
| 142 | -host = @host@ | |
| 143 | -host_alias = @host_alias@ | |
| 144 | -host_cpu = @host_cpu@ | |
| 145 | -host_os = @host_os@ | |
| 146 | -host_vendor = @host_vendor@ | |
| 147 | -includedir = @includedir@ | |
| 148 | -infodir = @infodir@ | |
| 99 | +am__include = @am__include@ | |
| 100 | +am__quote = @am__quote@ | |
| 149 | 101 | install_sh = @install_sh@ |
| 150 | -libdir = @libdir@ | |
| 151 | -libexecdir = @libexecdir@ | |
| 152 | -localstatedir = @localstatedir@ | |
| 153 | -mandir = @mandir@ | |
| 154 | -mkdir_p = @mkdir_p@ | |
| 155 | -oldincludedir = @oldincludedir@ | |
| 156 | -prefix = @prefix@ | |
| 157 | -program_transform_name = @program_transform_name@ | |
| 158 | -sbindir = @sbindir@ | |
| 159 | -sharedstatedir = @sharedstatedir@ | |
| 160 | -sysconfdir = @sysconfdir@ | |
| 161 | -target_alias = @target_alias@ | |
| 162 | -SUBDIRS = src test | |
| 102 | +pkgpyexecdir = @pkgpyexecdir@ | |
| 103 | +pkgpythondir = @pkgpythondir@ | |
| 104 | +pyexecdir = @pyexecdir@ | |
| 105 | +pythondir = @pythondir@ | |
| 106 | +ACLOCAL_AMFLAGS = -I m4 | |
| 107 | + | |
| 108 | +SUBDIRS = src test pyext | |
| 109 | + | |
| 110 | +EXTRA_DIST = autogen.sh | |
| 111 | +subdir = . | |
| 112 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| 113 | +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
| 114 | +CONFIG_HEADER = config.h | |
| 115 | +CONFIG_CLEAN_FILES = | |
| 116 | +depcomp = | |
| 117 | +am__depfiles_maybe = | |
| 118 | +DIST_SOURCES = | |
| 119 | + | |
| 120 | +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ | |
| 121 | + uninstall-info-recursive all-recursive install-data-recursive \ | |
| 122 | + install-exec-recursive installdirs-recursive install-recursive \ | |
| 123 | + uninstall-recursive check-recursive installcheck-recursive | |
| 124 | +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ | |
| 125 | + Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \ | |
| 126 | + configure configure.ac install-sh ltmain.sh missing \ | |
| 127 | + mkinstalldirs py-compile | |
| 128 | +DIST_SUBDIRS = $(SUBDIRS) | |
| 163 | 129 | all: config.h |
| 164 | 130 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
| 165 | 131 | |
| 166 | 132 | .SUFFIXES: |
| 167 | -am--refresh: | |
| 168 | - @: | |
| 169 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
| 170 | - @for dep in $?; do \ | |
| 171 | - case '$(am__configure_deps)' in \ | |
| 172 | - *$$dep*) \ | |
| 173 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps'; \ | |
| 174 | - cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps \ | |
| 175 | - && exit 0; \ | |
| 176 | - exit 1;; \ | |
| 177 | - esac; \ | |
| 178 | - done; \ | |
| 179 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps Makefile'; \ | |
| 133 | + | |
| 134 | +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | |
| 135 | + configure.lineno | |
| 136 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) | |
| 180 | 137 | cd $(top_srcdir) && \ |
| 181 | - $(AUTOMAKE) --gnu --ignore-deps Makefile | |
| 182 | -.PRECIOUS: Makefile | |
| 183 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 184 | - @case '$?' in \ | |
| 185 | - *config.status*) \ | |
| 186 | - echo ' $(SHELL) ./config.status'; \ | |
| 187 | - $(SHELL) ./config.status;; \ | |
| 188 | - *) \ | |
| 189 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | |
| 190 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | |
| 191 | - esac; | |
| 192 | - | |
| 193 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
| 194 | - $(SHELL) ./config.status --recheck | |
| 138 | + $(AUTOMAKE) --gnu Makefile | |
| 139 | +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 140 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) | |
| 195 | 141 | |
| 196 | -$(top_srcdir)/configure: $(am__configure_deps) | |
| 142 | +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
| 143 | + $(SHELL) ./config.status --recheck | |
| 144 | +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) | |
| 197 | 145 | cd $(srcdir) && $(AUTOCONF) |
| 198 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
| 146 | + | |
| 147 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/ac_pkg_swig.m4 m4/ac_python_devel.m4 m4/swig_enable_cxx.m4 m4/swig_multi_module_support.m4 m4/swig_python.m4 | |
| 199 | 148 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
| 200 | 149 | |
| 201 | 150 | config.h: stamp-h1 |
| ... | ... | @@ -207,10 +156,10 @@ config.h: stamp-h1 |
| 207 | 156 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
| 208 | 157 | @rm -f stamp-h1 |
| 209 | 158 | cd $(top_builddir) && $(SHELL) ./config.status config.h |
| 210 | -$(srcdir)/config.h.in: $(am__configure_deps) | |
| 159 | + | |
| 160 | +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) | |
| 211 | 161 | cd $(top_srcdir) && $(AUTOHEADER) |
| 212 | - rm -f stamp-h1 | |
| 213 | - touch $@ | |
| 162 | + touch $(srcdir)/config.h.in | |
| 214 | 163 | |
| 215 | 164 | distclean-hdr: |
| 216 | 165 | -rm -f config.h stamp-h1 |
| ... | ... | @@ -279,10 +228,11 @@ tags-recursive: |
| 279 | 228 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
| 280 | 229 | test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
| 281 | 230 | done |
| 282 | -ctags-recursive: | |
| 283 | - list='$(SUBDIRS)'; for subdir in $$list; do \ | |
| 284 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | |
| 285 | - done | |
| 231 | + | |
| 232 | +ETAGS = etags | |
| 233 | +ETAGSFLAGS = | |
| 234 | + | |
| 235 | +tags: TAGS | |
| 286 | 236 | |
| 287 | 237 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 288 | 238 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
| ... | ... | @@ -292,23 +242,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 292 | 242 | $(AWK) ' { files[$$0] = 1; } \ |
| 293 | 243 | END { for (i in files) print i; }'`; \ |
| 294 | 244 | mkid -fID $$unique |
| 295 | -tags: TAGS | |
| 296 | 245 | |
| 297 | 246 | TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
| 298 | 247 | $(TAGS_FILES) $(LISP) |
| 299 | 248 | tags=; \ |
| 300 | 249 | here=`pwd`; \ |
| 301 | - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | |
| 302 | - include_option=--etags-include; \ | |
| 303 | - empty_fix=.; \ | |
| 304 | - else \ | |
| 305 | - include_option=--include; \ | |
| 306 | - empty_fix=; \ | |
| 307 | - fi; \ | |
| 308 | 250 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
| 309 | 251 | if test "$$subdir" = .; then :; else \ |
| 310 | - test ! -f $$subdir/TAGS || \ | |
| 311 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | |
| 252 | + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ | |
| 312 | 253 | fi; \ |
| 313 | 254 | done; \ |
| 314 | 255 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
| ... | ... | @@ -317,24 +258,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
| 317 | 258 | done | \ |
| 318 | 259 | $(AWK) ' { files[$$0] = 1; } \ |
| 319 | 260 | END { for (i in files) print i; }'`; \ |
| 320 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| 321 | - test -n "$$unique" || unique=$$empty_fix; \ | |
| 322 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 323 | - $$tags $$unique; \ | |
| 324 | - fi | |
| 325 | -ctags: CTAGS | |
| 326 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | |
| 327 | - $(TAGS_FILES) $(LISP) | |
| 328 | - tags=; \ | |
| 329 | - here=`pwd`; \ | |
| 330 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | |
| 331 | - unique=`for i in $$list; do \ | |
| 332 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| 333 | - done | \ | |
| 334 | - $(AWK) ' { files[$$0] = 1; } \ | |
| 335 | - END { for (i in files) print i; }'`; \ | |
| 336 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| 337 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| 261 | + test -z "$(ETAGS_ARGS)$$tags$$unique" \ | |
| 262 | + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 338 | 263 | $$tags $$unique |
| 339 | 264 | |
| 340 | 265 | GTAGS: |
| ... | ... | @@ -343,23 +268,30 @@ GTAGS: |
| 343 | 268 | && gtags -i $(GTAGS_ARGS) $$here |
| 344 | 269 | |
| 345 | 270 | distclean-tags: |
| 346 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| 271 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH | |
| 272 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 273 | + | |
| 274 | +top_distdir = . | |
| 275 | +distdir = $(PACKAGE)-$(VERSION) | |
| 276 | + | |
| 277 | +am__remove_distdir = \ | |
| 278 | + { test ! -d $(distdir) \ | |
| 279 | + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ | |
| 280 | + && rm -fr $(distdir); }; } | |
| 281 | + | |
| 282 | +GZIP_ENV = --best | |
| 283 | +distcleancheck_listfiles = find . -type f -print | |
| 347 | 284 | |
| 348 | 285 | distdir: $(DISTFILES) |
| 349 | 286 | $(am__remove_distdir) |
| 350 | 287 | mkdir $(distdir) |
| 351 | - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| 352 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| 353 | - list='$(DISTFILES)'; for file in $$list; do \ | |
| 354 | - case $$file in \ | |
| 355 | - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| 356 | - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| 357 | - esac; \ | |
| 288 | + $(mkinstalldirs) $(distdir)/pyext | |
| 289 | + @list='$(DISTFILES)'; for file in $$list; do \ | |
| 358 | 290 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
| 359 | 291 | dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
| 360 | 292 | if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
| 361 | 293 | dir="/$$dir"; \ |
| 362 | - $(mkdir_p) "$(distdir)$$dir"; \ | |
| 294 | + $(mkinstalldirs) "$(distdir)$$dir"; \ | |
| 363 | 295 | else \ |
| 364 | 296 | dir=''; \ |
| 365 | 297 | fi; \ |
| ... | ... | @@ -374,17 +306,15 @@ distdir: $(DISTFILES) |
| 374 | 306 | || exit 1; \ |
| 375 | 307 | fi; \ |
| 376 | 308 | done |
| 377 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | |
| 309 | + list='$(SUBDIRS)'; for subdir in $$list; do \ | |
| 378 | 310 | if test "$$subdir" = .; then :; else \ |
| 379 | - test -d "$(distdir)/$$subdir" \ | |
| 380 | - || $(mkdir_p) "$(distdir)/$$subdir" \ | |
| 311 | + test -d $(distdir)/$$subdir \ | |
| 312 | + || mkdir $(distdir)/$$subdir \ | |
| 381 | 313 | || exit 1; \ |
| 382 | - distdir=`$(am__cd) $(distdir) && pwd`; \ | |
| 383 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | |
| 384 | 314 | (cd $$subdir && \ |
| 385 | 315 | $(MAKE) $(AM_MAKEFLAGS) \ |
| 386 | - top_distdir="$$top_distdir" \ | |
| 387 | - distdir="$$distdir/$$subdir" \ | |
| 316 | + top_distdir="$(top_distdir)" \ | |
| 317 | + distdir=../$(distdir)/$$subdir \ | |
| 388 | 318 | distdir) \ |
| 389 | 319 | || exit 1; \ |
| 390 | 320 | fi; \ |
| ... | ... | @@ -395,54 +325,26 @@ distdir: $(DISTFILES) |
| 395 | 325 | ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ |
| 396 | 326 | || chmod -R a+r $(distdir) |
| 397 | 327 | dist-gzip: distdir |
| 398 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | |
| 399 | - $(am__remove_distdir) | |
| 400 | - | |
| 401 | -dist-bzip2: distdir | |
| 402 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | |
| 403 | - $(am__remove_distdir) | |
| 404 | - | |
| 405 | -dist-tarZ: distdir | |
| 406 | - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | |
| 407 | - $(am__remove_distdir) | |
| 408 | - | |
| 409 | -dist-shar: distdir | |
| 410 | - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | |
| 411 | - $(am__remove_distdir) | |
| 412 | - | |
| 413 | -dist-zip: distdir | |
| 414 | - -rm -f $(distdir).zip | |
| 415 | - zip -rq $(distdir).zip $(distdir) | |
| 328 | + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | |
| 416 | 329 | $(am__remove_distdir) |
| 417 | 330 | |
| 418 | 331 | dist dist-all: distdir |
| 419 | - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | |
| 332 | + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | |
| 420 | 333 | $(am__remove_distdir) |
| 421 | 334 | |
| 422 | 335 | # This target untars the dist file and tries a VPATH configuration. Then |
| 423 | 336 | # it guarantees that the distribution is self-contained by making another |
| 424 | 337 | # tarfile. |
| 425 | 338 | distcheck: dist |
| 426 | - case '$(DIST_ARCHIVES)' in \ | |
| 427 | - *.tar.gz*) \ | |
| 428 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ | |
| 429 | - *.tar.bz2*) \ | |
| 430 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ | |
| 431 | - *.tar.Z*) \ | |
| 432 | - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | |
| 433 | - *.shar.gz*) \ | |
| 434 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ | |
| 435 | - *.zip*) \ | |
| 436 | - unzip $(distdir).zip ;;\ | |
| 437 | - esac | |
| 339 | + $(am__remove_distdir) | |
| 340 | + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - | |
| 438 | 341 | chmod -R a-w $(distdir); chmod a+w $(distdir) |
| 439 | - mkdir $(distdir)/_build | |
| 440 | - mkdir $(distdir)/_inst | |
| 342 | + mkdir $(distdir)/=build | |
| 343 | + mkdir $(distdir)/=inst | |
| 441 | 344 | chmod a-w $(distdir) |
| 442 | - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | |
| 443 | - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | |
| 444 | - && cd $(distdir)/_build \ | |
| 445 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | |
| 345 | + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ | |
| 346 | + && cd $(distdir)/=build \ | |
| 347 | + && ../configure --srcdir=.. --prefix=$$dc_install_base \ | |
| 446 | 348 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
| 447 | 349 | && $(MAKE) $(AM_MAKEFLAGS) \ |
| 448 | 350 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
| ... | ... | @@ -450,40 +352,23 @@ distcheck: dist |
| 450 | 352 | && $(MAKE) $(AM_MAKEFLAGS) install \ |
| 451 | 353 | && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
| 452 | 354 | && $(MAKE) $(AM_MAKEFLAGS) uninstall \ |
| 453 | - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ | |
| 454 | - distuninstallcheck \ | |
| 455 | - && chmod -R a-w "$$dc_install_base" \ | |
| 456 | - && ({ \ | |
| 457 | - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ | |
| 458 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ | |
| 459 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ | |
| 460 | - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ | |
| 461 | - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ | |
| 462 | - } || { rm -rf "$$dc_destdir"; exit 1; }) \ | |
| 463 | - && rm -rf "$$dc_destdir" \ | |
| 464 | - && $(MAKE) $(AM_MAKEFLAGS) dist \ | |
| 465 | - && rm -rf $(DIST_ARCHIVES) \ | |
| 355 | + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ | |
| 356 | + || { echo "ERROR: files left after uninstall:" ; \ | |
| 357 | + find $$dc_install_base -type f -print ; \ | |
| 358 | + exit 1; } >&2 ) \ | |
| 359 | + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ | |
| 360 | + && rm -f $(distdir).tar.gz \ | |
| 466 | 361 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck |
| 467 | 362 | $(am__remove_distdir) |
| 468 | - @(echo "$(distdir) archives ready for distribution: "; \ | |
| 469 | - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | |
| 470 | - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' | |
| 471 | -distuninstallcheck: | |
| 472 | - @cd $(distuninstallcheck_dir) \ | |
| 473 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | |
| 474 | - || { echo "ERROR: files left after uninstall:" ; \ | |
| 475 | - if test -n "$(DESTDIR)"; then \ | |
| 476 | - echo " (check DESTDIR support)"; \ | |
| 477 | - fi ; \ | |
| 478 | - $(distuninstallcheck_listfiles) ; \ | |
| 479 | - exit 1; } >&2 | |
| 363 | + @echo "$(distdir).tar.gz is ready for distribution" | \ | |
| 364 | + sed 'h;s/./=/g;p;x;p;x' | |
| 480 | 365 | distcleancheck: distclean |
| 481 | - @if test '$(srcdir)' = . ; then \ | |
| 366 | + if test '$(srcdir)' = . ; then \ | |
| 482 | 367 | echo "ERROR: distcleancheck can only run from a VPATH build" ; \ |
| 483 | 368 | exit 1 ; \ |
| 484 | 369 | fi |
| 485 | - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ | |
| 486 | - || { echo "ERROR: files left in build directory after distclean:" ; \ | |
| 370 | + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ | |
| 371 | + || { echo "ERROR: files left after distclean:" ; \ | |
| 487 | 372 | $(distcleancheck_listfiles) ; \ |
| 488 | 373 | exit 1; } >&2 |
| 489 | 374 | check-am: all-am |
| ... | ... | @@ -491,6 +376,7 @@ check: check-recursive |
| 491 | 376 | all-am: Makefile config.h |
| 492 | 377 | installdirs: installdirs-recursive |
| 493 | 378 | installdirs-am: |
| 379 | + | |
| 494 | 380 | install: install-recursive |
| 495 | 381 | install-exec: install-exec-recursive |
| 496 | 382 | install-data: install-data-recursive |
| ... | ... | @@ -502,7 +388,7 @@ install-am: all-am |
| 502 | 388 | installcheck: installcheck-recursive |
| 503 | 389 | install-strip: |
| 504 | 390 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| 505 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| 391 | + INSTALL_STRIP_FLAG=-s \ | |
| 506 | 392 | `test -z '$(STRIP)' || \ |
| 507 | 393 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
| 508 | 394 | mostlyclean-generic: |
| ... | ... | @@ -510,7 +396,7 @@ mostlyclean-generic: |
| 510 | 396 | clean-generic: |
| 511 | 397 | |
| 512 | 398 | distclean-generic: |
| 513 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | |
| 399 | + -rm -f Makefile $(CONFIG_CLEAN_FILES) | |
| 514 | 400 | |
| 515 | 401 | maintainer-clean-generic: |
| 516 | 402 | @echo "This command is intended for maintainers to use" |
| ... | ... | @@ -521,16 +407,13 @@ clean-am: clean-generic clean-libtool mostlyclean-am |
| 521 | 407 | |
| 522 | 408 | distclean: distclean-recursive |
| 523 | 409 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| 524 | - -rm -f Makefile | |
| 525 | -distclean-am: clean-am distclean-generic distclean-hdr \ | |
| 526 | - distclean-libtool distclean-tags | |
| 410 | +distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ | |
| 411 | + distclean-tags | |
| 527 | 412 | |
| 528 | 413 | dvi: dvi-recursive |
| 529 | 414 | |
| 530 | 415 | dvi-am: |
| 531 | 416 | |
| 532 | -html: html-recursive | |
| 533 | - | |
| 534 | 417 | info: info-recursive |
| 535 | 418 | |
| 536 | 419 | info-am: |
| ... | ... | @@ -547,40 +430,32 @@ installcheck-am: |
| 547 | 430 | |
| 548 | 431 | maintainer-clean: maintainer-clean-recursive |
| 549 | 432 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| 550 | - -rm -rf $(top_srcdir)/autom4te.cache | |
| 551 | - -rm -f Makefile | |
| 433 | + -rm -rf autom4te.cache | |
| 552 | 434 | maintainer-clean-am: distclean-am maintainer-clean-generic |
| 553 | 435 | |
| 554 | 436 | mostlyclean: mostlyclean-recursive |
| 555 | 437 | |
| 556 | 438 | mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
| 557 | 439 | |
| 558 | -pdf: pdf-recursive | |
| 559 | - | |
| 560 | -pdf-am: | |
| 561 | - | |
| 562 | -ps: ps-recursive | |
| 563 | - | |
| 564 | -ps-am: | |
| 565 | - | |
| 566 | 440 | uninstall-am: uninstall-info-am |
| 567 | 441 | |
| 568 | 442 | uninstall-info: uninstall-info-recursive |
| 569 | 443 | |
| 570 | -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ | |
| 571 | - check-am clean clean-generic clean-libtool clean-recursive \ | |
| 572 | - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ | |
| 573 | - dist-shar dist-tarZ dist-zip distcheck distclean \ | |
| 574 | - distclean-generic distclean-hdr distclean-libtool \ | |
| 575 | - distclean-recursive distclean-tags distcleancheck distdir \ | |
| 576 | - distuninstallcheck dvi dvi-am html html-am info info-am \ | |
| 577 | - install install-am install-data install-data-am install-exec \ | |
| 578 | - install-exec-am install-info install-info-am install-man \ | |
| 444 | +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ | |
| 445 | + clean-generic clean-libtool clean-recursive dist dist-all \ | |
| 446 | + dist-gzip distcheck distclean distclean-generic distclean-hdr \ | |
| 447 | + distclean-libtool distclean-recursive distclean-tags \ | |
| 448 | + distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ | |
| 449 | + info-recursive install install-am install-data install-data-am \ | |
| 450 | + install-data-recursive install-exec install-exec-am \ | |
| 451 | + install-exec-recursive install-info install-info-am \ | |
| 452 | + install-info-recursive install-man install-recursive \ | |
| 579 | 453 | install-strip installcheck installcheck-am installdirs \ |
| 580 | - installdirs-am maintainer-clean maintainer-clean-generic \ | |
| 581 | - maintainer-clean-recursive mostlyclean mostlyclean-generic \ | |
| 582 | - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ | |
| 583 | - tags tags-recursive uninstall uninstall-am uninstall-info-am | |
| 454 | + installdirs-am installdirs-recursive maintainer-clean \ | |
| 455 | + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ | |
| 456 | + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ | |
| 457 | + tags tags-recursive uninstall uninstall-am uninstall-info-am \ | |
| 458 | + uninstall-info-recursive uninstall-recursive | |
| 584 | 459 | |
| 585 | 460 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 586 | 461 | # Otherwise a system limit (for SysV at least) may be exceeded. | ... | ... |
autogen.sh
0 → 100755
config.guess
| 1 | 1 | #! /bin/sh |
| 2 | 2 | # Attempt to guess a canonical system name. |
| 3 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
| 4 | -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | |
| 4 | +# 2000, 2001, 2002 Free Software Foundation, Inc. | |
| 5 | 5 | |
| 6 | -timestamp='2003-01-10' | |
| 6 | +timestamp='2002-07-23' | |
| 7 | 7 | |
| 8 | 8 | # This file is free software; you can redistribute it and/or modify it |
| 9 | 9 | # under the terms of the GNU General Public License as published by |
| ... | ... | @@ -98,31 +98,30 @@ trap 'exit 1' 1 2 15 |
| 98 | 98 | # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still |
| 99 | 99 | # use `HOST_CC' if defined, but it is deprecated. |
| 100 | 100 | |
| 101 | -# Portable tmp directory creation inspired by the Autoconf team. | |
| 101 | +# This shell variable is my proudest work .. or something. --bje | |
| 102 | 102 | |
| 103 | -set_cc_for_build=' | |
| 104 | -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | |
| 105 | -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | |
| 106 | -: ${TMPDIR=/tmp} ; | |
| 107 | - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | |
| 108 | - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | |
| 109 | - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | |
| 110 | -dummy=$tmp/dummy ; | |
| 111 | -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | |
| 103 | +set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; | |
| 104 | +(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) | |
| 105 | + || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; | |
| 106 | +dummy=$tmpdir/dummy ; | |
| 107 | +files="$dummy.c $dummy.o $dummy.rel $dummy" ; | |
| 108 | +trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; | |
| 112 | 109 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
| 113 | 110 | ,,) echo "int x;" > $dummy.c ; |
| 114 | 111 | for c in cc gcc c89 c99 ; do |
| 115 | - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | |
| 112 | + if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then | |
| 116 | 113 | CC_FOR_BUILD="$c"; break ; |
| 117 | 114 | fi ; |
| 118 | 115 | done ; |
| 116 | + rm -f $files ; | |
| 119 | 117 | if test x"$CC_FOR_BUILD" = x ; then |
| 120 | 118 | CC_FOR_BUILD=no_compiler_found ; |
| 121 | 119 | fi |
| 122 | 120 | ;; |
| 123 | 121 | ,,*) CC_FOR_BUILD=$CC ;; |
| 124 | 122 | ,*,*) CC_FOR_BUILD=$HOST_CC ;; |
| 125 | -esac ;' | |
| 123 | +esac ; | |
| 124 | +unset files' | |
| 126 | 125 | |
| 127 | 126 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
| 128 | 127 | # (ghazi@noc.rutgers.edu 1994-08-24) |
| ... | ... | @@ -179,18 +178,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
| 179 | 178 | ;; |
| 180 | 179 | esac |
| 181 | 180 | # The OS release |
| 182 | - # Debian GNU/NetBSD machines have a different userland, and | |
| 183 | - # thus, need a distinct triplet. However, they do not need | |
| 184 | - # kernel version information, so it can be replaced with a | |
| 185 | - # suitable tag, in the style of linux-gnu. | |
| 186 | - case "${UNAME_VERSION}" in | |
| 187 | - Debian*) | |
| 188 | - release='-gnu' | |
| 189 | - ;; | |
| 190 | - *) | |
| 191 | - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | |
| 192 | - ;; | |
| 193 | - esac | |
| 181 | + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | |
| 194 | 182 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
| 195 | 183 | # contains redundant information, the shorter form: |
| 196 | 184 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
| ... | ... | @@ -235,9 +223,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
| 235 | 223 | *:OpenBSD:*:*) |
| 236 | 224 | echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} |
| 237 | 225 | exit 0 ;; |
| 238 | - *:MicroBSD:*:*) | |
| 239 | - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} | |
| 240 | - exit 0 ;; | |
| 241 | 226 | alpha:OSF1:*:*) |
| 242 | 227 | if test $UNAME_RELEASE = "V4.0"; then |
| 243 | 228 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
| ... | ... | @@ -272,7 +257,7 @@ main: |
| 272 | 257 | jsr \$26,exit |
| 273 | 258 | .end main |
| 274 | 259 | EOF |
| 275 | - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null | |
| 260 | + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null | |
| 276 | 261 | if test "$?" = 0 ; then |
| 277 | 262 | case `$dummy` in |
| 278 | 263 | 0-0) |
| ... | ... | @@ -301,6 +286,7 @@ EOF |
| 301 | 286 | ;; |
| 302 | 287 | esac |
| 303 | 288 | fi |
| 289 | + rm -f $dummy.s $dummy && rmdir $tmpdir | |
| 304 | 290 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
| 305 | 291 | exit 0 ;; |
| 306 | 292 | Alpha\ *:Windows_NT*:*) |
| ... | ... | @@ -451,18 +437,16 @@ EOF |
| 451 | 437 | exit (-1); |
| 452 | 438 | } |
| 453 | 439 | EOF |
| 454 | - $CC_FOR_BUILD -o $dummy $dummy.c \ | |
| 440 | + $CC_FOR_BUILD $dummy.c -o $dummy \ | |
| 455 | 441 | && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ |
| 456 | - && exit 0 | |
| 442 | + && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 | |
| 443 | + rm -f $dummy.c $dummy && rmdir $tmpdir | |
| 457 | 444 | echo mips-mips-riscos${UNAME_RELEASE} |
| 458 | 445 | exit 0 ;; |
| 459 | 446 | Motorola:PowerMAX_OS:*:*) |
| 460 | 447 | echo powerpc-motorola-powermax |
| 461 | 448 | exit 0 ;; |
| 462 | - Motorola:*:4.3:PL8-*) | |
| 463 | - echo powerpc-harris-powermax | |
| 464 | - exit 0 ;; | |
| 465 | - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) | |
| 449 | + Night_Hawk:*:*:PowerMAX_OS) | |
| 466 | 450 | echo powerpc-harris-powermax |
| 467 | 451 | exit 0 ;; |
| 468 | 452 | Night_Hawk:Power_UNIX:*:*) |
| ... | ... | @@ -537,7 +521,8 @@ EOF |
| 537 | 521 | exit(0); |
| 538 | 522 | } |
| 539 | 523 | EOF |
| 540 | - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | |
| 524 | + $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 | |
| 525 | + rm -f $dummy.c $dummy && rmdir $tmpdir | |
| 541 | 526 | echo rs6000-ibm-aix3.2.5 |
| 542 | 527 | elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
| 543 | 528 | echo rs6000-ibm-aix3.2.4 |
| ... | ... | @@ -635,21 +620,11 @@ EOF |
| 635 | 620 | exit (0); |
| 636 | 621 | } |
| 637 | 622 | EOF |
| 638 | - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | |
| 639 | - test -z "$HP_ARCH" && HP_ARCH=hppa | |
| 623 | + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` | |
| 624 | + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi | |
| 625 | + rm -f $dummy.c $dummy && rmdir $tmpdir | |
| 640 | 626 | fi ;; |
| 641 | 627 | esac |
| 642 | - if [ ${HP_ARCH} = "hppa2.0w" ] | |
| 643 | - then | |
| 644 | - # avoid double evaluation of $set_cc_for_build | |
| 645 | - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build | |
| 646 | - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null | |
| 647 | - then | |
| 648 | - HP_ARCH="hppa2.0w" | |
| 649 | - else | |
| 650 | - HP_ARCH="hppa64" | |
| 651 | - fi | |
| 652 | - fi | |
| 653 | 628 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
| 654 | 629 | exit 0 ;; |
| 655 | 630 | ia64:HP-UX:*:*) |
| ... | ... | @@ -683,7 +658,8 @@ EOF |
| 683 | 658 | exit (0); |
| 684 | 659 | } |
| 685 | 660 | EOF |
| 686 | - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | |
| 661 | + $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 | |
| 662 | + rm -f $dummy.c $dummy && rmdir $tmpdir | |
| 687 | 663 | echo unknown-hitachi-hiuxwe2 |
| 688 | 664 | exit 0 ;; |
| 689 | 665 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
| ... | ... | @@ -741,15 +717,15 @@ EOF |
| 741 | 717 | CRAY*TS:*:*:*) |
| 742 | 718 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
| 743 | 719 | exit 0 ;; |
| 720 | + CRAY*T3D:*:*:*) | |
| 721 | + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
| 722 | + exit 0 ;; | |
| 744 | 723 | CRAY*T3E:*:*:*) |
| 745 | 724 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
| 746 | 725 | exit 0 ;; |
| 747 | 726 | CRAY*SV1:*:*:*) |
| 748 | 727 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
| 749 | 728 | exit 0 ;; |
| 750 | - *:UNICOS/mp:*:*) | |
| 751 | - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
| 752 | - exit 0 ;; | |
| 753 | 729 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
| 754 | 730 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
| 755 | 731 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
| ... | ... | @@ -777,6 +753,7 @@ EOF |
| 777 | 753 | #endif |
| 778 | 754 | EOF |
| 779 | 755 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
| 756 | + rm -f $dummy.c && rmdir $tmpdir | |
| 780 | 757 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} |
| 781 | 758 | exit 0 ;; |
| 782 | 759 | i*:CYGWIN*:*) |
| ... | ... | @@ -789,16 +766,13 @@ EOF |
| 789 | 766 | echo ${UNAME_MACHINE}-pc-pw32 |
| 790 | 767 | exit 0 ;; |
| 791 | 768 | x86:Interix*:3*) |
| 792 | - echo i586-pc-interix3 | |
| 793 | - exit 0 ;; | |
| 794 | - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | |
| 795 | - echo i${UNAME_MACHINE}-pc-mks | |
| 769 | + echo i386-pc-interix3 | |
| 796 | 770 | exit 0 ;; |
| 797 | 771 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
| 798 | 772 | # How do we know it's Interix rather than the generic POSIX subsystem? |
| 799 | 773 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
| 800 | 774 | # UNAME_MACHINE based on the output of uname instead of i386? |
| 801 | - echo i586-pc-interix | |
| 775 | + echo i386-pc-interix | |
| 802 | 776 | exit 0 ;; |
| 803 | 777 | i*:UWIN*:*) |
| 804 | 778 | echo ${UNAME_MACHINE}-pc-uwin |
| ... | ... | @@ -841,26 +815,8 @@ EOF |
| 841 | 815 | #endif |
| 842 | 816 | EOF |
| 843 | 817 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` |
| 844 | - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 | |
| 845 | - ;; | |
| 846 | - mips64:Linux:*:*) | |
| 847 | - eval $set_cc_for_build | |
| 848 | - sed 's/^ //' << EOF >$dummy.c | |
| 849 | - #undef CPU | |
| 850 | - #undef mips64 | |
| 851 | - #undef mips64el | |
| 852 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | |
| 853 | - CPU=mips64el | |
| 854 | - #else | |
| 855 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | |
| 856 | - CPU=mips64 | |
| 857 | - #else | |
| 858 | - CPU= | |
| 859 | - #endif | |
| 860 | - #endif | |
| 861 | -EOF | |
| 862 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | |
| 863 | - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 | |
| 818 | + rm -f $dummy.c && rmdir $tmpdir | |
| 819 | + test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 | |
| 864 | 820 | ;; |
| 865 | 821 | ppc:Linux:*:*) |
| 866 | 822 | echo powerpc-unknown-linux-gnu |
| ... | ... | @@ -955,6 +911,7 @@ EOF |
| 955 | 911 | #endif |
| 956 | 912 | EOF |
| 957 | 913 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` |
| 914 | + rm -f $dummy.c && rmdir $tmpdir | |
| 958 | 915 | test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 |
| 959 | 916 | test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 |
| 960 | 917 | ;; |
| ... | ... | @@ -972,23 +929,6 @@ EOF |
| 972 | 929 | # Use sysv4.2uw... so that sysv4* matches it. |
| 973 | 930 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
| 974 | 931 | exit 0 ;; |
| 975 | - i*86:OS/2:*:*) | |
| 976 | - # If we were able to find `uname', then EMX Unix compatibility | |
| 977 | - # is probably installed. | |
| 978 | - echo ${UNAME_MACHINE}-pc-os2-emx | |
| 979 | - exit 0 ;; | |
| 980 | - i*86:XTS-300:*:STOP) | |
| 981 | - echo ${UNAME_MACHINE}-unknown-stop | |
| 982 | - exit 0 ;; | |
| 983 | - i*86:atheos:*:*) | |
| 984 | - echo ${UNAME_MACHINE}-unknown-atheos | |
| 985 | - exit 0 ;; | |
| 986 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | |
| 987 | - echo i386-unknown-lynxos${UNAME_RELEASE} | |
| 988 | - exit 0 ;; | |
| 989 | - i*86:*DOS:*:*) | |
| 990 | - echo ${UNAME_MACHINE}-pc-msdosdjgpp | |
| 991 | - exit 0 ;; | |
| 992 | 932 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
| 993 | 933 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
| 994 | 934 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
| ... | ... | @@ -1023,6 +963,9 @@ EOF |
| 1023 | 963 | echo ${UNAME_MACHINE}-pc-sysv32 |
| 1024 | 964 | fi |
| 1025 | 965 | exit 0 ;; |
| 966 | + i*86:*DOS:*:*) | |
| 967 | + echo ${UNAME_MACHINE}-pc-msdosdjgpp | |
| 968 | + exit 0 ;; | |
| 1026 | 969 | pc:*:*:*) |
| 1027 | 970 | # Left here for compatibility: |
| 1028 | 971 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
| ... | ... | @@ -1046,15 +989,9 @@ EOF |
| 1046 | 989 | # "miniframe" |
| 1047 | 990 | echo m68010-convergent-sysv |
| 1048 | 991 | exit 0 ;; |
| 1049 | - mc68k:UNIX:SYSTEM5:3.51m) | |
| 1050 | - echo m68k-convergent-sysv | |
| 1051 | - exit 0 ;; | |
| 1052 | - M680?0:D-NIX:5.3:*) | |
| 1053 | - echo m68k-diab-dnix | |
| 1054 | - exit 0 ;; | |
| 1055 | 992 | M68*:*:R3V[567]*:*) |
| 1056 | 993 | test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; |
| 1057 | - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) | |
| 994 | + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) | |
| 1058 | 995 | OS_REL='' |
| 1059 | 996 | test -r /etc/.relid \ |
| 1060 | 997 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
| ... | ... | @@ -1071,6 +1008,9 @@ EOF |
| 1071 | 1008 | mc68030:UNIX_System_V:4.*:*) |
| 1072 | 1009 | echo m68k-atari-sysv4 |
| 1073 | 1010 | exit 0 ;; |
| 1011 | + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | |
| 1012 | + echo i386-unknown-lynxos${UNAME_RELEASE} | |
| 1013 | + exit 0 ;; | |
| 1074 | 1014 | TSUNAMI:LynxOS:2.*:*) |
| 1075 | 1015 | echo sparc-unknown-lynxos${UNAME_RELEASE} |
| 1076 | 1016 | exit 0 ;; |
| ... | ... | @@ -1142,9 +1082,6 @@ EOF |
| 1142 | 1082 | SX-5:SUPER-UX:*:*) |
| 1143 | 1083 | echo sx5-nec-superux${UNAME_RELEASE} |
| 1144 | 1084 | exit 0 ;; |
| 1145 | - SX-6:SUPER-UX:*:*) | |
| 1146 | - echo sx6-nec-superux${UNAME_RELEASE} | |
| 1147 | - exit 0 ;; | |
| 1148 | 1085 | Power*:Rhapsody:*:*) |
| 1149 | 1086 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
| 1150 | 1087 | exit 0 ;; |
| ... | ... | @@ -1152,11 +1089,7 @@ EOF |
| 1152 | 1089 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
| 1153 | 1090 | exit 0 ;; |
| 1154 | 1091 | *:Darwin:*:*) |
| 1155 | - case `uname -p` in | |
| 1156 | - *86) UNAME_PROCESSOR=i686 ;; | |
| 1157 | - powerpc) UNAME_PROCESSOR=powerpc ;; | |
| 1158 | - esac | |
| 1159 | - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | |
| 1092 | + echo `uname -p`-apple-darwin${UNAME_RELEASE} | |
| 1160 | 1093 | exit 0 ;; |
| 1161 | 1094 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
| 1162 | 1095 | UNAME_PROCESSOR=`uname -p` |
| ... | ... | @@ -1169,7 +1102,7 @@ EOF |
| 1169 | 1102 | *:QNX:*:4*) |
| 1170 | 1103 | echo i386-pc-qnx |
| 1171 | 1104 | exit 0 ;; |
| 1172 | - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) | |
| 1105 | + NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) | |
| 1173 | 1106 | echo nsr-tandem-nsk${UNAME_RELEASE} |
| 1174 | 1107 | exit 0 ;; |
| 1175 | 1108 | *:NonStop-UX:*:*) |
| ... | ... | @@ -1192,6 +1125,11 @@ EOF |
| 1192 | 1125 | fi |
| 1193 | 1126 | echo ${UNAME_MACHINE}-unknown-plan9 |
| 1194 | 1127 | exit 0 ;; |
| 1128 | + i*86:OS/2:*:*) | |
| 1129 | + # If we were able to find `uname', then EMX Unix compatibility | |
| 1130 | + # is probably installed. | |
| 1131 | + echo ${UNAME_MACHINE}-pc-os2-emx | |
| 1132 | + exit 0 ;; | |
| 1195 | 1133 | *:TOPS-10:*:*) |
| 1196 | 1134 | echo pdp10-unknown-tops10 |
| 1197 | 1135 | exit 0 ;; |
| ... | ... | @@ -1210,6 +1148,12 @@ EOF |
| 1210 | 1148 | *:ITS:*:*) |
| 1211 | 1149 | echo pdp10-unknown-its |
| 1212 | 1150 | exit 0 ;; |
| 1151 | + i*86:XTS-300:*:STOP) | |
| 1152 | + echo ${UNAME_MACHINE}-unknown-stop | |
| 1153 | + exit 0 ;; | |
| 1154 | + i*86:atheos:*:*) | |
| 1155 | + echo ${UNAME_MACHINE}-unknown-atheos | |
| 1156 | + exit 0 ;; | |
| 1213 | 1157 | esac |
| 1214 | 1158 | |
| 1215 | 1159 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
| ... | ... | @@ -1330,7 +1274,8 @@ main () |
| 1330 | 1274 | } |
| 1331 | 1275 | EOF |
| 1332 | 1276 | |
| 1333 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 | |
| 1277 | +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 | |
| 1278 | +rm -f $dummy.c $dummy && rmdir $tmpdir | |
| 1334 | 1279 | |
| 1335 | 1280 | # Apollos put the system type in the environment. |
| 1336 | 1281 | ... | ... |
config.h.in
config.sub
| 1 | 1 | #! /bin/sh |
| 2 | 2 | # Configuration validation subroutine script. |
| 3 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
| 4 | -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | |
| 4 | +# 2000, 2001, 2002 Free Software Foundation, Inc. | |
| 5 | 5 | |
| 6 | -timestamp='2003-01-03' | |
| 6 | +timestamp='2002-07-03' | |
| 7 | 7 | |
| 8 | 8 | # This file is (in principle) common to ALL GNU software. |
| 9 | 9 | # The presence of a machine in this file suggests that SOME GNU software |
| ... | ... | @@ -118,7 +118,7 @@ esac |
| 118 | 118 | # Here we must recognize all the valid KERNEL-OS combinations. |
| 119 | 119 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
| 120 | 120 | case $maybe_os in |
| 121 | - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | |
| 121 | + nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) | |
| 122 | 122 | os=-$maybe_os |
| 123 | 123 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
| 124 | 124 | ;; |
| ... | ... | @@ -229,7 +229,7 @@ case $basic_machine in |
| 229 | 229 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
| 230 | 230 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
| 231 | 231 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ |
| 232 | - | clipper \ | |
| 232 | + | c4x | clipper \ | |
| 233 | 233 | | d10v | d30v | dlx | dsp16xx \ |
| 234 | 234 | | fr30 | frv \ |
| 235 | 235 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
| ... | ... | @@ -239,25 +239,20 @@ case $basic_machine in |
| 239 | 239 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
| 240 | 240 | | mips16 \ |
| 241 | 241 | | mips64 | mips64el \ |
| 242 | - | mips64vr | mips64vrel \ | |
| 243 | 242 | | mips64orion | mips64orionel \ |
| 244 | 243 | | mips64vr4100 | mips64vr4100el \ |
| 245 | 244 | | mips64vr4300 | mips64vr4300el \ |
| 246 | 245 | | mips64vr5000 | mips64vr5000el \ |
| 247 | 246 | | mipsisa32 | mipsisa32el \ |
| 248 | - | mipsisa32r2 | mipsisa32r2el \ | |
| 249 | 247 | | mipsisa64 | mipsisa64el \ |
| 250 | 248 | | mipsisa64sb1 | mipsisa64sb1el \ |
| 251 | - | mipsisa64sr71k | mipsisa64sr71kel \ | |
| 252 | 249 | | mipstx39 | mipstx39el \ |
| 253 | 250 | | mn10200 | mn10300 \ |
| 254 | - | msp430 \ | |
| 255 | 251 | | ns16k | ns32k \ |
| 256 | 252 | | openrisc | or32 \ |
| 257 | 253 | | pdp10 | pdp11 | pj | pjl \ |
| 258 | 254 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
| 259 | 255 | | pyramid \ |
| 260 | - | s390 | s390x \ | |
| 261 | 256 | | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
| 262 | 257 | | sh64 | sh64le \ |
| 263 | 258 | | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ |
| ... | ... | @@ -297,7 +292,7 @@ case $basic_machine in |
| 297 | 292 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
| 298 | 293 | | avr-* \ |
| 299 | 294 | | bs2000-* \ |
| 300 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ | |
| 295 | + | c[123]* | c30-* | [cjt]90-* | c54x-* \ | |
| 301 | 296 | | clipper-* | cydra-* \ |
| 302 | 297 | | d10v-* | d30v-* | dlx-* \ |
| 303 | 298 | | elxsi-* \ |
| ... | ... | @@ -312,30 +307,25 @@ case $basic_machine in |
| 312 | 307 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
| 313 | 308 | | mips16-* \ |
| 314 | 309 | | mips64-* | mips64el-* \ |
| 315 | - | mips64vr-* | mips64vrel-* \ | |
| 316 | 310 | | mips64orion-* | mips64orionel-* \ |
| 317 | 311 | | mips64vr4100-* | mips64vr4100el-* \ |
| 318 | 312 | | mips64vr4300-* | mips64vr4300el-* \ |
| 319 | 313 | | mips64vr5000-* | mips64vr5000el-* \ |
| 320 | 314 | | mipsisa32-* | mipsisa32el-* \ |
| 321 | - | mipsisa32r2-* | mipsisa32r2el-* \ | |
| 322 | 315 | | mipsisa64-* | mipsisa64el-* \ |
| 323 | 316 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
| 324 | - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | |
| 325 | - | mipstx39-* | mipstx39el-* \ | |
| 326 | - | msp430-* \ | |
| 327 | - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | |
| 317 | + | mipstx39 | mipstx39el \ | |
| 318 | + | none-* | np1-* | ns16k-* | ns32k-* \ | |
| 328 | 319 | | orion-* \ |
| 329 | 320 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
| 330 | 321 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
| 331 | 322 | | pyramid-* \ |
| 332 | 323 | | romp-* | rs6000-* \ |
| 333 | - | s390-* | s390x-* \ | |
| 334 | 324 | | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ |
| 335 | 325 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
| 336 | 326 | | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ |
| 337 | 327 | | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ |
| 338 | - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ | |
| 328 | + | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ | |
| 339 | 329 | | v850-* | v850e-* | vax-* \ |
| 340 | 330 | | we32k-* \ |
| 341 | 331 | | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ |
| ... | ... | @@ -722,10 +712,6 @@ case $basic_machine in |
| 722 | 712 | np1) |
| 723 | 713 | basic_machine=np1-gould |
| 724 | 714 | ;; |
| 725 | - nv1) | |
| 726 | - basic_machine=nv1-cray | |
| 727 | - os=-unicosmp | |
| 728 | - ;; | |
| 729 | 715 | nsr-tandem) |
| 730 | 716 | basic_machine=nsr-tandem |
| 731 | 717 | ;; |
| ... | ... | @@ -759,13 +745,13 @@ case $basic_machine in |
| 759 | 745 | pbb) |
| 760 | 746 | basic_machine=m68k-tti |
| 761 | 747 | ;; |
| 762 | - pc532 | pc532-*) | |
| 748 | + pc532 | pc532-*) | |
| 763 | 749 | basic_machine=ns32k-pc532 |
| 764 | 750 | ;; |
| 765 | 751 | pentium | p5 | k5 | k6 | nexgen | viac3) |
| 766 | 752 | basic_machine=i586-pc |
| 767 | 753 | ;; |
| 768 | - pentiumpro | p6 | 6x86 | athlon | athlon_*) | |
| 754 | + pentiumpro | p6 | 6x86 | athlon) | |
| 769 | 755 | basic_machine=i686-pc |
| 770 | 756 | ;; |
| 771 | 757 | pentiumii | pentium2) |
| ... | ... | @@ -786,22 +772,22 @@ case $basic_machine in |
| 786 | 772 | power) basic_machine=power-ibm |
| 787 | 773 | ;; |
| 788 | 774 | ppc) basic_machine=powerpc-unknown |
| 789 | - ;; | |
| 775 | + ;; | |
| 790 | 776 | ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 791 | 777 | ;; |
| 792 | 778 | ppcle | powerpclittle | ppc-le | powerpc-little) |
| 793 | 779 | basic_machine=powerpcle-unknown |
| 794 | - ;; | |
| 780 | + ;; | |
| 795 | 781 | ppcle-* | powerpclittle-*) |
| 796 | 782 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 797 | 783 | ;; |
| 798 | 784 | ppc64) basic_machine=powerpc64-unknown |
| 799 | - ;; | |
| 785 | + ;; | |
| 800 | 786 | ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 801 | 787 | ;; |
| 802 | 788 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
| 803 | 789 | basic_machine=powerpc64le-unknown |
| 804 | - ;; | |
| 790 | + ;; | |
| 805 | 791 | ppc64le-* | powerpc64little-*) |
| 806 | 792 | basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 807 | 793 | ;; |
| ... | ... | @@ -822,16 +808,16 @@ case $basic_machine in |
| 822 | 808 | rtpc | rtpc-*) |
| 823 | 809 | basic_machine=romp-ibm |
| 824 | 810 | ;; |
| 811 | + s390 | s390-*) | |
| 812 | + basic_machine=s390-ibm | |
| 813 | + ;; | |
| 814 | + s390x | s390x-*) | |
| 815 | + basic_machine=s390x-ibm | |
| 816 | + ;; | |
| 825 | 817 | sa29200) |
| 826 | 818 | basic_machine=a29k-amd |
| 827 | 819 | os=-udi |
| 828 | 820 | ;; |
| 829 | - sb1) | |
| 830 | - basic_machine=mipsisa64sb1-unknown | |
| 831 | - ;; | |
| 832 | - sb1el) | |
| 833 | - basic_machine=mipsisa64sb1el-unknown | |
| 834 | - ;; | |
| 835 | 821 | sequent) |
| 836 | 822 | basic_machine=i386-sequent |
| 837 | 823 | ;; |
| ... | ... | @@ -897,7 +883,7 @@ case $basic_machine in |
| 897 | 883 | sun386 | sun386i | roadrunner) |
| 898 | 884 | basic_machine=i386-sun |
| 899 | 885 | ;; |
| 900 | - sv1) | |
| 886 | + sv1) | |
| 901 | 887 | basic_machine=sv1-cray |
| 902 | 888 | os=-unicos |
| 903 | 889 | ;; |
| ... | ... | @@ -905,6 +891,10 @@ case $basic_machine in |
| 905 | 891 | basic_machine=i386-sequent |
| 906 | 892 | os=-dynix |
| 907 | 893 | ;; |
| 894 | + t3d) | |
| 895 | + basic_machine=alpha-cray | |
| 896 | + os=-unicos | |
| 897 | + ;; | |
| 908 | 898 | t3e) |
| 909 | 899 | basic_machine=alphaev5-cray |
| 910 | 900 | os=-unicos |
| ... | ... | @@ -913,10 +903,6 @@ case $basic_machine in |
| 913 | 903 | basic_machine=t90-cray |
| 914 | 904 | os=-unicos |
| 915 | 905 | ;; |
| 916 | - tic4x | c4x*) | |
| 917 | - basic_machine=tic4x-unknown | |
| 918 | - os=-coff | |
| 919 | - ;; | |
| 920 | 906 | tic54x | c54x*) |
| 921 | 907 | basic_machine=tic54x-unknown |
| 922 | 908 | os=-coff |
| ... | ... | @@ -955,8 +941,8 @@ case $basic_machine in |
| 955 | 941 | os=-vms |
| 956 | 942 | ;; |
| 957 | 943 | vpp*|vx|vx-*) |
| 958 | - basic_machine=f301-fujitsu | |
| 959 | - ;; | |
| 944 | + basic_machine=f301-fujitsu | |
| 945 | + ;; | |
| 960 | 946 | vxworks960) |
| 961 | 947 | basic_machine=i960-wrs |
| 962 | 948 | os=-vxworks |
| ... | ... | @@ -977,7 +963,11 @@ case $basic_machine in |
| 977 | 963 | basic_machine=hppa1.1-winbond |
| 978 | 964 | os=-proelf |
| 979 | 965 | ;; |
| 980 | - xps | xps100) | |
| 966 | + windows32) | |
| 967 | + basic_machine=i386-pc | |
| 968 | + os=-windows32-msvcrt | |
| 969 | + ;; | |
| 970 | + xps | xps100) | |
| 981 | 971 | basic_machine=xps100-honeywell |
| 982 | 972 | ;; |
| 983 | 973 | ymp) |
| ... | ... | @@ -1032,7 +1022,7 @@ case $basic_machine in |
| 1032 | 1022 | sparc | sparcv9 | sparcv9b) |
| 1033 | 1023 | basic_machine=sparc-sun |
| 1034 | 1024 | ;; |
| 1035 | - cydra) | |
| 1025 | + cydra) | |
| 1036 | 1026 | basic_machine=cydra-cydrome |
| 1037 | 1027 | ;; |
| 1038 | 1028 | orion) |
| ... | ... | @@ -1047,6 +1037,10 @@ case $basic_machine in |
| 1047 | 1037 | pmac | pmac-mpw) |
| 1048 | 1038 | basic_machine=powerpc-apple |
| 1049 | 1039 | ;; |
| 1040 | + c4x*) | |
| 1041 | + basic_machine=c4x-none | |
| 1042 | + os=-coff | |
| 1043 | + ;; | |
| 1050 | 1044 | *-unknown) |
| 1051 | 1045 | # Make sure to match an already-canonicalized machine name. |
| 1052 | 1046 | ;; |
| ... | ... | @@ -1109,12 +1103,11 @@ case $os in |
| 1109 | 1103 | | -chorusos* | -chorusrdb* \ |
| 1110 | 1104 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| 1111 | 1105 | | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ |
| 1112 | - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | |
| 1106 | + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | |
| 1113 | 1107 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
| 1114 | 1108 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
| 1115 | 1109 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| 1116 | - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | |
| 1117 | - | -powermax* | -dnix* | -microbsd*) | |
| 1110 | + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) | |
| 1118 | 1111 | # Remember, each alternative MUST END IN *, to match a version number. |
| 1119 | 1112 | ;; |
| 1120 | 1113 | -qnx*) |
| ... | ... | @@ -1126,10 +1119,8 @@ case $os in |
| 1126 | 1119 | ;; |
| 1127 | 1120 | esac |
| 1128 | 1121 | ;; |
| 1129 | - -nto-qnx*) | |
| 1130 | - ;; | |
| 1131 | 1122 | -nto*) |
| 1132 | - os=`echo $os | sed -e 's|nto|nto-qnx|'` | |
| 1123 | + os=-nto-qnx | |
| 1133 | 1124 | ;; |
| 1134 | 1125 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ |
| 1135 | 1126 | | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ |
| ... | ... | @@ -1181,7 +1172,7 @@ case $os in |
| 1181 | 1172 | os=-rtmk-nova |
| 1182 | 1173 | ;; |
| 1183 | 1174 | -ns2 ) |
| 1184 | - os=-nextstep2 | |
| 1175 | + os=-nextstep2 | |
| 1185 | 1176 | ;; |
| 1186 | 1177 | -nsk*) |
| 1187 | 1178 | os=-nsk |
| ... | ... | @@ -1220,8 +1211,8 @@ case $os in |
| 1220 | 1211 | -xenix) |
| 1221 | 1212 | os=-xenix |
| 1222 | 1213 | ;; |
| 1223 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | |
| 1224 | - os=-mint | |
| 1214 | + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | |
| 1215 | + os=-mint | |
| 1225 | 1216 | ;; |
| 1226 | 1217 | -none) |
| 1227 | 1218 | ;; |
| ... | ... | @@ -1258,7 +1249,7 @@ case $basic_machine in |
| 1258 | 1249 | pdp10-*) |
| 1259 | 1250 | os=-tops20 |
| 1260 | 1251 | ;; |
| 1261 | - pdp11-*) | |
| 1252 | + pdp11-*) | |
| 1262 | 1253 | os=-none |
| 1263 | 1254 | ;; |
| 1264 | 1255 | *-dec | vax-*) |
| ... | ... | @@ -1351,19 +1342,19 @@ case $basic_machine in |
| 1351 | 1342 | *-next) |
| 1352 | 1343 | os=-nextstep3 |
| 1353 | 1344 | ;; |
| 1354 | - *-gould) | |
| 1345 | + *-gould) | |
| 1355 | 1346 | os=-sysv |
| 1356 | 1347 | ;; |
| 1357 | - *-highlevel) | |
| 1348 | + *-highlevel) | |
| 1358 | 1349 | os=-bsd |
| 1359 | 1350 | ;; |
| 1360 | 1351 | *-encore) |
| 1361 | 1352 | os=-bsd |
| 1362 | 1353 | ;; |
| 1363 | - *-sgi) | |
| 1354 | + *-sgi) | |
| 1364 | 1355 | os=-irix |
| 1365 | 1356 | ;; |
| 1366 | - *-siemens) | |
| 1357 | + *-siemens) | |
| 1367 | 1358 | os=-sysv4 |
| 1368 | 1359 | ;; |
| 1369 | 1360 | *-masscomp) | ... | ... |
configure
| ... | ... | @@ -393,9 +393,9 @@ fi |
| 393 | 393 | |
| 394 | 394 | |
| 395 | 395 | |
| 396 | -tagnames=${tagnames+${tagnames},}CXX | |
| 396 | +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` | |
| 397 | 397 | |
| 398 | -tagnames=${tagnames+${tagnames},}F77 | |
| 398 | +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` | |
| 399 | 399 | |
| 400 | 400 | # Name of the host. |
| 401 | 401 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
| ... | ... | @@ -465,7 +465,7 @@ ac_includes_default="\ |
| 465 | 465 | # include <unistd.h> |
| 466 | 466 | #endif" |
| 467 | 467 | |
| 468 | -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT GAMMALIB_LT_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS' | |
| 468 | +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT GAMMALIB_LT_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SWIG HAVE_SWIG_TRUE HAVE_SWIG_FALSE PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE ENABLE_PYTHON_BINDING_TRUE ENABLE_PYTHON_BINDING_FALSE LIBOBJS LTLIBOBJS' | |
| 469 | 469 | ac_subst_files='' |
| 470 | 470 | |
| 471 | 471 | # Initialize some variables set by options. |
| ... | ... | @@ -1027,6 +1027,8 @@ if test -n "$ac_init_help"; then |
| 1027 | 1027 | Optional Features: |
| 1028 | 1028 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
| 1029 | 1029 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
| 1030 | + --enable-maintainer-mode enable make rules and dependencies not useful | |
| 1031 | + (and sometimes confusing) to the casual installer | |
| 1030 | 1032 | --enable-shared[=PKGS] |
| 1031 | 1033 | build shared libraries [default=yes] |
| 1032 | 1034 | --enable-static[=PKGS] |
| ... | ... | @@ -1034,6 +1036,8 @@ Optional Features: |
| 1034 | 1036 | --enable-fast-install[=PKGS] |
| 1035 | 1037 | optimize for fast installation [default=yes] |
| 1036 | 1038 | --disable-libtool-lock avoid locking (might break parallel builds) |
| 1039 | + --enable-range-check performs index range checking | |
| 1040 | + --enable-python-binding build python binding (default=no | |
| 1037 | 1041 | |
| 1038 | 1042 | Optional Packages: |
| 1039 | 1043 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
| ... | ... | @@ -1509,7 +1513,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 1509 | 1513 | |
| 1510 | 1514 | |
| 1511 | 1515 | |
| 1512 | -am__api_version="1.9" | |
| 1516 | +am__api_version="1.6" | |
| 1513 | 1517 | ac_aux_dir= |
| 1514 | 1518 | for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do |
| 1515 | 1519 | if test -f $ac_dir/install-sh; then |
| ... | ... | @@ -1672,6 +1676,7 @@ _ACEOF |
| 1672 | 1676 | program_transform_name=`echo $program_transform_name | sed -f conftest.sed` |
| 1673 | 1677 | rm conftest.sed |
| 1674 | 1678 | |
| 1679 | + | |
| 1675 | 1680 | # expand $ac_aux_dir to an absolute path |
| 1676 | 1681 | am_aux_dir=`cd $ac_aux_dir && pwd` |
| 1677 | 1682 | |
| ... | ... | @@ -1685,39 +1690,6 @@ else |
| 1685 | 1690 | echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
| 1686 | 1691 | fi |
| 1687 | 1692 | |
| 1688 | -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then | |
| 1689 | - # We used to keeping the `.' as first argument, in order to | |
| 1690 | - # allow $(mkdir_p) to be used without argument. As in | |
| 1691 | - # $(mkdir_p) $(somedir) | |
| 1692 | - # where $(somedir) is conditionally defined. However this is wrong | |
| 1693 | - # for two reasons: | |
| 1694 | - # 1. if the package is installed by a user who cannot write `.' | |
| 1695 | - # make install will fail, | |
| 1696 | - # 2. the above comment should most certainly read | |
| 1697 | - # $(mkdir_p) $(DESTDIR)$(somedir) | |
| 1698 | - # so it does not work when $(somedir) is undefined and | |
| 1699 | - # $(DESTDIR) is not. | |
| 1700 | - # To support the latter case, we have to write | |
| 1701 | - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), | |
| 1702 | - # so the `.' trick is pointless. | |
| 1703 | - mkdir_p='mkdir -p --' | |
| 1704 | -else | |
| 1705 | - # On NextStep and OpenStep, the `mkdir' command does not | |
| 1706 | - # recognize any option. It will interpret all options as | |
| 1707 | - # directories to create, and then abort because `.' already | |
| 1708 | - # exists. | |
| 1709 | - for d in ./-p ./--version; | |
| 1710 | - do | |
| 1711 | - test -d $d && rmdir $d | |
| 1712 | - done | |
| 1713 | - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. | |
| 1714 | - if test -f "$ac_aux_dir/mkinstalldirs"; then | |
| 1715 | - mkdir_p='$(mkinstalldirs)' | |
| 1716 | - else | |
| 1717 | - mkdir_p='$(install_sh) -d' | |
| 1718 | - fi | |
| 1719 | -fi | |
| 1720 | - | |
| 1721 | 1693 | for ac_prog in gawk mawk nawk awk |
| 1722 | 1694 | do |
| 1723 | 1695 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| ... | ... | @@ -1787,16 +1759,7 @@ echo "${ECHO_T}no" >&6 |
| 1787 | 1759 | SET_MAKE="MAKE=${MAKE-make}" |
| 1788 | 1760 | fi |
| 1789 | 1761 | |
| 1790 | -rm -rf .tst 2>/dev/null | |
| 1791 | -mkdir .tst 2>/dev/null | |
| 1792 | -if test -d .tst; then | |
| 1793 | - am__leading_dot=. | |
| 1794 | -else | |
| 1795 | - am__leading_dot=_ | |
| 1796 | -fi | |
| 1797 | -rmdir .tst 2>/dev/null | |
| 1798 | - | |
| 1799 | -# test to see if srcdir already configured | |
| 1762 | + # test to see if srcdir already configured | |
| 1800 | 1763 | if test "`cd $srcdir && pwd`" != "`pwd`" && |
| 1801 | 1764 | test -f $srcdir/config.status; then |
| 1802 | 1765 | { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 |
| ... | ... | @@ -1804,19 +1767,9 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" |
| 1804 | 1767 | { (exit 1); exit 1; }; } |
| 1805 | 1768 | fi |
| 1806 | 1769 | |
| 1807 | -# test whether we have cygpath | |
| 1808 | -if test -z "$CYGPATH_W"; then | |
| 1809 | - if (cygpath --version) >/dev/null 2>/dev/null; then | |
| 1810 | - CYGPATH_W='cygpath -w' | |
| 1811 | - else | |
| 1812 | - CYGPATH_W=echo | |
| 1813 | - fi | |
| 1814 | -fi | |
| 1815 | - | |
| 1816 | - | |
| 1817 | 1770 | # Define the identity of the package. |
| 1818 | - PACKAGE='gammalib' | |
| 1819 | - VERSION='0.1pre' | |
| 1771 | + PACKAGE=gammalib | |
| 1772 | + VERSION=0.1pre | |
| 1820 | 1773 | |
| 1821 | 1774 | |
| 1822 | 1775 | cat >>confdefs.h <<_ACEOF |
| ... | ... | @@ -1844,6 +1797,9 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} |
| 1844 | 1797 | |
| 1845 | 1798 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
| 1846 | 1799 | |
| 1800 | + | |
| 1801 | +AMTAR=${AMTAR-"${am_missing_run}tar"} | |
| 1802 | + | |
| 1847 | 1803 | install_sh=${install_sh-"$am_aux_dir/install-sh"} |
| 1848 | 1804 | |
| 1849 | 1805 | # Installed binaries are usually stripped using `strip' when the user |
| ... | ... | @@ -1936,19 +1892,39 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
| 1936 | 1892 | |
| 1937 | 1893 | # We need awk for the "check" target. The system "awk" is bad on |
| 1938 | 1894 | # some platforms. |
| 1939 | -# Always define AMTAR for backward compatibility. | |
| 1940 | 1895 | |
| 1941 | -AMTAR=${AMTAR-"${am_missing_run}tar"} | |
| 1942 | 1896 | |
| 1943 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | |
| 1897 | + | |
| 1898 | +# Add the stamp file to the list of files AC keeps track of, | |
| 1899 | +# along with our hook. | |
| 1900 | + ac_config_headers="$ac_config_headers config.h" | |
| 1944 | 1901 | |
| 1945 | 1902 | |
| 1946 | 1903 | |
| 1904 | +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | |
| 1905 | +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 | |
| 1906 | + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. | |
| 1907 | +if test "${enable_maintainer_mode+set}" = set; then | |
| 1908 | + enableval="$enable_maintainer_mode" | |
| 1909 | + USE_MAINTAINER_MODE=$enableval | |
| 1910 | +else | |
| 1911 | + USE_MAINTAINER_MODE=no | |
| 1912 | +fi; | |
| 1913 | + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 | |
| 1914 | +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 | |
| 1947 | 1915 | |
| 1948 | 1916 | |
| 1949 | - ac_config_headers="$ac_config_headers config.h" | |
| 1917 | +if test $USE_MAINTAINER_MODE = yes; then | |
| 1918 | + MAINTAINER_MODE_TRUE= | |
| 1919 | + MAINTAINER_MODE_FALSE='#' | |
| 1920 | +else | |
| 1921 | + MAINTAINER_MODE_TRUE='#' | |
| 1922 | + MAINTAINER_MODE_FALSE= | |
| 1923 | +fi | |
| 1924 | + | |
| 1925 | + MAINT=$MAINTAINER_MODE_TRUE | |
| 1926 | + | |
| 1950 | 1927 | |
| 1951 | -#AM_MAINTAINER_MODE | |
| 1952 | 1928 | |
| 1953 | 1929 | # things required by automake |
| 1954 | 1930 | # AC_ARG_PROGRAM |
| ... | ... | @@ -3585,7 +3561,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 |
| 3585 | 3561 | # Accept absolute paths. |
| 3586 | 3562 | [\\/]* | ?:[\\/]*) |
| 3587 | 3563 | re_direlt='/[^/][^/]*/\.\./' |
| 3588 | - # Canonicalize the pathname of ld | |
| 3564 | + # Canonicalize the path of ld | |
| 3589 | 3565 | ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` |
| 3590 | 3566 | while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
| 3591 | 3567 | ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` |
| ... | ... | @@ -3654,7 +3630,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then |
| 3654 | 3630 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3655 | 3631 | else |
| 3656 | 3632 | # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
| 3657 | -case `$LD -v 2>&1 </dev/null` in | |
| 3633 | +case `"$LD" -v 2>&1 </dev/null` in | |
| 3658 | 3634 | *GNU* | *'with BFD'*) |
| 3659 | 3635 | lt_cv_prog_gnu_ld=yes |
| 3660 | 3636 | ;; |
| ... | ... | @@ -3682,7 +3658,7 @@ case $reload_flag in |
| 3682 | 3658 | "" | " "*) ;; |
| 3683 | 3659 | *) reload_flag=" $reload_flag" ;; |
| 3684 | 3660 | esac |
| 3685 | -reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| 3661 | +reload_cmds='$CC -nostdlib -Xlinker$reload_flag $archargs -o $output$reload_objs' | |
| 3686 | 3662 | |
| 3687 | 3663 | echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 |
| 3688 | 3664 | echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 |
| ... | ... | @@ -3775,24 +3751,28 @@ bsdi4*) |
| 3775 | 3751 | lt_cv_file_magic_test_file=/shlib/libc.so |
| 3776 | 3752 | ;; |
| 3777 | 3753 | |
| 3778 | -cygwin*) | |
| 3779 | - # func_win32_libid is a shell function defined in ltmain.sh | |
| 3754 | +cygwin* | mingw* | pw32*) | |
| 3755 | + # win32_libid is a shell function defined in ltmain.sh | |
| 3780 | 3756 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 3781 | - lt_cv_file_magic_cmd='func_win32_libid' | |
| 3782 | - ;; | |
| 3783 | - | |
| 3784 | -mingw* | pw32*) | |
| 3785 | - # Base MSYS/MinGW do not provide the 'file' command needed by | |
| 3786 | - # func_win32_libid shell function, so use a weaker test based on 'objdump'. | |
| 3787 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| 3788 | - lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| 3757 | + lt_cv_file_magic_cmd='win32_libid' | |
| 3789 | 3758 | ;; |
| 3790 | 3759 | |
| 3791 | 3760 | darwin* | rhapsody*) |
| 3761 | + # this will be overwritten by pass_all, but leave it in just in case | |
| 3762 | + lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' | |
| 3763 | + lt_cv_file_magic_cmd='/usr/bin/file -L' | |
| 3764 | + case "$host_os" in | |
| 3765 | + rhapsody* | darwin1.[012]) | |
| 3766 | + lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` | |
| 3767 | + ;; | |
| 3768 | + *) # Darwin 1.3 on | |
| 3769 | + lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' | |
| 3770 | + ;; | |
| 3771 | + esac | |
| 3792 | 3772 | lt_cv_deplibs_check_method=pass_all |
| 3793 | 3773 | ;; |
| 3794 | 3774 | |
| 3795 | -freebsd* | kfreebsd*-gnu) | |
| 3775 | +freebsd*) | |
| 3796 | 3776 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
| 3797 | 3777 | case $host_cpu in |
| 3798 | 3778 | i*86 ) |
| ... | ... | @@ -3831,27 +3811,36 @@ hpux10.20* | hpux11*) |
| 3831 | 3811 | ;; |
| 3832 | 3812 | |
| 3833 | 3813 | irix5* | irix6* | nonstopux*) |
| 3834 | - case $LD in | |
| 3835 | - *-32|*"-32 ") libmagic=32-bit;; | |
| 3836 | - *-n32|*"-n32 ") libmagic=N32;; | |
| 3837 | - *-64|*"-64 ") libmagic=64-bit;; | |
| 3838 | - *) libmagic=never-match;; | |
| 3814 | + case $host_os in | |
| 3815 | + irix5* | nonstopux*) | |
| 3816 | + # this will be overridden with pass_all, but let us keep it just in case | |
| 3817 | + lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" | |
| 3818 | + ;; | |
| 3819 | + *) | |
| 3820 | + case $LD in | |
| 3821 | + *-32|*"-32 ") libmagic=32-bit;; | |
| 3822 | + *-n32|*"-n32 ") libmagic=N32;; | |
| 3823 | + *-64|*"-64 ") libmagic=64-bit;; | |
| 3824 | + *) libmagic=never-match;; | |
| 3825 | + esac | |
| 3826 | + # this will be overridden with pass_all, but let us keep it just in case | |
| 3827 | + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" | |
| 3828 | + ;; | |
| 3839 | 3829 | esac |
| 3830 | + lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` | |
| 3840 | 3831 | lt_cv_deplibs_check_method=pass_all |
| 3841 | 3832 | ;; |
| 3842 | 3833 | |
| 3843 | 3834 | # This must be Linux ELF. |
| 3844 | 3835 | linux*) |
| 3845 | 3836 | case $host_cpu in |
| 3846 | - alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) | |
| 3837 | + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) | |
| 3847 | 3838 | lt_cv_deplibs_check_method=pass_all ;; |
| 3848 | 3839 | *) |
| 3849 | 3840 | # glibc up to 2.1.1 does not perform some relocations on ARM |
| 3850 | - # this will be overridden with pass_all, but let us keep it just in case | |
| 3851 | 3841 | lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; |
| 3852 | 3842 | esac |
| 3853 | 3843 | lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` |
| 3854 | - lt_cv_deplibs_check_method=pass_all | |
| 3855 | 3844 | ;; |
| 3856 | 3845 | |
| 3857 | 3846 | netbsd*) |
| ... | ... | @@ -3868,7 +3857,7 @@ newos6*) |
| 3868 | 3857 | lt_cv_file_magic_test_file=/usr/lib/libnls.so |
| 3869 | 3858 | ;; |
| 3870 | 3859 | |
| 3871 | -nto-qnx*) | |
| 3860 | +nto-qnx) | |
| 3872 | 3861 | lt_cv_deplibs_check_method=unknown |
| 3873 | 3862 | ;; |
| 3874 | 3863 | |
| ... | ... | @@ -3883,6 +3872,9 @@ openbsd*) |
| 3883 | 3872 | ;; |
| 3884 | 3873 | |
| 3885 | 3874 | osf3* | osf4* | osf5*) |
| 3875 | + # this will be overridden with pass_all, but let us keep it just in case | |
| 3876 | + lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' | |
| 3877 | + lt_cv_file_magic_test_file=/shlib/libc.so | |
| 3886 | 3878 | lt_cv_deplibs_check_method=pass_all |
| 3887 | 3879 | ;; |
| 3888 | 3880 | |
| ... | ... | @@ -3892,6 +3884,7 @@ sco3.2v5*) |
| 3892 | 3884 | |
| 3893 | 3885 | solaris*) |
| 3894 | 3886 | lt_cv_deplibs_check_method=pass_all |
| 3887 | + lt_cv_file_magic_test_file=/lib/libc.so | |
| 3895 | 3888 | ;; |
| 3896 | 3889 | |
| 3897 | 3890 | sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
| ... | ... | @@ -3971,7 +3964,7 @@ ia64-*-hpux*) |
| 3971 | 3964 | ;; |
| 3972 | 3965 | *-*-irix6*) |
| 3973 | 3966 | # Find out which ABI we are using. |
| 3974 | - echo '#line 3974 "configure"' > conftest.$ac_ext | |
| 3967 | + echo '#line 3967 "configure"' > conftest.$ac_ext | |
| 3975 | 3968 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 3976 | 3969 | (eval $ac_compile) 2>&5 |
| 3977 | 3970 | ac_status=$? |
| ... | ... | @@ -4020,7 +4013,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) |
| 4020 | 4013 | x86_64-*linux*) |
| 4021 | 4014 | LD="${LD-ld} -m elf_i386" |
| 4022 | 4015 | ;; |
| 4023 | - ppc64-*linux*|powerpc64-*linux*) | |
| 4016 | + ppc64-*linux*) | |
| 4024 | 4017 | LD="${LD-ld} -m elf32ppclinux" |
| 4025 | 4018 | ;; |
| 4026 | 4019 | s390x-*linux*) |
| ... | ... | @@ -5079,7 +5072,7 @@ fi |
| 5079 | 5072 | |
| 5080 | 5073 | |
| 5081 | 5074 | # Provide some information about the compiler. |
| 5082 | -echo "$as_me:5082:" \ | |
| 5075 | +echo "$as_me:5075:" \ | |
| 5083 | 5076 | "checking for Fortran 77 compiler version" >&5 |
| 5084 | 5077 | ac_compiler=`set X $ac_compile; echo $2` |
| 5085 | 5078 | { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
| ... | ... | @@ -5234,7 +5227,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then |
| 5234 | 5227 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5235 | 5228 | else |
| 5236 | 5229 | i=0 |
| 5237 | - teststring="ABCD" | |
| 5230 | + testring="ABCD" | |
| 5238 | 5231 | |
| 5239 | 5232 | case $build_os in |
| 5240 | 5233 | msdosdjgpp*) |
| ... | ... | @@ -5263,26 +5256,20 @@ else |
| 5263 | 5256 | lt_cv_sys_max_cmd_len=8192; |
| 5264 | 5257 | ;; |
| 5265 | 5258 | |
| 5266 | - amigaos*) | |
| 5267 | - # On AmigaOS with pdksh, this test takes hours, literally. | |
| 5268 | - # So we just punt and use a minimum line length of 8192. | |
| 5269 | - lt_cv_sys_max_cmd_len=8192; | |
| 5270 | - ;; | |
| 5271 | - | |
| 5272 | 5259 | *) |
| 5273 | 5260 | # If test is not a shell built-in, we'll probably end up computing a |
| 5274 | 5261 | # maximum length that is only half of the actual maximum length, but |
| 5275 | 5262 | # we can't tell. |
| 5276 | - while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ | |
| 5277 | - = "XX$teststring") >/dev/null 2>&1 && | |
| 5278 | - new_result=`expr "X$teststring" : ".*" 2>&1` && | |
| 5263 | + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ | |
| 5264 | + = "XX$testring") >/dev/null 2>&1 && | |
| 5265 | + new_result=`expr "X$testring" : ".*" 2>&1` && | |
| 5279 | 5266 | lt_cv_sys_max_cmd_len=$new_result && |
| 5280 | 5267 | test $i != 17 # 1/2 MB should be enough |
| 5281 | 5268 | do |
| 5282 | 5269 | i=`expr $i + 1` |
| 5283 | - teststring=$teststring$teststring | |
| 5270 | + testring=$testring$testring | |
| 5284 | 5271 | done |
| 5285 | - teststring= | |
| 5272 | + testring= | |
| 5286 | 5273 | # Add a significant safety factor because C++ compilers can tack on massive |
| 5287 | 5274 | # amounts of additional arguments before passing them to the linker. |
| 5288 | 5275 | # It appears as though 1/2 is a usable value. |
| ... | ... | @@ -5350,7 +5337,7 @@ osf*) |
| 5350 | 5337 | symcode='[BCDEGQRST]' |
| 5351 | 5338 | ;; |
| 5352 | 5339 | solaris* | sysv5*) |
| 5353 | - symcode='[BDRT]' | |
| 5340 | + symcode='[BDT]' | |
| 5354 | 5341 | ;; |
| 5355 | 5342 | sysv4) |
| 5356 | 5343 | symcode='[DFNSTU]' |
| ... | ... | @@ -5368,7 +5355,7 @@ esac |
| 5368 | 5355 | # If we're using GNU nm, then use its standard symbol codes. |
| 5369 | 5356 | case `$NM -V 2>&1` in |
| 5370 | 5357 | *GNU* | *'with BFD'*) |
| 5371 | - symcode='[ABCDGIRSTW]' ;; | |
| 5358 | + symcode='[ABCDGISTW]' ;; | |
| 5372 | 5359 | esac |
| 5373 | 5360 | |
| 5374 | 5361 | # Try without a prefix undercore, then with it. |
| ... | ... | @@ -5547,6 +5534,9 @@ double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' |
| 5547 | 5534 | # double_quote_subst'ed string. |
| 5548 | 5535 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
| 5549 | 5536 | |
| 5537 | +# Sed substitution to undo escaping of the cmd sep variable | |
| 5538 | +unescape_variable_subst='s/\\\(${_S_}\)/\1/g' | |
| 5539 | + | |
| 5550 | 5540 | # Sed substitution to avoid accidental globbing in evaled expressions |
| 5551 | 5541 | no_glob_subst='s/\*/\\\*/g' |
| 5552 | 5542 | |
| ... | ... | @@ -5833,13 +5823,13 @@ old_postuninstall_cmds= |
| 5833 | 5823 | if test -n "$RANLIB"; then |
| 5834 | 5824 | case $host_os in |
| 5835 | 5825 | openbsd*) |
| 5836 | - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" | |
| 5826 | + old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds" | |
| 5837 | 5827 | ;; |
| 5838 | 5828 | *) |
| 5839 | - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" | |
| 5829 | + old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds" | |
| 5840 | 5830 | ;; |
| 5841 | 5831 | esac |
| 5842 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | |
| 5832 | + old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib" | |
| 5843 | 5833 | fi |
| 5844 | 5834 | |
| 5845 | 5835 | # Only perform the check for file, if the check method requires it |
| ... | ... | @@ -6094,8 +6084,7 @@ lt_prog_compiler_no_builtin_flag= |
| 6094 | 6084 | if test "$GCC" = yes; then |
| 6095 | 6085 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
| 6096 | 6086 | |
| 6097 | - | |
| 6098 | -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| 6087 | + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| 6099 | 6088 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 |
| 6100 | 6089 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
| 6101 | 6090 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -6113,11 +6102,11 @@ else |
| 6113 | 6102 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 6114 | 6103 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 6115 | 6104 | -e 's:$: $lt_compiler_flag:'` |
| 6116 | - (eval echo "\"\$as_me:6116: $lt_compile\"" >&5) | |
| 6105 | + (eval echo "\"\$as_me:6105: $lt_compile\"" >&5) | |
| 6117 | 6106 | (eval "$lt_compile" 2>conftest.err) |
| 6118 | 6107 | ac_status=$? |
| 6119 | 6108 | cat conftest.err >&5 |
| 6120 | - echo "$as_me:6120: \$? = $ac_status" >&5 | |
| 6109 | + echo "$as_me:6109: \$? = $ac_status" >&5 | |
| 6121 | 6110 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 6122 | 6111 | # The compiler can only warn and ignore the option if not recognized |
| 6123 | 6112 | # So say no if there are warnings |
| ... | ... | @@ -6260,12 +6249,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
| 6260 | 6249 | |
| 6261 | 6250 | linux*) |
| 6262 | 6251 | case $CC in |
| 6263 | - icc* | ecc*) | |
| 6252 | + icc|ecc) | |
| 6264 | 6253 | lt_prog_compiler_wl='-Wl,' |
| 6265 | 6254 | lt_prog_compiler_pic='-KPIC' |
| 6266 | 6255 | lt_prog_compiler_static='-static' |
| 6267 | 6256 | ;; |
| 6268 | - ccc*) | |
| 6257 | + ccc) | |
| 6269 | 6258 | lt_prog_compiler_wl='-Wl,' |
| 6270 | 6259 | # All Alpha code is PIC. |
| 6271 | 6260 | lt_prog_compiler_static='-non_shared' |
| ... | ... | @@ -6327,8 +6316,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6 |
| 6327 | 6316 | # Check to make sure the PIC flag actually works. |
| 6328 | 6317 | # |
| 6329 | 6318 | if test -n "$lt_prog_compiler_pic"; then |
| 6330 | - | |
| 6331 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | |
| 6319 | + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | |
| 6332 | 6320 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 |
| 6333 | 6321 | if test "${lt_prog_compiler_pic_works+set}" = set; then |
| 6334 | 6322 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -6346,11 +6334,11 @@ else |
| 6346 | 6334 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 6347 | 6335 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 6348 | 6336 | -e 's:$: $lt_compiler_flag:'` |
| 6349 | - (eval echo "\"\$as_me:6349: $lt_compile\"" >&5) | |
| 6337 | + (eval echo "\"\$as_me:6337: $lt_compile\"" >&5) | |
| 6350 | 6338 | (eval "$lt_compile" 2>conftest.err) |
| 6351 | 6339 | ac_status=$? |
| 6352 | 6340 | cat conftest.err >&5 |
| 6353 | - echo "$as_me:6353: \$? = $ac_status" >&5 | |
| 6341 | + echo "$as_me:6341: \$? = $ac_status" >&5 | |
| 6354 | 6342 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 6355 | 6343 | # The compiler can only warn and ignore the option if not recognized |
| 6356 | 6344 | # So say no if there are warnings |
| ... | ... | @@ -6397,6 +6385,13 @@ else |
| 6397 | 6385 | mkdir out |
| 6398 | 6386 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 6399 | 6387 | |
| 6388 | + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers | |
| 6389 | + # that will create temporary files in the current directory regardless of | |
| 6390 | + # the output directory. Thus, making CWD read-only will cause this test | |
| 6391 | + # to fail, enabling locking or at least warning the user not to do parallel | |
| 6392 | + # builds. | |
| 6393 | + chmod -w . | |
| 6394 | + | |
| 6400 | 6395 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
| 6401 | 6396 | # Insert the option either (1) after the last *FLAGS variable, or |
| 6402 | 6397 | # (2) before a word containing "conftest.", or (3) at the end. |
| ... | ... | @@ -6406,11 +6401,11 @@ else |
| 6406 | 6401 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 6407 | 6402 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 6408 | 6403 | -e 's:$: $lt_compiler_flag:'` |
| 6409 | - (eval echo "\"\$as_me:6409: $lt_compile\"" >&5) | |
| 6404 | + (eval echo "\"\$as_me:6404: $lt_compile\"" >&5) | |
| 6410 | 6405 | (eval "$lt_compile" 2>out/conftest.err) |
| 6411 | 6406 | ac_status=$? |
| 6412 | 6407 | cat out/conftest.err >&5 |
| 6413 | - echo "$as_me:6413: \$? = $ac_status" >&5 | |
| 6408 | + echo "$as_me:6408: \$? = $ac_status" >&5 | |
| 6414 | 6409 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 6415 | 6410 | then |
| 6416 | 6411 | # The compiler can only warn and ignore the option if not recognized |
| ... | ... | @@ -6420,11 +6415,8 @@ else |
| 6420 | 6415 | fi |
| 6421 | 6416 | fi |
| 6422 | 6417 | chmod u+w . |
| 6423 | - $rm conftest* | |
| 6424 | - # SGI C++ compiler will create directory out/ii_files/ for | |
| 6425 | - # template instantiation | |
| 6426 | - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files | |
| 6427 | - $rm out/* && rmdir out | |
| 6418 | + $rm conftest* out/* | |
| 6419 | + rmdir out | |
| 6428 | 6420 | cd .. |
| 6429 | 6421 | rmdir conftest |
| 6430 | 6422 | $rm conftest* |
| ... | ... | @@ -6534,7 +6526,7 @@ EOF |
| 6534 | 6526 | ;; |
| 6535 | 6527 | |
| 6536 | 6528 | amigaos*) |
| 6537 | - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 6529 | + archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 6538 | 6530 | hardcode_libdir_flag_spec='-L$libdir' |
| 6539 | 6531 | hardcode_minus_L=yes |
| 6540 | 6532 | |
| ... | ... | @@ -6576,7 +6568,7 @@ EOF |
| 6576 | 6568 | else |
| 6577 | 6569 | echo EXPORTS > $output_objdir/$soname.def; |
| 6578 | 6570 | cat $export_symbols >> $output_objdir/$soname.def; |
| 6579 | - fi~ | |
| 6571 | + fi${_S_} | |
| 6580 | 6572 | $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
| 6581 | 6573 | else |
| 6582 | 6574 | ld_shlibs=no |
| ... | ... | @@ -6621,31 +6613,6 @@ EOF |
| 6621 | 6613 | hardcode_shlibpath_var=no |
| 6622 | 6614 | ;; |
| 6623 | 6615 | |
| 6624 | - linux*) | |
| 6625 | - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| 6626 | - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| 6627 | - archive_cmds="$tmp_archive_cmds" | |
| 6628 | - supports_anon_versioning=no | |
| 6629 | - case `$LD -v 2>/dev/null` in | |
| 6630 | - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 | |
| 6631 | - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | |
| 6632 | - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | |
| 6633 | - *\ 2.11.*) ;; # other 2.11 versions | |
| 6634 | - *) supports_anon_versioning=yes ;; | |
| 6635 | - esac | |
| 6636 | - if test $supports_anon_versioning = yes; then | |
| 6637 | - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| 6638 | -cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| 6639 | -$echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| 6640 | - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| 6641 | - else | |
| 6642 | - archive_expsym_cmds="$tmp_archive_cmds" | |
| 6643 | - fi | |
| 6644 | - else | |
| 6645 | - ld_shlibs=no | |
| 6646 | - fi | |
| 6647 | - ;; | |
| 6648 | - | |
| 6649 | 6616 | *) |
| 6650 | 6617 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
| 6651 | 6618 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| ... | ... | @@ -6673,7 +6640,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 6673 | 6640 | aix3*) |
| 6674 | 6641 | allow_undefined_flag=unsupported |
| 6675 | 6642 | always_export_symbols=yes |
| 6676 | - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 6643 | + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 6677 | 6644 | # Note: this linker hardcodes the directories in LIBPATH if there |
| 6678 | 6645 | # are no directories specified by -L. |
| 6679 | 6646 | hardcode_minus_L=yes |
| ... | ... | @@ -6897,13 +6864,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6897 | 6864 | whole_archive_flag_spec=' ' |
| 6898 | 6865 | archive_cmds_need_lc=yes |
| 6899 | 6866 | # This is similar to how AIX traditionally builds it's shared libraries. |
| 6900 | - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 6867 | + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 6901 | 6868 | fi |
| 6902 | 6869 | fi |
| 6903 | 6870 | ;; |
| 6904 | 6871 | |
| 6905 | 6872 | amigaos*) |
| 6906 | - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 6873 | + archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 6907 | 6874 | hardcode_libdir_flag_spec='-L$libdir' |
| 6908 | 6875 | hardcode_minus_L=yes |
| 6909 | 6876 | # see comment about different semantics on the GNU ld section |
| ... | ... | @@ -6924,9 +6891,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6924 | 6891 | # Tell ltmain to make .lib files, not .a files. |
| 6925 | 6892 | libext=lib |
| 6926 | 6893 | # Tell ltmain to make .dll files, not .so files. |
| 6927 | - shrext_cmds=".dll" | |
| 6894 | + shrext=".dll" | |
| 6928 | 6895 | # FIXME: Setting linknames here is a bad hack. |
| 6929 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' | |
| 6896 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' | |
| 6930 | 6897 | # The linker will automatically build a .lib file if we build a DLL. |
| 6931 | 6898 | old_archive_From_new_cmds='true' |
| 6932 | 6899 | # FIXME: Should let the user specify the lib program. |
| ... | ... | @@ -6936,52 +6903,57 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6936 | 6903 | ;; |
| 6937 | 6904 | |
| 6938 | 6905 | darwin* | rhapsody*) |
| 6939 | - if test "$GXX" = yes ; then | |
| 6906 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 6940 | 6907 | archive_cmds_need_lc=no |
| 6941 | 6908 | case "$host_os" in |
| 6942 | 6909 | rhapsody* | darwin1.[012]) |
| 6943 | 6910 | allow_undefined_flag='-undefined suppress' |
| 6944 | 6911 | ;; |
| 6945 | - *) # Darwin 1.3 on | |
| 6946 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| 6947 | - allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 6948 | - else | |
| 6949 | - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| 6950 | - 10.[012]) | |
| 6951 | - allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 6952 | - ;; | |
| 6953 | - 10.*) | |
| 6954 | - allow_undefined_flag='-undefined dynamic_lookup' | |
| 6955 | - ;; | |
| 6956 | - esac | |
| 6957 | - fi | |
| 6912 | + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 | |
| 6913 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 6914 | + ;; | |
| 6915 | + *) # Darwin 7.0 on | |
| 6916 | + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in | |
| 6917 | + 10.[012]) | |
| 6918 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 6919 | + ;; | |
| 6920 | + *) # 10.3 on | |
| 6921 | + if test -z ${LD_TWOLEVEL_NAMESPACE}; then | |
| 6922 | + allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 6923 | + else | |
| 6924 | + allow_undefined_flag='-undefined dynamic_lookup' | |
| 6925 | + fi | |
| 6926 | + ;; | |
| 6927 | + esac | |
| 6958 | 6928 | ;; |
| 6959 | 6929 | esac |
| 6930 | + # FIXME: Relying on posixy $() will cause problems for | |
| 6931 | + # cross-compilation, but unfortunately the echo tests do not | |
| 6932 | + # yet detect zsh echo's removal of \ escapes. Also zsh mangles | |
| 6933 | + # `"' quotes if we put them in here... so don't! | |
| 6960 | 6934 | lt_int_apple_cc_single_mod=no |
| 6961 | 6935 | output_verbose_link_cmd='echo' |
| 6962 | 6936 | if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
| 6963 | 6937 | lt_int_apple_cc_single_mod=yes |
| 6964 | 6938 | fi |
| 6965 | 6939 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 6966 | - archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 6940 | + archive_cmds='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 6967 | 6941 | else |
| 6968 | - archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 6942 | + archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 6969 | 6943 | fi |
| 6970 | - module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| 6944 | + module_cmds='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' | |
| 6971 | 6945 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
| 6972 | 6946 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 6973 | - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6947 | + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6974 | 6948 | else |
| 6975 | - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6949 | + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6976 | 6950 | fi |
| 6977 | - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6951 | + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 6978 | 6952 | hardcode_direct=no |
| 6979 | 6953 | hardcode_automatic=yes |
| 6980 | 6954 | hardcode_shlibpath_var=unsupported |
| 6981 | 6955 | whole_archive_flag_spec='-all_load $convenience' |
| 6982 | 6956 | link_all_deplibs=yes |
| 6983 | - else | |
| 6984 | - ld_shlibs=no | |
| 6985 | 6957 | fi |
| 6986 | 6958 | ;; |
| 6987 | 6959 | |
| ... | ... | @@ -7015,7 +6987,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7015 | 6987 | ;; |
| 7016 | 6988 | |
| 7017 | 6989 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 7018 | - freebsd* | kfreebsd*-gnu) | |
| 6990 | + freebsd*) | |
| 7019 | 6991 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 7020 | 6992 | hardcode_libdir_flag_spec='-R$libdir' |
| 7021 | 6993 | hardcode_direct=yes |
| ... | ... | @@ -7024,9 +6996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7024 | 6996 | |
| 7025 | 6997 | hpux9*) |
| 7026 | 6998 | if test "$GCC" = yes; then |
| 7027 | - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 6999 | + archive_cmds='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 7028 | 7000 | else |
| 7029 | - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 7001 | + archive_cmds='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 7030 | 7002 | fi |
| 7031 | 7003 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
| 7032 | 7004 | hardcode_libdir_separator=: |
| ... | ... | @@ -7146,7 +7118,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7146 | 7118 | hardcode_libdir_flag_spec='-L$libdir' |
| 7147 | 7119 | hardcode_minus_L=yes |
| 7148 | 7120 | allow_undefined_flag=unsupported |
| 7149 | - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 7121 | + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 7150 | 7122 | old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
| 7151 | 7123 | ;; |
| 7152 | 7124 | |
| ... | ... | @@ -7170,8 +7142,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7170 | 7142 | else |
| 7171 | 7143 | allow_undefined_flag=' -expect_unresolved \*' |
| 7172 | 7144 | archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
| 7173 | - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ | |
| 7174 | - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' | |
| 7145 | + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} | |
| 7146 | + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' | |
| 7175 | 7147 | |
| 7176 | 7148 | # Both c and cxx compiler support -rpath directly |
| 7177 | 7149 | hardcode_libdir_flag_spec='-rpath $libdir' |
| ... | ... | @@ -7191,12 +7163,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7191 | 7163 | no_undefined_flag=' -z text' |
| 7192 | 7164 | if test "$GCC" = yes; then |
| 7193 | 7165 | archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7194 | - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 7195 | - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' | |
| 7166 | + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 7167 | + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' | |
| 7196 | 7168 | else |
| 7197 | 7169 | archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 7198 | - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 7199 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 7170 | + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 7171 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 7200 | 7172 | fi |
| 7201 | 7173 | hardcode_libdir_flag_spec='-R$libdir' |
| 7202 | 7174 | hardcode_shlibpath_var=no |
| ... | ... | @@ -7285,8 +7257,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7285 | 7257 | # $CC -shared without GNU ld will not create a library from C++ |
| 7286 | 7258 | # object files and a static libstdc++, better avoid it by now |
| 7287 | 7259 | archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 7288 | - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 7289 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 7260 | + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 7261 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 7290 | 7262 | hardcode_libdir_flag_spec= |
| 7291 | 7263 | hardcode_shlibpath_var=no |
| 7292 | 7264 | runpath_var='LD_RUN_PATH' |
| ... | ... | @@ -7323,7 +7295,7 @@ x|xyes) |
| 7323 | 7295 | |
| 7324 | 7296 | if test "$enable_shared" = yes && test "$GCC" = yes; then |
| 7325 | 7297 | case $archive_cmds in |
| 7326 | - *'~'*) | |
| 7298 | + *"$_S_"*) | |
| 7327 | 7299 | # FIXME: we may have to deal with multi-command sequences. |
| 7328 | 7300 | ;; |
| 7329 | 7301 | '$CC '*) |
| ... | ... | @@ -7375,12 +7347,78 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6 |
| 7375 | 7347 | ;; |
| 7376 | 7348 | esac |
| 7377 | 7349 | |
| 7350 | +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 7351 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 7352 | +hardcode_action= | |
| 7353 | +if test -n "$hardcode_libdir_flag_spec" || \ | |
| 7354 | + test -n "$runpath_var " || \ | |
| 7355 | + test "X$hardcode_automatic"="Xyes" ; then | |
| 7356 | + | |
| 7357 | + # We can hardcode non-existant directories. | |
| 7358 | + if test "$hardcode_direct" != no && | |
| 7359 | + # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 7360 | + # have to relink, otherwise we might link with an installed library | |
| 7361 | + # when we should be linking with a yet-to-be-installed one | |
| 7362 | + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && | |
| 7363 | + test "$hardcode_minus_L" != no; then | |
| 7364 | + # Linking always hardcodes the temporary library directory. | |
| 7365 | + hardcode_action=relink | |
| 7366 | + else | |
| 7367 | + # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 7368 | + hardcode_action=immediate | |
| 7369 | + fi | |
| 7370 | +else | |
| 7371 | + # We cannot hardcode anything, or else we can only hardcode existing | |
| 7372 | + # directories. | |
| 7373 | + hardcode_action=unsupported | |
| 7374 | +fi | |
| 7375 | +echo "$as_me:$LINENO: result: $hardcode_action" >&5 | |
| 7376 | +echo "${ECHO_T}$hardcode_action" >&6 | |
| 7377 | + | |
| 7378 | +if test "$hardcode_action" = relink; then | |
| 7379 | + # Fast installation is not supported | |
| 7380 | + enable_fast_install=no | |
| 7381 | +elif test "$shlibpath_overrides_runpath" = yes || | |
| 7382 | + test "$enable_shared" = no; then | |
| 7383 | + # Fast installation is not necessary | |
| 7384 | + enable_fast_install=needless | |
| 7385 | +fi | |
| 7386 | + | |
| 7387 | +striplib= | |
| 7388 | +old_striplib= | |
| 7389 | +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 7390 | +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 7391 | +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 7392 | + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 7393 | + test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 7394 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 7395 | +echo "${ECHO_T}yes" >&6 | |
| 7396 | +else | |
| 7397 | +# FIXME - insert some real tests, host_os isn't really good enough | |
| 7398 | + case $host_os in | |
| 7399 | + NOT-darwin*) | |
| 7400 | + if test -n "$STRIP" ; then | |
| 7401 | + striplib="$STRIP -x" | |
| 7402 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 7403 | +echo "${ECHO_T}yes" >&6 | |
| 7404 | + else | |
| 7405 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 7406 | +echo "${ECHO_T}no" >&6 | |
| 7407 | +fi | |
| 7408 | + ;; | |
| 7409 | + *) | |
| 7410 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 7411 | +echo "${ECHO_T}no" >&6 | |
| 7412 | + ;; | |
| 7413 | + esac | |
| 7414 | +fi | |
| 7415 | + | |
| 7378 | 7416 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 7379 | 7417 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
| 7380 | 7418 | library_names_spec= |
| 7381 | 7419 | libname_spec='lib$name' |
| 7382 | 7420 | soname_spec= |
| 7383 | -shrext_cmds=".so" | |
| 7421 | +shrext=".so" | |
| 7384 | 7422 | postinstall_cmds= |
| 7385 | 7423 | postuninstall_cmds= |
| 7386 | 7424 | finish_cmds= |
| ... | ... | @@ -7468,7 +7506,7 @@ aix4* | aix5*) |
| 7468 | 7506 | amigaos*) |
| 7469 | 7507 | library_names_spec='$libname.ixlibrary $libname.a' |
| 7470 | 7508 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
| 7471 | - 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' | |
| 7509 | + 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' | |
| 7472 | 7510 | ;; |
| 7473 | 7511 | |
| 7474 | 7512 | beos*) |
| ... | ... | @@ -7493,7 +7531,7 @@ bsdi4*) |
| 7493 | 7531 | |
| 7494 | 7532 | cygwin* | mingw* | pw32*) |
| 7495 | 7533 | version_type=windows |
| 7496 | - shrext_cmds=".dll" | |
| 7534 | + shrext=".dll" | |
| 7497 | 7535 | need_version=no |
| 7498 | 7536 | need_lib_prefix=no |
| 7499 | 7537 | |
| ... | ... | @@ -7501,13 +7539,13 @@ cygwin* | mingw* | pw32*) |
| 7501 | 7539 | yes,cygwin* | yes,mingw* | yes,pw32*) |
| 7502 | 7540 | library_names_spec='$libname.dll.a' |
| 7503 | 7541 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 7504 | - postinstall_cmds='base_file=`basename \${file}`~ | |
| 7505 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ | |
| 7506 | - dldir=$destdir/`dirname \$dlpath`~ | |
| 7507 | - test -d \$dldir || mkdir -p \$dldir~ | |
| 7542 | + postinstall_cmds='base_file=`basename \${file}`${_S_} | |
| 7543 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} | |
| 7544 | + dldir=$destdir/`dirname \$dlpath`${_S_} | |
| 7545 | + test -d \$dldir || mkdir -p \$dldir${_S_} | |
| 7508 | 7546 | $install_prog $dir/$dlname \$dldir/$dlname' |
| 7509 | - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| 7510 | - dlpath=$dir/\$dldll~ | |
| 7547 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} | |
| 7548 | + dlpath=$dir/\$dldll${_S_} | |
| 7511 | 7549 | $rm \$dlpath' |
| 7512 | 7550 | shlibpath_overrides_runpath=yes |
| 7513 | 7551 | |
| ... | ... | @@ -7515,7 +7553,7 @@ cygwin* | mingw* | pw32*) |
| 7515 | 7553 | cygwin*) |
| 7516 | 7554 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
| 7517 | 7555 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 7518 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | |
| 7556 | + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" | |
| 7519 | 7557 | ;; |
| 7520 | 7558 | mingw*) |
| 7521 | 7559 | # MinGW DLLs use traditional 'lib' prefix |
| ... | ... | @@ -7554,16 +7592,17 @@ darwin* | rhapsody*) |
| 7554 | 7592 | version_type=darwin |
| 7555 | 7593 | need_lib_prefix=no |
| 7556 | 7594 | need_version=no |
| 7557 | - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' | |
| 7595 | + # FIXME: Relying on posixy $() will cause problems for | |
| 7596 | + # cross-compilation, but unfortunately the echo tests do not | |
| 7597 | + # yet detect zsh echo's removal of \ escapes. | |
| 7598 | + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' | |
| 7558 | 7599 | soname_spec='${libname}${release}${major}$shared_ext' |
| 7559 | 7600 | shlibpath_overrides_runpath=yes |
| 7560 | 7601 | shlibpath_var=DYLD_LIBRARY_PATH |
| 7561 | - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 7602 | + shrext='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 7562 | 7603 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
| 7563 | - if test "$GCC" = yes; then | |
| 7564 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 7565 | - else | |
| 7566 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| 7604 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 7605 | + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 7567 | 7606 | fi |
| 7568 | 7607 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 7569 | 7608 | ;; |
| ... | ... | @@ -7581,18 +7620,6 @@ freebsd1*) |
| 7581 | 7620 | dynamic_linker=no |
| 7582 | 7621 | ;; |
| 7583 | 7622 | |
| 7584 | -kfreebsd*-gnu) | |
| 7585 | - version_type=linux | |
| 7586 | - need_lib_prefix=no | |
| 7587 | - need_version=no | |
| 7588 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 7589 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 7590 | - shlibpath_var=LD_LIBRARY_PATH | |
| 7591 | - shlibpath_overrides_runpath=no | |
| 7592 | - hardcode_into_libs=yes | |
| 7593 | - dynamic_linker='GNU ld.so' | |
| 7594 | - ;; | |
| 7595 | - | |
| 7596 | 7623 | freebsd*) |
| 7597 | 7624 | objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 7598 | 7625 | version_type=freebsd-$objformat |
| ... | ... | @@ -7641,7 +7668,7 @@ hpux9* | hpux10* | hpux11*) |
| 7641 | 7668 | need_version=no |
| 7642 | 7669 | case "$host_cpu" in |
| 7643 | 7670 | ia64*) |
| 7644 | - shrext_cmds='.so' | |
| 7671 | + shrext='.so' | |
| 7645 | 7672 | hardcode_into_libs=yes |
| 7646 | 7673 | dynamic_linker="$host_os dld.so" |
| 7647 | 7674 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -7656,7 +7683,7 @@ hpux9* | hpux10* | hpux11*) |
| 7656 | 7683 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 7657 | 7684 | ;; |
| 7658 | 7685 | hppa*64*) |
| 7659 | - shrext_cmds='.sl' | |
| 7686 | + shrext='.sl' | |
| 7660 | 7687 | hardcode_into_libs=yes |
| 7661 | 7688 | dynamic_linker="$host_os dld.sl" |
| 7662 | 7689 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
| ... | ... | @@ -7667,7 +7694,7 @@ hpux9* | hpux10* | hpux11*) |
| 7667 | 7694 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 7668 | 7695 | ;; |
| 7669 | 7696 | *) |
| 7670 | - shrext_cmds='.sl' | |
| 7697 | + shrext='.sl' | |
| 7671 | 7698 | dynamic_linker="$host_os dld.sl" |
| 7672 | 7699 | shlibpath_var=SHLIB_PATH |
| 7673 | 7700 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
| ... | ... | @@ -7736,33 +7763,6 @@ linux*) |
| 7736 | 7763 | # before this can be enabled. |
| 7737 | 7764 | hardcode_into_libs=yes |
| 7738 | 7765 | |
| 7739 | - # find out which ABI we are using | |
| 7740 | - libsuff= | |
| 7741 | - case "$host_cpu" in | |
| 7742 | - x86_64*|s390x*|powerpc64*) | |
| 7743 | - echo '#line 7743 "configure"' > conftest.$ac_ext | |
| 7744 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| 7745 | - (eval $ac_compile) 2>&5 | |
| 7746 | - ac_status=$? | |
| 7747 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 7748 | - (exit $ac_status); }; then | |
| 7749 | - case `/usr/bin/file conftest.$ac_objext` in | |
| 7750 | - *64-bit*) | |
| 7751 | - libsuff=64 | |
| 7752 | - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| 7753 | - ;; | |
| 7754 | - esac | |
| 7755 | - fi | |
| 7756 | - rm -rf conftest* | |
| 7757 | - ;; | |
| 7758 | - esac | |
| 7759 | - | |
| 7760 | - # Append ld.so.conf contents to the search path | |
| 7761 | - if test -f /etc/ld.so.conf; then | |
| 7762 | - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` | |
| 7763 | - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| 7764 | - fi | |
| 7765 | - | |
| 7766 | 7766 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
| 7767 | 7767 | # powerpc, because MkLinux only supported shared libraries with the |
| 7768 | 7768 | # GNU dynamic linker. Since this was broken with cross compilers, |
| ... | ... | @@ -7772,18 +7772,6 @@ linux*) |
| 7772 | 7772 | dynamic_linker='GNU/Linux ld.so' |
| 7773 | 7773 | ;; |
| 7774 | 7774 | |
| 7775 | -knetbsd*-gnu) | |
| 7776 | - version_type=linux | |
| 7777 | - need_lib_prefix=no | |
| 7778 | - need_version=no | |
| 7779 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 7780 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 7781 | - shlibpath_var=LD_LIBRARY_PATH | |
| 7782 | - shlibpath_overrides_runpath=no | |
| 7783 | - hardcode_into_libs=yes | |
| 7784 | - dynamic_linker='GNU ld.so' | |
| 7785 | - ;; | |
| 7786 | - | |
| 7787 | 7775 | netbsd*) |
| 7788 | 7776 | version_type=sunos |
| 7789 | 7777 | need_lib_prefix=no |
| ... | ... | @@ -7793,7 +7781,7 @@ netbsd*) |
| 7793 | 7781 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 7794 | 7782 | dynamic_linker='NetBSD (a.out) ld.so' |
| 7795 | 7783 | else |
| 7796 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 7784 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' | |
| 7797 | 7785 | soname_spec='${libname}${release}${shared_ext}$major' |
| 7798 | 7786 | dynamic_linker='NetBSD ld.elf_so' |
| 7799 | 7787 | fi |
| ... | ... | @@ -7809,7 +7797,7 @@ newsos6) |
| 7809 | 7797 | shlibpath_overrides_runpath=yes |
| 7810 | 7798 | ;; |
| 7811 | 7799 | |
| 7812 | -nto-qnx*) | |
| 7800 | +nto-qnx) | |
| 7813 | 7801 | version_type=linux |
| 7814 | 7802 | need_lib_prefix=no |
| 7815 | 7803 | need_version=no |
| ... | ... | @@ -7822,7 +7810,7 @@ nto-qnx*) |
| 7822 | 7810 | openbsd*) |
| 7823 | 7811 | version_type=sunos |
| 7824 | 7812 | need_lib_prefix=no |
| 7825 | - need_version=yes | |
| 7813 | + need_version=no | |
| 7826 | 7814 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
| 7827 | 7815 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 7828 | 7816 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -7842,7 +7830,7 @@ openbsd*) |
| 7842 | 7830 | |
| 7843 | 7831 | os2*) |
| 7844 | 7832 | libname_spec='$name' |
| 7845 | - shrext_cmds=".dll" | |
| 7833 | + shrext=".dll" | |
| 7846 | 7834 | need_lib_prefix=no |
| 7847 | 7835 | library_names_spec='$libname${shared_ext} $libname.a' |
| 7848 | 7836 | dynamic_linker='OS/2 ld.exe' |
| ... | ... | @@ -7940,72 +7928,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 7940 | 7928 | echo "${ECHO_T}$dynamic_linker" >&6 |
| 7941 | 7929 | test "$dynamic_linker" = no && can_build_shared=no |
| 7942 | 7930 | |
| 7943 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 7944 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 7945 | -hardcode_action= | |
| 7946 | -if test -n "$hardcode_libdir_flag_spec" || \ | |
| 7947 | - test -n "$runpath_var " || \ | |
| 7948 | - test "X$hardcode_automatic"="Xyes" ; then | |
| 7949 | - | |
| 7950 | - # We can hardcode non-existant directories. | |
| 7951 | - if test "$hardcode_direct" != no && | |
| 7952 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 7953 | - # have to relink, otherwise we might link with an installed library | |
| 7954 | - # when we should be linking with a yet-to-be-installed one | |
| 7955 | - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && | |
| 7956 | - test "$hardcode_minus_L" != no; then | |
| 7957 | - # Linking always hardcodes the temporary library directory. | |
| 7958 | - hardcode_action=relink | |
| 7959 | - else | |
| 7960 | - # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 7961 | - hardcode_action=immediate | |
| 7962 | - fi | |
| 7963 | -else | |
| 7964 | - # We cannot hardcode anything, or else we can only hardcode existing | |
| 7965 | - # directories. | |
| 7966 | - hardcode_action=unsupported | |
| 7967 | -fi | |
| 7968 | -echo "$as_me:$LINENO: result: $hardcode_action" >&5 | |
| 7969 | -echo "${ECHO_T}$hardcode_action" >&6 | |
| 7970 | - | |
| 7971 | -if test "$hardcode_action" = relink; then | |
| 7972 | - # Fast installation is not supported | |
| 7973 | - enable_fast_install=no | |
| 7974 | -elif test "$shlibpath_overrides_runpath" = yes || | |
| 7975 | - test "$enable_shared" = no; then | |
| 7976 | - # Fast installation is not necessary | |
| 7977 | - enable_fast_install=needless | |
| 7978 | -fi | |
| 7979 | - | |
| 7980 | -striplib= | |
| 7981 | -old_striplib= | |
| 7982 | -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 7983 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 7984 | -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 7985 | - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 7986 | - test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 7987 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 7988 | -echo "${ECHO_T}yes" >&6 | |
| 7989 | -else | |
| 7990 | -# FIXME - insert some real tests, host_os isn't really good enough | |
| 7991 | - case $host_os in | |
| 7992 | - darwin*) | |
| 7993 | - if test -n "$STRIP" ; then | |
| 7994 | - striplib="$STRIP -x" | |
| 7995 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 7996 | -echo "${ECHO_T}yes" >&6 | |
| 7997 | - else | |
| 7998 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 7999 | -echo "${ECHO_T}no" >&6 | |
| 8000 | -fi | |
| 8001 | - ;; | |
| 8002 | - *) | |
| 8003 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 8004 | -echo "${ECHO_T}no" >&6 | |
| 8005 | - ;; | |
| 8006 | - esac | |
| 8007 | -fi | |
| 8008 | - | |
| 8009 | 7931 | if test "x$enable_dlopen" != xyes; then |
| 8010 | 7932 | enable_dlopen=unknown |
| 8011 | 7933 | enable_dlopen_self=unknown |
| ... | ... | @@ -8611,7 +8533,7 @@ else |
| 8611 | 8533 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 8612 | 8534 | lt_status=$lt_dlunknown |
| 8613 | 8535 | cat > conftest.$ac_ext <<EOF |
| 8614 | -#line 8614 "configure" | |
| 8536 | +#line 8536 "configure" | |
| 8615 | 8537 | #include "confdefs.h" |
| 8616 | 8538 | |
| 8617 | 8539 | #if HAVE_DLFCN_H |
| ... | ... | @@ -8709,7 +8631,7 @@ else |
| 8709 | 8631 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 8710 | 8632 | lt_status=$lt_dlunknown |
| 8711 | 8633 | cat > conftest.$ac_ext <<EOF |
| 8712 | -#line 8712 "configure" | |
| 8634 | +#line 8634 "configure" | |
| 8713 | 8635 | #include "confdefs.h" |
| 8714 | 8636 | |
| 8715 | 8637 | #if HAVE_DLFCN_H |
| ... | ... | @@ -8829,52 +8751,57 @@ case "$host_os" in |
| 8829 | 8751 | aix3*) |
| 8830 | 8752 | test "$enable_shared" = yes && enable_static=no |
| 8831 | 8753 | if test -n "$RANLIB"; then |
| 8832 | - archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| 8754 | + archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib" | |
| 8833 | 8755 | postinstall_cmds='$RANLIB $lib' |
| 8834 | 8756 | fi |
| 8835 | 8757 | ;; |
| 8836 | 8758 | |
| 8837 | -aix4* | aix5*) | |
| 8759 | +aix4*) | |
| 8838 | 8760 | if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then |
| 8839 | 8761 | test "$enable_shared" = yes && enable_static=no |
| 8840 | 8762 | fi |
| 8841 | 8763 | ;; |
| 8842 | 8764 | darwin* | rhapsody*) |
| 8843 | - if test "$GCC" = yes; then | |
| 8765 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 8844 | 8766 | archive_cmds_need_lc=no |
| 8845 | 8767 | case "$host_os" in |
| 8846 | 8768 | rhapsody* | darwin1.[012]) |
| 8847 | 8769 | allow_undefined_flag='-undefined suppress' |
| 8848 | 8770 | ;; |
| 8849 | - *) # Darwin 1.3 on | |
| 8850 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| 8851 | - allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 8852 | - else | |
| 8853 | - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| 8854 | - 10.[012]) | |
| 8855 | - allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 8856 | - ;; | |
| 8857 | - 10.*) | |
| 8858 | - allow_undefined_flag='-undefined dynamic_lookup' | |
| 8859 | - ;; | |
| 8860 | - esac | |
| 8861 | - fi | |
| 8771 | + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 | |
| 8772 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 8773 | + ;; | |
| 8774 | + *) # Darwin 7.0 on | |
| 8775 | + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in | |
| 8776 | + 10.[012]) | |
| 8777 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 8778 | + ;; | |
| 8779 | + *) # 10.3 on | |
| 8780 | + if test -z ${LD_TWOLEVEL_NAMESPACE}; then | |
| 8781 | + allow_undefined_flag='-flat_namespace -undefined suppress' | |
| 8782 | + else | |
| 8783 | + allow_undefined_flag='-undefined dynamic_lookup' | |
| 8784 | + fi | |
| 8785 | + ;; | |
| 8786 | + esac | |
| 8862 | 8787 | ;; |
| 8863 | 8788 | esac |
| 8864 | - output_verbose_link_cmd='echo' | |
| 8865 | - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' | |
| 8866 | - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| 8789 | + # FIXME: Relying on posixy $() will cause problems for | |
| 8790 | + # cross-compilation, but unfortunately the echo tests do not | |
| 8791 | + # yet detect zsh echo's removal of \ escapes. Also zsh mangles | |
| 8792 | + # `"' quotes if we put them in here... so don't! | |
| 8793 | + output_verbose_link_cmd='echo' | |
| 8794 | + archive_cmds='$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' | |
| 8795 | + module_cmds='$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' | |
| 8867 | 8796 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
| 8868 | - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 8869 | - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 8797 | + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 8798 | + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 8870 | 8799 | hardcode_direct=no |
| 8871 | 8800 | hardcode_automatic=yes |
| 8872 | 8801 | hardcode_shlibpath_var=unsupported |
| 8873 | 8802 | whole_archive_flag_spec='-all_load $convenience' |
| 8874 | 8803 | link_all_deplibs=yes |
| 8875 | - else | |
| 8876 | - ld_shlibs=no | |
| 8877 | - fi | |
| 8804 | + fi | |
| 8878 | 8805 | ;; |
| 8879 | 8806 | esac |
| 8880 | 8807 | echo "$as_me:$LINENO: result: $enable_shared" >&5 |
| ... | ... | @@ -8900,8 +8827,7 @@ if test -f "$ltmain"; then |
| 8900 | 8827 | # Now quote all the things that may contain metacharacters while being |
| 8901 | 8828 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
| 8902 | 8829 | # variables and quote the copies for generation of the libtool script. |
| 8903 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ | |
| 8904 | - SED SHELL STRIP \ | |
| 8830 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ | |
| 8905 | 8831 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
| 8906 | 8832 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
| 8907 | 8833 | deplibs_check_method reload_flag reload_cmds need_locks \ |
| ... | ... | @@ -8959,7 +8885,7 @@ if test -f "$ltmain"; then |
| 8959 | 8885 | old_postinstall_cmds | old_postuninstall_cmds | \ |
| 8960 | 8886 | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
| 8961 | 8887 | # Double-quote double-evaled strings. |
| 8962 | - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\\"" | |
| 8888 | + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\\"" | |
| 8963 | 8889 | ;; |
| 8964 | 8890 | *) |
| 8965 | 8891 | eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
| ... | ... | @@ -9028,6 +8954,9 @@ available_tags= |
| 9028 | 8954 | |
| 9029 | 8955 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 9030 | 8956 | |
| 8957 | +# Set the command separator (default: ~) | |
| 8958 | +_S_=\${LIBTOOL_CMD_SEP-\~} | |
| 8959 | + | |
| 9031 | 8960 | # Shell to use when invoking shell scripts. |
| 9032 | 8961 | SHELL=$lt_SHELL |
| 9033 | 8962 | |
| ... | ... | @@ -9079,7 +9008,7 @@ LN_S=$lt_LN_S |
| 9079 | 9008 | NM=$lt_NM |
| 9080 | 9009 | |
| 9081 | 9010 | # A symbol stripping program |
| 9082 | -STRIP=$lt_STRIP | |
| 9011 | +STRIP=$STRIP | |
| 9083 | 9012 | |
| 9084 | 9013 | # Used to examine libraries when file_magic_cmd begins "file" |
| 9085 | 9014 | MAGIC_CMD=$MAGIC_CMD |
| ... | ... | @@ -9110,7 +9039,7 @@ objext="$ac_objext" |
| 9110 | 9039 | libext="$libext" |
| 9111 | 9040 | |
| 9112 | 9041 | # Shared library suffix (normally ".so"). |
| 9113 | -shrext_cmds='$shrext_cmds' | |
| 9042 | +shrext='$shrext' | |
| 9114 | 9043 | |
| 9115 | 9044 | # Executable file suffix (normally ""). |
| 9116 | 9045 | exeext="$exeext" |
| ... | ... | @@ -9352,10 +9281,7 @@ else |
| 9352 | 9281 | # If there is no Makefile yet, we rely on a make rule to execute |
| 9353 | 9282 | # `config.status --recheck' to rerun these tests and create the |
| 9354 | 9283 | # libtool script then. |
| 9355 | - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` | |
| 9356 | - if test -f "$ltmain_in"; then | |
| 9357 | - test -f Makefile && make "$ltmain" | |
| 9358 | - fi | |
| 9284 | + test -f Makefile && make "$ltmain" | |
| 9359 | 9285 | fi |
| 9360 | 9286 | |
| 9361 | 9287 | |
| ... | ... | @@ -9536,7 +9462,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 |
| 9536 | 9462 | # Accept absolute paths. |
| 9537 | 9463 | [\\/]* | ?:[\\/]*) |
| 9538 | 9464 | re_direlt='/[^/][^/]*/\.\./' |
| 9539 | - # Canonicalize the pathname of ld | |
| 9465 | + # Canonicalize the path of ld | |
| 9540 | 9466 | ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` |
| 9541 | 9467 | while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
| 9542 | 9468 | ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` |
| ... | ... | @@ -9605,7 +9531,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then |
| 9605 | 9531 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 9606 | 9532 | else |
| 9607 | 9533 | # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
| 9608 | -case `$LD -v 2>&1 </dev/null` in | |
| 9534 | +case `"$LD" -v 2>&1 </dev/null` in | |
| 9609 | 9535 | *GNU* | *'with BFD'*) |
| 9610 | 9536 | lt_cv_prog_gnu_ld=yes |
| 9611 | 9537 | ;; |
| ... | ... | @@ -9650,7 +9576,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld |
| 9650 | 9576 | # linker, instead of GNU ld. If possible, this setting should |
| 9651 | 9577 | # overridden to take advantage of the native linker features on |
| 9652 | 9578 | # the platform it is being used on. |
| 9653 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| 9579 | + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| 9654 | 9580 | fi |
| 9655 | 9581 | |
| 9656 | 9582 | # Commands to make compiler produce verbose output that lists |
| ... | ... | @@ -9882,7 +9808,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9882 | 9808 | whole_archive_flag_spec_CXX=' ' |
| 9883 | 9809 | archive_cmds_need_lc_CXX=yes |
| 9884 | 9810 | # This is similar to how AIX traditionally builds it's shared libraries. |
| 9885 | - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 9811 | + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 9886 | 9812 | fi |
| 9887 | 9813 | fi |
| 9888 | 9814 | ;; |
| ... | ... | @@ -9912,7 +9838,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9912 | 9838 | else |
| 9913 | 9839 | echo EXPORTS > $output_objdir/$soname.def; |
| 9914 | 9840 | cat $export_symbols >> $output_objdir/$soname.def; |
| 9915 | - fi~ | |
| 9841 | + fi${_S_} | |
| 9916 | 9842 | $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
| 9917 | 9843 | else |
| 9918 | 9844 | ld_shlibs_CXX=no |
| ... | ... | @@ -9920,54 +9846,55 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9920 | 9846 | ;; |
| 9921 | 9847 | |
| 9922 | 9848 | darwin* | rhapsody*) |
| 9923 | - if test "$GXX" = yes; then | |
| 9849 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 9924 | 9850 | archive_cmds_need_lc_CXX=no |
| 9925 | 9851 | case "$host_os" in |
| 9926 | 9852 | rhapsody* | darwin1.[012]) |
| 9927 | 9853 | allow_undefined_flag_CXX='-undefined suppress' |
| 9928 | 9854 | ;; |
| 9929 | - *) # Darwin 1.3 on | |
| 9930 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| 9931 | - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' | |
| 9932 | - else | |
| 9933 | - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| 9934 | - 10.[012]) | |
| 9935 | - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' | |
| 9936 | - ;; | |
| 9937 | - 10.*) | |
| 9938 | - allow_undefined_flag_CXX='-undefined dynamic_lookup' | |
| 9939 | - ;; | |
| 9940 | - esac | |
| 9941 | - fi | |
| 9855 | + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 | |
| 9856 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' | |
| 9857 | + ;; | |
| 9858 | + *) # Darwin 7.0 on | |
| 9859 | + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in | |
| 9860 | + 10.[012]) | |
| 9861 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' | |
| 9862 | + ;; | |
| 9863 | + *) # 10.3 on | |
| 9864 | + if test -z ${LD_TWOLEVEL_NAMESPACE}; then | |
| 9865 | + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' | |
| 9866 | + else | |
| 9867 | + allow_undefined_flag_CXX='-undefined dynamic_lookup' | |
| 9868 | + fi | |
| 9869 | + ;; | |
| 9870 | + esac | |
| 9942 | 9871 | ;; |
| 9943 | 9872 | esac |
| 9944 | - lt_int_apple_cc_single_mod=no | |
| 9945 | - output_verbose_link_cmd='echo' | |
| 9946 | - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then | |
| 9947 | - lt_int_apple_cc_single_mod=yes | |
| 9948 | - fi | |
| 9949 | - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| 9950 | - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 9951 | - else | |
| 9952 | - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 9953 | - fi | |
| 9954 | - module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| 9873 | + lt_int_apple_cc_single_mod=no | |
| 9874 | + output_verbose_link_cmd='echo' | |
| 9875 | + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then | |
| 9876 | + lt_int_apple_cc_single_mod=yes | |
| 9877 | + fi | |
| 9878 | + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| 9879 | + archive_cmds_CXX='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 9880 | + else | |
| 9881 | + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 9882 | + fi | |
| 9883 | + module_cmds_CXX='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' | |
| 9955 | 9884 | |
| 9956 | 9885 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
| 9957 | - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| 9958 | - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9959 | - else | |
| 9960 | - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9961 | - fi | |
| 9962 | - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9886 | + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| 9887 | + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9888 | + else | |
| 9889 | + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9890 | + fi | |
| 9891 | + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 9963 | 9892 | hardcode_direct_CXX=no |
| 9964 | 9893 | hardcode_automatic_CXX=yes |
| 9965 | 9894 | hardcode_shlibpath_var_CXX=unsupported |
| 9966 | 9895 | whole_archive_flag_spec_CXX='-all_load $convenience' |
| 9967 | 9896 | link_all_deplibs_CXX=yes |
| 9968 | - else | |
| 9969 | - ld_shlibs_CXX=no | |
| 9970 | - fi | |
| 9897 | + fi | |
| 9971 | 9898 | ;; |
| 9972 | 9899 | |
| 9973 | 9900 | dgux*) |
| ... | ... | @@ -9994,7 +9921,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9994 | 9921 | freebsd-elf*) |
| 9995 | 9922 | archive_cmds_need_lc_CXX=no |
| 9996 | 9923 | ;; |
| 9997 | - freebsd* | kfreebsd*-gnu) | |
| 9924 | + freebsd*) | |
| 9998 | 9925 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
| 9999 | 9926 | # conventions |
| 10000 | 9927 | ld_shlibs_CXX=yes |
| ... | ... | @@ -10016,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10016 | 9943 | ld_shlibs_CXX=no |
| 10017 | 9944 | ;; |
| 10018 | 9945 | aCC) |
| 10019 | - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 9946 | + archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 10020 | 9947 | # Commands to make compiler produce verbose output that lists |
| 10021 | 9948 | # what "hidden" libraries, object files and flags are used when |
| 10022 | 9949 | # linking a shared library. |
| ... | ... | @@ -10025,11 +9952,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10025 | 9952 | # explicitly linking system object files so we need to strip them |
| 10026 | 9953 | # from the output so that they don't get included in the library |
| 10027 | 9954 | # dependencies. |
| 10028 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' | |
| 9955 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' | |
| 10029 | 9956 | ;; |
| 10030 | 9957 | *) |
| 10031 | 9958 | if test "$GXX" = yes; then |
| 10032 | - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 9959 | + archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 10033 | 9960 | else |
| 10034 | 9961 | # FIXME: insert proper C++ library support |
| 10035 | 9962 | ld_shlibs_CXX=no |
| ... | ... | @@ -10318,9 +10245,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10318 | 10245 | cxx) |
| 10319 | 10246 | allow_undefined_flag_CXX=' -expect_unresolved \*' |
| 10320 | 10247 | archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' |
| 10321 | - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ | |
| 10322 | - echo "-hidden">> $lib.exp~ | |
| 10323 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ | |
| 10248 | + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done${_S_} | |
| 10249 | + echo "-hidden">> $lib.exp${_S_} | |
| 10250 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib${_S_} | |
| 10324 | 10251 | $rm $lib.exp' |
| 10325 | 10252 | |
| 10326 | 10253 | hardcode_libdir_flag_spec_CXX='-rpath $libdir' |
| ... | ... | @@ -10397,8 +10324,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10397 | 10324 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 10398 | 10325 | no_undefined_flag_CXX=' -zdefs' |
| 10399 | 10326 | archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 10400 | - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 10401 | - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' | |
| 10327 | + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 10328 | + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' | |
| 10402 | 10329 | |
| 10403 | 10330 | hardcode_libdir_flag_spec_CXX='-R$libdir' |
| 10404 | 10331 | hardcode_shlibpath_var_CXX=no |
| ... | ... | @@ -10443,8 +10370,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10443 | 10370 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 10444 | 10371 | if $CC --version | grep -v '^2\.7' > /dev/null; then |
| 10445 | 10372 | archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 10446 | - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 10447 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' | |
| 10373 | + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 10374 | + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' | |
| 10448 | 10375 | |
| 10449 | 10376 | # Commands to make compiler produce verbose output that lists |
| 10450 | 10377 | # what "hidden" libraries, object files and flags are used when |
| ... | ... | @@ -10454,8 +10381,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10454 | 10381 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
| 10455 | 10382 | # platform. |
| 10456 | 10383 | archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 10457 | - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 10458 | - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' | |
| 10384 | + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 10385 | + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' | |
| 10459 | 10386 | |
| 10460 | 10387 | # Commands to make compiler produce verbose output that lists |
| 10461 | 10388 | # what "hidden" libraries, object files and flags are used when |
| ... | ... | @@ -10701,7 +10628,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
| 10701 | 10628 | ;; |
| 10702 | 10629 | esac |
| 10703 | 10630 | ;; |
| 10704 | - freebsd* | kfreebsd*-gnu) | |
| 10631 | + freebsd*) | |
| 10705 | 10632 | # FreeBSD uses GNU C++ |
| 10706 | 10633 | ;; |
| 10707 | 10634 | hpux9* | hpux10* | hpux11*) |
| ... | ... | @@ -10869,8 +10796,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 |
| 10869 | 10796 | # Check to make sure the PIC flag actually works. |
| 10870 | 10797 | # |
| 10871 | 10798 | if test -n "$lt_prog_compiler_pic_CXX"; then |
| 10872 | - | |
| 10873 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | |
| 10799 | + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | |
| 10874 | 10800 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 |
| 10875 | 10801 | if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then |
| 10876 | 10802 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -10888,11 +10814,11 @@ else |
| 10888 | 10814 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 10889 | 10815 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 10890 | 10816 | -e 's:$: $lt_compiler_flag:'` |
| 10891 | - (eval echo "\"\$as_me:10891: $lt_compile\"" >&5) | |
| 10817 | + (eval echo "\"\$as_me:10817: $lt_compile\"" >&5) | |
| 10892 | 10818 | (eval "$lt_compile" 2>conftest.err) |
| 10893 | 10819 | ac_status=$? |
| 10894 | 10820 | cat conftest.err >&5 |
| 10895 | - echo "$as_me:10895: \$? = $ac_status" >&5 | |
| 10821 | + echo "$as_me:10821: \$? = $ac_status" >&5 | |
| 10896 | 10822 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 10897 | 10823 | # The compiler can only warn and ignore the option if not recognized |
| 10898 | 10824 | # So say no if there are warnings |
| ... | ... | @@ -10939,6 +10865,13 @@ else |
| 10939 | 10865 | mkdir out |
| 10940 | 10866 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 10941 | 10867 | |
| 10868 | + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers | |
| 10869 | + # that will create temporary files in the current directory regardless of | |
| 10870 | + # the output directory. Thus, making CWD read-only will cause this test | |
| 10871 | + # to fail, enabling locking or at least warning the user not to do parallel | |
| 10872 | + # builds. | |
| 10873 | + chmod -w . | |
| 10874 | + | |
| 10942 | 10875 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
| 10943 | 10876 | # Insert the option either (1) after the last *FLAGS variable, or |
| 10944 | 10877 | # (2) before a word containing "conftest.", or (3) at the end. |
| ... | ... | @@ -10948,11 +10881,11 @@ else |
| 10948 | 10881 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 10949 | 10882 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 10950 | 10883 | -e 's:$: $lt_compiler_flag:'` |
| 10951 | - (eval echo "\"\$as_me:10951: $lt_compile\"" >&5) | |
| 10884 | + (eval echo "\"\$as_me:10884: $lt_compile\"" >&5) | |
| 10952 | 10885 | (eval "$lt_compile" 2>out/conftest.err) |
| 10953 | 10886 | ac_status=$? |
| 10954 | 10887 | cat out/conftest.err >&5 |
| 10955 | - echo "$as_me:10955: \$? = $ac_status" >&5 | |
| 10888 | + echo "$as_me:10888: \$? = $ac_status" >&5 | |
| 10956 | 10889 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 10957 | 10890 | then |
| 10958 | 10891 | # The compiler can only warn and ignore the option if not recognized |
| ... | ... | @@ -10962,11 +10895,8 @@ else |
| 10962 | 10895 | fi |
| 10963 | 10896 | fi |
| 10964 | 10897 | chmod u+w . |
| 10965 | - $rm conftest* | |
| 10966 | - # SGI C++ compiler will create directory out/ii_files/ for | |
| 10967 | - # template instantiation | |
| 10968 | - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files | |
| 10969 | - $rm out/* && rmdir out | |
| 10898 | + $rm conftest* out/* | |
| 10899 | + rmdir out | |
| 10970 | 10900 | cd .. |
| 10971 | 10901 | rmdir conftest |
| 10972 | 10902 | $rm conftest* |
| ... | ... | @@ -11042,7 +10972,7 @@ x|xyes) |
| 11042 | 10972 | |
| 11043 | 10973 | if test "$enable_shared" = yes && test "$GCC" = yes; then |
| 11044 | 10974 | case $archive_cmds_CXX in |
| 11045 | - *'~'*) | |
| 10975 | + *"$_S_"*) | |
| 11046 | 10976 | # FIXME: we may have to deal with multi-command sequences. |
| 11047 | 10977 | ;; |
| 11048 | 10978 | '$CC '*) |
| ... | ... | @@ -11094,12 +11024,78 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 |
| 11094 | 11024 | ;; |
| 11095 | 11025 | esac |
| 11096 | 11026 | |
| 11027 | +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 11028 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 11029 | +hardcode_action_CXX= | |
| 11030 | +if test -n "$hardcode_libdir_flag_spec_CXX" || \ | |
| 11031 | + test -n "$runpath_var CXX" || \ | |
| 11032 | + test "X$hardcode_automatic_CXX"="Xyes" ; then | |
| 11033 | + | |
| 11034 | + # We can hardcode non-existant directories. | |
| 11035 | + if test "$hardcode_direct_CXX" != no && | |
| 11036 | + # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 11037 | + # have to relink, otherwise we might link with an installed library | |
| 11038 | + # when we should be linking with a yet-to-be-installed one | |
| 11039 | + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && | |
| 11040 | + test "$hardcode_minus_L_CXX" != no; then | |
| 11041 | + # Linking always hardcodes the temporary library directory. | |
| 11042 | + hardcode_action_CXX=relink | |
| 11043 | + else | |
| 11044 | + # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 11045 | + hardcode_action_CXX=immediate | |
| 11046 | + fi | |
| 11047 | +else | |
| 11048 | + # We cannot hardcode anything, or else we can only hardcode existing | |
| 11049 | + # directories. | |
| 11050 | + hardcode_action_CXX=unsupported | |
| 11051 | +fi | |
| 11052 | +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | |
| 11053 | +echo "${ECHO_T}$hardcode_action_CXX" >&6 | |
| 11054 | + | |
| 11055 | +if test "$hardcode_action_CXX" = relink; then | |
| 11056 | + # Fast installation is not supported | |
| 11057 | + enable_fast_install=no | |
| 11058 | +elif test "$shlibpath_overrides_runpath" = yes || | |
| 11059 | + test "$enable_shared" = no; then | |
| 11060 | + # Fast installation is not necessary | |
| 11061 | + enable_fast_install=needless | |
| 11062 | +fi | |
| 11063 | + | |
| 11064 | +striplib= | |
| 11065 | +old_striplib= | |
| 11066 | +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 11067 | +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 11068 | +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 11069 | + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 11070 | + test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 11071 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 11072 | +echo "${ECHO_T}yes" >&6 | |
| 11073 | +else | |
| 11074 | +# FIXME - insert some real tests, host_os isn't really good enough | |
| 11075 | + case $host_os in | |
| 11076 | + NOT-darwin*) | |
| 11077 | + if test -n "$STRIP" ; then | |
| 11078 | + striplib="$STRIP -x" | |
| 11079 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 11080 | +echo "${ECHO_T}yes" >&6 | |
| 11081 | + else | |
| 11082 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 11083 | +echo "${ECHO_T}no" >&6 | |
| 11084 | +fi | |
| 11085 | + ;; | |
| 11086 | + *) | |
| 11087 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 11088 | +echo "${ECHO_T}no" >&6 | |
| 11089 | + ;; | |
| 11090 | + esac | |
| 11091 | +fi | |
| 11092 | + | |
| 11097 | 11093 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 11098 | 11094 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
| 11099 | 11095 | library_names_spec= |
| 11100 | 11096 | libname_spec='lib$name' |
| 11101 | 11097 | soname_spec= |
| 11102 | -shrext_cmds=".so" | |
| 11098 | +shrext=".so" | |
| 11103 | 11099 | postinstall_cmds= |
| 11104 | 11100 | postuninstall_cmds= |
| 11105 | 11101 | finish_cmds= |
| ... | ... | @@ -11187,7 +11183,7 @@ aix4* | aix5*) |
| 11187 | 11183 | amigaos*) |
| 11188 | 11184 | library_names_spec='$libname.ixlibrary $libname.a' |
| 11189 | 11185 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
| 11190 | - 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' | |
| 11186 | + 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' | |
| 11191 | 11187 | ;; |
| 11192 | 11188 | |
| 11193 | 11189 | beos*) |
| ... | ... | @@ -11212,7 +11208,7 @@ bsdi4*) |
| 11212 | 11208 | |
| 11213 | 11209 | cygwin* | mingw* | pw32*) |
| 11214 | 11210 | version_type=windows |
| 11215 | - shrext_cmds=".dll" | |
| 11211 | + shrext=".dll" | |
| 11216 | 11212 | need_version=no |
| 11217 | 11213 | need_lib_prefix=no |
| 11218 | 11214 | |
| ... | ... | @@ -11220,13 +11216,13 @@ cygwin* | mingw* | pw32*) |
| 11220 | 11216 | yes,cygwin* | yes,mingw* | yes,pw32*) |
| 11221 | 11217 | library_names_spec='$libname.dll.a' |
| 11222 | 11218 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 11223 | - postinstall_cmds='base_file=`basename \${file}`~ | |
| 11224 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ | |
| 11225 | - dldir=$destdir/`dirname \$dlpath`~ | |
| 11226 | - test -d \$dldir || mkdir -p \$dldir~ | |
| 11219 | + postinstall_cmds='base_file=`basename \${file}`${_S_} | |
| 11220 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} | |
| 11221 | + dldir=$destdir/`dirname \$dlpath`${_S_} | |
| 11222 | + test -d \$dldir || mkdir -p \$dldir${_S_} | |
| 11227 | 11223 | $install_prog $dir/$dlname \$dldir/$dlname' |
| 11228 | - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| 11229 | - dlpath=$dir/\$dldll~ | |
| 11224 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} | |
| 11225 | + dlpath=$dir/\$dldll${_S_} | |
| 11230 | 11226 | $rm \$dlpath' |
| 11231 | 11227 | shlibpath_overrides_runpath=yes |
| 11232 | 11228 | |
| ... | ... | @@ -11234,7 +11230,7 @@ cygwin* | mingw* | pw32*) |
| 11234 | 11230 | cygwin*) |
| 11235 | 11231 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
| 11236 | 11232 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 11237 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | |
| 11233 | + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" | |
| 11238 | 11234 | ;; |
| 11239 | 11235 | mingw*) |
| 11240 | 11236 | # MinGW DLLs use traditional 'lib' prefix |
| ... | ... | @@ -11273,16 +11269,17 @@ darwin* | rhapsody*) |
| 11273 | 11269 | version_type=darwin |
| 11274 | 11270 | need_lib_prefix=no |
| 11275 | 11271 | need_version=no |
| 11276 | - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' | |
| 11272 | + # FIXME: Relying on posixy $() will cause problems for | |
| 11273 | + # cross-compilation, but unfortunately the echo tests do not | |
| 11274 | + # yet detect zsh echo's removal of \ escapes. | |
| 11275 | + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' | |
| 11277 | 11276 | soname_spec='${libname}${release}${major}$shared_ext' |
| 11278 | 11277 | shlibpath_overrides_runpath=yes |
| 11279 | 11278 | shlibpath_var=DYLD_LIBRARY_PATH |
| 11280 | - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 11279 | + shrext='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 11281 | 11280 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
| 11282 | - if test "$GCC" = yes; then | |
| 11283 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 11284 | - else | |
| 11285 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| 11281 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 11282 | + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 11286 | 11283 | fi |
| 11287 | 11284 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 11288 | 11285 | ;; |
| ... | ... | @@ -11300,18 +11297,6 @@ freebsd1*) |
| 11300 | 11297 | dynamic_linker=no |
| 11301 | 11298 | ;; |
| 11302 | 11299 | |
| 11303 | -kfreebsd*-gnu) | |
| 11304 | - version_type=linux | |
| 11305 | - need_lib_prefix=no | |
| 11306 | - need_version=no | |
| 11307 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 11308 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 11309 | - shlibpath_var=LD_LIBRARY_PATH | |
| 11310 | - shlibpath_overrides_runpath=no | |
| 11311 | - hardcode_into_libs=yes | |
| 11312 | - dynamic_linker='GNU ld.so' | |
| 11313 | - ;; | |
| 11314 | - | |
| 11315 | 11300 | freebsd*) |
| 11316 | 11301 | objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 11317 | 11302 | version_type=freebsd-$objformat |
| ... | ... | @@ -11360,7 +11345,7 @@ hpux9* | hpux10* | hpux11*) |
| 11360 | 11345 | need_version=no |
| 11361 | 11346 | case "$host_cpu" in |
| 11362 | 11347 | ia64*) |
| 11363 | - shrext_cmds='.so' | |
| 11348 | + shrext='.so' | |
| 11364 | 11349 | hardcode_into_libs=yes |
| 11365 | 11350 | dynamic_linker="$host_os dld.so" |
| 11366 | 11351 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -11375,7 +11360,7 @@ hpux9* | hpux10* | hpux11*) |
| 11375 | 11360 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 11376 | 11361 | ;; |
| 11377 | 11362 | hppa*64*) |
| 11378 | - shrext_cmds='.sl' | |
| 11363 | + shrext='.sl' | |
| 11379 | 11364 | hardcode_into_libs=yes |
| 11380 | 11365 | dynamic_linker="$host_os dld.sl" |
| 11381 | 11366 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
| ... | ... | @@ -11386,7 +11371,7 @@ hpux9* | hpux10* | hpux11*) |
| 11386 | 11371 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 11387 | 11372 | ;; |
| 11388 | 11373 | *) |
| 11389 | - shrext_cmds='.sl' | |
| 11374 | + shrext='.sl' | |
| 11390 | 11375 | dynamic_linker="$host_os dld.sl" |
| 11391 | 11376 | shlibpath_var=SHLIB_PATH |
| 11392 | 11377 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
| ... | ... | @@ -11455,33 +11440,6 @@ linux*) |
| 11455 | 11440 | # before this can be enabled. |
| 11456 | 11441 | hardcode_into_libs=yes |
| 11457 | 11442 | |
| 11458 | - # find out which ABI we are using | |
| 11459 | - libsuff= | |
| 11460 | - case "$host_cpu" in | |
| 11461 | - x86_64*|s390x*|powerpc64*) | |
| 11462 | - echo '#line 11462 "configure"' > conftest.$ac_ext | |
| 11463 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| 11464 | - (eval $ac_compile) 2>&5 | |
| 11465 | - ac_status=$? | |
| 11466 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 11467 | - (exit $ac_status); }; then | |
| 11468 | - case `/usr/bin/file conftest.$ac_objext` in | |
| 11469 | - *64-bit*) | |
| 11470 | - libsuff=64 | |
| 11471 | - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| 11472 | - ;; | |
| 11473 | - esac | |
| 11474 | - fi | |
| 11475 | - rm -rf conftest* | |
| 11476 | - ;; | |
| 11477 | - esac | |
| 11478 | - | |
| 11479 | - # Append ld.so.conf contents to the search path | |
| 11480 | - if test -f /etc/ld.so.conf; then | |
| 11481 | - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` | |
| 11482 | - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| 11483 | - fi | |
| 11484 | - | |
| 11485 | 11443 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
| 11486 | 11444 | # powerpc, because MkLinux only supported shared libraries with the |
| 11487 | 11445 | # GNU dynamic linker. Since this was broken with cross compilers, |
| ... | ... | @@ -11491,18 +11449,6 @@ linux*) |
| 11491 | 11449 | dynamic_linker='GNU/Linux ld.so' |
| 11492 | 11450 | ;; |
| 11493 | 11451 | |
| 11494 | -knetbsd*-gnu) | |
| 11495 | - version_type=linux | |
| 11496 | - need_lib_prefix=no | |
| 11497 | - need_version=no | |
| 11498 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 11499 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 11500 | - shlibpath_var=LD_LIBRARY_PATH | |
| 11501 | - shlibpath_overrides_runpath=no | |
| 11502 | - hardcode_into_libs=yes | |
| 11503 | - dynamic_linker='GNU ld.so' | |
| 11504 | - ;; | |
| 11505 | - | |
| 11506 | 11452 | netbsd*) |
| 11507 | 11453 | version_type=sunos |
| 11508 | 11454 | need_lib_prefix=no |
| ... | ... | @@ -11512,7 +11458,7 @@ netbsd*) |
| 11512 | 11458 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 11513 | 11459 | dynamic_linker='NetBSD (a.out) ld.so' |
| 11514 | 11460 | else |
| 11515 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 11461 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' | |
| 11516 | 11462 | soname_spec='${libname}${release}${shared_ext}$major' |
| 11517 | 11463 | dynamic_linker='NetBSD ld.elf_so' |
| 11518 | 11464 | fi |
| ... | ... | @@ -11528,7 +11474,7 @@ newsos6) |
| 11528 | 11474 | shlibpath_overrides_runpath=yes |
| 11529 | 11475 | ;; |
| 11530 | 11476 | |
| 11531 | -nto-qnx*) | |
| 11477 | +nto-qnx) | |
| 11532 | 11478 | version_type=linux |
| 11533 | 11479 | need_lib_prefix=no |
| 11534 | 11480 | need_version=no |
| ... | ... | @@ -11541,7 +11487,7 @@ nto-qnx*) |
| 11541 | 11487 | openbsd*) |
| 11542 | 11488 | version_type=sunos |
| 11543 | 11489 | need_lib_prefix=no |
| 11544 | - need_version=yes | |
| 11490 | + need_version=no | |
| 11545 | 11491 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
| 11546 | 11492 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 11547 | 11493 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -11561,7 +11507,7 @@ openbsd*) |
| 11561 | 11507 | |
| 11562 | 11508 | os2*) |
| 11563 | 11509 | libname_spec='$name' |
| 11564 | - shrext_cmds=".dll" | |
| 11510 | + shrext=".dll" | |
| 11565 | 11511 | need_lib_prefix=no |
| 11566 | 11512 | library_names_spec='$libname${shared_ext} $libname.a' |
| 11567 | 11513 | dynamic_linker='OS/2 ld.exe' |
| ... | ... | @@ -11659,72 +11605,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 11659 | 11605 | echo "${ECHO_T}$dynamic_linker" >&6 |
| 11660 | 11606 | test "$dynamic_linker" = no && can_build_shared=no |
| 11661 | 11607 | |
| 11662 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 11663 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 11664 | -hardcode_action_CXX= | |
| 11665 | -if test -n "$hardcode_libdir_flag_spec_CXX" || \ | |
| 11666 | - test -n "$runpath_var CXX" || \ | |
| 11667 | - test "X$hardcode_automatic_CXX"="Xyes" ; then | |
| 11668 | - | |
| 11669 | - # We can hardcode non-existant directories. | |
| 11670 | - if test "$hardcode_direct_CXX" != no && | |
| 11671 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 11672 | - # have to relink, otherwise we might link with an installed library | |
| 11673 | - # when we should be linking with a yet-to-be-installed one | |
| 11674 | - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && | |
| 11675 | - test "$hardcode_minus_L_CXX" != no; then | |
| 11676 | - # Linking always hardcodes the temporary library directory. | |
| 11677 | - hardcode_action_CXX=relink | |
| 11678 | - else | |
| 11679 | - # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 11680 | - hardcode_action_CXX=immediate | |
| 11681 | - fi | |
| 11682 | -else | |
| 11683 | - # We cannot hardcode anything, or else we can only hardcode existing | |
| 11684 | - # directories. | |
| 11685 | - hardcode_action_CXX=unsupported | |
| 11686 | -fi | |
| 11687 | -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | |
| 11688 | -echo "${ECHO_T}$hardcode_action_CXX" >&6 | |
| 11689 | - | |
| 11690 | -if test "$hardcode_action_CXX" = relink; then | |
| 11691 | - # Fast installation is not supported | |
| 11692 | - enable_fast_install=no | |
| 11693 | -elif test "$shlibpath_overrides_runpath" = yes || | |
| 11694 | - test "$enable_shared" = no; then | |
| 11695 | - # Fast installation is not necessary | |
| 11696 | - enable_fast_install=needless | |
| 11697 | -fi | |
| 11698 | - | |
| 11699 | -striplib= | |
| 11700 | -old_striplib= | |
| 11701 | -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 11702 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 11703 | -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 11704 | - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 11705 | - test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 11706 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 11707 | -echo "${ECHO_T}yes" >&6 | |
| 11708 | -else | |
| 11709 | -# FIXME - insert some real tests, host_os isn't really good enough | |
| 11710 | - case $host_os in | |
| 11711 | - darwin*) | |
| 11712 | - if test -n "$STRIP" ; then | |
| 11713 | - striplib="$STRIP -x" | |
| 11714 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 11715 | -echo "${ECHO_T}yes" >&6 | |
| 11716 | - else | |
| 11717 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 11718 | -echo "${ECHO_T}no" >&6 | |
| 11719 | -fi | |
| 11720 | - ;; | |
| 11721 | - *) | |
| 11722 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 11723 | -echo "${ECHO_T}no" >&6 | |
| 11724 | - ;; | |
| 11725 | - esac | |
| 11726 | -fi | |
| 11727 | - | |
| 11728 | 11608 | if test "x$enable_dlopen" != xyes; then |
| 11729 | 11609 | enable_dlopen=unknown |
| 11730 | 11610 | enable_dlopen_self=unknown |
| ... | ... | @@ -12330,7 +12210,7 @@ else |
| 12330 | 12210 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 12331 | 12211 | lt_status=$lt_dlunknown |
| 12332 | 12212 | cat > conftest.$ac_ext <<EOF |
| 12333 | -#line 12333 "configure" | |
| 12213 | +#line 12213 "configure" | |
| 12334 | 12214 | #include "confdefs.h" |
| 12335 | 12215 | |
| 12336 | 12216 | #if HAVE_DLFCN_H |
| ... | ... | @@ -12428,7 +12308,7 @@ else |
| 12428 | 12308 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 12429 | 12309 | lt_status=$lt_dlunknown |
| 12430 | 12310 | cat > conftest.$ac_ext <<EOF |
| 12431 | -#line 12431 "configure" | |
| 12311 | +#line 12311 "configure" | |
| 12432 | 12312 | #include "confdefs.h" |
| 12433 | 12313 | |
| 12434 | 12314 | #if HAVE_DLFCN_H |
| ... | ... | @@ -12545,8 +12425,7 @@ if test -f "$ltmain"; then |
| 12545 | 12425 | # Now quote all the things that may contain metacharacters while being |
| 12546 | 12426 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
| 12547 | 12427 | # variables and quote the copies for generation of the libtool script. |
| 12548 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ | |
| 12549 | - SED SHELL STRIP \ | |
| 12428 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ | |
| 12550 | 12429 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
| 12551 | 12430 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
| 12552 | 12431 | deplibs_check_method reload_flag reload_cmds need_locks \ |
| ... | ... | @@ -12604,7 +12483,7 @@ if test -f "$ltmain"; then |
| 12604 | 12483 | old_postinstall_cmds | old_postuninstall_cmds | \ |
| 12605 | 12484 | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
| 12606 | 12485 | # Double-quote double-evaled strings. |
| 12607 | - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\\"" | |
| 12486 | + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\\"" | |
| 12608 | 12487 | ;; |
| 12609 | 12488 | *) |
| 12610 | 12489 | eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
| ... | ... | @@ -12625,6 +12504,9 @@ cfgfile="$ofile" |
| 12625 | 12504 | |
| 12626 | 12505 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 12627 | 12506 | |
| 12507 | +# Set the command separator (default: ~) | |
| 12508 | +_S_=\${LIBTOOL_CMD_SEP-\~} | |
| 12509 | + | |
| 12628 | 12510 | # Shell to use when invoking shell scripts. |
| 12629 | 12511 | SHELL=$lt_SHELL |
| 12630 | 12512 | |
| ... | ... | @@ -12676,7 +12558,7 @@ LN_S=$lt_LN_S |
| 12676 | 12558 | NM=$lt_NM |
| 12677 | 12559 | |
| 12678 | 12560 | # A symbol stripping program |
| 12679 | -STRIP=$lt_STRIP | |
| 12561 | +STRIP=$STRIP | |
| 12680 | 12562 | |
| 12681 | 12563 | # Used to examine libraries when file_magic_cmd begins "file" |
| 12682 | 12564 | MAGIC_CMD=$MAGIC_CMD |
| ... | ... | @@ -12707,7 +12589,7 @@ objext="$ac_objext" |
| 12707 | 12589 | libext="$libext" |
| 12708 | 12590 | |
| 12709 | 12591 | # Shared library suffix (normally ".so"). |
| 12710 | -shrext_cmds='$shrext_cmds' | |
| 12592 | +shrext='$shrext' | |
| 12711 | 12593 | |
| 12712 | 12594 | # Executable file suffix (normally ""). |
| 12713 | 12595 | exeext="$exeext" |
| ... | ... | @@ -12924,10 +12806,7 @@ else |
| 12924 | 12806 | # If there is no Makefile yet, we rely on a make rule to execute |
| 12925 | 12807 | # `config.status --recheck' to rerun these tests and create the |
| 12926 | 12808 | # libtool script then. |
| 12927 | - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` | |
| 12928 | - if test -f "$ltmain_in"; then | |
| 12929 | - test -f Makefile && make "$ltmain" | |
| 12930 | - fi | |
| 12809 | + test -f Makefile && make "$ltmain" | |
| 12931 | 12810 | fi |
| 12932 | 12811 | |
| 12933 | 12812 | |
| ... | ... | @@ -13025,11 +12904,11 @@ case "$host_os" in |
| 13025 | 12904 | aix3*) |
| 13026 | 12905 | test "$enable_shared" = yes && enable_static=no |
| 13027 | 12906 | if test -n "$RANLIB"; then |
| 13028 | - archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| 12907 | + archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib" | |
| 13029 | 12908 | postinstall_cmds='$RANLIB $lib' |
| 13030 | 12909 | fi |
| 13031 | 12910 | ;; |
| 13032 | -aix4* | aix5*) | |
| 12911 | +aix4*) | |
| 13033 | 12912 | test "$enable_shared" = yes && enable_static=no |
| 13034 | 12913 | ;; |
| 13035 | 12914 | esac |
| ... | ... | @@ -13169,12 +13048,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
| 13169 | 13048 | |
| 13170 | 13049 | linux*) |
| 13171 | 13050 | case $CC in |
| 13172 | - icc* | ecc*) | |
| 13051 | + icc|ecc) | |
| 13173 | 13052 | lt_prog_compiler_wl_F77='-Wl,' |
| 13174 | 13053 | lt_prog_compiler_pic_F77='-KPIC' |
| 13175 | 13054 | lt_prog_compiler_static_F77='-static' |
| 13176 | 13055 | ;; |
| 13177 | - ccc*) | |
| 13056 | + ccc) | |
| 13178 | 13057 | lt_prog_compiler_wl_F77='-Wl,' |
| 13179 | 13058 | # All Alpha code is PIC. |
| 13180 | 13059 | lt_prog_compiler_static_F77='-non_shared' |
| ... | ... | @@ -13236,8 +13115,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 |
| 13236 | 13115 | # Check to make sure the PIC flag actually works. |
| 13237 | 13116 | # |
| 13238 | 13117 | if test -n "$lt_prog_compiler_pic_F77"; then |
| 13239 | - | |
| 13240 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | |
| 13118 | + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | |
| 13241 | 13119 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 |
| 13242 | 13120 | if test "${lt_prog_compiler_pic_works_F77+set}" = set; then |
| 13243 | 13121 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -13255,11 +13133,11 @@ else |
| 13255 | 13133 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 13256 | 13134 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 13257 | 13135 | -e 's:$: $lt_compiler_flag:'` |
| 13258 | - (eval echo "\"\$as_me:13258: $lt_compile\"" >&5) | |
| 13136 | + (eval echo "\"\$as_me:13136: $lt_compile\"" >&5) | |
| 13259 | 13137 | (eval "$lt_compile" 2>conftest.err) |
| 13260 | 13138 | ac_status=$? |
| 13261 | 13139 | cat conftest.err >&5 |
| 13262 | - echo "$as_me:13262: \$? = $ac_status" >&5 | |
| 13140 | + echo "$as_me:13140: \$? = $ac_status" >&5 | |
| 13263 | 13141 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 13264 | 13142 | # The compiler can only warn and ignore the option if not recognized |
| 13265 | 13143 | # So say no if there are warnings |
| ... | ... | @@ -13306,6 +13184,13 @@ else |
| 13306 | 13184 | mkdir out |
| 13307 | 13185 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 13308 | 13186 | |
| 13187 | + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers | |
| 13188 | + # that will create temporary files in the current directory regardless of | |
| 13189 | + # the output directory. Thus, making CWD read-only will cause this test | |
| 13190 | + # to fail, enabling locking or at least warning the user not to do parallel | |
| 13191 | + # builds. | |
| 13192 | + chmod -w . | |
| 13193 | + | |
| 13309 | 13194 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
| 13310 | 13195 | # Insert the option either (1) after the last *FLAGS variable, or |
| 13311 | 13196 | # (2) before a word containing "conftest.", or (3) at the end. |
| ... | ... | @@ -13315,11 +13200,11 @@ else |
| 13315 | 13200 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 13316 | 13201 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 13317 | 13202 | -e 's:$: $lt_compiler_flag:'` |
| 13318 | - (eval echo "\"\$as_me:13318: $lt_compile\"" >&5) | |
| 13203 | + (eval echo "\"\$as_me:13203: $lt_compile\"" >&5) | |
| 13319 | 13204 | (eval "$lt_compile" 2>out/conftest.err) |
| 13320 | 13205 | ac_status=$? |
| 13321 | 13206 | cat out/conftest.err >&5 |
| 13322 | - echo "$as_me:13322: \$? = $ac_status" >&5 | |
| 13207 | + echo "$as_me:13207: \$? = $ac_status" >&5 | |
| 13323 | 13208 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 13324 | 13209 | then |
| 13325 | 13210 | # The compiler can only warn and ignore the option if not recognized |
| ... | ... | @@ -13329,11 +13214,8 @@ else |
| 13329 | 13214 | fi |
| 13330 | 13215 | fi |
| 13331 | 13216 | chmod u+w . |
| 13332 | - $rm conftest* | |
| 13333 | - # SGI C++ compiler will create directory out/ii_files/ for | |
| 13334 | - # template instantiation | |
| 13335 | - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files | |
| 13336 | - $rm out/* && rmdir out | |
| 13217 | + $rm conftest* out/* | |
| 13218 | + rmdir out | |
| 13337 | 13219 | cd .. |
| 13338 | 13220 | rmdir conftest |
| 13339 | 13221 | $rm conftest* |
| ... | ... | @@ -13443,7 +13325,7 @@ EOF |
| 13443 | 13325 | ;; |
| 13444 | 13326 | |
| 13445 | 13327 | amigaos*) |
| 13446 | - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 13328 | + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 13447 | 13329 | hardcode_libdir_flag_spec_F77='-L$libdir' |
| 13448 | 13330 | hardcode_minus_L_F77=yes |
| 13449 | 13331 | |
| ... | ... | @@ -13485,7 +13367,7 @@ EOF |
| 13485 | 13367 | else |
| 13486 | 13368 | echo EXPORTS > $output_objdir/$soname.def; |
| 13487 | 13369 | cat $export_symbols >> $output_objdir/$soname.def; |
| 13488 | - fi~ | |
| 13370 | + fi${_S_} | |
| 13489 | 13371 | $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
| 13490 | 13372 | else |
| 13491 | 13373 | ld_shlibs=no |
| ... | ... | @@ -13530,31 +13412,6 @@ EOF |
| 13530 | 13412 | hardcode_shlibpath_var_F77=no |
| 13531 | 13413 | ;; |
| 13532 | 13414 | |
| 13533 | - linux*) | |
| 13534 | - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| 13535 | - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| 13536 | - archive_cmds_F77="$tmp_archive_cmds" | |
| 13537 | - supports_anon_versioning=no | |
| 13538 | - case `$LD -v 2>/dev/null` in | |
| 13539 | - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 | |
| 13540 | - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | |
| 13541 | - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | |
| 13542 | - *\ 2.11.*) ;; # other 2.11 versions | |
| 13543 | - *) supports_anon_versioning=yes ;; | |
| 13544 | - esac | |
| 13545 | - if test $supports_anon_versioning = yes; then | |
| 13546 | - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| 13547 | -cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| 13548 | -$echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| 13549 | - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| 13550 | - else | |
| 13551 | - archive_expsym_cmds_F77="$tmp_archive_cmds" | |
| 13552 | - fi | |
| 13553 | - else | |
| 13554 | - ld_shlibs_F77=no | |
| 13555 | - fi | |
| 13556 | - ;; | |
| 13557 | - | |
| 13558 | 13415 | *) |
| 13559 | 13416 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
| 13560 | 13417 | archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| ... | ... | @@ -13582,7 +13439,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 13582 | 13439 | aix3*) |
| 13583 | 13440 | allow_undefined_flag_F77=unsupported |
| 13584 | 13441 | always_export_symbols_F77=yes |
| 13585 | - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 13442 | + archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 13586 | 13443 | # Note: this linker hardcodes the directories in LIBPATH if there |
| 13587 | 13444 | # are no directories specified by -L. |
| 13588 | 13445 | hardcode_minus_L_F77=yes |
| ... | ... | @@ -13786,13 +13643,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 13786 | 13643 | whole_archive_flag_spec_F77=' ' |
| 13787 | 13644 | archive_cmds_need_lc_F77=yes |
| 13788 | 13645 | # This is similar to how AIX traditionally builds it's shared libraries. |
| 13789 | - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 13646 | + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 13790 | 13647 | fi |
| 13791 | 13648 | fi |
| 13792 | 13649 | ;; |
| 13793 | 13650 | |
| 13794 | 13651 | amigaos*) |
| 13795 | - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 13652 | + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 13796 | 13653 | hardcode_libdir_flag_spec_F77='-L$libdir' |
| 13797 | 13654 | hardcode_minus_L_F77=yes |
| 13798 | 13655 | # see comment about different semantics on the GNU ld section |
| ... | ... | @@ -13813,9 +13670,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 13813 | 13670 | # Tell ltmain to make .lib files, not .a files. |
| 13814 | 13671 | libext=lib |
| 13815 | 13672 | # Tell ltmain to make .dll files, not .so files. |
| 13816 | - shrext_cmds=".dll" | |
| 13673 | + shrext=".dll" | |
| 13817 | 13674 | # FIXME: Setting linknames here is a bad hack. |
| 13818 | - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' | |
| 13675 | + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' | |
| 13819 | 13676 | # The linker will automatically build a .lib file if we build a DLL. |
| 13820 | 13677 | old_archive_From_new_cmds_F77='true' |
| 13821 | 13678 | # FIXME: Should let the user specify the lib program. |
| ... | ... | @@ -13825,52 +13682,57 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 13825 | 13682 | ;; |
| 13826 | 13683 | |
| 13827 | 13684 | darwin* | rhapsody*) |
| 13828 | - if test "$GXX" = yes ; then | |
| 13685 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 13829 | 13686 | archive_cmds_need_lc_F77=no |
| 13830 | 13687 | case "$host_os" in |
| 13831 | 13688 | rhapsody* | darwin1.[012]) |
| 13832 | 13689 | allow_undefined_flag_F77='-undefined suppress' |
| 13833 | 13690 | ;; |
| 13834 | - *) # Darwin 1.3 on | |
| 13835 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| 13836 | - allow_undefined_flag_F77='-flat_namespace -undefined suppress' | |
| 13837 | - else | |
| 13838 | - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| 13839 | - 10.[012]) | |
| 13840 | - allow_undefined_flag_F77='-flat_namespace -undefined suppress' | |
| 13841 | - ;; | |
| 13842 | - 10.*) | |
| 13843 | - allow_undefined_flag_F77='-undefined dynamic_lookup' | |
| 13844 | - ;; | |
| 13845 | - esac | |
| 13846 | - fi | |
| 13691 | + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 | |
| 13692 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' | |
| 13693 | + ;; | |
| 13694 | + *) # Darwin 7.0 on | |
| 13695 | + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in | |
| 13696 | + 10.[012]) | |
| 13697 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' | |
| 13698 | + ;; | |
| 13699 | + *) # 10.3 on | |
| 13700 | + if test -z ${LD_TWOLEVEL_NAMESPACE}; then | |
| 13701 | + allow_undefined_flag_F77='-flat_namespace -undefined suppress' | |
| 13702 | + else | |
| 13703 | + allow_undefined_flag_F77='-undefined dynamic_lookup' | |
| 13704 | + fi | |
| 13705 | + ;; | |
| 13706 | + esac | |
| 13847 | 13707 | ;; |
| 13848 | 13708 | esac |
| 13709 | + # FIXME: Relying on posixy $() will cause problems for | |
| 13710 | + # cross-compilation, but unfortunately the echo tests do not | |
| 13711 | + # yet detect zsh echo's removal of \ escapes. Also zsh mangles | |
| 13712 | + # `"' quotes if we put them in here... so don't! | |
| 13849 | 13713 | lt_int_apple_cc_single_mod=no |
| 13850 | 13714 | output_verbose_link_cmd='echo' |
| 13851 | 13715 | if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
| 13852 | 13716 | lt_int_apple_cc_single_mod=yes |
| 13853 | 13717 | fi |
| 13854 | 13718 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 13855 | - archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 13719 | + archive_cmds_F77='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 13856 | 13720 | else |
| 13857 | - archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 13721 | + archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 13858 | 13722 | fi |
| 13859 | - module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| 13723 | + module_cmds_F77='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' | |
| 13860 | 13724 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
| 13861 | 13725 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 13862 | - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13726 | + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13863 | 13727 | else |
| 13864 | - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13728 | + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13865 | 13729 | fi |
| 13866 | - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13730 | + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 13867 | 13731 | hardcode_direct_F77=no |
| 13868 | 13732 | hardcode_automatic_F77=yes |
| 13869 | 13733 | hardcode_shlibpath_var_F77=unsupported |
| 13870 | 13734 | whole_archive_flag_spec_F77='-all_load $convenience' |
| 13871 | 13735 | link_all_deplibs_F77=yes |
| 13872 | - else | |
| 13873 | - ld_shlibs_F77=no | |
| 13874 | 13736 | fi |
| 13875 | 13737 | ;; |
| 13876 | 13738 | |
| ... | ... | @@ -13904,7 +13766,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 13904 | 13766 | ;; |
| 13905 | 13767 | |
| 13906 | 13768 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 13907 | - freebsd* | kfreebsd*-gnu) | |
| 13769 | + freebsd*) | |
| 13908 | 13770 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 13909 | 13771 | hardcode_libdir_flag_spec_F77='-R$libdir' |
| 13910 | 13772 | hardcode_direct_F77=yes |
| ... | ... | @@ -13913,9 +13775,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 13913 | 13775 | |
| 13914 | 13776 | hpux9*) |
| 13915 | 13777 | if test "$GCC" = yes; then |
| 13916 | - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 13778 | + archive_cmds_F77='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 13917 | 13779 | else |
| 13918 | - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 13780 | + archive_cmds_F77='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 13919 | 13781 | fi |
| 13920 | 13782 | hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' |
| 13921 | 13783 | hardcode_libdir_separator_F77=: |
| ... | ... | @@ -14035,7 +13897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14035 | 13897 | hardcode_libdir_flag_spec_F77='-L$libdir' |
| 14036 | 13898 | hardcode_minus_L_F77=yes |
| 14037 | 13899 | allow_undefined_flag_F77=unsupported |
| 14038 | - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 13900 | + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 14039 | 13901 | old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
| 14040 | 13902 | ;; |
| 14041 | 13903 | |
| ... | ... | @@ -14059,8 +13921,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14059 | 13921 | else |
| 14060 | 13922 | allow_undefined_flag_F77=' -expect_unresolved \*' |
| 14061 | 13923 | archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
| 14062 | - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ | |
| 14063 | - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' | |
| 13924 | + archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} | |
| 13925 | + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' | |
| 14064 | 13926 | |
| 14065 | 13927 | # Both c and cxx compiler support -rpath directly |
| 14066 | 13928 | hardcode_libdir_flag_spec_F77='-rpath $libdir' |
| ... | ... | @@ -14080,12 +13942,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14080 | 13942 | no_undefined_flag_F77=' -z text' |
| 14081 | 13943 | if test "$GCC" = yes; then |
| 14082 | 13944 | archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 14083 | - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 14084 | - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' | |
| 13945 | + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 13946 | + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' | |
| 14085 | 13947 | else |
| 14086 | 13948 | archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 14087 | - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 14088 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 13949 | + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 13950 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 14089 | 13951 | fi |
| 14090 | 13952 | hardcode_libdir_flag_spec_F77='-R$libdir' |
| 14091 | 13953 | hardcode_shlibpath_var_F77=no |
| ... | ... | @@ -14174,8 +14036,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 14174 | 14036 | # $CC -shared without GNU ld will not create a library from C++ |
| 14175 | 14037 | # object files and a static libstdc++, better avoid it by now |
| 14176 | 14038 | archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 14177 | - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 14178 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 14039 | + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 14040 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 14179 | 14041 | hardcode_libdir_flag_spec_F77= |
| 14180 | 14042 | hardcode_shlibpath_var_F77=no |
| 14181 | 14043 | runpath_var='LD_RUN_PATH' |
| ... | ... | @@ -14212,7 +14074,7 @@ x|xyes) |
| 14212 | 14074 | |
| 14213 | 14075 | if test "$enable_shared" = yes && test "$GCC" = yes; then |
| 14214 | 14076 | case $archive_cmds_F77 in |
| 14215 | - *'~'*) | |
| 14077 | + *"$_S_"*) | |
| 14216 | 14078 | # FIXME: we may have to deal with multi-command sequences. |
| 14217 | 14079 | ;; |
| 14218 | 14080 | '$CC '*) |
| ... | ... | @@ -14264,39 +14126,105 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 |
| 14264 | 14126 | ;; |
| 14265 | 14127 | esac |
| 14266 | 14128 | |
| 14267 | -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| 14268 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| 14269 | -library_names_spec= | |
| 14270 | -libname_spec='lib$name' | |
| 14271 | -soname_spec= | |
| 14272 | -shrext_cmds=".so" | |
| 14273 | -postinstall_cmds= | |
| 14274 | -postuninstall_cmds= | |
| 14275 | -finish_cmds= | |
| 14276 | -finish_eval= | |
| 14277 | -shlibpath_var= | |
| 14278 | -shlibpath_overrides_runpath=unknown | |
| 14279 | -version_type=none | |
| 14280 | -dynamic_linker="$host_os ld.so" | |
| 14281 | -sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| 14282 | -if test "$GCC" = yes; then | |
| 14283 | - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| 14284 | - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| 14285 | - # if the path contains ";" then we assume it to be the separator | |
| 14286 | - # otherwise default to the standard path separator (i.e. ":") - it is | |
| 14287 | - # assumed that no part of a normal pathname contains ";" but that should | |
| 14288 | - # okay in the real world where ";" in dirpaths is itself problematic. | |
| 14289 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| 14290 | - else | |
| 14291 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| 14292 | - fi | |
| 14293 | -else | |
| 14294 | - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| 14295 | -fi | |
| 14296 | -need_lib_prefix=unknown | |
| 14297 | -hardcode_into_libs=no | |
| 14129 | +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 14130 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 14131 | +hardcode_action_F77= | |
| 14132 | +if test -n "$hardcode_libdir_flag_spec_F77" || \ | |
| 14133 | + test -n "$runpath_var F77" || \ | |
| 14134 | + test "X$hardcode_automatic_F77"="Xyes" ; then | |
| 14298 | 14135 | |
| 14299 | -# when you set need_version to no, make sure it does not cause -set_version | |
| 14136 | + # We can hardcode non-existant directories. | |
| 14137 | + if test "$hardcode_direct_F77" != no && | |
| 14138 | + # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 14139 | + # have to relink, otherwise we might link with an installed library | |
| 14140 | + # when we should be linking with a yet-to-be-installed one | |
| 14141 | + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && | |
| 14142 | + test "$hardcode_minus_L_F77" != no; then | |
| 14143 | + # Linking always hardcodes the temporary library directory. | |
| 14144 | + hardcode_action_F77=relink | |
| 14145 | + else | |
| 14146 | + # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 14147 | + hardcode_action_F77=immediate | |
| 14148 | + fi | |
| 14149 | +else | |
| 14150 | + # We cannot hardcode anything, or else we can only hardcode existing | |
| 14151 | + # directories. | |
| 14152 | + hardcode_action_F77=unsupported | |
| 14153 | +fi | |
| 14154 | +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | |
| 14155 | +echo "${ECHO_T}$hardcode_action_F77" >&6 | |
| 14156 | + | |
| 14157 | +if test "$hardcode_action_F77" = relink; then | |
| 14158 | + # Fast installation is not supported | |
| 14159 | + enable_fast_install=no | |
| 14160 | +elif test "$shlibpath_overrides_runpath" = yes || | |
| 14161 | + test "$enable_shared" = no; then | |
| 14162 | + # Fast installation is not necessary | |
| 14163 | + enable_fast_install=needless | |
| 14164 | +fi | |
| 14165 | + | |
| 14166 | +striplib= | |
| 14167 | +old_striplib= | |
| 14168 | +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 14169 | +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 14170 | +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 14171 | + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 14172 | + test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 14173 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 14174 | +echo "${ECHO_T}yes" >&6 | |
| 14175 | +else | |
| 14176 | +# FIXME - insert some real tests, host_os isn't really good enough | |
| 14177 | + case $host_os in | |
| 14178 | + NOT-darwin*) | |
| 14179 | + if test -n "$STRIP" ; then | |
| 14180 | + striplib="$STRIP -x" | |
| 14181 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 14182 | +echo "${ECHO_T}yes" >&6 | |
| 14183 | + else | |
| 14184 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 14185 | +echo "${ECHO_T}no" >&6 | |
| 14186 | +fi | |
| 14187 | + ;; | |
| 14188 | + *) | |
| 14189 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 14190 | +echo "${ECHO_T}no" >&6 | |
| 14191 | + ;; | |
| 14192 | + esac | |
| 14193 | +fi | |
| 14194 | + | |
| 14195 | +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| 14196 | +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| 14197 | +library_names_spec= | |
| 14198 | +libname_spec='lib$name' | |
| 14199 | +soname_spec= | |
| 14200 | +shrext=".so" | |
| 14201 | +postinstall_cmds= | |
| 14202 | +postuninstall_cmds= | |
| 14203 | +finish_cmds= | |
| 14204 | +finish_eval= | |
| 14205 | +shlibpath_var= | |
| 14206 | +shlibpath_overrides_runpath=unknown | |
| 14207 | +version_type=none | |
| 14208 | +dynamic_linker="$host_os ld.so" | |
| 14209 | +sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| 14210 | +if test "$GCC" = yes; then | |
| 14211 | + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| 14212 | + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| 14213 | + # if the path contains ";" then we assume it to be the separator | |
| 14214 | + # otherwise default to the standard path separator (i.e. ":") - it is | |
| 14215 | + # assumed that no part of a normal pathname contains ";" but that should | |
| 14216 | + # okay in the real world where ";" in dirpaths is itself problematic. | |
| 14217 | + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| 14218 | + else | |
| 14219 | + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| 14220 | + fi | |
| 14221 | +else | |
| 14222 | + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| 14223 | +fi | |
| 14224 | +need_lib_prefix=unknown | |
| 14225 | +hardcode_into_libs=no | |
| 14226 | + | |
| 14227 | +# when you set need_version to no, make sure it does not cause -set_version | |
| 14300 | 14228 | # flags to be left without arguments |
| 14301 | 14229 | need_version=unknown |
| 14302 | 14230 | |
| ... | ... | @@ -14357,7 +14285,7 @@ aix4* | aix5*) |
| 14357 | 14285 | amigaos*) |
| 14358 | 14286 | library_names_spec='$libname.ixlibrary $libname.a' |
| 14359 | 14287 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
| 14360 | - 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' | |
| 14288 | + 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' | |
| 14361 | 14289 | ;; |
| 14362 | 14290 | |
| 14363 | 14291 | beos*) |
| ... | ... | @@ -14382,7 +14310,7 @@ bsdi4*) |
| 14382 | 14310 | |
| 14383 | 14311 | cygwin* | mingw* | pw32*) |
| 14384 | 14312 | version_type=windows |
| 14385 | - shrext_cmds=".dll" | |
| 14313 | + shrext=".dll" | |
| 14386 | 14314 | need_version=no |
| 14387 | 14315 | need_lib_prefix=no |
| 14388 | 14316 | |
| ... | ... | @@ -14390,13 +14318,13 @@ cygwin* | mingw* | pw32*) |
| 14390 | 14318 | yes,cygwin* | yes,mingw* | yes,pw32*) |
| 14391 | 14319 | library_names_spec='$libname.dll.a' |
| 14392 | 14320 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 14393 | - postinstall_cmds='base_file=`basename \${file}`~ | |
| 14394 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ | |
| 14395 | - dldir=$destdir/`dirname \$dlpath`~ | |
| 14396 | - test -d \$dldir || mkdir -p \$dldir~ | |
| 14321 | + postinstall_cmds='base_file=`basename \${file}`${_S_} | |
| 14322 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} | |
| 14323 | + dldir=$destdir/`dirname \$dlpath`${_S_} | |
| 14324 | + test -d \$dldir || mkdir -p \$dldir${_S_} | |
| 14397 | 14325 | $install_prog $dir/$dlname \$dldir/$dlname' |
| 14398 | - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| 14399 | - dlpath=$dir/\$dldll~ | |
| 14326 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} | |
| 14327 | + dlpath=$dir/\$dldll${_S_} | |
| 14400 | 14328 | $rm \$dlpath' |
| 14401 | 14329 | shlibpath_overrides_runpath=yes |
| 14402 | 14330 | |
| ... | ... | @@ -14404,7 +14332,7 @@ cygwin* | mingw* | pw32*) |
| 14404 | 14332 | cygwin*) |
| 14405 | 14333 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
| 14406 | 14334 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 14407 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | |
| 14335 | + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" | |
| 14408 | 14336 | ;; |
| 14409 | 14337 | mingw*) |
| 14410 | 14338 | # MinGW DLLs use traditional 'lib' prefix |
| ... | ... | @@ -14443,16 +14371,17 @@ darwin* | rhapsody*) |
| 14443 | 14371 | version_type=darwin |
| 14444 | 14372 | need_lib_prefix=no |
| 14445 | 14373 | need_version=no |
| 14446 | - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' | |
| 14374 | + # FIXME: Relying on posixy $() will cause problems for | |
| 14375 | + # cross-compilation, but unfortunately the echo tests do not | |
| 14376 | + # yet detect zsh echo's removal of \ escapes. | |
| 14377 | + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' | |
| 14447 | 14378 | soname_spec='${libname}${release}${major}$shared_ext' |
| 14448 | 14379 | shlibpath_overrides_runpath=yes |
| 14449 | 14380 | shlibpath_var=DYLD_LIBRARY_PATH |
| 14450 | - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 14381 | + shrext='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 14451 | 14382 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
| 14452 | - if test "$GCC" = yes; then | |
| 14453 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 14454 | - else | |
| 14455 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| 14383 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 14384 | + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 14456 | 14385 | fi |
| 14457 | 14386 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 14458 | 14387 | ;; |
| ... | ... | @@ -14470,18 +14399,6 @@ freebsd1*) |
| 14470 | 14399 | dynamic_linker=no |
| 14471 | 14400 | ;; |
| 14472 | 14401 | |
| 14473 | -kfreebsd*-gnu) | |
| 14474 | - version_type=linux | |
| 14475 | - need_lib_prefix=no | |
| 14476 | - need_version=no | |
| 14477 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 14478 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 14479 | - shlibpath_var=LD_LIBRARY_PATH | |
| 14480 | - shlibpath_overrides_runpath=no | |
| 14481 | - hardcode_into_libs=yes | |
| 14482 | - dynamic_linker='GNU ld.so' | |
| 14483 | - ;; | |
| 14484 | - | |
| 14485 | 14402 | freebsd*) |
| 14486 | 14403 | objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 14487 | 14404 | version_type=freebsd-$objformat |
| ... | ... | @@ -14530,7 +14447,7 @@ hpux9* | hpux10* | hpux11*) |
| 14530 | 14447 | need_version=no |
| 14531 | 14448 | case "$host_cpu" in |
| 14532 | 14449 | ia64*) |
| 14533 | - shrext_cmds='.so' | |
| 14450 | + shrext='.so' | |
| 14534 | 14451 | hardcode_into_libs=yes |
| 14535 | 14452 | dynamic_linker="$host_os dld.so" |
| 14536 | 14453 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -14545,7 +14462,7 @@ hpux9* | hpux10* | hpux11*) |
| 14545 | 14462 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 14546 | 14463 | ;; |
| 14547 | 14464 | hppa*64*) |
| 14548 | - shrext_cmds='.sl' | |
| 14465 | + shrext='.sl' | |
| 14549 | 14466 | hardcode_into_libs=yes |
| 14550 | 14467 | dynamic_linker="$host_os dld.sl" |
| 14551 | 14468 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
| ... | ... | @@ -14556,7 +14473,7 @@ hpux9* | hpux10* | hpux11*) |
| 14556 | 14473 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 14557 | 14474 | ;; |
| 14558 | 14475 | *) |
| 14559 | - shrext_cmds='.sl' | |
| 14476 | + shrext='.sl' | |
| 14560 | 14477 | dynamic_linker="$host_os dld.sl" |
| 14561 | 14478 | shlibpath_var=SHLIB_PATH |
| 14562 | 14479 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
| ... | ... | @@ -14625,33 +14542,6 @@ linux*) |
| 14625 | 14542 | # before this can be enabled. |
| 14626 | 14543 | hardcode_into_libs=yes |
| 14627 | 14544 | |
| 14628 | - # find out which ABI we are using | |
| 14629 | - libsuff= | |
| 14630 | - case "$host_cpu" in | |
| 14631 | - x86_64*|s390x*|powerpc64*) | |
| 14632 | - echo '#line 14632 "configure"' > conftest.$ac_ext | |
| 14633 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| 14634 | - (eval $ac_compile) 2>&5 | |
| 14635 | - ac_status=$? | |
| 14636 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 14637 | - (exit $ac_status); }; then | |
| 14638 | - case `/usr/bin/file conftest.$ac_objext` in | |
| 14639 | - *64-bit*) | |
| 14640 | - libsuff=64 | |
| 14641 | - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| 14642 | - ;; | |
| 14643 | - esac | |
| 14644 | - fi | |
| 14645 | - rm -rf conftest* | |
| 14646 | - ;; | |
| 14647 | - esac | |
| 14648 | - | |
| 14649 | - # Append ld.so.conf contents to the search path | |
| 14650 | - if test -f /etc/ld.so.conf; then | |
| 14651 | - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` | |
| 14652 | - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| 14653 | - fi | |
| 14654 | - | |
| 14655 | 14545 | # We used to test for /lib/ld.so.1 and disable shared libraries on |
| 14656 | 14546 | # powerpc, because MkLinux only supported shared libraries with the |
| 14657 | 14547 | # GNU dynamic linker. Since this was broken with cross compilers, |
| ... | ... | @@ -14661,18 +14551,6 @@ linux*) |
| 14661 | 14551 | dynamic_linker='GNU/Linux ld.so' |
| 14662 | 14552 | ;; |
| 14663 | 14553 | |
| 14664 | -knetbsd*-gnu) | |
| 14665 | - version_type=linux | |
| 14666 | - need_lib_prefix=no | |
| 14667 | - need_version=no | |
| 14668 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 14669 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 14670 | - shlibpath_var=LD_LIBRARY_PATH | |
| 14671 | - shlibpath_overrides_runpath=no | |
| 14672 | - hardcode_into_libs=yes | |
| 14673 | - dynamic_linker='GNU ld.so' | |
| 14674 | - ;; | |
| 14675 | - | |
| 14676 | 14554 | netbsd*) |
| 14677 | 14555 | version_type=sunos |
| 14678 | 14556 | need_lib_prefix=no |
| ... | ... | @@ -14682,7 +14560,7 @@ netbsd*) |
| 14682 | 14560 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 14683 | 14561 | dynamic_linker='NetBSD (a.out) ld.so' |
| 14684 | 14562 | else |
| 14685 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 14563 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' | |
| 14686 | 14564 | soname_spec='${libname}${release}${shared_ext}$major' |
| 14687 | 14565 | dynamic_linker='NetBSD ld.elf_so' |
| 14688 | 14566 | fi |
| ... | ... | @@ -14698,7 +14576,7 @@ newsos6) |
| 14698 | 14576 | shlibpath_overrides_runpath=yes |
| 14699 | 14577 | ;; |
| 14700 | 14578 | |
| 14701 | -nto-qnx*) | |
| 14579 | +nto-qnx) | |
| 14702 | 14580 | version_type=linux |
| 14703 | 14581 | need_lib_prefix=no |
| 14704 | 14582 | need_version=no |
| ... | ... | @@ -14711,7 +14589,7 @@ nto-qnx*) |
| 14711 | 14589 | openbsd*) |
| 14712 | 14590 | version_type=sunos |
| 14713 | 14591 | need_lib_prefix=no |
| 14714 | - need_version=yes | |
| 14592 | + need_version=no | |
| 14715 | 14593 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
| 14716 | 14594 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 14717 | 14595 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -14731,7 +14609,7 @@ openbsd*) |
| 14731 | 14609 | |
| 14732 | 14610 | os2*) |
| 14733 | 14611 | libname_spec='$name' |
| 14734 | - shrext_cmds=".dll" | |
| 14612 | + shrext=".dll" | |
| 14735 | 14613 | need_lib_prefix=no |
| 14736 | 14614 | library_names_spec='$libname${shared_ext} $libname.a' |
| 14737 | 14615 | dynamic_linker='OS/2 ld.exe' |
| ... | ... | @@ -14829,73 +14707,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 14829 | 14707 | echo "${ECHO_T}$dynamic_linker" >&6 |
| 14830 | 14708 | test "$dynamic_linker" = no && can_build_shared=no |
| 14831 | 14709 | |
| 14832 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 14833 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 14834 | -hardcode_action_F77= | |
| 14835 | -if test -n "$hardcode_libdir_flag_spec_F77" || \ | |
| 14836 | - test -n "$runpath_var F77" || \ | |
| 14837 | - test "X$hardcode_automatic_F77"="Xyes" ; then | |
| 14838 | - | |
| 14839 | - # We can hardcode non-existant directories. | |
| 14840 | - if test "$hardcode_direct_F77" != no && | |
| 14841 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 14842 | - # have to relink, otherwise we might link with an installed library | |
| 14843 | - # when we should be linking with a yet-to-be-installed one | |
| 14844 | - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && | |
| 14845 | - test "$hardcode_minus_L_F77" != no; then | |
| 14846 | - # Linking always hardcodes the temporary library directory. | |
| 14847 | - hardcode_action_F77=relink | |
| 14848 | - else | |
| 14849 | - # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 14850 | - hardcode_action_F77=immediate | |
| 14851 | - fi | |
| 14852 | -else | |
| 14853 | - # We cannot hardcode anything, or else we can only hardcode existing | |
| 14854 | - # directories. | |
| 14855 | - hardcode_action_F77=unsupported | |
| 14856 | -fi | |
| 14857 | -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | |
| 14858 | -echo "${ECHO_T}$hardcode_action_F77" >&6 | |
| 14859 | - | |
| 14860 | -if test "$hardcode_action_F77" = relink; then | |
| 14861 | - # Fast installation is not supported | |
| 14862 | - enable_fast_install=no | |
| 14863 | -elif test "$shlibpath_overrides_runpath" = yes || | |
| 14864 | - test "$enable_shared" = no; then | |
| 14865 | - # Fast installation is not necessary | |
| 14866 | - enable_fast_install=needless | |
| 14867 | -fi | |
| 14868 | - | |
| 14869 | -striplib= | |
| 14870 | -old_striplib= | |
| 14871 | -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 14872 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 14873 | -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 14874 | - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 14875 | - test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 14876 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 14877 | -echo "${ECHO_T}yes" >&6 | |
| 14878 | -else | |
| 14879 | -# FIXME - insert some real tests, host_os isn't really good enough | |
| 14880 | - case $host_os in | |
| 14881 | - darwin*) | |
| 14882 | - if test -n "$STRIP" ; then | |
| 14883 | - striplib="$STRIP -x" | |
| 14884 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 14885 | -echo "${ECHO_T}yes" >&6 | |
| 14886 | - else | |
| 14887 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 14888 | -echo "${ECHO_T}no" >&6 | |
| 14889 | -fi | |
| 14890 | - ;; | |
| 14891 | - *) | |
| 14892 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 14893 | -echo "${ECHO_T}no" >&6 | |
| 14894 | - ;; | |
| 14895 | - esac | |
| 14896 | -fi | |
| 14897 | - | |
| 14898 | - | |
| 14899 | 14710 | |
| 14900 | 14711 | # The else clause should only fire when bootstrapping the |
| 14901 | 14712 | # libtool distribution, otherwise you forgot to ship ltmain.sh |
| ... | ... | @@ -14910,8 +14721,7 @@ if test -f "$ltmain"; then |
| 14910 | 14721 | # Now quote all the things that may contain metacharacters while being |
| 14911 | 14722 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
| 14912 | 14723 | # variables and quote the copies for generation of the libtool script. |
| 14913 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ | |
| 14914 | - SED SHELL STRIP \ | |
| 14724 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ | |
| 14915 | 14725 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
| 14916 | 14726 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
| 14917 | 14727 | deplibs_check_method reload_flag reload_cmds need_locks \ |
| ... | ... | @@ -14969,7 +14779,7 @@ if test -f "$ltmain"; then |
| 14969 | 14779 | old_postinstall_cmds | old_postuninstall_cmds | \ |
| 14970 | 14780 | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
| 14971 | 14781 | # Double-quote double-evaled strings. |
| 14972 | - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\\"" | |
| 14782 | + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\\"" | |
| 14973 | 14783 | ;; |
| 14974 | 14784 | *) |
| 14975 | 14785 | eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
| ... | ... | @@ -14990,6 +14800,9 @@ cfgfile="$ofile" |
| 14990 | 14800 | |
| 14991 | 14801 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 14992 | 14802 | |
| 14803 | +# Set the command separator (default: ~) | |
| 14804 | +_S_=\${LIBTOOL_CMD_SEP-\~} | |
| 14805 | + | |
| 14993 | 14806 | # Shell to use when invoking shell scripts. |
| 14994 | 14807 | SHELL=$lt_SHELL |
| 14995 | 14808 | |
| ... | ... | @@ -15041,7 +14854,7 @@ LN_S=$lt_LN_S |
| 15041 | 14854 | NM=$lt_NM |
| 15042 | 14855 | |
| 15043 | 14856 | # A symbol stripping program |
| 15044 | -STRIP=$lt_STRIP | |
| 14857 | +STRIP=$STRIP | |
| 15045 | 14858 | |
| 15046 | 14859 | # Used to examine libraries when file_magic_cmd begins "file" |
| 15047 | 14860 | MAGIC_CMD=$MAGIC_CMD |
| ... | ... | @@ -15072,7 +14885,7 @@ objext="$ac_objext" |
| 15072 | 14885 | libext="$libext" |
| 15073 | 14886 | |
| 15074 | 14887 | # Shared library suffix (normally ".so"). |
| 15075 | -shrext_cmds='$shrext_cmds' | |
| 14888 | +shrext='$shrext' | |
| 15076 | 14889 | |
| 15077 | 14890 | # Executable file suffix (normally ""). |
| 15078 | 14891 | exeext="$exeext" |
| ... | ... | @@ -15289,10 +15102,7 @@ else |
| 15289 | 15102 | # If there is no Makefile yet, we rely on a make rule to execute |
| 15290 | 15103 | # `config.status --recheck' to rerun these tests and create the |
| 15291 | 15104 | # libtool script then. |
| 15292 | - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` | |
| 15293 | - if test -f "$ltmain_in"; then | |
| 15294 | - test -f Makefile && make "$ltmain" | |
| 15295 | - fi | |
| 15105 | + test -f Makefile && make "$ltmain" | |
| 15296 | 15106 | fi |
| 15297 | 15107 | |
| 15298 | 15108 | |
| ... | ... | @@ -15351,8 +15161,7 @@ lt_prog_compiler_no_builtin_flag_GCJ= |
| 15351 | 15161 | if test "$GCC" = yes; then |
| 15352 | 15162 | lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' |
| 15353 | 15163 | |
| 15354 | - | |
| 15355 | -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| 15164 | + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| 15356 | 15165 | echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 |
| 15357 | 15166 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
| 15358 | 15167 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -15370,11 +15179,11 @@ else |
| 15370 | 15179 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 15371 | 15180 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 15372 | 15181 | -e 's:$: $lt_compiler_flag:'` |
| 15373 | - (eval echo "\"\$as_me:15373: $lt_compile\"" >&5) | |
| 15182 | + (eval echo "\"\$as_me:15182: $lt_compile\"" >&5) | |
| 15374 | 15183 | (eval "$lt_compile" 2>conftest.err) |
| 15375 | 15184 | ac_status=$? |
| 15376 | 15185 | cat conftest.err >&5 |
| 15377 | - echo "$as_me:15377: \$? = $ac_status" >&5 | |
| 15186 | + echo "$as_me:15186: \$? = $ac_status" >&5 | |
| 15378 | 15187 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 15379 | 15188 | # The compiler can only warn and ignore the option if not recognized |
| 15380 | 15189 | # So say no if there are warnings |
| ... | ... | @@ -15517,12 +15326,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 |
| 15517 | 15326 | |
| 15518 | 15327 | linux*) |
| 15519 | 15328 | case $CC in |
| 15520 | - icc* | ecc*) | |
| 15329 | + icc|ecc) | |
| 15521 | 15330 | lt_prog_compiler_wl_GCJ='-Wl,' |
| 15522 | 15331 | lt_prog_compiler_pic_GCJ='-KPIC' |
| 15523 | 15332 | lt_prog_compiler_static_GCJ='-static' |
| 15524 | 15333 | ;; |
| 15525 | - ccc*) | |
| 15334 | + ccc) | |
| 15526 | 15335 | lt_prog_compiler_wl_GCJ='-Wl,' |
| 15527 | 15336 | # All Alpha code is PIC. |
| 15528 | 15337 | lt_prog_compiler_static_GCJ='-non_shared' |
| ... | ... | @@ -15584,8 +15393,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 |
| 15584 | 15393 | # Check to make sure the PIC flag actually works. |
| 15585 | 15394 | # |
| 15586 | 15395 | if test -n "$lt_prog_compiler_pic_GCJ"; then |
| 15587 | - | |
| 15588 | -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | |
| 15396 | + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | |
| 15589 | 15397 | echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 |
| 15590 | 15398 | if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then |
| 15591 | 15399 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
| ... | ... | @@ -15603,11 +15411,11 @@ else |
| 15603 | 15411 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 15604 | 15412 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 15605 | 15413 | -e 's:$: $lt_compiler_flag:'` |
| 15606 | - (eval echo "\"\$as_me:15606: $lt_compile\"" >&5) | |
| 15414 | + (eval echo "\"\$as_me:15414: $lt_compile\"" >&5) | |
| 15607 | 15415 | (eval "$lt_compile" 2>conftest.err) |
| 15608 | 15416 | ac_status=$? |
| 15609 | 15417 | cat conftest.err >&5 |
| 15610 | - echo "$as_me:15610: \$? = $ac_status" >&5 | |
| 15418 | + echo "$as_me:15418: \$? = $ac_status" >&5 | |
| 15611 | 15419 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 15612 | 15420 | # The compiler can only warn and ignore the option if not recognized |
| 15613 | 15421 | # So say no if there are warnings |
| ... | ... | @@ -15654,6 +15462,13 @@ else |
| 15654 | 15462 | mkdir out |
| 15655 | 15463 | printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 15656 | 15464 | |
| 15465 | + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers | |
| 15466 | + # that will create temporary files in the current directory regardless of | |
| 15467 | + # the output directory. Thus, making CWD read-only will cause this test | |
| 15468 | + # to fail, enabling locking or at least warning the user not to do parallel | |
| 15469 | + # builds. | |
| 15470 | + chmod -w . | |
| 15471 | + | |
| 15657 | 15472 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
| 15658 | 15473 | # Insert the option either (1) after the last *FLAGS variable, or |
| 15659 | 15474 | # (2) before a word containing "conftest.", or (3) at the end. |
| ... | ... | @@ -15663,11 +15478,11 @@ else |
| 15663 | 15478 | -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
| 15664 | 15479 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 15665 | 15480 | -e 's:$: $lt_compiler_flag:'` |
| 15666 | - (eval echo "\"\$as_me:15666: $lt_compile\"" >&5) | |
| 15481 | + (eval echo "\"\$as_me:15481: $lt_compile\"" >&5) | |
| 15667 | 15482 | (eval "$lt_compile" 2>out/conftest.err) |
| 15668 | 15483 | ac_status=$? |
| 15669 | 15484 | cat out/conftest.err >&5 |
| 15670 | - echo "$as_me:15670: \$? = $ac_status" >&5 | |
| 15485 | + echo "$as_me:15485: \$? = $ac_status" >&5 | |
| 15671 | 15486 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 15672 | 15487 | then |
| 15673 | 15488 | # The compiler can only warn and ignore the option if not recognized |
| ... | ... | @@ -15677,11 +15492,8 @@ else |
| 15677 | 15492 | fi |
| 15678 | 15493 | fi |
| 15679 | 15494 | chmod u+w . |
| 15680 | - $rm conftest* | |
| 15681 | - # SGI C++ compiler will create directory out/ii_files/ for | |
| 15682 | - # template instantiation | |
| 15683 | - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files | |
| 15684 | - $rm out/* && rmdir out | |
| 15495 | + $rm conftest* out/* | |
| 15496 | + rmdir out | |
| 15685 | 15497 | cd .. |
| 15686 | 15498 | rmdir conftest |
| 15687 | 15499 | $rm conftest* |
| ... | ... | @@ -15791,7 +15603,7 @@ EOF |
| 15791 | 15603 | ;; |
| 15792 | 15604 | |
| 15793 | 15605 | amigaos*) |
| 15794 | - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 15606 | + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 15795 | 15607 | hardcode_libdir_flag_spec_GCJ='-L$libdir' |
| 15796 | 15608 | hardcode_minus_L_GCJ=yes |
| 15797 | 15609 | |
| ... | ... | @@ -15833,7 +15645,7 @@ EOF |
| 15833 | 15645 | else |
| 15834 | 15646 | echo EXPORTS > $output_objdir/$soname.def; |
| 15835 | 15647 | cat $export_symbols >> $output_objdir/$soname.def; |
| 15836 | - fi~ | |
| 15648 | + fi${_S_} | |
| 15837 | 15649 | $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' |
| 15838 | 15650 | else |
| 15839 | 15651 | ld_shlibs=no |
| ... | ... | @@ -15878,31 +15690,6 @@ EOF |
| 15878 | 15690 | hardcode_shlibpath_var_GCJ=no |
| 15879 | 15691 | ;; |
| 15880 | 15692 | |
| 15881 | - linux*) | |
| 15882 | - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| 15883 | - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| 15884 | - archive_cmds_GCJ="$tmp_archive_cmds" | |
| 15885 | - supports_anon_versioning=no | |
| 15886 | - case `$LD -v 2>/dev/null` in | |
| 15887 | - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 | |
| 15888 | - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | |
| 15889 | - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | |
| 15890 | - *\ 2.11.*) ;; # other 2.11 versions | |
| 15891 | - *) supports_anon_versioning=yes ;; | |
| 15892 | - esac | |
| 15893 | - if test $supports_anon_versioning = yes; then | |
| 15894 | - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| 15895 | -cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| 15896 | -$echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| 15897 | - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| 15898 | - else | |
| 15899 | - archive_expsym_cmds_GCJ="$tmp_archive_cmds" | |
| 15900 | - fi | |
| 15901 | - else | |
| 15902 | - ld_shlibs_GCJ=no | |
| 15903 | - fi | |
| 15904 | - ;; | |
| 15905 | - | |
| 15906 | 15693 | *) |
| 15907 | 15694 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
| 15908 | 15695 | archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| ... | ... | @@ -15930,7 +15717,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 15930 | 15717 | aix3*) |
| 15931 | 15718 | allow_undefined_flag_GCJ=unsupported |
| 15932 | 15719 | always_export_symbols_GCJ=yes |
| 15933 | - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 15720 | + archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' | |
| 15934 | 15721 | # Note: this linker hardcodes the directories in LIBPATH if there |
| 15935 | 15722 | # are no directories specified by -L. |
| 15936 | 15723 | hardcode_minus_L_GCJ=yes |
| ... | ... | @@ -16154,13 +15941,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16154 | 15941 | whole_archive_flag_spec_GCJ=' ' |
| 16155 | 15942 | archive_cmds_need_lc_GCJ=yes |
| 16156 | 15943 | # This is similar to how AIX traditionally builds it's shared libraries. |
| 16157 | - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 15944 | + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | |
| 16158 | 15945 | fi |
| 16159 | 15946 | fi |
| 16160 | 15947 | ;; |
| 16161 | 15948 | |
| 16162 | 15949 | amigaos*) |
| 16163 | - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' | |
| 15950 | + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' | |
| 16164 | 15951 | hardcode_libdir_flag_spec_GCJ='-L$libdir' |
| 16165 | 15952 | hardcode_minus_L_GCJ=yes |
| 16166 | 15953 | # see comment about different semantics on the GNU ld section |
| ... | ... | @@ -16181,9 +15968,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16181 | 15968 | # Tell ltmain to make .lib files, not .a files. |
| 16182 | 15969 | libext=lib |
| 16183 | 15970 | # Tell ltmain to make .dll files, not .so files. |
| 16184 | - shrext_cmds=".dll" | |
| 15971 | + shrext=".dll" | |
| 16185 | 15972 | # FIXME: Setting linknames here is a bad hack. |
| 16186 | - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' | |
| 15973 | + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' | |
| 16187 | 15974 | # The linker will automatically build a .lib file if we build a DLL. |
| 16188 | 15975 | old_archive_From_new_cmds_GCJ='true' |
| 16189 | 15976 | # FIXME: Should let the user specify the lib program. |
| ... | ... | @@ -16193,52 +15980,57 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16193 | 15980 | ;; |
| 16194 | 15981 | |
| 16195 | 15982 | darwin* | rhapsody*) |
| 16196 | - if test "$GXX" = yes ; then | |
| 15983 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 16197 | 15984 | archive_cmds_need_lc_GCJ=no |
| 16198 | 15985 | case "$host_os" in |
| 16199 | 15986 | rhapsody* | darwin1.[012]) |
| 16200 | 15987 | allow_undefined_flag_GCJ='-undefined suppress' |
| 16201 | 15988 | ;; |
| 16202 | - *) # Darwin 1.3 on | |
| 16203 | - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| 16204 | - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' | |
| 16205 | - else | |
| 16206 | - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| 16207 | - 10.[012]) | |
| 16208 | - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' | |
| 16209 | - ;; | |
| 16210 | - 10.*) | |
| 16211 | - allow_undefined_flag_GCJ='-undefined dynamic_lookup' | |
| 16212 | - ;; | |
| 16213 | - esac | |
| 16214 | - fi | |
| 15989 | + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 | |
| 15990 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' | |
| 15991 | + ;; | |
| 15992 | + *) # Darwin 7.0 on | |
| 15993 | + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in | |
| 15994 | + 10.[012]) | |
| 15995 | + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' | |
| 15996 | + ;; | |
| 15997 | + *) # 10.3 on | |
| 15998 | + if test -z ${LD_TWOLEVEL_NAMESPACE}; then | |
| 15999 | + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' | |
| 16000 | + else | |
| 16001 | + allow_undefined_flag_GCJ='-undefined dynamic_lookup' | |
| 16002 | + fi | |
| 16003 | + ;; | |
| 16004 | + esac | |
| 16215 | 16005 | ;; |
| 16216 | 16006 | esac |
| 16007 | + # FIXME: Relying on posixy $() will cause problems for | |
| 16008 | + # cross-compilation, but unfortunately the echo tests do not | |
| 16009 | + # yet detect zsh echo's removal of \ escapes. Also zsh mangles | |
| 16010 | + # `"' quotes if we put them in here... so don't! | |
| 16217 | 16011 | lt_int_apple_cc_single_mod=no |
| 16218 | 16012 | output_verbose_link_cmd='echo' |
| 16219 | 16013 | if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then |
| 16220 | 16014 | lt_int_apple_cc_single_mod=yes |
| 16221 | 16015 | fi |
| 16222 | 16016 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 16223 | - archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 16017 | + archive_cmds_GCJ='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 16224 | 16018 | else |
| 16225 | - archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 16019 | + archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| 16226 | 16020 | fi |
| 16227 | - module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| 16021 | + module_cmds_GCJ='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' | |
| 16228 | 16022 | # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's |
| 16229 | 16023 | if test "X$lt_int_apple_cc_single_mod" = Xyes ; then |
| 16230 | - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16024 | + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16231 | 16025 | else |
| 16232 | - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16026 | + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16233 | 16027 | fi |
| 16234 | - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16028 | + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| 16235 | 16029 | hardcode_direct_GCJ=no |
| 16236 | 16030 | hardcode_automatic_GCJ=yes |
| 16237 | 16031 | hardcode_shlibpath_var_GCJ=unsupported |
| 16238 | 16032 | whole_archive_flag_spec_GCJ='-all_load $convenience' |
| 16239 | 16033 | link_all_deplibs_GCJ=yes |
| 16240 | - else | |
| 16241 | - ld_shlibs_GCJ=no | |
| 16242 | 16034 | fi |
| 16243 | 16035 | ;; |
| 16244 | 16036 | |
| ... | ... | @@ -16272,7 +16064,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16272 | 16064 | ;; |
| 16273 | 16065 | |
| 16274 | 16066 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 16275 | - freebsd* | kfreebsd*-gnu) | |
| 16067 | + freebsd*) | |
| 16276 | 16068 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 16277 | 16069 | hardcode_libdir_flag_spec_GCJ='-R$libdir' |
| 16278 | 16070 | hardcode_direct_GCJ=yes |
| ... | ... | @@ -16281,9 +16073,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16281 | 16073 | |
| 16282 | 16074 | hpux9*) |
| 16283 | 16075 | if test "$GCC" = yes; then |
| 16284 | - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 16076 | + archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 16285 | 16077 | else |
| 16286 | - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 16078 | + archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| 16287 | 16079 | fi |
| 16288 | 16080 | hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' |
| 16289 | 16081 | hardcode_libdir_separator_GCJ=: |
| ... | ... | @@ -16403,7 +16195,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16403 | 16195 | hardcode_libdir_flag_spec_GCJ='-L$libdir' |
| 16404 | 16196 | hardcode_minus_L_GCJ=yes |
| 16405 | 16197 | allow_undefined_flag_GCJ=unsupported |
| 16406 | - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 16198 | + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | |
| 16407 | 16199 | old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
| 16408 | 16200 | ;; |
| 16409 | 16201 | |
| ... | ... | @@ -16427,8 +16219,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16427 | 16219 | else |
| 16428 | 16220 | allow_undefined_flag_GCJ=' -expect_unresolved \*' |
| 16429 | 16221 | archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' |
| 16430 | - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ | |
| 16431 | - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' | |
| 16222 | + archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} | |
| 16223 | + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' | |
| 16432 | 16224 | |
| 16433 | 16225 | # Both c and cxx compiler support -rpath directly |
| 16434 | 16226 | hardcode_libdir_flag_spec_GCJ='-rpath $libdir' |
| ... | ... | @@ -16448,12 +16240,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16448 | 16240 | no_undefined_flag_GCJ=' -z text' |
| 16449 | 16241 | if test "$GCC" = yes; then |
| 16450 | 16242 | archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 16451 | - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 16452 | - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' | |
| 16243 | + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 16244 | + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' | |
| 16453 | 16245 | else |
| 16454 | 16246 | archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 16455 | - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 16456 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 16247 | + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 16248 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 16457 | 16249 | fi |
| 16458 | 16250 | hardcode_libdir_flag_spec_GCJ='-R$libdir' |
| 16459 | 16251 | hardcode_shlibpath_var_GCJ=no |
| ... | ... | @@ -16542,8 +16334,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 16542 | 16334 | # $CC -shared without GNU ld will not create a library from C++ |
| 16543 | 16335 | # object files and a static libstdc++, better avoid it by now |
| 16544 | 16336 | archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' |
| 16545 | - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ | |
| 16546 | - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' | |
| 16337 | + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} | |
| 16338 | + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' | |
| 16547 | 16339 | hardcode_libdir_flag_spec_GCJ= |
| 16548 | 16340 | hardcode_shlibpath_var_GCJ=no |
| 16549 | 16341 | runpath_var='LD_RUN_PATH' |
| ... | ... | @@ -16580,7 +16372,7 @@ x|xyes) |
| 16580 | 16372 | |
| 16581 | 16373 | if test "$enable_shared" = yes && test "$GCC" = yes; then |
| 16582 | 16374 | case $archive_cmds_GCJ in |
| 16583 | - *'~'*) | |
| 16375 | + *"$_S_"*) | |
| 16584 | 16376 | # FIXME: we may have to deal with multi-command sequences. |
| 16585 | 16377 | ;; |
| 16586 | 16378 | '$CC '*) |
| ... | ... | @@ -16632,12 +16424,78 @@ echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 |
| 16632 | 16424 | ;; |
| 16633 | 16425 | esac |
| 16634 | 16426 | |
| 16427 | +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 16428 | +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 16429 | +hardcode_action_GCJ= | |
| 16430 | +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ | |
| 16431 | + test -n "$runpath_var GCJ" || \ | |
| 16432 | + test "X$hardcode_automatic_GCJ"="Xyes" ; then | |
| 16433 | + | |
| 16434 | + # We can hardcode non-existant directories. | |
| 16435 | + if test "$hardcode_direct_GCJ" != no && | |
| 16436 | + # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 16437 | + # have to relink, otherwise we might link with an installed library | |
| 16438 | + # when we should be linking with a yet-to-be-installed one | |
| 16439 | + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && | |
| 16440 | + test "$hardcode_minus_L_GCJ" != no; then | |
| 16441 | + # Linking always hardcodes the temporary library directory. | |
| 16442 | + hardcode_action_GCJ=relink | |
| 16443 | + else | |
| 16444 | + # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 16445 | + hardcode_action_GCJ=immediate | |
| 16446 | + fi | |
| 16447 | +else | |
| 16448 | + # We cannot hardcode anything, or else we can only hardcode existing | |
| 16449 | + # directories. | |
| 16450 | + hardcode_action_GCJ=unsupported | |
| 16451 | +fi | |
| 16452 | +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | |
| 16453 | +echo "${ECHO_T}$hardcode_action_GCJ" >&6 | |
| 16454 | + | |
| 16455 | +if test "$hardcode_action_GCJ" = relink; then | |
| 16456 | + # Fast installation is not supported | |
| 16457 | + enable_fast_install=no | |
| 16458 | +elif test "$shlibpath_overrides_runpath" = yes || | |
| 16459 | + test "$enable_shared" = no; then | |
| 16460 | + # Fast installation is not necessary | |
| 16461 | + enable_fast_install=needless | |
| 16462 | +fi | |
| 16463 | + | |
| 16464 | +striplib= | |
| 16465 | +old_striplib= | |
| 16466 | +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 16467 | +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 16468 | +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 16469 | + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 16470 | + test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 16471 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 16472 | +echo "${ECHO_T}yes" >&6 | |
| 16473 | +else | |
| 16474 | +# FIXME - insert some real tests, host_os isn't really good enough | |
| 16475 | + case $host_os in | |
| 16476 | + NOT-darwin*) | |
| 16477 | + if test -n "$STRIP" ; then | |
| 16478 | + striplib="$STRIP -x" | |
| 16479 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 16480 | +echo "${ECHO_T}yes" >&6 | |
| 16481 | + else | |
| 16482 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 16483 | +echo "${ECHO_T}no" >&6 | |
| 16484 | +fi | |
| 16485 | + ;; | |
| 16486 | + *) | |
| 16487 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 16488 | +echo "${ECHO_T}no" >&6 | |
| 16489 | + ;; | |
| 16490 | + esac | |
| 16491 | +fi | |
| 16492 | + | |
| 16635 | 16493 | echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 16636 | 16494 | echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 |
| 16637 | 16495 | library_names_spec= |
| 16638 | 16496 | libname_spec='lib$name' |
| 16639 | 16497 | soname_spec= |
| 16640 | -shrext_cmds=".so" | |
| 16498 | +shrext=".so" | |
| 16641 | 16499 | postinstall_cmds= |
| 16642 | 16500 | postuninstall_cmds= |
| 16643 | 16501 | finish_cmds= |
| ... | ... | @@ -16725,7 +16583,7 @@ aix4* | aix5*) |
| 16725 | 16583 | amigaos*) |
| 16726 | 16584 | library_names_spec='$libname.ixlibrary $libname.a' |
| 16727 | 16585 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
| 16728 | - 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' | |
| 16586 | + 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' | |
| 16729 | 16587 | ;; |
| 16730 | 16588 | |
| 16731 | 16589 | beos*) |
| ... | ... | @@ -16750,7 +16608,7 @@ bsdi4*) |
| 16750 | 16608 | |
| 16751 | 16609 | cygwin* | mingw* | pw32*) |
| 16752 | 16610 | version_type=windows |
| 16753 | - shrext_cmds=".dll" | |
| 16611 | + shrext=".dll" | |
| 16754 | 16612 | need_version=no |
| 16755 | 16613 | need_lib_prefix=no |
| 16756 | 16614 | |
| ... | ... | @@ -16758,13 +16616,13 @@ cygwin* | mingw* | pw32*) |
| 16758 | 16616 | yes,cygwin* | yes,mingw* | yes,pw32*) |
| 16759 | 16617 | library_names_spec='$libname.dll.a' |
| 16760 | 16618 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 16761 | - postinstall_cmds='base_file=`basename \${file}`~ | |
| 16762 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ | |
| 16763 | - dldir=$destdir/`dirname \$dlpath`~ | |
| 16764 | - test -d \$dldir || mkdir -p \$dldir~ | |
| 16619 | + postinstall_cmds='base_file=`basename \${file}`${_S_} | |
| 16620 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} | |
| 16621 | + dldir=$destdir/`dirname \$dlpath`${_S_} | |
| 16622 | + test -d \$dldir || mkdir -p \$dldir${_S_} | |
| 16765 | 16623 | $install_prog $dir/$dlname \$dldir/$dlname' |
| 16766 | - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| 16767 | - dlpath=$dir/\$dldll~ | |
| 16624 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} | |
| 16625 | + dlpath=$dir/\$dldll${_S_} | |
| 16768 | 16626 | $rm \$dlpath' |
| 16769 | 16627 | shlibpath_overrides_runpath=yes |
| 16770 | 16628 | |
| ... | ... | @@ -16772,7 +16630,7 @@ cygwin* | mingw* | pw32*) |
| 16772 | 16630 | cygwin*) |
| 16773 | 16631 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
| 16774 | 16632 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 16775 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | |
| 16633 | + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" | |
| 16776 | 16634 | ;; |
| 16777 | 16635 | mingw*) |
| 16778 | 16636 | # MinGW DLLs use traditional 'lib' prefix |
| ... | ... | @@ -16811,16 +16669,17 @@ darwin* | rhapsody*) |
| 16811 | 16669 | version_type=darwin |
| 16812 | 16670 | need_lib_prefix=no |
| 16813 | 16671 | need_version=no |
| 16814 | - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' | |
| 16672 | + # FIXME: Relying on posixy $() will cause problems for | |
| 16673 | + # cross-compilation, but unfortunately the echo tests do not | |
| 16674 | + # yet detect zsh echo's removal of \ escapes. | |
| 16675 | + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' | |
| 16815 | 16676 | soname_spec='${libname}${release}${major}$shared_ext' |
| 16816 | 16677 | shlibpath_overrides_runpath=yes |
| 16817 | 16678 | shlibpath_var=DYLD_LIBRARY_PATH |
| 16818 | - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 16679 | + shrext='$(test .$module = .yes && echo .so || echo .dylib)' | |
| 16819 | 16680 | # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
| 16820 | - if test "$GCC" = yes; then | |
| 16821 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 16822 | - else | |
| 16823 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| 16681 | + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | |
| 16682 | + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| 16824 | 16683 | fi |
| 16825 | 16684 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
| 16826 | 16685 | ;; |
| ... | ... | @@ -16838,18 +16697,6 @@ freebsd1*) |
| 16838 | 16697 | dynamic_linker=no |
| 16839 | 16698 | ;; |
| 16840 | 16699 | |
| 16841 | -kfreebsd*-gnu) | |
| 16842 | - version_type=linux | |
| 16843 | - need_lib_prefix=no | |
| 16844 | - need_version=no | |
| 16845 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 16846 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 16847 | - shlibpath_var=LD_LIBRARY_PATH | |
| 16848 | - shlibpath_overrides_runpath=no | |
| 16849 | - hardcode_into_libs=yes | |
| 16850 | - dynamic_linker='GNU ld.so' | |
| 16851 | - ;; | |
| 16852 | - | |
| 16853 | 16700 | freebsd*) |
| 16854 | 16701 | objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
| 16855 | 16702 | version_type=freebsd-$objformat |
| ... | ... | @@ -16898,7 +16745,7 @@ hpux9* | hpux10* | hpux11*) |
| 16898 | 16745 | need_version=no |
| 16899 | 16746 | case "$host_cpu" in |
| 16900 | 16747 | ia64*) |
| 16901 | - shrext_cmds='.so' | |
| 16748 | + shrext='.so' | |
| 16902 | 16749 | hardcode_into_libs=yes |
| 16903 | 16750 | dynamic_linker="$host_os dld.so" |
| 16904 | 16751 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -16913,7 +16760,7 @@ hpux9* | hpux10* | hpux11*) |
| 16913 | 16760 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 16914 | 16761 | ;; |
| 16915 | 16762 | hppa*64*) |
| 16916 | - shrext_cmds='.sl' | |
| 16763 | + shrext='.sl' | |
| 16917 | 16764 | hardcode_into_libs=yes |
| 16918 | 16765 | dynamic_linker="$host_os dld.sl" |
| 16919 | 16766 | shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
| ... | ... | @@ -16924,7 +16771,7 @@ hpux9* | hpux10* | hpux11*) |
| 16924 | 16771 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
| 16925 | 16772 | ;; |
| 16926 | 16773 | *) |
| 16927 | - shrext_cmds='.sl' | |
| 16774 | + shrext='.sl' | |
| 16928 | 16775 | dynamic_linker="$host_os dld.sl" |
| 16929 | 16776 | shlibpath_var=SHLIB_PATH |
| 16930 | 16777 | shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH |
| ... | ... | @@ -16970,75 +16817,36 @@ irix5* | irix6* | nonstopux*) |
| 16970 | 16817 | shlibpath_overrides_runpath=no |
| 16971 | 16818 | sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" |
| 16972 | 16819 | sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" |
| 16973 | - hardcode_into_libs=yes | |
| 16974 | - ;; | |
| 16975 | - | |
| 16976 | -# No shared lib support for Linux oldld, aout, or coff. | |
| 16977 | -linux*oldld* | linux*aout* | linux*coff*) | |
| 16978 | - dynamic_linker=no | |
| 16979 | - ;; | |
| 16980 | - | |
| 16981 | -# This must be Linux ELF. | |
| 16982 | -linux*) | |
| 16983 | - version_type=linux | |
| 16984 | - need_lib_prefix=no | |
| 16985 | - need_version=no | |
| 16986 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| 16987 | - soname_spec='${libname}${release}${shared_ext}$major' | |
| 16988 | - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | |
| 16989 | - shlibpath_var=LD_LIBRARY_PATH | |
| 16990 | - shlibpath_overrides_runpath=no | |
| 16991 | - # This implies no fast_install, which is unacceptable. | |
| 16992 | - # Some rework will be needed to allow for fast_install | |
| 16993 | - # before this can be enabled. | |
| 16994 | - hardcode_into_libs=yes | |
| 16995 | - | |
| 16996 | - # find out which ABI we are using | |
| 16997 | - libsuff= | |
| 16998 | - case "$host_cpu" in | |
| 16999 | - x86_64*|s390x*|powerpc64*) | |
| 17000 | - echo '#line 17000 "configure"' > conftest.$ac_ext | |
| 17001 | - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| 17002 | - (eval $ac_compile) 2>&5 | |
| 17003 | - ac_status=$? | |
| 17004 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 17005 | - (exit $ac_status); }; then | |
| 17006 | - case `/usr/bin/file conftest.$ac_objext` in | |
| 17007 | - *64-bit*) | |
| 17008 | - libsuff=64 | |
| 17009 | - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| 17010 | - ;; | |
| 17011 | - esac | |
| 17012 | - fi | |
| 17013 | - rm -rf conftest* | |
| 17014 | - ;; | |
| 17015 | - esac | |
| 17016 | - | |
| 17017 | - # Append ld.so.conf contents to the search path | |
| 17018 | - if test -f /etc/ld.so.conf; then | |
| 17019 | - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` | |
| 17020 | - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| 17021 | - fi | |
| 17022 | - | |
| 17023 | - # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| 17024 | - # powerpc, because MkLinux only supported shared libraries with the | |
| 17025 | - # GNU dynamic linker. Since this was broken with cross compilers, | |
| 17026 | - # most powerpc-linux boxes support dynamic linking these days and | |
| 17027 | - # people can always --disable-shared, the test was removed, and we | |
| 17028 | - # assume the GNU/Linux dynamic linker is in use. | |
| 17029 | - dynamic_linker='GNU/Linux ld.so' | |
| 16820 | + hardcode_into_libs=yes | |
| 16821 | + ;; | |
| 16822 | + | |
| 16823 | +# No shared lib support for Linux oldld, aout, or coff. | |
| 16824 | +linux*oldld* | linux*aout* | linux*coff*) | |
| 16825 | + dynamic_linker=no | |
| 17030 | 16826 | ;; |
| 17031 | 16827 | |
| 17032 | -knetbsd*-gnu) | |
| 16828 | +# This must be Linux ELF. | |
| 16829 | +linux*) | |
| 17033 | 16830 | version_type=linux |
| 17034 | 16831 | need_lib_prefix=no |
| 17035 | 16832 | need_version=no |
| 17036 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 16833 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| 17037 | 16834 | soname_spec='${libname}${release}${shared_ext}$major' |
| 16835 | + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | |
| 17038 | 16836 | shlibpath_var=LD_LIBRARY_PATH |
| 17039 | 16837 | shlibpath_overrides_runpath=no |
| 16838 | + # This implies no fast_install, which is unacceptable. | |
| 16839 | + # Some rework will be needed to allow for fast_install | |
| 16840 | + # before this can be enabled. | |
| 17040 | 16841 | hardcode_into_libs=yes |
| 17041 | - dynamic_linker='GNU ld.so' | |
| 16842 | + | |
| 16843 | + # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| 16844 | + # powerpc, because MkLinux only supported shared libraries with the | |
| 16845 | + # GNU dynamic linker. Since this was broken with cross compilers, | |
| 16846 | + # most powerpc-linux boxes support dynamic linking these days and | |
| 16847 | + # people can always --disable-shared, the test was removed, and we | |
| 16848 | + # assume the GNU/Linux dynamic linker is in use. | |
| 16849 | + dynamic_linker='GNU/Linux ld.so' | |
| 17042 | 16850 | ;; |
| 17043 | 16851 | |
| 17044 | 16852 | netbsd*) |
| ... | ... | @@ -17050,7 +16858,7 @@ netbsd*) |
| 17050 | 16858 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 17051 | 16859 | dynamic_linker='NetBSD (a.out) ld.so' |
| 17052 | 16860 | else |
| 17053 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| 16861 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' | |
| 17054 | 16862 | soname_spec='${libname}${release}${shared_ext}$major' |
| 17055 | 16863 | dynamic_linker='NetBSD ld.elf_so' |
| 17056 | 16864 | fi |
| ... | ... | @@ -17066,7 +16874,7 @@ newsos6) |
| 17066 | 16874 | shlibpath_overrides_runpath=yes |
| 17067 | 16875 | ;; |
| 17068 | 16876 | |
| 17069 | -nto-qnx*) | |
| 16877 | +nto-qnx) | |
| 17070 | 16878 | version_type=linux |
| 17071 | 16879 | need_lib_prefix=no |
| 17072 | 16880 | need_version=no |
| ... | ... | @@ -17079,7 +16887,7 @@ nto-qnx*) |
| 17079 | 16887 | openbsd*) |
| 17080 | 16888 | version_type=sunos |
| 17081 | 16889 | need_lib_prefix=no |
| 17082 | - need_version=yes | |
| 16890 | + need_version=no | |
| 17083 | 16891 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
| 17084 | 16892 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
| 17085 | 16893 | shlibpath_var=LD_LIBRARY_PATH |
| ... | ... | @@ -17099,7 +16907,7 @@ openbsd*) |
| 17099 | 16907 | |
| 17100 | 16908 | os2*) |
| 17101 | 16909 | libname_spec='$name' |
| 17102 | - shrext_cmds=".dll" | |
| 16910 | + shrext=".dll" | |
| 17103 | 16911 | need_lib_prefix=no |
| 17104 | 16912 | library_names_spec='$libname${shared_ext} $libname.a' |
| 17105 | 16913 | dynamic_linker='OS/2 ld.exe' |
| ... | ... | @@ -17197,72 +17005,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 17197 | 17005 | echo "${ECHO_T}$dynamic_linker" >&6 |
| 17198 | 17006 | test "$dynamic_linker" = no && can_build_shared=no |
| 17199 | 17007 | |
| 17200 | -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| 17201 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| 17202 | -hardcode_action_GCJ= | |
| 17203 | -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ | |
| 17204 | - test -n "$runpath_var GCJ" || \ | |
| 17205 | - test "X$hardcode_automatic_GCJ"="Xyes" ; then | |
| 17206 | - | |
| 17207 | - # We can hardcode non-existant directories. | |
| 17208 | - if test "$hardcode_direct_GCJ" != no && | |
| 17209 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we | |
| 17210 | - # have to relink, otherwise we might link with an installed library | |
| 17211 | - # when we should be linking with a yet-to-be-installed one | |
| 17212 | - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && | |
| 17213 | - test "$hardcode_minus_L_GCJ" != no; then | |
| 17214 | - # Linking always hardcodes the temporary library directory. | |
| 17215 | - hardcode_action_GCJ=relink | |
| 17216 | - else | |
| 17217 | - # We can link without hardcoding, and we can hardcode nonexisting dirs. | |
| 17218 | - hardcode_action_GCJ=immediate | |
| 17219 | - fi | |
| 17220 | -else | |
| 17221 | - # We cannot hardcode anything, or else we can only hardcode existing | |
| 17222 | - # directories. | |
| 17223 | - hardcode_action_GCJ=unsupported | |
| 17224 | -fi | |
| 17225 | -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | |
| 17226 | -echo "${ECHO_T}$hardcode_action_GCJ" >&6 | |
| 17227 | - | |
| 17228 | -if test "$hardcode_action_GCJ" = relink; then | |
| 17229 | - # Fast installation is not supported | |
| 17230 | - enable_fast_install=no | |
| 17231 | -elif test "$shlibpath_overrides_runpath" = yes || | |
| 17232 | - test "$enable_shared" = no; then | |
| 17233 | - # Fast installation is not necessary | |
| 17234 | - enable_fast_install=needless | |
| 17235 | -fi | |
| 17236 | - | |
| 17237 | -striplib= | |
| 17238 | -old_striplib= | |
| 17239 | -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| 17240 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| 17241 | -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| 17242 | - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| 17243 | - test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| 17244 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 17245 | -echo "${ECHO_T}yes" >&6 | |
| 17246 | -else | |
| 17247 | -# FIXME - insert some real tests, host_os isn't really good enough | |
| 17248 | - case $host_os in | |
| 17249 | - darwin*) | |
| 17250 | - if test -n "$STRIP" ; then | |
| 17251 | - striplib="$STRIP -x" | |
| 17252 | - echo "$as_me:$LINENO: result: yes" >&5 | |
| 17253 | -echo "${ECHO_T}yes" >&6 | |
| 17254 | - else | |
| 17255 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 17256 | -echo "${ECHO_T}no" >&6 | |
| 17257 | -fi | |
| 17258 | - ;; | |
| 17259 | - *) | |
| 17260 | - echo "$as_me:$LINENO: result: no" >&5 | |
| 17261 | -echo "${ECHO_T}no" >&6 | |
| 17262 | - ;; | |
| 17263 | - esac | |
| 17264 | -fi | |
| 17265 | - | |
| 17266 | 17008 | if test "x$enable_dlopen" != xyes; then |
| 17267 | 17009 | enable_dlopen=unknown |
| 17268 | 17010 | enable_dlopen_self=unknown |
| ... | ... | @@ -17868,7 +17610,7 @@ else |
| 17868 | 17610 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 17869 | 17611 | lt_status=$lt_dlunknown |
| 17870 | 17612 | cat > conftest.$ac_ext <<EOF |
| 17871 | -#line 17871 "configure" | |
| 17613 | +#line 17613 "configure" | |
| 17872 | 17614 | #include "confdefs.h" |
| 17873 | 17615 | |
| 17874 | 17616 | #if HAVE_DLFCN_H |
| ... | ... | @@ -17966,7 +17708,7 @@ else |
| 17966 | 17708 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 17967 | 17709 | lt_status=$lt_dlunknown |
| 17968 | 17710 | cat > conftest.$ac_ext <<EOF |
| 17969 | -#line 17969 "configure" | |
| 17711 | +#line 17711 "configure" | |
| 17970 | 17712 | #include "confdefs.h" |
| 17971 | 17713 | |
| 17972 | 17714 | #if HAVE_DLFCN_H |
| ... | ... | @@ -18083,8 +17825,7 @@ if test -f "$ltmain"; then |
| 18083 | 17825 | # Now quote all the things that may contain metacharacters while being |
| 18084 | 17826 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
| 18085 | 17827 | # variables and quote the copies for generation of the libtool script. |
| 18086 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ | |
| 18087 | - SED SHELL STRIP \ | |
| 17828 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ | |
| 18088 | 17829 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
| 18089 | 17830 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
| 18090 | 17831 | deplibs_check_method reload_flag reload_cmds need_locks \ |
| ... | ... | @@ -18142,7 +17883,7 @@ if test -f "$ltmain"; then |
| 18142 | 17883 | old_postinstall_cmds | old_postuninstall_cmds | \ |
| 18143 | 17884 | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
| 18144 | 17885 | # Double-quote double-evaled strings. |
| 18145 | - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\\"" | |
| 17886 | + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\\"" | |
| 18146 | 17887 | ;; |
| 18147 | 17888 | *) |
| 18148 | 17889 | eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
| ... | ... | @@ -18163,6 +17904,9 @@ cfgfile="$ofile" |
| 18163 | 17904 | |
| 18164 | 17905 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 18165 | 17906 | |
| 17907 | +# Set the command separator (default: ~) | |
| 17908 | +_S_=\${LIBTOOL_CMD_SEP-\~} | |
| 17909 | + | |
| 18166 | 17910 | # Shell to use when invoking shell scripts. |
| 18167 | 17911 | SHELL=$lt_SHELL |
| 18168 | 17912 | |
| ... | ... | @@ -18214,7 +17958,7 @@ LN_S=$lt_LN_S |
| 18214 | 17958 | NM=$lt_NM |
| 18215 | 17959 | |
| 18216 | 17960 | # A symbol stripping program |
| 18217 | -STRIP=$lt_STRIP | |
| 17961 | +STRIP=$STRIP | |
| 18218 | 17962 | |
| 18219 | 17963 | # Used to examine libraries when file_magic_cmd begins "file" |
| 18220 | 17964 | MAGIC_CMD=$MAGIC_CMD |
| ... | ... | @@ -18245,7 +17989,7 @@ objext="$ac_objext" |
| 18245 | 17989 | libext="$libext" |
| 18246 | 17990 | |
| 18247 | 17991 | # Shared library suffix (normally ".so"). |
| 18248 | -shrext_cmds='$shrext_cmds' | |
| 17992 | +shrext='$shrext' | |
| 18249 | 17993 | |
| 18250 | 17994 | # Executable file suffix (normally ""). |
| 18251 | 17995 | exeext="$exeext" |
| ... | ... | @@ -18462,10 +18206,7 @@ else |
| 18462 | 18206 | # If there is no Makefile yet, we rely on a make rule to execute |
| 18463 | 18207 | # `config.status --recheck' to rerun these tests and create the |
| 18464 | 18208 | # libtool script then. |
| 18465 | - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` | |
| 18466 | - if test -f "$ltmain_in"; then | |
| 18467 | - test -f Makefile && make "$ltmain" | |
| 18468 | - fi | |
| 18209 | + test -f Makefile && make "$ltmain" | |
| 18469 | 18210 | fi |
| 18470 | 18211 | |
| 18471 | 18212 | |
| ... | ... | @@ -18528,8 +18269,7 @@ if test -f "$ltmain"; then |
| 18528 | 18269 | # Now quote all the things that may contain metacharacters while being |
| 18529 | 18270 | # careful not to overquote the AC_SUBSTed values. We take copies of the |
| 18530 | 18271 | # variables and quote the copies for generation of the libtool script. |
| 18531 | - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ | |
| 18532 | - SED SHELL STRIP \ | |
| 18272 | + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ | |
| 18533 | 18273 | libname_spec library_names_spec soname_spec extract_expsyms_cmds \ |
| 18534 | 18274 | old_striplib striplib file_magic_cmd finish_cmds finish_eval \ |
| 18535 | 18275 | deplibs_check_method reload_flag reload_cmds need_locks \ |
| ... | ... | @@ -18587,7 +18327,7 @@ if test -f "$ltmain"; then |
| 18587 | 18327 | old_postinstall_cmds | old_postuninstall_cmds | \ |
| 18588 | 18328 | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) |
| 18589 | 18329 | # Double-quote double-evaled strings. |
| 18590 | - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\\"" | |
| 18330 | + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\\"" | |
| 18591 | 18331 | ;; |
| 18592 | 18332 | *) |
| 18593 | 18333 | eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" |
| ... | ... | @@ -18608,6 +18348,9 @@ cfgfile="$ofile" |
| 18608 | 18348 | |
| 18609 | 18349 | # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 18610 | 18350 | |
| 18351 | +# Set the command separator (default: ~) | |
| 18352 | +_S_=\${LIBTOOL_CMD_SEP-\~} | |
| 18353 | + | |
| 18611 | 18354 | # Shell to use when invoking shell scripts. |
| 18612 | 18355 | SHELL=$lt_SHELL |
| 18613 | 18356 | |
| ... | ... | @@ -18659,7 +18402,7 @@ LN_S=$lt_LN_S |
| 18659 | 18402 | NM=$lt_NM |
| 18660 | 18403 | |
| 18661 | 18404 | # A symbol stripping program |
| 18662 | -STRIP=$lt_STRIP | |
| 18405 | +STRIP=$STRIP | |
| 18663 | 18406 | |
| 18664 | 18407 | # Used to examine libraries when file_magic_cmd begins "file" |
| 18665 | 18408 | MAGIC_CMD=$MAGIC_CMD |
| ... | ... | @@ -18690,7 +18433,7 @@ objext="$ac_objext" |
| 18690 | 18433 | libext="$libext" |
| 18691 | 18434 | |
| 18692 | 18435 | # Shared library suffix (normally ".so"). |
| 18693 | -shrext_cmds='$shrext_cmds' | |
| 18436 | +shrext='$shrext' | |
| 18694 | 18437 | |
| 18695 | 18438 | # Executable file suffix (normally ""). |
| 18696 | 18439 | exeext="$exeext" |
| ... | ... | @@ -18907,10 +18650,7 @@ else |
| 18907 | 18650 | # If there is no Makefile yet, we rely on a make rule to execute |
| 18908 | 18651 | # `config.status --recheck' to rerun these tests and create the |
| 18909 | 18652 | # libtool script then. |
| 18910 | - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` | |
| 18911 | - if test -f "$ltmain_in"; then | |
| 18912 | - test -f Makefile && make "$ltmain" | |
| 18913 | - fi | |
| 18653 | + test -f Makefile && make "$ltmain" | |
| 18914 | 18654 | fi |
| 18915 | 18655 | |
| 18916 | 18656 | |
| ... | ... | @@ -18994,19 +18734,278 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 18994 | 18734 | # Checks for library functions. |
| 18995 | 18735 | |
| 18996 | 18736 | # Check for range cheking option. |
| 18997 | -#RANGE_CHECK="no" | |
| 18998 | -#AC_ARG_ENABLE(range_check, | |
| 18999 | -# [ --enable-range-check performs index range checking], | |
| 19000 | -# [ RANGE_CHECK="$enableval" | |
| 19001 | -# ]) | |
| 19002 | -#if test "x$RANGE_CHECK" = "xyes"; then | |
| 19003 | -# AC_DEFINE([G_RANGE_CHECK], [1], | |
| 19004 | -# [Define if range checking should be performed]) | |
| 19005 | -#fi | |
| 18737 | +RANGE_CHECK="no" | |
| 18738 | +# Check whether --enable-range_check or --disable-range_check was given. | |
| 18739 | +if test "${enable_range_check+set}" = set; then | |
| 18740 | + enableval="$enable_range_check" | |
| 18741 | + RANGE_CHECK="$enableval" | |
| 18742 | + | |
| 18743 | +fi; | |
| 18744 | +if test "x$RANGE_CHECK" = "xyes"; then | |
| 18745 | + | |
| 18746 | +cat >>confdefs.h <<\_ACEOF | |
| 18747 | +#define G_RANGE_CHECK 1 | |
| 18748 | +_ACEOF | |
| 18749 | + | |
| 18750 | +fi | |
| 18751 | + | |
| 18752 | +# Extract the first word of "swig", so it can be a program name with args. | |
| 18753 | +set dummy swig; ac_word=$2 | |
| 18754 | +echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| 18755 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| 18756 | +if test "${ac_cv_path_SWIG+set}" = set; then | |
| 18757 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| 18758 | +else | |
| 18759 | + case $SWIG in | |
| 18760 | + [\\/]* | ?:[\\/]*) | |
| 18761 | + ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path. | |
| 18762 | + ;; | |
| 18763 | + *) | |
| 18764 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| 18765 | +for as_dir in $PATH | |
| 18766 | +do | |
| 18767 | + IFS=$as_save_IFS | |
| 18768 | + test -z "$as_dir" && as_dir=. | |
| 18769 | + for ac_exec_ext in '' $ac_executable_extensions; do | |
| 18770 | + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| 18771 | + ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" | |
| 18772 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| 18773 | + break 2 | |
| 18774 | + fi | |
| 18775 | +done | |
| 18776 | +done | |
| 18777 | + | |
| 18778 | + ;; | |
| 18779 | +esac | |
| 18780 | +fi | |
| 18781 | +SWIG=$ac_cv_path_SWIG | |
| 18782 | + | |
| 18783 | +if test -n "$SWIG"; then | |
| 18784 | + echo "$as_me:$LINENO: result: $SWIG" >&5 | |
| 18785 | +echo "${ECHO_T}$SWIG" >&6 | |
| 18786 | +else | |
| 18787 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 18788 | +echo "${ECHO_T}no" >&6 | |
| 18789 | +fi | |
| 19006 | 18790 | |
| 19007 | -# | |
| 19008 | - ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile" | |
| 19009 | 18791 | |
| 18792 | + | |
| 18793 | +if test "$SWIG"; then | |
| 18794 | + HAVE_SWIG_TRUE= | |
| 18795 | + HAVE_SWIG_FALSE='#' | |
| 18796 | +else | |
| 18797 | + HAVE_SWIG_TRUE='#' | |
| 18798 | + HAVE_SWIG_FALSE= | |
| 18799 | +fi | |
| 18800 | + | |
| 18801 | + | |
| 18802 | + | |
| 18803 | + | |
| 18804 | + | |
| 18805 | + | |
| 18806 | + | |
| 18807 | + if test -n "$PYTHON"; then | |
| 18808 | + # If the user set $PYTHON, use it and don't search something else. | |
| 18809 | + echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 | |
| 18810 | +echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6 | |
| 18811 | + prog="import sys, string | |
| 18812 | +# split strings by '.' and convert to numeric. Append some zeros | |
| 18813 | +# because we need at least 4 digits for the hex conversion. | |
| 18814 | +minver = map(int, string.split('2.2', '.')) + [0, 0, 0] | |
| 18815 | +minverhex = 0 | |
| 18816 | +for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] | |
| 18817 | +sys.exit(sys.hexversion < minverhex)" | |
| 18818 | + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 | |
| 18819 | + ($PYTHON -c "$prog") >&5 2>&5 | |
| 18820 | + ac_status=$? | |
| 18821 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 18822 | + (exit $ac_status); }; then | |
| 18823 | + echo "$as_me:$LINENO: result: yes" >&5 | |
| 18824 | +echo "${ECHO_T}yes" >&6 | |
| 18825 | +else | |
| 18826 | + { { echo "$as_me:$LINENO: error: too old" >&5 | |
| 18827 | +echo "$as_me: error: too old" >&2;} | |
| 18828 | + { (exit 1); exit 1; }; } | |
| 18829 | +fi | |
| 18830 | + | |
| 18831 | + else | |
| 18832 | + # Otherwise, try each interpreter until we find one that satisfies | |
| 18833 | + # VERSION. | |
| 18834 | + echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 | |
| 18835 | +echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6 | |
| 18836 | +if test "${am_cv_pathless_PYTHON+set}" = set; then | |
| 18837 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| 18838 | +else | |
| 18839 | + | |
| 18840 | + for am_cv_pathless_PYTHON in python python2 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do | |
| 18841 | + if test "$am_cv_pathless_PYTHON" = : ; then | |
| 18842 | + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 | |
| 18843 | +echo "$as_me: error: no suitable Python interpreter found" >&2;} | |
| 18844 | + { (exit 1); exit 1; }; } | |
| 18845 | + fi | |
| 18846 | + prog="import sys, string | |
| 18847 | +# split strings by '.' and convert to numeric. Append some zeros | |
| 18848 | +# because we need at least 4 digits for the hex conversion. | |
| 18849 | +minver = map(int, string.split('2.2', '.')) + [0, 0, 0] | |
| 18850 | +minverhex = 0 | |
| 18851 | +for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] | |
| 18852 | +sys.exit(sys.hexversion < minverhex)" | |
| 18853 | + if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 | |
| 18854 | + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 | |
| 18855 | + ac_status=$? | |
| 18856 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| 18857 | + (exit $ac_status); }; then | |
| 18858 | + break | |
| 18859 | +fi | |
| 18860 | + | |
| 18861 | + done | |
| 18862 | +fi | |
| 18863 | +echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 | |
| 18864 | +echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6 | |
| 18865 | + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. | |
| 18866 | + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. | |
| 18867 | +set dummy $am_cv_pathless_PYTHON; ac_word=$2 | |
| 18868 | +echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| 18869 | +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| 18870 | +if test "${ac_cv_path_PYTHON+set}" = set; then | |
| 18871 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| 18872 | +else | |
| 18873 | + case $PYTHON in | |
| 18874 | + [\\/]* | ?:[\\/]*) | |
| 18875 | + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. | |
| 18876 | + ;; | |
| 18877 | + *) | |
| 18878 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| 18879 | +for as_dir in $PATH | |
| 18880 | +do | |
| 18881 | + IFS=$as_save_IFS | |
| 18882 | + test -z "$as_dir" && as_dir=. | |
| 18883 | + for ac_exec_ext in '' $ac_executable_extensions; do | |
| 18884 | + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| 18885 | + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" | |
| 18886 | + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| 18887 | + break 2 | |
| 18888 | + fi | |
| 18889 | +done | |
| 18890 | +done | |
| 18891 | + | |
| 18892 | + ;; | |
| 18893 | +esac | |
| 18894 | +fi | |
| 18895 | +PYTHON=$ac_cv_path_PYTHON | |
| 18896 | + | |
| 18897 | +if test -n "$PYTHON"; then | |
| 18898 | + echo "$as_me:$LINENO: result: $PYTHON" >&5 | |
| 18899 | +echo "${ECHO_T}$PYTHON" >&6 | |
| 18900 | +else | |
| 18901 | + echo "$as_me:$LINENO: result: no" >&5 | |
| 18902 | +echo "${ECHO_T}no" >&6 | |
| 18903 | +fi | |
| 18904 | + | |
| 18905 | + fi | |
| 18906 | + | |
| 18907 | + | |
| 18908 | + | |
| 18909 | + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 | |
| 18910 | +echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 | |
| 18911 | +if test "${am_cv_python_version+set}" = set; then | |
| 18912 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| 18913 | +else | |
| 18914 | + am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` | |
| 18915 | +fi | |
| 18916 | +echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 | |
| 18917 | +echo "${ECHO_T}$am_cv_python_version" >&6 | |
| 18918 | + PYTHON_VERSION=$am_cv_python_version | |
| 18919 | + | |
| 18920 | + | |
| 18921 | + | |
| 18922 | + PYTHON_PREFIX='${prefix}' | |
| 18923 | + | |
| 18924 | + PYTHON_EXEC_PREFIX='${exec_prefix}' | |
| 18925 | + | |
| 18926 | + | |
| 18927 | + | |
| 18928 | + echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 | |
| 18929 | +echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 | |
| 18930 | +if test "${am_cv_python_platform+set}" = set; then | |
| 18931 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| 18932 | +else | |
| 18933 | + am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` | |
| 18934 | +fi | |
| 18935 | +echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 | |
| 18936 | +echo "${ECHO_T}$am_cv_python_platform" >&6 | |
| 18937 | + PYTHON_PLATFORM=$am_cv_python_platform | |
| 18938 | + | |
| 18939 | + | |
| 18940 | + | |
| 18941 | + | |
| 18942 | + | |
| 18943 | + pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages | |
| 18944 | + | |
| 18945 | + | |
| 18946 | + | |
| 18947 | + pkgpythondir=\${pythondir}/$PACKAGE | |
| 18948 | + | |
| 18949 | + | |
| 18950 | + | |
| 18951 | + pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages | |
| 18952 | + | |
| 18953 | + | |
| 18954 | + | |
| 18955 | + pkgpyexecdir=\${pyexecdir}/$PACKAGE | |
| 18956 | + | |
| 18957 | + | |
| 18958 | + | |
| 18959 | + | |
| 18960 | +if test "$PYTHON"; then | |
| 18961 | + HAVE_PYTHON_TRUE= | |
| 18962 | + HAVE_PYTHON_FALSE='#' | |
| 18963 | +else | |
| 18964 | + HAVE_PYTHON_TRUE='#' | |
| 18965 | + HAVE_PYTHON_FALSE= | |
| 18966 | +fi | |
| 18967 | + | |
| 18968 | + | |
| 18969 | +# Check whether --enable-python-binding or --disable-python-binding was given. | |
| 18970 | +if test "${enable_python_binding+set}" = set; then | |
| 18971 | + enableval="$enable_python_binding" | |
| 18972 | + ac_enable_python_binding=yes | |
| 18973 | +else | |
| 18974 | + ac_enable_python_binding=no | |
| 18975 | +fi; | |
| 18976 | +if test "x$ac_enable_python_binding" = "xyes" | |
| 18977 | +then | |
| 18978 | + if test ! "$SWIG" -a ! "$PYTHON" | |
| 18979 | + then | |
| 18980 | + { echo "$as_me:$LINENO: WARNING: Python binding for soothsayer cannot be built. Ensure that SWIG and Python packages are available." >&5 | |
| 18981 | +echo "$as_me: WARNING: Python binding for soothsayer cannot be built. Ensure that SWIG and Python packages are available." >&2;} | |
| 18982 | + fi | |
| 18983 | +else | |
| 18984 | + { echo "$as_me:$LINENO: Python binding for soothsayer will not be built." >&5 | |
| 18985 | +echo "$as_me: Python binding for soothsayer will not be built." >&6;} | |
| 18986 | + { echo "$as_me:$LINENO: Enable Python binding module building with --enable-python-binding" >&5 | |
| 18987 | +echo "$as_me: Enable Python binding module building with --enable-python-binding" >&6;} | |
| 18988 | +fi | |
| 18989 | + | |
| 18990 | + | |
| 18991 | +if test "x$ac_enable_python_binding" = "xyes"; then | |
| 18992 | + ENABLE_PYTHON_BINDING_TRUE= | |
| 18993 | + ENABLE_PYTHON_BINDING_FALSE='#' | |
| 18994 | +else | |
| 18995 | + ENABLE_PYTHON_BINDING_TRUE='#' | |
| 18996 | + ENABLE_PYTHON_BINDING_FALSE= | |
| 18997 | +fi | |
| 18998 | + | |
| 18999 | + | |
| 19000 | +# Checks for SWIG | |
| 19001 | +#AM_PATH_PYTHON(2.2) | |
| 19002 | +#AC_PROG_SWIG(1.3.0) | |
| 19003 | +#SWIG_ENABLE_CXX | |
| 19004 | +#SWIG_PYTHON | |
| 19005 | + | |
| 19006 | +# | |
| 19007 | +#AC_CONFIG_FILES([Makefile src/Makefile test/Makefile pyext/Makefile]) | |
| 19008 | + ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile pyext/Makefile pyext/setup.py" | |
| 19010 | 19009 | cat >confcache <<\_ACEOF |
| 19011 | 19010 | # This file is a shell script that caches the results of configure |
| 19012 | 19011 | # tests run on this system so they can be shared between configure |
| ... | ... | @@ -19098,6 +19097,34 @@ LIBOBJS=$ac_libobjs |
| 19098 | 19097 | LTLIBOBJS=$ac_ltlibobjs |
| 19099 | 19098 | |
| 19100 | 19099 | |
| 19100 | +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | |
| 19101 | + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. | |
| 19102 | +Usually this means the macro was only invoked conditionally." >&5 | |
| 19103 | +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. | |
| 19104 | +Usually this means the macro was only invoked conditionally." >&2;} | |
| 19105 | + { (exit 1); exit 1; }; } | |
| 19106 | +fi | |
| 19107 | +if test -z "${HAVE_SWIG_TRUE}" && test -z "${HAVE_SWIG_FALSE}"; then | |
| 19108 | + { { echo "$as_me:$LINENO: error: conditional \"HAVE_SWIG\" was never defined. | |
| 19109 | +Usually this means the macro was only invoked conditionally." >&5 | |
| 19110 | +echo "$as_me: error: conditional \"HAVE_SWIG\" was never defined. | |
| 19111 | +Usually this means the macro was only invoked conditionally." >&2;} | |
| 19112 | + { (exit 1); exit 1; }; } | |
| 19113 | +fi | |
| 19114 | +if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then | |
| 19115 | + { { echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined. | |
| 19116 | +Usually this means the macro was only invoked conditionally." >&5 | |
| 19117 | +echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined. | |
| 19118 | +Usually this means the macro was only invoked conditionally." >&2;} | |
| 19119 | + { (exit 1); exit 1; }; } | |
| 19120 | +fi | |
| 19121 | +if test -z "${ENABLE_PYTHON_BINDING_TRUE}" && test -z "${ENABLE_PYTHON_BINDING_FALSE}"; then | |
| 19122 | + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON_BINDING\" was never defined. | |
| 19123 | +Usually this means the macro was only invoked conditionally." >&5 | |
| 19124 | +echo "$as_me: error: conditional \"ENABLE_PYTHON_BINDING\" was never defined. | |
| 19125 | +Usually this means the macro was only invoked conditionally." >&2;} | |
| 19126 | + { (exit 1); exit 1; }; } | |
| 19127 | +fi | |
| 19101 | 19128 | |
| 19102 | 19129 | : ${CONFIG_STATUS=./config.status} |
| 19103 | 19130 | ac_clean_files_save=$ac_clean_files |
| ... | ... | @@ -19535,6 +19562,8 @@ do |
| 19535 | 19562 | "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
| 19536 | 19563 | "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; |
| 19537 | 19564 | "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; |
| 19565 | + "pyext/Makefile" ) CONFIG_FILES="$CONFIG_FILES pyext/Makefile" ;; | |
| 19566 | + "pyext/setup.py" ) CONFIG_FILES="$CONFIG_FILES pyext/setup.py" ;; | |
| 19538 | 19567 | "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; |
| 19539 | 19568 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
| 19540 | 19569 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
| ... | ... | @@ -19623,7 +19652,6 @@ s,@LIBS@,$LIBS,;t t |
| 19623 | 19652 | s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t |
| 19624 | 19653 | s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t |
| 19625 | 19654 | s,@INSTALL_DATA@,$INSTALL_DATA,;t t |
| 19626 | -s,@CYGPATH_W@,$CYGPATH_W,;t t | |
| 19627 | 19655 | s,@PACKAGE@,$PACKAGE,;t t |
| 19628 | 19656 | s,@VERSION@,$VERSION,;t t |
| 19629 | 19657 | s,@ACLOCAL@,$ACLOCAL,;t t |
| ... | ... | @@ -19631,17 +19659,16 @@ s,@AUTOCONF@,$AUTOCONF,;t t |
| 19631 | 19659 | s,@AUTOMAKE@,$AUTOMAKE,;t t |
| 19632 | 19660 | s,@AUTOHEADER@,$AUTOHEADER,;t t |
| 19633 | 19661 | s,@MAKEINFO@,$MAKEINFO,;t t |
| 19662 | +s,@AMTAR@,$AMTAR,;t t | |
| 19634 | 19663 | s,@install_sh@,$install_sh,;t t |
| 19635 | 19664 | s,@STRIP@,$STRIP,;t t |
| 19636 | 19665 | s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t |
| 19637 | 19666 | s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t |
| 19638 | -s,@mkdir_p@,$mkdir_p,;t t | |
| 19639 | 19667 | s,@AWK@,$AWK,;t t |
| 19640 | 19668 | s,@SET_MAKE@,$SET_MAKE,;t t |
| 19641 | -s,@am__leading_dot@,$am__leading_dot,;t t | |
| 19642 | -s,@AMTAR@,$AMTAR,;t t | |
| 19643 | -s,@am__tar@,$am__tar,;t t | |
| 19644 | -s,@am__untar@,$am__untar,;t t | |
| 19669 | +s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t | |
| 19670 | +s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t | |
| 19671 | +s,@MAINT@,$MAINT,;t t | |
| 19645 | 19672 | s,@CXX@,$CXX,;t t |
| 19646 | 19673 | s,@CXXFLAGS@,$CXXFLAGS,;t t |
| 19647 | 19674 | s,@LDFLAGS@,$LDFLAGS,;t t |
| ... | ... | @@ -19674,6 +19701,22 @@ s,@F77@,$F77,;t t |
| 19674 | 19701 | s,@FFLAGS@,$FFLAGS,;t t |
| 19675 | 19702 | s,@ac_ct_F77@,$ac_ct_F77,;t t |
| 19676 | 19703 | s,@LIBTOOL@,$LIBTOOL,;t t |
| 19704 | +s,@SWIG@,$SWIG,;t t | |
| 19705 | +s,@HAVE_SWIG_TRUE@,$HAVE_SWIG_TRUE,;t t | |
| 19706 | +s,@HAVE_SWIG_FALSE@,$HAVE_SWIG_FALSE,;t t | |
| 19707 | +s,@PYTHON@,$PYTHON,;t t | |
| 19708 | +s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t | |
| 19709 | +s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t | |
| 19710 | +s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t | |
| 19711 | +s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t | |
| 19712 | +s,@pythondir@,$pythondir,;t t | |
| 19713 | +s,@pkgpythondir@,$pkgpythondir,;t t | |
| 19714 | +s,@pyexecdir@,$pyexecdir,;t t | |
| 19715 | +s,@pkgpyexecdir@,$pkgpyexecdir,;t t | |
| 19716 | +s,@HAVE_PYTHON_TRUE@,$HAVE_PYTHON_TRUE,;t t | |
| 19717 | +s,@HAVE_PYTHON_FALSE@,$HAVE_PYTHON_FALSE,;t t | |
| 19718 | +s,@ENABLE_PYTHON_BINDING_TRUE@,$ENABLE_PYTHON_BINDING_TRUE,;t t | |
| 19719 | +s,@ENABLE_PYTHON_BINDING_FALSE@,$ENABLE_PYTHON_BINDING_FALSE,;t t | |
| 19677 | 19720 | s,@LIBOBJS@,$LIBOBJS,;t t |
| 19678 | 19721 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t |
| 19679 | 19722 | CEOF |
| ... | ... | @@ -20135,29 +20178,13 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} |
| 20135 | 20178 | cat $tmp/config.h |
| 20136 | 20179 | rm -f $tmp/config.h |
| 20137 | 20180 | fi |
| 20138 | -# Compute $ac_file's index in $config_headers. | |
| 20139 | -_am_stamp_count=1 | |
| 20140 | -for _am_header in $config_headers :; do | |
| 20141 | - case $_am_header in | |
| 20142 | - $ac_file | $ac_file:* ) | |
| 20143 | - break ;; | |
| 20144 | - * ) | |
| 20145 | - _am_stamp_count=`expr $_am_stamp_count + 1` ;; | |
| 20181 | + # Run the commands associated with the file. | |
| 20182 | + case $ac_file in | |
| 20183 | + config.h ) # update the timestamp | |
| 20184 | +echo 'timestamp for config.h' >"./stamp-h1" | |
| 20185 | + ;; | |
| 20146 | 20186 | esac |
| 20147 | 20187 | done |
| 20148 | -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || | |
| 20149 | -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| 20150 | - X$ac_file : 'X\(//\)[^/]' \| \ | |
| 20151 | - X$ac_file : 'X\(//\)$' \| \ | |
| 20152 | - X$ac_file : 'X\(/\)' \| \ | |
| 20153 | - . : '\(.\)' 2>/dev/null || | |
| 20154 | -echo X$ac_file | | |
| 20155 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| 20156 | - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| 20157 | - /^X\(\/\/\)$/{ s//\1/; q; } | |
| 20158 | - /^X\(\/\).*/{ s//\1/; q; } | |
| 20159 | - s/.*/./; q'`/stamp-h$_am_stamp_count | |
| 20160 | -done | |
| 20161 | 20188 | _ACEOF |
| 20162 | 20189 | |
| 20163 | 20190 | cat >>$CONFIG_STATUS <<\_ACEOF | ... | ... |
configure.ac
| ... | ... | @@ -6,7 +6,7 @@ AC_CONFIG_SRCDIR(src/GammaLib.hpp) |
| 6 | 6 | |
| 7 | 7 | AM_INIT_AUTOMAKE([gnu no-dependencies]) |
| 8 | 8 | AM_CONFIG_HEADER([config.h]) |
| 9 | -#AM_MAINTAINER_MODE | |
| 9 | +AM_MAINTAINER_MODE | |
| 10 | 10 | |
| 11 | 11 | # things required by automake |
| 12 | 12 | # AC_ARG_PROGRAM |
| ... | ... | @@ -46,16 +46,49 @@ AC_PROG_LIBTOOL |
| 46 | 46 | # Checks for library functions. |
| 47 | 47 | |
| 48 | 48 | # Check for range cheking option. |
| 49 | -#RANGE_CHECK="no" | |
| 50 | -#AC_ARG_ENABLE(range_check, | |
| 51 | -# [ --enable-range-check performs index range checking], | |
| 52 | -# [ RANGE_CHECK="$enableval" | |
| 53 | -# ]) | |
| 54 | -#if test "x$RANGE_CHECK" = "xyes"; then | |
| 55 | -# AC_DEFINE([G_RANGE_CHECK], [1], | |
| 56 | -# [Define if range checking should be performed]) | |
| 57 | -#fi | |
| 49 | +RANGE_CHECK="no" | |
| 50 | +AC_ARG_ENABLE(range_check, | |
| 51 | + [ --enable-range-check performs index range checking], | |
| 52 | + [ RANGE_CHECK="$enableval" | |
| 53 | + ]) | |
| 54 | +if test "x$RANGE_CHECK" = "xyes"; then | |
| 55 | + AC_DEFINE([G_RANGE_CHECK], [1], | |
| 56 | + [Define if range checking should be performed]) | |
| 57 | +fi | |
| 58 | + | |
| 59 | +dnl =============== | |
| 60 | +dnl Checks for SWIG | |
| 61 | +dnl =============== | |
| 62 | +AC_PATH_PROG([SWIG], [swig]) | |
| 63 | +AM_CONDITIONAL(HAVE_SWIG, test "$SWIG") | |
| 64 | + | |
| 65 | + | |
| 66 | +dnl ================= | |
| 67 | +dnl Checks for Python | |
| 68 | +dnl ================= | |
| 69 | +AM_PATH_PYTHON([2.2], | |
| 70 | + [], | |
| 71 | + [AC_MSG_WARN([Python not found. Python is required to build soothsayer python binding. Python can be obtained from http://www.python.org])]) | |
| 72 | +AM_CONDITIONAL(HAVE_PYTHON, test "$PYTHON") | |
| 73 | + | |
| 74 | +AC_ARG_ENABLE([python-binding], | |
| 75 | + AS_HELP_STRING([--enable-python-binding], | |
| 76 | + [build python binding (default=no]), | |
| 77 | + [ac_enable_python_binding=yes], | |
| 78 | + [ac_enable_python_binding=no]) | |
| 79 | +if test "x$ac_enable_python_binding" = "xyes" | |
| 80 | +then | |
| 81 | + if test ! "$SWIG" -a ! "$PYTHON" | |
| 82 | + then | |
| 83 | + AC_MSG_WARN([Python binding for gammalib cannot be built. Ensure that SWIG and Python packages are available.]) | |
| 84 | + fi | |
| 85 | +else | |
| 86 | + AC_MSG_NOTICE([Python binding for gammalib will not be built.]) | |
| 87 | + AC_MSG_NOTICE([Enable Python binding module building with --enable-python-binding]) | |
| 88 | +fi | |
| 89 | +AM_CONDITIONAL(ENABLE_PYTHON_BINDING, test "x$ac_enable_python_binding" = "xyes") | |
| 90 | + | |
| 58 | 91 | |
| 59 | 92 | # |
| 60 | -AC_CONFIG_FILES([Makefile src/Makefile test/Makefile]) | |
| 61 | -AC_OUTPUT | |
| 93 | +#AC_CONFIG_FILES([Makefile src/Makefile test/Makefile pyext/Makefile]) | |
| 94 | +AC_OUTPUT([Makefile src/Makefile test/Makefile pyext/Makefile pyext/setup.py]) | ... | ... |
doc/gammalib_um.tex
| 1 | -%---------------------------------------------------------------------------- % GammaLib User Manual % % Version .........: 0.0.0 % Last modification: 26 October 2006 %---------------------------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Definitions for manual package %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\task}{\mbox{GammaLib}} \newcommand{\this}{\mbox{\tt \task}} \newcommand{\version}{\mbox{0.0.0}} \newcommand{\calendar}{\mbox{26 October 2006}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Document definition %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass{article}[12pt,a4] \usepackage{epsfig} \usepackage{manual} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Begin of document body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} \frontpage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Introduction %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Introduction} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Motivation} Again another library? Indeed, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Philisophy} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Implementation} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % GammaLib objects %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{\this\ objects} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Vectors and matrices} %---------------------------------------------------------------------------- \subsubsection{General} Most of the calculations that are needed in data analysis can be expressed as vector and matrix operations. For this reason, \this\ provides a vector and matrix package that is implemeted as the {\tt GVector} and the {\tt GMatrix} classes. %---------------------------------------------------------------------------- \subsubsection{Matrix storage classes} The matrix base class is {\tt GMatrix} which stores all elements of the matrix (including zeros) in a full array. The full array has the dimensions {\tt rows} $\times$ {\tt cols}, matrix elements are stored in column major format. Derived matrix classes exist for more compact storage modes, reducing the memory requirements for handling and storing the information. {\tt GSymMatrix} symmetric matrix. {\tt GSparseMatrix} sparse matrix. The following description of the matrix class properties apply to all matrix storage classes, if not stated otherwise. %---------------------------------------------------------------------------- \subsubsection{Matrix arithmetics} {\tt GMatrix} and its derived objects can be added, subtracted, scaled and negated, very much as other data types. The following code fragment illustrates the usage: \begin{verbatim} // Matrix allocation GMatrix A(2,3); GMatrix B(3,2); GMatrix C(2,2); GMatrix D(2,2); // Element assignment A(0,0) = A(1,1) = A(1,2) = 1.0; B(0,0) = B(1,1) = B(2,1) = 1.0; D(0,0) = D(1,1) = 1.0; // Arithmetics C = A * B; // Matrix multiplication D = C; // Assignment C = C * 2.0; // Multiplication of all matrix elements by 2.0 D = D + D - C; // Matrix addition and subtraction C = -D; // Negation of all matrix elements A *= 5.0; // Multiplication of all matrix elements by 5.0 \end{verbatim} Matrix allocation requires {\bf always} the specification of the number of rows and columns of the matrix. This means that there is no such thing as a matrix object with zero rows or columns. All matrix elements are initialised to 0.0 by the matrix allocation. Matrix elements are accessed by the {\tt matrix(row,col)} function, where {\tt row} and {\tt col} start from 0 for the first row or column and run up to the number of rows or columns minus 1. Matrix arithmetics comprise binary operators {\tt C = A operator B} and unary operators {\tt C operator A}. {\tt A} and {\tt B} may be either {\tt GMatrix} (or derived) objects or {\tt double} values. The following fundamental operations exist for all matrices: \begin{verbatim} C = A + B; // Matrix addition C = A - B; // Matrix subtraction C = A * B; // Matrix multiplication C = A * v; // Matrix vector multiplication C = A * s; // Matrix scalar multiplication C = s * A; // Matrix scalar multiplication (left sided) C = A * s; // Matrix scalar multiplication (right sided) C = A / s; // Matrix scalar division C = -A; // Negation A += B; // Matrix inplace addition A -= B; // Matrix inplace subtraction A *= B; // Matrix inplace multiplications A *= s; // Matrix inplace scalar multiplication A /= s; // Matrix inplace scalar division \end{verbatim} Note that all {\bf inplace operations}, such as the {\tt +=}, {\tt -=}, {\tt *=}, and {\tt /=} operators do not require the allocation of additional memory to hold the matrix result elements, hence inplace operations may be preferable if memory requirements are an issue. Matrices may be compared to each other using \begin{verbatim} int identical = (A == B); // True if all matrix elements are identical // and if the matrices have identical dimensions int different = (A != B); // True if at least one matrix element differs // or if the matrices have different dimensions \end{verbatim} %---------------------------------------------------------------------------- \subsubsection{Matrix functions} Matrix attributes: \begin{verbatim} unsigned rows = M.rows(); // Returns number of rows in matrix unsigned cols = M.cols(); // Returns number of columns in matrix \end{verbatim} Matrix information: \begin{verbatim} double sum = M.sum(); // Sum of all elements in matrix double min = M.min(); // Returns minimum element of matrix double max = M.max(); // Returns maximum element of matrix \end{verbatim} %---------------------------------------------------------------------------- \subsubsection{Matrix factorisations} A general tool of numeric matrix calculs is factorisation. Solve linear equation {\tt Ax = b}. Inverse a matrix (by solving successively {\tt Ax = e}, where {\tt e} are the unit vectors for all dimensions). % \paragraph{Matrix factorisations} For symmetric and positive definite matrices the most efficient factorisation is the Cholesky decomposition. The following code fragment illustrates the usage: \begin{verbatim} GMatrix A(n_rows, n_cols}; GVector x(n_rows}; GVector b(n_rows}; ... A.cholesky_decompose(); // Perform Cholesky factorisation x = A.cholesky_solver(b); // Solve Ax=b for x \end{verbatim} Note that once the function {\tt A.cholesky\_decompose()} has been applied, the original matrix content has been replaced by its Cholesky decomposition. Since the Cholesky decomposition can be performed inplace (i.e. without the allocation of additional memory to hold the result), the matrix replacement is most memory economic. In case that the original matrix should be kept, one may either copy it before into another {\tt GMatrix} object or use the function \begin{verbatim} GMatrix L = cholesky_decompose(A); x = L.cholesky_solver(b); \end{verbatim} A symmetric and positif definite matrix can be inverted using the Cholesky decomposition using \begin{verbatim} A.cholesky_invert(); // Inverse matrix using Cholesky factorisation \end{verbatim} Alternatively, the function \begin{verbatim} GMatrix A_inv = cholesky_invert(A); \end{verbatim} may be used. The Cholesky decomposition, solver and inversion routines may also be applied to matrices that contain rows or columns that are filled by zeros. In this case the functions provide the option to (logically) compress the matrices by skipping the zero rows and columns during the calculation. For compressed matrix Cholesky factorisation, only the non-zero rows and columns have to be symmetric and positive definite. In particular, the full matrix may even be non-symmetric. %---------------------------------------------------------------------------- \subsubsection{Sparse matrix} %%%%% \paragraph{General} \this\ provides a sparse matrix storage type that can save considerable amounts of memory for calculations. Assigment possible. The only exception that does not work is \begin{verbatim} GSparseMatrix A; A(0,0) = A(1,1) = A(2,2) = 1.0; \end{verbatim} In this case the value {\tt 1.0} is only assigned to the last element, i.e. {\tt A(2,2)}. Inverting a sparse matrix produces in general a full matrix, so the inversion function should be used with caution. Note that a full matrix that is stored in sparse format takes roughly twice the memory than a normal {\tt GMatrix} object. If nevertheless the inverse of a sparse matrix should be examined, it is recommended to perform the analysis column-wise: \begin{verbatim} GSparseMatrix A(rows,cols); // Allocate sparse matrix GVector unit(rows); // Allocate vector ... A.cholesky_decompose(); // Factorise matrix // Column-wise solving the matrix equation for (int col = 0; col < m_cols; ++col) { unit(col) = 1.0; // Set unit vector GVector x = cholesky_solver(unit); // Get column x of inverse ... unit(col) = 0.0; // Clear unit vector for next round } \end{verbatim} %%%%% \paragraph{Filling of a sparse matrix} The filling of a sparse matrix is a tricky issue since the storage of the elements depends on their distribution in the matrix. If one would know beforehand this distribution, sparse matrix filling would be easy and fast. In general, however, the distribution is not known a priori, and matrix filling may become a quite time consuming task. If a matrix has to be filled element by element, the access through the operator \begin{verbatim} m(row,col) = value; \end{verbatim} may be mandatory. In principle, if a new element is inserted into a matrix a new memory cell has to be allocated for this element, and other elements may be moved. Memory allocation is quite time consuming, and to reduce the overhead, {\tt GSparseMatrix} can be configured to allocate memory in bunches. By default, each time more matrix memory is needed, {\tt GSparseMatrix} allocates 512 cells at once (or 6144 Bytes since each element requires a {\tt double} and a {\tt int} storage location). If this amount of memory is not adequat one may change this value by using \begin{verbatim} m.set_mem_block(size); \end{verbatim} where {\tt size} is the number of matrix elements that should be allocated at once (corresponding to a total memory of $12 \times {\tt size}$ Bytes). Alternatively, a matrix may be filled column-wise using the functions \begin{verbatim} m.insert_col(vector,col); // Insert a vector in column m.add_col(vector,col); // Add content of a vector to column \end{verbatim} While {\tt insert\_col} sets the values of column {\tt col} (deleting thus any previously existing entries), {\tt add\_col} adds the content of {\tt vector} to all elements of column {\tt col}. Using these functions is considerably more rapid than filling individual values. Still, if the matrix is big (i.e. severeal thousands of rows and columns), filling individual columns may still be slow. To speed-up dynamical matrix filling, an internal fill-stack has been implemented in {\tt GSparseMatrix}. Instead of inserting values column-by-column, the columns are stored in a stack and filled into the matrix once the stack is full. This reduces the number of dynamic memory allocations to let the matrix grow as it is built. By default, the internal stack is disabled. The stack can be enabled and used as follows: \begin{verbatim} m.stack_init(size, entries); // Initialise stack ... m.add_col(vector,col); // Add columns ... m.stack_destroy(); // Flush and destory stack \end{verbatim} The method {\tt stack\_init} initialises a stack with a number of {\tt size} elements and a maximum of {\tt entries} columns. The larger the values {\tt size} and {\tt entries} are chosen, the more efficient the stack works. The total amount of memory of the stack can be estimated as $12 \times {\tt size} + 8 \times {\tt entries}$ Bytes. If a rough estimate of the total number of non-zero elements is available it is recommended to set {\tt size} to this value. As a rule of thumb, {\tt size} should be at least of the dimension of either the number of rows or the number of columns of the matrix (take the maximum of both). {\tt entries} is best set to the number of columns of the matrix. If memory limits are an issue smaller values may be set, but if the values are too small, the speed increase may become negligible (or even, stack-filling may become slower than normal filling). Stack-filling only works with the method {\tt add\_col}. Note also that filling sub-sequently the same row leads to stack flushing, so if the same column is filled in a loop, i.e. \begin{verbatim} for (int col = 0; col < 100; ++col) { column = 0.0; // Reset column column(i) = i; // Set column m.add_col(column,col); // Add column } \end{verbatim} it is better to fill the column before adding, i.e. \begin{verbatim} column = 0.0; // Reset column for (int col = 0; col < 100; ++col) column(i) = i; // Set column \end{verbatim} The method {\tt add\_col} calls the method {\tt stack\_push\_column} for stack filling. {\tt add\_col} is more general than {\tt stack\_push\_column} in that it decides which of stack- or direct filling is more adequate. In particular, {\tt stack\_push\_column} may refuse pushing a column onto the stack if there is not enough space. In that case, {\tt stack\_push\_column} returns a non-zero value that corresponds to the number of non-zero elements in the vector that should be added. However, it is recommended to not use {\tt stack\_push\_column} and call instead {\tt add\_col}. The method {\tt stack\_destroy} is used to flush and destroy the stack. After this call the stack memory is liberated. If the stack should be flushed without destroying it, the method {\tt stack\_flush} may be used: \begin{verbatim} m.stack_init(size, entries); // Initialise stack ... m.add_col(vector,col); // Add columns ... m.stack_flush(); // Simply flush stack \end{verbatim} Once flushed, the stack can be filled anew. Note that stack flushing is not automatic! This means, if one trys to use a matrix for calculs without flushing, the calculs may be work. {\bf If a stack is used for filling, always flush the stack before using the matrix.} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Code reference %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \clearpage \section{Code reference} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{{\tt GVector}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{{\tt GMatrix}} \end{document} | |
| 2 | 1 | \ No newline at end of file |
| 2 | +%---------------------------------------------------------------------------- % GammaLib User Manual % % Version .........: 0.1pre % Last modification: 2 November 2006 %---------------------------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Definitions for manual package %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\task}{\mbox{GammaLib}} \newcommand{\this}{\mbox{\tt \task}} \newcommand{\version}{\mbox{0.1pre}} \newcommand{\calendar}{\mbox{2 November 2006}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Document definition %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass{article}[12pt,a4] \usepackage{epsfig} \usepackage{manual} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Begin of document body %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} \frontpage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Introduction %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Introduction} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Motivation} Again another library for scientific calculus? Yes and no. \this\ indeed provides a number of functionnalities that are also found in other libraries, but \this\ goes beyond these libraries in that it provides tools that are rather specific to the analysis of high-energy astronomy data. The idea was to put everything together in one single place, limiting thus the dependencies. It all started when I was preparing the software for the scientific exploitation of the data from the SPI telescope aboard INTEGRAL. Instead of writing a number of indepedent executables, I decided to write a set of powerful C++ classes that provide the required functionalities, such as data handling, response calculation, image convolution, model fitting, etc. Analysis executables were then simple clients of these C++ classes and basically only provided the user interface. The C++ classes were designed quite general, so that it was obvious to attempt their utilisation also for the analysis of other data. However, it turned out that the SPI classes were still too spezialised for this purpose, and a new, more general library was required to fullfil my goal. I started the work when I needed sparse matrix capabilities for my SPI model fitting routines. With the ongoing INTEGRAL mission, the datasets became increasinly larger and the number of fit parameters required to model these data increased accordingly. The initial \this\ thus had vector and matrix classes which it provided to the SPI tools library. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Using \this} TBD: How to install, how to write code .. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % GammaLib objects %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{\this\ objects} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Vectors} %---------------------------------------------------------------------------- \subsubsection{General} A vector is a one-dimensional array of successive {\tt double} type values. Vectors are handled in \this\ by {\tt GVector} objects. On construction, the dimension of the vector has to be specified. In other words \begin{verbatim} GVector vector; // WRONG: constructor needs dimension \end{verbatim} is not allowed. The minimum dimension of a vector is 1, i.e. there is no such thing like an empty vector: \begin{verbatim} GVector vector(0); // WRONG: empty vector not allowed \end{verbatim} The correct allocation of a vector is done using \begin{verbatim} GVector vector(10); // Allocates a vector with 10 elements \end{verbatim} On allocation, all elements of a vector are set to 0. Vectors may also be allocated by copying from another vector \begin{verbatim} GVector vector(10); // Allocates a vector with 10 elements GVector another = vector; // Allocates another vector with 10 elements \end{verbatim} or by using \begin{verbatim} GVector vector = GVector(10); // Allocates a vector with 10 elements \end{verbatim} Vector elements are accessed using the {\tt ( )} operator: \begin{verbatim} GVector vector(10); // Allocates a vector with 10 elements for (int i = 0; i < 10; ++i) vector(i) = (i+1)*10.0; // Set elements 10, 20, ..., 100 for (int i = 0; i < 10; ++i) cout << vector(i) << endl; // Dump all elements, one by row \end{verbatim} The content of a vector may also be dumped using \begin{verbatim} cout << vector << endl; // Dump entire vector \end{verbatim} which in the above example will put the sequence \begin{verbatim} 10 20 30 40 50 60 70 80 90 100 \end{verbatim} on the screen. %---------------------------------------------------------------------------- \subsubsection{Vector arithmetics} Vectors can be very much handled like {\tt double} type variables with the difference that operations are performed on each element of the vector. The complete list of fundamental vector operators is: \begin{verbatim} c = a + b; // Vector + Vector addition c = a + s; // Vector + Scalar addition c = s + b; // Scalar + Vector addition c = a - b; // Vector - Vector subtraction c = a - s; // Vector - Scalar subtraction c = s - b; // Scalar - Vector subtraction s = a * b; // Vector * Vector multiplication (dot product) c = a * s; // Vector * Scalar multiplication c = s * b; // Scalar * Vector multiplication c = a / s; // Vector * Scalar division \end{verbatim} where {\tt a}, {\tt b} and {\tt c} are of type {\tt GVector} and {\tt s} is of type {\tt double}. Note in particular the combination of {\tt GVector} and {\tt double} type objects in addition, subtraction, multiplication and division. In these cases the specified operation is applied to each of the vector elements. It is also obvious that only vector of identicial dimension can occur in vector operations. Dimension errors can be catched by the {\tt try} - {\tt catch} functionality: \begin{verbatim} try { GVector a(10); GVector b(11); GVector c = a + b; // WRONG: Vectors have incompatible dimensions } catch (GVector::vector_mismatch &e) { cout << e.what() << endl; // Dimension exception is catched here throw; } \end{verbatim} Further vector operations are \begin{verbatim} c = a; // Vector assignment c = s; // Scalar assignment s = c(index); // Vector element access c += a; // c = c + a; c -= a; // c = c - a; c += s; // c = c + s; c -= s; // c = c - s; c *= s; // c = c * s; c /= s; // c = c / s; c = -a; // Vector negation \end{verbatim} Finally, the comparison operators \begin{verbatim} int equal = (a == b); // True if all elements equal int unequal = (a != b); // True if at least one elements unequal \end{verbatim} allow to compare all elements of a vector. If all elements are identical, the {\tt ==} operator returns true, otherwise false. If at least one element differs, the {\tt !=} operator returns true, is all elements are identical it returns false. In addition to the operators, the following mathematical functions can be applied to vectors: \begin{verbatim} acos atan exp sin tanh acosh atanh fabs sinh asin cos log sqrt asinh cosh log10 tan \end{verbatim} Again, these functions should be understood to be applied element wise. They all take a vector as argument and produce a vector as result. For example \begin{verbatim} c = sin(a); \end{verbatim} attributes the sine of each element of vector {\tt a} to vector {\tt c}. Additional implemented functions are \begin{verbatim} c = cross(a, b); // Vector cross product (for 3d only) s = norm(a); // Vector norm |a| s = min(a); // Minimum element of vector s = max(a); // Maximum element of vector s = sum(a); // Sum of vector elements \end{verbatim} Finally, a small number of vector methods have been implemented: \begin{verbatim} int n = a.size(); // Returns dimension of vector int n = a.non_zeros(); // Returns number of non-zero elements in vector \end{verbatim} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Matrixes} %---------------------------------------------------------------------------- \subsubsection{General} A matrix is a two-dimensional array of {\tt double} type values, arranged in rows and columns. Matrixes are handled in \this\ by {\tt GMatrix} objects and the derived classes {\tt GSymMatrix} and {\tt GSparseMatrix} (see section \ref{sec:matrix:storage}). On construction, the dimension of the matrix has to be specified: \begin{verbatim} GMatrix matrix(10,20); // Allocates 10 rows and 20 columns \end{verbatim} Similar to vectors, there is no such thing as a matrix without dimensions in \this. %---------------------------------------------------------------------------- \subsubsection{Matrix storage classes} \label{sec:matrix:storage} In the most general case, the {\tt rows} and {\tt columns} of a matrix are stored in a continuous array of ${\tt rows} \times {\tt columns}$ memory locations. This storage type is referred to as a {\em full matrix}, and is implemented by the class {\tt GMatrix}. Operations on full matrixes are in general relatively fast, but memory requirements may be important to hold all the elements. In general matrixes are stored by \this\ column-wise (or in column-major format). For example, the matrix \begin{verbatim} 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 \end{verbatim} is stored in memory as \begin{verbatim} | 1 6 11 | 2 7 12 | 3 8 13 | 4 9 14 | 5 10 15 | \end{verbatim} Many physical or mathematical problems treat with a subclass of matrixes that is symmetric, i.e. for which the element {\tt (row,col)} is identical to the element {\tt (col,row)}. In this case, the duplicated elements need not to be stored. The derived class {\tt GSymMatrix} implements such a storage type. {\tt GSymMatrix} stores the lower-left triangle of the matrix in column-major format. For illustration, the matrix \begin{verbatim} 1 2 3 4 2 5 6 7 3 6 8 9 4 7 9 10 \end{verbatim} is stored in memory as \begin{verbatim} | 1 2 3 4 | 5 6 7 | 8 9 | 10 | \end{verbatim} This divides the storage requirements to hold the matrix elements by almost a factor of two. Finally, quite often one has to deal with matrixes that contain a large number of zeros. Such matrixes are called {\em sparse matrixes}. If only the non-zero elements of a sparse matrix are stored the memory requirements are considerably reduced. This goes however at the expense of matrix element access, which has become now more complex. In particular, filling efficiently a sparse matrix is a non-trivial problem (see section \ref{sec:matrix:filling}). Sparse matrix storage is implemented in \this\ by the derived class {\tt GSparseMatrix}. A {\tt GSparseMatrix} object contains three one-dimensional arrays to store the matrix elements: a {\tt double} type array that contains in continuous column-major order all non-zero elements, an {\tt int} type array that contains for each non-zero element the row number of its location, and an {\tt int} type array that contains the storage location of the first non-zero element for each matrix column. To illustrate this storage format, the matrix \begin{verbatim} 1 0 0 7 2 5 0 0 3 0 6 0 4 0 0 8 \end{verbatim} is stored in memory as \begin{verbatim} | 1 2 3 4 | 5 | 6 | 7 8 | Matrix elements | 0 1 2 3 | 1 | 2 | 0 3 | Row indices for all elements | 0 | 4 | 5 | 6 | Storage location of first element of each column \end{verbatim} This example is of course not very economic, since the total number of Bytes used to store the matrix is $8 \times 8 + (8 + 4) \times 4 = 112$ Bytes, while a full $4 \times 4$ matrix is stored in $(4 \times 4) \times 8 = 128$ Bytes (recall: a {\tt double} type values takes 8 Bytes, an {\tt int} type value takes 4 Bytes). For realistic large systems, however, the gain in memory space can be dramatical. The usage of the {\tt GMatrix}, {\tt GSymMatrix} and {\tt GSparseMatrix} classes is analoguous in that they implement basically all functions and methods in an identical way. So from the semantics the user has not to worry about the storage class. However, matrix element access speeds are not identical for all storage types, and if performance is an issue (as it certainly always will be), the user has to consider matrix access more carefully (see section \ref{sec:matrix:filling}). Matrix allocation is performed using the constructors: \begin{verbatim} GMatrix A(10,20); // Full 10 x 20 matrix GSymMatrix B(10,10); // Symmetric 10 x 10 matrix GSparseMatrix C(1000,10000); // Sparse 1000 x 10000 matrix GMatrix A(0,0); // WRONG: empty matrix not allowed GSymMatrix B(20,22); // WRONG: symmetric matrix requested \end{verbatim} In the constructor, the first argument specifies the number of rows, the second the number of columns: {\tt A(row,column)}. A symmetric matrix needs of course an equal number of rows and columns. And an empty matrix is not allowed. All matrix elements are initialised to 0 by the matrix allocation. Matrix elements are accessed by the {\tt A(row,col)} function, where {\tt row} and {\tt col} start from 0 for the first row or column and run up to the number of rows or columns minus 1: \begin{verbatim} for (int row = 0; row < n_rows; ++row) { for (int col = 0; col < n_cols; ++col) A(row,col) = (row+col)/2.0; // Set value of matrix element } ... double sum2 = 0.0; for (int row = 0; row < n_rows; ++row) { for (int col = 0; col < n_cols; ++col) sum2 *= A(row,col) * A(row,col); // Get value of matrix element } \end{verbatim} The content of a matrix can be visualised using \begin{verbatim} cout << A << endl; // Dump matrix \end{verbatim} %---------------------------------------------------------------------------- \subsubsection{Matrix arithmetics} The following description of matrix arithmetics applies to all storage classes (see section \ref{sec:matrix:storage}). The following matrix operators have been implemented in \this: \begin{verbatim} C = A + B; // Matrix Matrix addition C = A - B; // Matrix Matrix subtraction C = A * B; // Matrix Matrix multiplication C = A * v; // Matrix Vector multiplication C = A * s; // Matrix Scalar multiplication C = s * A; // Scalar Matrix multiplication C = A / s; // Matrix Scalar division C = -A; // Negation A += B; // Matrix inplace addition A -= B; // Matrix inplace subtraction A *= B; // Matrix inplace multiplications A *= s; // Matrix inplace scalar multiplication A /= s; // Matrix inplace scalar division \end{verbatim} The comparison operators \begin{verbatim} int equal = (A == B); // True if all elements equal int unequal = (A != B); // True if at least one elements unequal \end{verbatim} allow to compare all elements of a matrix. If all elements are identical, the {\tt ==} operator returns true, otherwise false. If at least one element differs, the {\tt !=} operator returns true, is all elements are identical it returns false. %---------------------------------------------------------------------------- \subsubsection{Matrix methods and functions} A number of methods has been implemented to manipulate matrixes. The method \begin{verbatim} A.clear(); // Set all elements to 0 \end{verbatim} sets all elements to 0. The methods \begin{verbatim} int rows = A.rows(); // Returns number of rows in matrix int cols = A.cols(); // Returns number of columns in matrix \end{verbatim} provide access to the matrix dimensions, the methods \begin{verbatim} double sum = A.sum(); // Sum of all elements in matrix double min = A.min(); // Returns minimum element of matrix double max = A.max(); // Returns maximum element of matrix \end{verbatim} inform about some matrix properties. The methods \begin{verbatim} GVector v_row = A.extract_row(row); // Puts row in vector GVector v_column = A.extract_col(col); // Puts column in vector \end{verbatim} extract entire rows and columns from a matrix. Extraction of lower or upper triangle parts of a matrix into another is performed using \begin{verbatim} B = A.extract_lower_triangle(); // B holds lower triangle B = A.extract_upper_triangle(); // B holds upper triangle \end{verbatim} {\tt B} is of the same storage class as {\tt A}, except for the case that {\tt A} is a {\tt GSymMatrix} object. In this case, {\tt B} will be a full matrix of type {\tt GMatrix}. The methods \begin{verbatim} A.insert_col(v_col,col); // Puts vector in column A.add_col(v_col,col); // Add vector to column \end{verbatim} inserts or adds the elements of a vector into a matrix column. Note that no row insertion routines have been implemented (so far) since they would be less efficient (recall that all matrix types are stored in column-major format). Conversion from one storage type to another is performed using \begin{verbatim} B = A.convert_to_full(); // Converts A -> GMatrix B = A.convert_to_sym(); // Converts A -> GSymMatrix B = A.convert_to_sparse(); // Converts A -> GSparseMatrix \end{verbatim} Note that {\tt convert\_to\_sym()} can only be applied to a matrix that is indeed symmetric. The transpose of a matrix can be obtained by using one of \begin{verbatim} A.transpose(); // Transpose method B = transpose(A); // Transpose function \end{verbatim} The absolute value of a matrix is provided by \begin{verbatim} B = fabs(A); // B = |A| \end{verbatim} %---------------------------------------------------------------------------- \subsubsection{Matrix factorisations} A general tool of numeric matrix calculs is factorisation. Solve linear equation {\tt Ax = b}. Inverse a matrix (by solving successively {\tt Ax = e}, where {\tt e} are the unit vectors for all dimensions). For symmetric and positive definite matrices the most efficient factorisation is the Cholesky decomposition. The following code fragment illustrates the usage: \begin{verbatim} GMatrix A(n_rows, n_cols}; GVector x(n_rows}; GVector b(n_rows}; ... A.cholesky_decompose(); // Perform Cholesky factorisation x = A.cholesky_solver(b); // Solve Ax=b for x \end{verbatim} Note that once the function {\tt A.cholesky\_decompose()} has been applied, the original matrix content has been replaced by its Cholesky decomposition. Since the Cholesky decomposition can be performed inplace (i.e. without the allocation of additional memory to hold the result), the matrix replacement is most memory economic. In case that the original matrix should be kept, one may either copy it before into another {\tt GMatrix} object or use the function \begin{verbatim} GMatrix L = cholesky_decompose(A); x = L.cholesky_solver(b); \end{verbatim} A symmetric and positif definite matrix can be inverted using the Cholesky decomposition using \begin{verbatim} A.cholesky_invert(); // Inverse matrix using Cholesky fact. \end{verbatim} Alternatively, the function \begin{verbatim} GMatrix A_inv = cholesky_invert(A); \end{verbatim} may be used. The Cholesky decomposition, solver and inversion routines may also be applied to matrices that contain rows or columns that are filled by zeros. In this case the functions provide the option to (logically) compress the matrices by skipping the zero rows and columns during the calculation. For compressed matrix Cholesky factorisation, only the non-zero rows and columns have to be symmetric and positive definite. In particular, the full matrix may even be non-symmetric. %---------------------------------------------------------------------------- \subsubsection{Sparse matrixes} The only exception that does not work is \begin{verbatim} GSparseMatrix A(10,10); A(0,0) = A(1,1) = A(2,2) = 1.0; // WRONG: Cannot assign multiple at once \end{verbatim} In this case the value {\tt 1.0} is only assigned to the last element, i.e. {\tt A(2,2)}, the other elements will remain {\tt 0}. This feature has to do with the way how the compiler translates the code and how \this\ implements sparse matrix filling. {\tt GSparseMatrix} provides a pointer for a new element to be filled. Since there is only one such {\em fill pointer}, only one element can be filled at once in a statement. {\bf So it is strongly advised to avoid multiple matrix element assignment in a single row.} Better write the above code like \begin{verbatim} GSparseMatrix A; A(0,0) = 1.0; A(1,1) = 1.0; A(2,2) = 1.0; \end{verbatim} This way, element assignment works fine. Inverting a sparse matrix produces in general a full matrix, so the inversion function should be used with caution. Note that a full matrix that is stored in sparse format takes roughly twice the memory than a normal {\tt GMatrix} object. If nevertheless the inverse of a sparse matrix should be examined, it is recommended to perform the analysis column-wise: \begin{verbatim} GSparseMatrix A(rows,cols); // Allocate sparse matrix GVector unit(rows); // Allocate vector ... A.cholesky_decompose(); // Factorise matrix // Column-wise solving the matrix equation for (int col = 0; col < cols; ++col) { unit(col) = 1.0; // Set unit vector GVector x = cholesky_solver(unit); // Get column x of inverse ... unit(col) = 0.0; // Clear unit vector for next round } \end{verbatim} %---------------------------------------------------------------------------- \subsubsection{Filling sparse matrixes} \label{sec:matrix:filling} The filling of a sparse matrix is a tricky issue since the storage of the elements depends on their distribution in the matrix. If one would know beforehand this distribution, sparse matrix filling would be easy and fast. In general, however, the distribution is not known a priori, and matrix filling may become a quite time consuming task. If a matrix has to be filled element by element, the access through the operator \begin{verbatim} m(row,col) = value; \end{verbatim} may be mandatory. In principle, if a new element is inserted into a matrix a new memory cell has to be allocated for this element, and other elements may be moved. Memory allocation is quite time consuming, and to reduce the overhead, {\tt GSparseMatrix} can be configured to allocate memory in bunches. By default, each time more matrix memory is needed, {\tt GSparseMatrix} allocates 512 cells at once (or 6144 Bytes since each element requires a {\tt double} and a {\tt int} storage location). If this amount of memory is not adequat one may change this value by using \begin{verbatim} m.set_mem_block(size); \end{verbatim} where {\tt size} is the number of matrix elements that should be allocated at once (corresponding to a total memory of $12 \times {\tt size}$ Bytes). Alternatively, a matrix may be filled column-wise using the functions \begin{verbatim} m.insert_col(vector,col); // Insert a vector in column m.add_col(vector,col); // Add content of a vector to column \end{verbatim} While {\tt insert\_col} sets the values of column {\tt col} (deleting thus any previously existing entries), {\tt add\_col} adds the content of {\tt vector} to all elements of column {\tt col}. Using these functions is considerably more rapid than filling individual values. Still, if the matrix is big (i.e. severeal thousands of rows and columns), filling individual columns may still be slow. To speed-up dynamical matrix filling, an internal fill-stack has been implemented in {\tt GSparseMatrix}. Instead of inserting values column-by-column, the columns are stored in a stack and filled into the matrix once the stack is full. This reduces the number of dynamic memory allocations to let the matrix grow as it is built. By default, the internal stack is disabled. The stack can be enabled and used as follows: \begin{verbatim} m.stack_init(size, entries); // Initialise stack ... m.add_col(vector,col); // Add columns ... m.stack_destroy(); // Flush and destory stack \end{verbatim} The method {\tt stack\_init} initialises a stack with a number of {\tt size} elements and a maximum of {\tt entries} columns. The larger the values {\tt size} and {\tt entries} are chosen, the more efficient the stack works. The total amount of memory of the stack can be estimated as $12 \times {\tt size} + 8 \times {\tt entries}$ Bytes. If a rough estimate of the total number of non-zero elements is available it is recommended to set {\tt size} to this value. As a rule of thumb, {\tt size} should be at least of the dimension of either the number of rows or the number of columns of the matrix (take the maximum of both). {\tt entries} is best set to the number of columns of the matrix. If memory limits are an issue smaller values may be set, but if the values are too small, the speed increase may become negligible (or stack-filling may even become slower than normal filling). Stack-filling only works with the method {\tt add\_col}. Note also that filling sub-sequently the same column leads to stack flushing. In the code \begin{verbatim} for (int col = 0; col < 100; ++col) { column = 0.0; // Reset column column(col) = col; // Set column m.add_col(column,col); // Add column } \end{verbatim} stack flushing occurs in each loop, and consequently, the stack-filling approach will be not very efficient (it would probably be even slover than normal filling). If successive operations are to be performed on columns, it is better to perform them before adding. The code \begin{verbatim} column = 0.0; // Reset column for (int col = 0; col < 100; ++col) column(col) = col; // Set column m.add_col(column,col); // Add column \end{verbatim} would be far more efficient. A avoidable overhead occurs for the case that the column to be added is sparse. The vector may contain many zeros, and {\tt GSparseMatrix} has to filter them out. If the sparsity of the column is known, this overhead can be avoided by directly passing a compressed array to {\tt add\_col}: \begin{verbatim} int number = 5; // 5 elements in array double* values = new double[number]; // Allocate values int* rows = new int[number]; // Allocate row index ... m.stack_init(size, entries); // Initialise stack ... for (int i = 0; i < number; ++i) { // Initialise array values[i] = ... // ... set values rows[i] = ... // ... set row indices } ... m.add_col(values,rows,number,col); // Add array ... m.stack_destroy(); // Flush and destory stack ... delete [] values; // Free array delete [] rows; \end{verbatim} The method {\tt add\_col} calls the method {\tt stack\_push\_column} for stack filling. {\tt add\_col} is more general than {\tt stack\_push\_column} in that it decides which of stack- or direct filling is more adequate. In particular, {\tt stack\_push\_column} may refuse pushing a column onto the stack if there is not enough space. In that case, {\tt stack\_push\_column} returns a non-zero value that corresponds to the number of non-zero elements in the vector that should be added. However, it is recommended to not use {\tt stack\_push\_column} and call instead {\tt add\_col}. The method {\tt stack\_destroy} is used to flush and destroy the stack. After this call the stack memory is liberated. If the stack should be flushed without destroying it, the method {\tt stack\_flush} may be used: \begin{verbatim} m.stack_init(size, entries); // Initialise stack ... m.add_col(vector,col); // Add columns ... m.stack_flush(); // Simply flush stack \end{verbatim} Once flushed, the stack can be filled anew. Note that stack flushing is not automatic! This means, if one trys to use a matrix for calculs without flushing, the calculs may be wrong. {\bf If a stack is used for filling, always flush the stack before using the matrix.} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Code reference %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \clearpage \section{Code reference} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{{\tt GVector}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{{\tt GMatrix}} \end{document} | |
| 3 | 3 | \ No newline at end of file | ... | ... |
install-sh
| 1 | 1 | #!/bin/sh |
| 2 | -# install - install a program, script, or datafile | |
| 3 | - | |
| 4 | -scriptversion=2004-09-10.20 | |
| 5 | - | |
| 6 | -# This originates from X11R5 (mit/util/scripts/install.sh), which was | |
| 7 | -# later released in X11R6 (xc/config/util/install.sh) with the | |
| 8 | -# following copyright and license. | |
| 9 | -# | |
| 10 | -# Copyright (C) 1994 X Consortium | |
| 11 | -# | |
| 12 | -# Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 13 | -# of this software and associated documentation files (the "Software"), to | |
| 14 | -# deal in the Software without restriction, including without limitation the | |
| 15 | -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | |
| 16 | -# sell copies of the Software, and to permit persons to whom the Software is | |
| 17 | -# furnished to do so, subject to the following conditions: | |
| 18 | -# | |
| 19 | -# The above copyright notice and this permission notice shall be included in | |
| 20 | -# all copies or substantial portions of the Software. | |
| 21 | 2 | # |
| 22 | -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 23 | -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 24 | -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 25 | -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | |
| 26 | -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- | |
| 27 | -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
| 28 | -# | |
| 29 | -# Except as contained in this notice, the name of the X Consortium shall not | |
| 30 | -# be used in advertising or otherwise to promote the sale, use or other deal- | |
| 31 | -# ings in this Software without prior written authorization from the X Consor- | |
| 32 | -# tium. | |
| 3 | +# install - install a program, script, or datafile | |
| 4 | +# This comes from X11R5 (mit/util/scripts/install.sh). | |
| 33 | 5 | # |
| 6 | +# Copyright 1991 by the Massachusetts Institute of Technology | |
| 34 | 7 | # |
| 35 | -# FSF changes to this file are in the public domain. | |
| 8 | +# Permission to use, copy, modify, distribute, and sell this software and its | |
| 9 | +# documentation for any purpose is hereby granted without fee, provided that | |
| 10 | +# the above copyright notice appear in all copies and that both that | |
| 11 | +# copyright notice and this permission notice appear in supporting | |
| 12 | +# documentation, and that the name of M.I.T. not be used in advertising or | |
| 13 | +# publicity pertaining to distribution of the software without specific, | |
| 14 | +# written prior permission. M.I.T. makes no representations about the | |
| 15 | +# suitability of this software for any purpose. It is provided "as is" | |
| 16 | +# without express or implied warranty. | |
| 36 | 17 | # |
| 37 | 18 | # Calling this script install-sh is preferred over install.sh, to prevent |
| 38 | 19 | # `make' implicit rules from creating a file called install from it |
| ... | ... | @@ -42,11 +23,13 @@ scriptversion=2004-09-10.20 |
| 42 | 23 | # from scratch. It can only install one file at a time, a restriction |
| 43 | 24 | # shared with many OS's install programs. |
| 44 | 25 | |
| 26 | + | |
| 45 | 27 | # set DOITPROG to echo to test this script |
| 46 | 28 | |
| 47 | 29 | # Don't use :- since 4.3BSD and earlier shells don't like it. |
| 48 | 30 | doit="${DOITPROG-}" |
| 49 | 31 | |
| 32 | + | |
| 50 | 33 | # put in absolute paths if you don't have them in your path; or use env. vars. |
| 51 | 34 | |
| 52 | 35 | mvprog="${MVPROG-mv}" |
| ... | ... | @@ -58,265 +41,211 @@ stripprog="${STRIPPROG-strip}" |
| 58 | 41 | rmprog="${RMPROG-rm}" |
| 59 | 42 | mkdirprog="${MKDIRPROG-mkdir}" |
| 60 | 43 | |
| 44 | +transformbasename="" | |
| 45 | +transform_arg="" | |
| 46 | +instcmd="$mvprog" | |
| 61 | 47 | chmodcmd="$chmodprog 0755" |
| 62 | -chowncmd= | |
| 63 | -chgrpcmd= | |
| 64 | -stripcmd= | |
| 48 | +chowncmd="" | |
| 49 | +chgrpcmd="" | |
| 50 | +stripcmd="" | |
| 65 | 51 | rmcmd="$rmprog -f" |
| 66 | 52 | mvcmd="$mvprog" |
| 67 | -src= | |
| 68 | -dst= | |
| 69 | -dir_arg= | |
| 70 | -dstarg= | |
| 71 | -no_target_directory= | |
| 72 | - | |
| 73 | -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE | |
| 74 | - or: $0 [OPTION]... SRCFILES... DIRECTORY | |
| 75 | - or: $0 [OPTION]... -t DIRECTORY SRCFILES... | |
| 76 | - or: $0 [OPTION]... -d DIRECTORIES... | |
| 77 | - | |
| 78 | -In the 1st form, copy SRCFILE to DSTFILE. | |
| 79 | -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. | |
| 80 | -In the 4th, create DIRECTORIES. | |
| 81 | - | |
| 82 | -Options: | |
| 83 | --c (ignored) | |
| 84 | --d create directories instead of installing files. | |
| 85 | --g GROUP $chgrpprog installed files to GROUP. | |
| 86 | --m MODE $chmodprog installed files to MODE. | |
| 87 | --o USER $chownprog installed files to USER. | |
| 88 | --s $stripprog installed files. | |
| 89 | --t DIRECTORY install into DIRECTORY. | |
| 90 | --T report an error if DSTFILE is a directory. | |
| 91 | ---help display this help and exit. | |
| 92 | ---version display version info and exit. | |
| 93 | - | |
| 94 | -Environment variables override the default commands: | |
| 95 | - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG | |
| 96 | -" | |
| 97 | - | |
| 98 | -while test -n "$1"; do | |
| 99 | - case $1 in | |
| 100 | - -c) shift | |
| 101 | - continue;; | |
| 102 | - | |
| 103 | - -d) dir_arg=true | |
| 104 | - shift | |
| 105 | - continue;; | |
| 106 | - | |
| 107 | - -g) chgrpcmd="$chgrpprog $2" | |
| 108 | - shift | |
| 109 | - shift | |
| 110 | - continue;; | |
| 111 | - | |
| 112 | - --help) echo "$usage"; exit 0;; | |
| 113 | - | |
| 114 | - -m) chmodcmd="$chmodprog $2" | |
| 115 | - shift | |
| 116 | - shift | |
| 117 | - continue;; | |
| 118 | - | |
| 119 | - -o) chowncmd="$chownprog $2" | |
| 120 | - shift | |
| 121 | - shift | |
| 122 | - continue;; | |
| 123 | - | |
| 124 | - -s) stripcmd=$stripprog | |
| 125 | - shift | |
| 126 | - continue;; | |
| 127 | - | |
| 128 | - -t) dstarg=$2 | |
| 129 | - shift | |
| 130 | - shift | |
| 131 | - continue;; | |
| 132 | - | |
| 133 | - -T) no_target_directory=true | |
| 134 | - shift | |
| 135 | - continue;; | |
| 136 | - | |
| 137 | - --version) echo "$0 $scriptversion"; exit 0;; | |
| 138 | - | |
| 139 | - *) # When -d is used, all remaining arguments are directories to create. | |
| 140 | - # When -t is used, the destination is already specified. | |
| 141 | - test -n "$dir_arg$dstarg" && break | |
| 142 | - # Otherwise, the last argument is the destination. Remove it from $@. | |
| 143 | - for arg | |
| 144 | - do | |
| 145 | - if test -n "$dstarg"; then | |
| 146 | - # $@ is not empty: it contains at least $arg. | |
| 147 | - set fnord "$@" "$dstarg" | |
| 148 | - shift # fnord | |
| 149 | - fi | |
| 150 | - shift # arg | |
| 151 | - dstarg=$arg | |
| 152 | - done | |
| 153 | - break;; | |
| 154 | - esac | |
| 53 | +src="" | |
| 54 | +dst="" | |
| 55 | +dir_arg="" | |
| 56 | + | |
| 57 | +while [ x"$1" != x ]; do | |
| 58 | + case $1 in | |
| 59 | + -c) instcmd="$cpprog" | |
| 60 | + shift | |
| 61 | + continue;; | |
| 62 | + | |
| 63 | + -d) dir_arg=true | |
| 64 | + shift | |
| 65 | + continue;; | |
| 66 | + | |
| 67 | + -m) chmodcmd="$chmodprog $2" | |
| 68 | + shift | |
| 69 | + shift | |
| 70 | + continue;; | |
| 71 | + | |
| 72 | + -o) chowncmd="$chownprog $2" | |
| 73 | + shift | |
| 74 | + shift | |
| 75 | + continue;; | |
| 76 | + | |
| 77 | + -g) chgrpcmd="$chgrpprog $2" | |
| 78 | + shift | |
| 79 | + shift | |
| 80 | + continue;; | |
| 81 | + | |
| 82 | + -s) stripcmd="$stripprog" | |
| 83 | + shift | |
| 84 | + continue;; | |
| 85 | + | |
| 86 | + -t=*) transformarg=`echo $1 | sed 's/-t=//'` | |
| 87 | + shift | |
| 88 | + continue;; | |
| 89 | + | |
| 90 | + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` | |
| 91 | + shift | |
| 92 | + continue;; | |
| 93 | + | |
| 94 | + *) if [ x"$src" = x ] | |
| 95 | + then | |
| 96 | + src=$1 | |
| 97 | + else | |
| 98 | + # this colon is to work around a 386BSD /bin/sh bug | |
| 99 | + : | |
| 100 | + dst=$1 | |
| 101 | + fi | |
| 102 | + shift | |
| 103 | + continue;; | |
| 104 | + esac | |
| 155 | 105 | done |
| 156 | 106 | |
| 157 | -if test -z "$1"; then | |
| 158 | - if test -z "$dir_arg"; then | |
| 159 | - echo "$0: no input file specified." >&2 | |
| 160 | - exit 1 | |
| 161 | - fi | |
| 162 | - # It's OK to call `install-sh -d' without argument. | |
| 163 | - # This can happen when creating conditional directories. | |
| 164 | - exit 0 | |
| 107 | +if [ x"$src" = x ] | |
| 108 | +then | |
| 109 | + echo "install: no input file specified" | |
| 110 | + exit 1 | |
| 111 | +else | |
| 112 | + : | |
| 165 | 113 | fi |
| 166 | 114 | |
| 167 | -for src | |
| 168 | -do | |
| 169 | - # Protect names starting with `-'. | |
| 170 | - case $src in | |
| 171 | - -*) src=./$src ;; | |
| 172 | - esac | |
| 173 | - | |
| 174 | - if test -n "$dir_arg"; then | |
| 175 | - dst=$src | |
| 176 | - src= | |
| 177 | - | |
| 178 | - if test -d "$dst"; then | |
| 179 | - mkdircmd=: | |
| 180 | - chmodcmd= | |
| 181 | - else | |
| 182 | - mkdircmd=$mkdirprog | |
| 183 | - fi | |
| 184 | - else | |
| 185 | - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command | |
| 186 | - # might cause directories to be created, which would be especially bad | |
| 187 | - # if $src (and thus $dsttmp) contains '*'. | |
| 188 | - if test ! -f "$src" && test ! -d "$src"; then | |
| 189 | - echo "$0: $src does not exist." >&2 | |
| 190 | - exit 1 | |
| 191 | - fi | |
| 192 | - | |
| 193 | - if test -z "$dstarg"; then | |
| 194 | - echo "$0: no destination specified." >&2 | |
| 195 | - exit 1 | |
| 196 | - fi | |
| 197 | - | |
| 198 | - dst=$dstarg | |
| 199 | - # Protect names starting with `-'. | |
| 200 | - case $dst in | |
| 201 | - -*) dst=./$dst ;; | |
| 202 | - esac | |
| 115 | +if [ x"$dir_arg" != x ]; then | |
| 116 | + dst=$src | |
| 117 | + src="" | |
| 118 | + | |
| 119 | + if [ -d $dst ]; then | |
| 120 | + instcmd=: | |
| 121 | + chmodcmd="" | |
| 122 | + else | |
| 123 | + instcmd=$mkdirprog | |
| 124 | + fi | |
| 125 | +else | |
| 126 | + | |
| 127 | +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command | |
| 128 | +# might cause directories to be created, which would be especially bad | |
| 129 | +# if $src (and thus $dsttmp) contains '*'. | |
| 130 | + | |
| 131 | + if [ -f "$src" ] || [ -d "$src" ] | |
| 132 | + then | |
| 133 | + : | |
| 134 | + else | |
| 135 | + echo "install: $src does not exist" | |
| 136 | + exit 1 | |
| 137 | + fi | |
| 138 | + | |
| 139 | + if [ x"$dst" = x ] | |
| 140 | + then | |
| 141 | + echo "install: no destination specified" | |
| 142 | + exit 1 | |
| 143 | + else | |
| 144 | + : | |
| 145 | + fi | |
| 146 | + | |
| 147 | +# If destination is a directory, append the input filename; if your system | |
| 148 | +# does not like double slashes in filenames, you may need to add some logic | |
| 149 | + | |
| 150 | + if [ -d $dst ] | |
| 151 | + then | |
| 152 | + dst="$dst"/`basename $src` | |
| 153 | + else | |
| 154 | + : | |
| 155 | + fi | |
| 156 | +fi | |
| 203 | 157 | |
| 204 | - # If destination is a directory, append the input filename; won't work | |
| 205 | - # if double slashes aren't ignored. | |
| 206 | - if test -d "$dst"; then | |
| 207 | - if test -n "$no_target_directory"; then | |
| 208 | - echo "$0: $dstarg: Is a directory" >&2 | |
| 209 | - exit 1 | |
| 210 | - fi | |
| 211 | - dst=$dst/`basename "$src"` | |
| 212 | - fi | |
| 213 | - fi | |
| 214 | - | |
| 215 | - # This sed command emulates the dirname command. | |
| 216 | - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` | |
| 217 | - | |
| 218 | - # Make sure that the destination directory exists. | |
| 219 | - | |
| 220 | - # Skip lots of stat calls in the usual case. | |
| 221 | - if test ! -d "$dstdir"; then | |
| 222 | - defaultIFS=' | |
| 223 | - ' | |
| 224 | - IFS="${IFS-$defaultIFS}" | |
| 225 | - | |
| 226 | - oIFS=$IFS | |
| 227 | - # Some sh's can't handle IFS=/ for some reason. | |
| 228 | - IFS='%' | |
| 229 | - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` | |
| 230 | - IFS=$oIFS | |
| 231 | - | |
| 232 | - pathcomp= | |
| 233 | - | |
| 234 | - while test $# -ne 0 ; do | |
| 235 | - pathcomp=$pathcomp$1 | |
| 236 | - shift | |
| 237 | - if test ! -d "$pathcomp"; then | |
| 238 | - $mkdirprog "$pathcomp" | |
| 239 | - # mkdir can fail with a `File exist' error in case several | |
| 240 | - # install-sh are creating the directory concurrently. This | |
| 241 | - # is OK. | |
| 242 | - test -d "$pathcomp" || exit | |
| 243 | - fi | |
| 244 | - pathcomp=$pathcomp/ | |
| 245 | - done | |
| 246 | - fi | |
| 247 | - | |
| 248 | - if test -n "$dir_arg"; then | |
| 249 | - $doit $mkdircmd "$dst" \ | |
| 250 | - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ | |
| 251 | - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ | |
| 252 | - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ | |
| 253 | - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } | |
| 254 | - | |
| 255 | - else | |
| 256 | - dstfile=`basename "$dst"` | |
| 257 | - | |
| 258 | - # Make a couple of temp file names in the proper directory. | |
| 259 | - dsttmp=$dstdir/_inst.$$_ | |
| 260 | - rmtmp=$dstdir/_rm.$$_ | |
| 261 | - | |
| 262 | - # Trap to clean up those temp files at exit. | |
| 263 | - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 | |
| 264 | - trap '(exit $?); exit' 1 2 13 15 | |
| 265 | - | |
| 266 | - # Copy the file name to the temp name. | |
| 267 | - $doit $cpprog "$src" "$dsttmp" && | |
| 268 | - | |
| 269 | - # and set any options; do chmod last to preserve setuid bits. | |
| 270 | - # | |
| 271 | - # If any of these fail, we abort the whole thing. If we want to | |
| 272 | - # ignore errors from any of these, just make sure not to ignore | |
| 273 | - # errors from the above "$doit $cpprog $src $dsttmp" command. | |
| 274 | - # | |
| 275 | - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ | |
| 276 | - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ | |
| 277 | - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ | |
| 278 | - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && | |
| 279 | - | |
| 280 | - # Now rename the file to the real destination. | |
| 281 | - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ | |
| 282 | - || { | |
| 283 | - # The rename failed, perhaps because mv can't rename something else | |
| 284 | - # to itself, or perhaps because mv is so ancient that it does not | |
| 285 | - # support -f. | |
| 286 | - | |
| 287 | - # Now remove or move aside any old file at destination location. | |
| 288 | - # We try this two ways since rm can't unlink itself on some | |
| 289 | - # systems and the destination file might be busy for other | |
| 290 | - # reasons. In this case, the final cleanup might fail but the new | |
| 291 | - # file should still install successfully. | |
| 292 | - { | |
| 293 | - if test -f "$dstdir/$dstfile"; then | |
| 294 | - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ | |
| 295 | - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ | |
| 296 | - || { | |
| 297 | - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 | |
| 298 | - (exit 1); exit | |
| 299 | - } | |
| 300 | - else | |
| 301 | - : | |
| 302 | - fi | |
| 303 | - } && | |
| 304 | - | |
| 305 | - # Now rename the file to the real destination. | |
| 306 | - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" | |
| 307 | - } | |
| 308 | - } | |
| 309 | - fi || { (exit 1); exit; } | |
| 158 | +## this sed command emulates the dirname command | |
| 159 | +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` | |
| 160 | + | |
| 161 | +# Make sure that the destination directory exists. | |
| 162 | +# this part is taken from Noah Friedman's mkinstalldirs script | |
| 163 | + | |
| 164 | +# Skip lots of stat calls in the usual case. | |
| 165 | +if [ ! -d "$dstdir" ]; then | |
| 166 | +defaultIFS=' | |
| 167 | + ' | |
| 168 | +IFS="${IFS-${defaultIFS}}" | |
| 169 | + | |
| 170 | +oIFS="${IFS}" | |
| 171 | +# Some sh's can't handle IFS=/ for some reason. | |
| 172 | +IFS='%' | |
| 173 | +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` | |
| 174 | +IFS="${oIFS}" | |
| 175 | + | |
| 176 | +pathcomp='' | |
| 177 | + | |
| 178 | +while [ $# -ne 0 ] ; do | |
| 179 | + pathcomp="${pathcomp}${1}" | |
| 180 | + shift | |
| 181 | + | |
| 182 | + if [ ! -d "${pathcomp}" ] ; | |
| 183 | + then | |
| 184 | + $mkdirprog "${pathcomp}" | |
| 185 | + else | |
| 186 | + : | |
| 187 | + fi | |
| 188 | + | |
| 189 | + pathcomp="${pathcomp}/" | |
| 310 | 190 | done |
| 191 | +fi | |
| 192 | + | |
| 193 | +if [ x"$dir_arg" != x ] | |
| 194 | +then | |
| 195 | + $doit $instcmd $dst && | |
| 196 | + | |
| 197 | + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && | |
| 198 | + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && | |
| 199 | + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && | |
| 200 | + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi | |
| 201 | +else | |
| 202 | + | |
| 203 | +# If we're going to rename the final executable, determine the name now. | |
| 204 | + | |
| 205 | + if [ x"$transformarg" = x ] | |
| 206 | + then | |
| 207 | + dstfile=`basename $dst` | |
| 208 | + else | |
| 209 | + dstfile=`basename $dst $transformbasename | | |
| 210 | + sed $transformarg`$transformbasename | |
| 211 | + fi | |
| 212 | + | |
| 213 | +# don't allow the sed command to completely eliminate the filename | |
| 214 | + | |
| 215 | + if [ x"$dstfile" = x ] | |
| 216 | + then | |
| 217 | + dstfile=`basename $dst` | |
| 218 | + else | |
| 219 | + : | |
| 220 | + fi | |
| 221 | + | |
| 222 | +# Make a temp file name in the proper directory. | |
| 223 | + | |
| 224 | + dsttmp=$dstdir/#inst.$$# | |
| 225 | + | |
| 226 | +# Move or copy the file name to the temp name | |
| 227 | + | |
| 228 | + $doit $instcmd $src $dsttmp && | |
| 229 | + | |
| 230 | + trap "rm -f ${dsttmp}" 0 && | |
| 231 | + | |
| 232 | +# and set any options; do chmod last to preserve setuid bits | |
| 233 | + | |
| 234 | +# If any of these fail, we abort the whole thing. If we want to | |
| 235 | +# ignore errors from any of these, just make sure not to ignore | |
| 236 | +# errors from the above "$doit $instcmd $src $dsttmp" command. | |
| 237 | + | |
| 238 | + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && | |
| 239 | + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && | |
| 240 | + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && | |
| 241 | + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && | |
| 242 | + | |
| 243 | +# Now rename the file to the real destination. | |
| 244 | + | |
| 245 | + $doit $rmcmd -f $dstdir/$dstfile && | |
| 246 | + $doit $mvcmd $dsttmp $dstdir/$dstfile | |
| 247 | + | |
| 248 | +fi && | |
| 249 | + | |
| 311 | 250 | |
| 312 | -# The final little trick to "correctly" pass the exit status to the exit trap. | |
| 313 | -{ | |
| 314 | - (exit 0); exit | |
| 315 | -} | |
| 316 | - | |
| 317 | -# Local variables: | |
| 318 | -# eval: (add-hook 'write-file-hooks 'time-stamp) | |
| 319 | -# time-stamp-start: "scriptversion=" | |
| 320 | -# time-stamp-format: "%:y-%02m-%02d.%02H" | |
| 321 | -# time-stamp-end: "$" | |
| 322 | -# End: | |
| 251 | +exit 0 | ... | ... |
ltmain.sh
| 1 | 1 | # ltmain.sh - Provide generalized library-building support services. |
| 2 | 2 | # NOTE: Changing this file will not affect anything until you rerun configure. |
| 3 | 3 | # |
| 4 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 | |
| 4 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 | |
| 5 | 5 | # Free Software Foundation, Inc. |
| 6 | 6 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
| 7 | 7 | # |
| ... | ... | @@ -24,32 +24,6 @@ |
| 24 | 24 | # configuration script generated by Autoconf, you may include it under |
| 25 | 25 | # the same distribution terms that you use for the rest of that program. |
| 26 | 26 | |
| 27 | -basename="s,^.*/,,g" | |
| 28 | - | |
| 29 | -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | |
| 30 | -# is ksh but when the shell is invoked as "sh" and the current value of | |
| 31 | -# the _XPG environment variable is not equal to 1 (one), the special | |
| 32 | -# positional parameter $0, within a function call, is the name of the | |
| 33 | -# function. | |
| 34 | -progpath="$0" | |
| 35 | - | |
| 36 | -# RH: define SED for historic ltconfig's generated by Libtool 1.3 | |
| 37 | -[ -z "$SED" ] && SED=sed | |
| 38 | - | |
| 39 | -# The name of this program: | |
| 40 | -progname=`echo "$progpath" | $SED $basename` | |
| 41 | -modename="$progname" | |
| 42 | - | |
| 43 | -# Global variables: | |
| 44 | -EXIT_SUCCESS=0 | |
| 45 | -EXIT_FAILURE=1 | |
| 46 | - | |
| 47 | -PROGRAM=ltmain.sh | |
| 48 | -PACKAGE=libtool | |
| 49 | -VERSION=1.5.6 | |
| 50 | -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" | |
| 51 | - | |
| 52 | - | |
| 53 | 27 | # Check that we have a working $echo. |
| 54 | 28 | if test "X$1" = X--no-reexec; then |
| 55 | 29 | # Discard the --no-reexec flag, and continue. |
| ... | ... | @@ -62,7 +36,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then |
| 62 | 36 | : |
| 63 | 37 | else |
| 64 | 38 | # Restart under the correct shell, and then maybe $echo will work. |
| 65 | - exec $SHELL "$progpath" --no-reexec ${1+"$@"} | |
| 39 | + exec $SHELL "$0" --no-reexec ${1+"$@"} | |
| 66 | 40 | fi |
| 67 | 41 | |
| 68 | 42 | if test "X$1" = X--fallback-echo; then |
| ... | ... | @@ -71,9 +45,19 @@ if test "X$1" = X--fallback-echo; then |
| 71 | 45 | cat <<EOF |
| 72 | 46 | $* |
| 73 | 47 | EOF |
| 74 | - exit $EXIT_SUCCESS | |
| 48 | + exit 0 | |
| 75 | 49 | fi |
| 76 | 50 | |
| 51 | +# The name of this program. | |
| 52 | +progname=`$echo "$0" | ${SED} 's%^.*/%%'` | |
| 53 | +modename="$progname" | |
| 54 | + | |
| 55 | +# Constants. | |
| 56 | +PROGRAM=ltmain.sh | |
| 57 | +PACKAGE=libtool | |
| 58 | +VERSION=1.5 | |
| 59 | +TIMESTAMP=" (1.1220 2003/04/05 19:32:58)" | |
| 60 | + | |
| 77 | 61 | default_mode= |
| 78 | 62 | help="Try \`$progname --help' for more information." |
| 79 | 63 | magic="%%%MAGIC variable%%%" |
| ... | ... | @@ -86,8 +70,8 @@ rm="rm -f" |
| 86 | 70 | Xsed="${SED}"' -e 1s/^X//' |
| 87 | 71 | sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' |
| 88 | 72 | # test EBCDIC or ASCII |
| 89 | -case `echo A|tr A '\301'` in | |
| 90 | - A) # EBCDIC based system | |
| 73 | +case `echo A|od -x` in | |
| 74 | + *[Cc]1*) # EBCDIC based system | |
| 91 | 75 | SP2NL="tr '\100' '\n'" |
| 92 | 76 | NL2SP="tr '\r\n' '\100\100'" |
| 93 | 77 | ;; |
| ... | ... | @@ -110,13 +94,12 @@ if test "${LANG+set}" = set; then |
| 110 | 94 | fi |
| 111 | 95 | |
| 112 | 96 | # Make sure IFS has a sensible default |
| 113 | -: ${IFS=" | |
| 114 | -"} | |
| 97 | +: ${IFS=" "} | |
| 115 | 98 | |
| 116 | 99 | if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 117 | 100 | $echo "$modename: not configured to build any kind of library" 1>&2 |
| 118 | 101 | $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
| 119 | - exit $EXIT_FAILURE | |
| 102 | + exit 1 | |
| 120 | 103 | fi |
| 121 | 104 | |
| 122 | 105 | # Global variables. |
| ... | ... | @@ -135,13 +118,10 @@ o2lo="s/\\.${objext}\$/.lo/" |
| 135 | 118 | # Shell function definitions: |
| 136 | 119 | # This seems to be the best place for them |
| 137 | 120 | |
| 138 | -# func_win32_libid arg | |
| 139 | -# return the library type of file 'arg' | |
| 140 | -# | |
| 141 | 121 | # Need a lot of goo to handle *both* DLLs and import libs |
| 142 | 122 | # Has to be a shell function in order to 'eat' the argument |
| 143 | 123 | # that is supplied when $file_magic_command is called. |
| 144 | -func_win32_libid () { | |
| 124 | +win32_libid () { | |
| 145 | 125 | win32_libid_type="unknown" |
| 146 | 126 | win32_fileres=`file -L $1 2>/dev/null` |
| 147 | 127 | case $win32_fileres in |
| ... | ... | @@ -150,7 +130,7 @@ func_win32_libid () { |
| 150 | 130 | ;; |
| 151 | 131 | *ar\ archive*) # could be an import, or static |
| 152 | 132 | if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ |
| 153 | - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then | |
| 133 | + grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then | |
| 154 | 134 | win32_nmres=`eval $NM -f posix -A $1 | \ |
| 155 | 135 | sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` |
| 156 | 136 | if test "X$win32_nmres" = "Ximport" ; then |
| ... | ... | @@ -160,7 +140,7 @@ func_win32_libid () { |
| 160 | 140 | fi |
| 161 | 141 | fi |
| 162 | 142 | ;; |
| 163 | - *DLL*) | |
| 143 | + *DLL*) | |
| 164 | 144 | win32_libid_type="x86 DLL" |
| 165 | 145 | ;; |
| 166 | 146 | *executable*) # but shell scripts are "executable" too... |
| ... | ... | @@ -174,76 +154,9 @@ func_win32_libid () { |
| 174 | 154 | $echo $win32_libid_type |
| 175 | 155 | } |
| 176 | 156 | |
| 177 | - | |
| 178 | -# func_infer_tag arg | |
| 179 | -# Infer tagged configuration to use if any are available and | |
| 180 | -# if one wasn't chosen via the "--tag" command line option. | |
| 181 | -# Only attempt this if the compiler in the base compile | |
| 182 | -# command doesn't match the default compiler. | |
| 183 | -# arg is usually of the form 'gcc ...' | |
| 184 | -func_infer_tag () { | |
| 185 | - if test -n "$available_tags" && test -z "$tagname"; then | |
| 186 | - CC_quoted= | |
| 187 | - for arg in $CC; do | |
| 188 | - case $arg in | |
| 189 | - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") | |
| 190 | - arg="\"$arg\"" | |
| 191 | - ;; | |
| 192 | - esac | |
| 193 | - CC_quoted="$CC_quoted $arg" | |
| 194 | - done | |
| 195 | - case $@ in | |
| 196 | - # Blanks in the command may have been stripped by the calling shell, | |
| 197 | - # but not from the CC environment variable when configure was run. | |
| 198 | - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; | |
| 199 | - # Blanks at the start of $base_compile will cause this to fail | |
| 200 | - # if we don't check for them as well. | |
| 201 | - *) | |
| 202 | - for z in $available_tags; do | |
| 203 | - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then | |
| 204 | - # Evaluate the configuration. | |
| 205 | - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" | |
| 206 | - CC_quoted= | |
| 207 | - for arg in $CC; do | |
| 208 | - # Double-quote args containing other shell metacharacters. | |
| 209 | - case $arg in | |
| 210 | - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") | |
| 211 | - arg="\"$arg\"" | |
| 212 | - ;; | |
| 213 | - esac | |
| 214 | - CC_quoted="$CC_quoted $arg" | |
| 215 | - done | |
| 216 | - case "$@ " in | |
| 217 | - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) | |
| 218 | - # The compiler in the base compile command matches | |
| 219 | - # the one in the tagged configuration. | |
| 220 | - # Assume this is the tagged configuration we want. | |
| 221 | - tagname=$z | |
| 222 | - break | |
| 223 | - ;; | |
| 224 | - esac | |
| 225 | - fi | |
| 226 | - done | |
| 227 | - # If $tagname still isn't set, then no tagged configuration | |
| 228 | - # was found and let the user know that the "--tag" command | |
| 229 | - # line option must be used. | |
| 230 | - if test -z "$tagname"; then | |
| 231 | - $echo "$modename: unable to infer tagged configuration" | |
| 232 | - $echo "$modename: specify a tag with \`--tag'" 1>&2 | |
| 233 | - exit $EXIT_FAILURE | |
| 234 | -# else | |
| 235 | -# $echo "$modename: using $tagname tagged configuration" | |
| 236 | - fi | |
| 237 | - ;; | |
| 238 | - esac | |
| 239 | - fi | |
| 240 | -} | |
| 241 | 157 | # End of Shell function definitions |
| 242 | 158 | ##################################### |
| 243 | 159 | |
| 244 | -# Darwin sucks | |
| 245 | -eval std_shrext=\"$shrext_cmds\" | |
| 246 | - | |
| 247 | 160 | # Parse our command line options once, thoroughly. |
| 248 | 161 | while test "$#" -gt 0 |
| 249 | 162 | do |
| ... | ... | @@ -263,13 +176,12 @@ do |
| 263 | 176 | ;; |
| 264 | 177 | tag) |
| 265 | 178 | tagname="$arg" |
| 266 | - preserve_args="${preserve_args}=$arg" | |
| 267 | 179 | |
| 268 | 180 | # Check whether tagname contains only valid characters |
| 269 | 181 | case $tagname in |
| 270 | 182 | *[!-_A-Za-z0-9,/]*) |
| 271 | 183 | $echo "$progname: invalid tag name: $tagname" 1>&2 |
| 272 | - exit $EXIT_FAILURE | |
| 184 | + exit 1 | |
| 273 | 185 | ;; |
| 274 | 186 | esac |
| 275 | 187 | |
| ... | ... | @@ -279,10 +191,10 @@ do |
| 279 | 191 | # not specially marked. |
| 280 | 192 | ;; |
| 281 | 193 | *) |
| 282 | - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then | |
| 194 | + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then | |
| 283 | 195 | taglist="$taglist $tagname" |
| 284 | 196 | # Evaluate the configuration. |
| 285 | - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" | |
| 197 | + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" | |
| 286 | 198 | else |
| 287 | 199 | $echo "$progname: ignoring unknown tag $tagname" 1>&2 |
| 288 | 200 | fi |
| ... | ... | @@ -311,22 +223,21 @@ do |
| 311 | 223 | $echo "Copyright (C) 2003 Free Software Foundation, Inc." |
| 312 | 224 | $echo "This is free software; see the source for copying conditions. There is NO" |
| 313 | 225 | $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
| 314 | - exit $EXIT_SUCCESS | |
| 226 | + exit 0 | |
| 315 | 227 | ;; |
| 316 | 228 | |
| 317 | 229 | --config) |
| 318 | - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath | |
| 230 | + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 | |
| 319 | 231 | # Now print the configurations for the tags. |
| 320 | 232 | for tagname in $taglist; do |
| 321 | - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" | |
| 233 | + ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" | |
| 322 | 234 | done |
| 323 | - exit $EXIT_SUCCESS | |
| 235 | + exit 0 | |
| 324 | 236 | ;; |
| 325 | 237 | |
| 326 | 238 | --debug) |
| 327 | 239 | $echo "$progname: enabling shell trace mode" |
| 328 | 240 | set -x |
| 329 | - preserve_args="$preserve_args $arg" | |
| 330 | 241 | ;; |
| 331 | 242 | |
| 332 | 243 | --dry-run | -n) |
| ... | ... | @@ -345,7 +256,7 @@ do |
| 345 | 256 | else |
| 346 | 257 | $echo "disable static libraries" |
| 347 | 258 | fi |
| 348 | - exit $EXIT_SUCCESS | |
| 259 | + exit 0 | |
| 349 | 260 | ;; |
| 350 | 261 | |
| 351 | 262 | --finish) mode="finish" ;; |
| ... | ... | @@ -357,7 +268,6 @@ do |
| 357 | 268 | |
| 358 | 269 | --quiet | --silent) |
| 359 | 270 | show=: |
| 360 | - preserve_args="$preserve_args $arg" | |
| 361 | 271 | ;; |
| 362 | 272 | |
| 363 | 273 | --tag) prevopt="--tag" prev=tag ;; |
| ... | ... | @@ -365,7 +275,6 @@ do |
| 365 | 275 | set tag "$optarg" ${1+"$@"} |
| 366 | 276 | shift |
| 367 | 277 | prev=tag |
| 368 | - preserve_args="$preserve_args --tag" | |
| 369 | 278 | ;; |
| 370 | 279 | |
| 371 | 280 | -dlopen) |
| ... | ... | @@ -376,7 +285,7 @@ do |
| 376 | 285 | -*) |
| 377 | 286 | $echo "$modename: unrecognized option \`$arg'" 1>&2 |
| 378 | 287 | $echo "$help" 1>&2 |
| 379 | - exit $EXIT_FAILURE | |
| 288 | + exit 1 | |
| 380 | 289 | ;; |
| 381 | 290 | |
| 382 | 291 | *) |
| ... | ... | @@ -389,7 +298,7 @@ done |
| 389 | 298 | if test -n "$prevopt"; then |
| 390 | 299 | $echo "$modename: option \`$prevopt' requires an argument" 1>&2 |
| 391 | 300 | $echo "$help" 1>&2 |
| 392 | - exit $EXIT_FAILURE | |
| 301 | + exit 1 | |
| 393 | 302 | fi |
| 394 | 303 | |
| 395 | 304 | # If this variable is set in any of the actions, the command in it |
| ... | ... | @@ -398,6 +307,23 @@ fi |
| 398 | 307 | exec_cmd= |
| 399 | 308 | |
| 400 | 309 | if test -z "$show_help"; then |
| 310 | + archargs= | |
| 311 | + case $host in | |
| 312 | + *-*-darwin*) | |
| 313 | + # For darwin, separate arch arguments and apply them to all compile/link | |
| 314 | + # commands | |
| 315 | + doarch= | |
| 316 | + for arg; do | |
| 317 | + if test -n "$doarch"; then | |
| 318 | + archargs="$archargs -arch $arg" | |
| 319 | + doarch= | |
| 320 | + continue | |
| 321 | + fi | |
| 322 | + case $arg in | |
| 323 | + -arch) doarch=y;; | |
| 324 | + esac | |
| 325 | + done | |
| 326 | + esac | |
| 401 | 327 | |
| 402 | 328 | # Infer the operation mode. |
| 403 | 329 | if test -z "$mode"; then |
| ... | ... | @@ -445,7 +371,7 @@ if test -z "$show_help"; then |
| 445 | 371 | if test -n "$execute_dlfiles" && test "$mode" != execute; then |
| 446 | 372 | $echo "$modename: unrecognized option \`-dlopen'" 1>&2 |
| 447 | 373 | $echo "$help" 1>&2 |
| 448 | - exit $EXIT_FAILURE | |
| 374 | + exit 1 | |
| 449 | 375 | fi |
| 450 | 376 | |
| 451 | 377 | # Change the help message to a mode-specific one. |
| ... | ... | @@ -460,11 +386,9 @@ if test -z "$show_help"; then |
| 460 | 386 | # Get the compilation command and the source file. |
| 461 | 387 | base_compile= |
| 462 | 388 | srcfile="$nonopt" # always keep a non-empty value in "srcfile" |
| 463 | - suppress_opt=yes | |
| 464 | 389 | suppress_output= |
| 465 | 390 | arg_mode=normal |
| 466 | 391 | libobj= |
| 467 | - later= | |
| 468 | 392 | |
| 469 | 393 | for arg |
| 470 | 394 | do |
| ... | ... | @@ -487,19 +411,24 @@ if test -z "$show_help"; then |
| 487 | 411 | -o) |
| 488 | 412 | if test -n "$libobj" ; then |
| 489 | 413 | $echo "$modename: you cannot specify \`-o' more than once" 1>&2 |
| 490 | - exit $EXIT_FAILURE | |
| 414 | + exit 1 | |
| 491 | 415 | fi |
| 492 | 416 | arg_mode=target |
| 493 | 417 | continue |
| 494 | 418 | ;; |
| 495 | 419 | |
| 496 | - -static | -prefer-pic | -prefer-non-pic) | |
| 497 | - later="$later $arg" | |
| 420 | + -static) | |
| 421 | + build_old_libs=yes | |
| 498 | 422 | continue |
| 499 | 423 | ;; |
| 500 | 424 | |
| 501 | - -no-suppress) | |
| 502 | - suppress_opt=no | |
| 425 | + -prefer-pic) | |
| 426 | + pic_mode=yes | |
| 427 | + continue | |
| 428 | + ;; | |
| 429 | + | |
| 430 | + -prefer-non-pic) | |
| 431 | + pic_mode=no | |
| 503 | 432 | continue |
| 504 | 433 | ;; |
| 505 | 434 | |
| ... | ... | @@ -512,7 +441,7 @@ if test -z "$show_help"; then |
| 512 | 441 | args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` |
| 513 | 442 | lastarg= |
| 514 | 443 | save_ifs="$IFS"; IFS=',' |
| 515 | - for arg in $args; do | |
| 444 | + for arg in $args; do | |
| 516 | 445 | IFS="$save_ifs" |
| 517 | 446 | |
| 518 | 447 | # Double-quote args containing other shell metacharacters. |
| ... | ... | @@ -562,11 +491,11 @@ if test -z "$show_help"; then |
| 562 | 491 | case $arg_mode in |
| 563 | 492 | arg) |
| 564 | 493 | $echo "$modename: you must specify an argument for -Xcompile" |
| 565 | - exit $EXIT_FAILURE | |
| 494 | + exit 1 | |
| 566 | 495 | ;; |
| 567 | 496 | target) |
| 568 | 497 | $echo "$modename: you must specify a target with \`-o'" 1>&2 |
| 569 | - exit $EXIT_FAILURE | |
| 498 | + exit 1 | |
| 570 | 499 | ;; |
| 571 | 500 | *) |
| 572 | 501 | # Get the name of the library object. |
| ... | ... | @@ -599,30 +528,50 @@ if test -z "$show_help"; then |
| 599 | 528 | *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; |
| 600 | 529 | *) |
| 601 | 530 | $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 |
| 602 | - exit $EXIT_FAILURE | |
| 531 | + exit 1 | |
| 603 | 532 | ;; |
| 604 | 533 | esac |
| 605 | 534 | |
| 606 | - func_infer_tag $base_compile | |
| 607 | - | |
| 608 | - for arg in $later; do | |
| 609 | - case $arg in | |
| 610 | - -static) | |
| 611 | - build_old_libs=yes | |
| 612 | - continue | |
| 613 | - ;; | |
| 614 | - | |
| 615 | - -prefer-pic) | |
| 616 | - pic_mode=yes | |
| 617 | - continue | |
| 618 | - ;; | |
| 619 | - | |
| 620 | - -prefer-non-pic) | |
| 621 | - pic_mode=no | |
| 622 | - continue | |
| 535 | + # Infer tagged configuration to use if any are available and | |
| 536 | + # if one wasn't chosen via the "--tag" command line option. | |
| 537 | + # Only attempt this if the compiler in the base compile | |
| 538 | + # command doesn't match the default compiler. | |
| 539 | + if test -n "$available_tags" && test -z "$tagname"; then | |
| 540 | + case $base_compile in | |
| 541 | + # Blanks in the command may have been stripped by the calling shell, | |
| 542 | + # but not from the CC environment variable when configure was run. | |
| 543 | + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; | |
| 544 | + # Blanks at the start of $base_compile will cause this to fail | |
| 545 | + # if we don't check for them as well. | |
| 546 | + *) | |
| 547 | + for z in $available_tags; do | |
| 548 | + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then | |
| 549 | + # Evaluate the configuration. | |
| 550 | + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" | |
| 551 | + case "$base_compile " in | |
| 552 | + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) | |
| 553 | + # The compiler in the base compile command matches | |
| 554 | + # the one in the tagged configuration. | |
| 555 | + # Assume this is the tagged configuration we want. | |
| 556 | + tagname=$z | |
| 557 | + break | |
| 558 | + ;; | |
| 559 | + esac | |
| 560 | + fi | |
| 561 | + done | |
| 562 | + # If $tagname still isn't set, then no tagged configuration | |
| 563 | + # was found and let the user know that the "--tag" command | |
| 564 | + # line option must be used. | |
| 565 | + if test -z "$tagname"; then | |
| 566 | + $echo "$modename: unable to infer tagged configuration" | |
| 567 | + $echo "$modename: specify a tag with \`--tag'" 1>&2 | |
| 568 | + exit 1 | |
| 569 | +# else | |
| 570 | +# $echo "$modename: using $tagname tagged configuration" | |
| 571 | + fi | |
| 623 | 572 | ;; |
| 624 | 573 | esac |
| 625 | - done | |
| 574 | + fi | |
| 626 | 575 | |
| 627 | 576 | objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` |
| 628 | 577 | xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` |
| ... | ... | @@ -636,7 +585,7 @@ if test -z "$show_help"; then |
| 636 | 585 | if test -z "$base_compile"; then |
| 637 | 586 | $echo "$modename: you must specify a compilation command" 1>&2 |
| 638 | 587 | $echo "$help" 1>&2 |
| 639 | - exit $EXIT_FAILURE | |
| 588 | + exit 1 | |
| 640 | 589 | fi |
| 641 | 590 | |
| 642 | 591 | # Delete any leftover library objects. |
| ... | ... | @@ -647,7 +596,7 @@ if test -z "$show_help"; then |
| 647 | 596 | fi |
| 648 | 597 | |
| 649 | 598 | $run $rm $removelist |
| 650 | - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 | |
| 599 | + trap "$run $rm $removelist; exit 1" 1 2 15 | |
| 651 | 600 | |
| 652 | 601 | # On Cygwin there's no "real" PIC flag so we must build both object types |
| 653 | 602 | case $host_os in |
| ... | ... | @@ -666,7 +615,7 @@ if test -z "$show_help"; then |
| 666 | 615 | output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} |
| 667 | 616 | lockfile="$output_obj.lock" |
| 668 | 617 | removelist="$removelist $output_obj $lockfile" |
| 669 | - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 | |
| 618 | + trap "$run $rm $removelist; exit 1" 1 2 15 | |
| 670 | 619 | else |
| 671 | 620 | output_obj= |
| 672 | 621 | need_locks=no |
| ... | ... | @@ -676,7 +625,7 @@ if test -z "$show_help"; then |
| 676 | 625 | # Lock this critical section if it is needed |
| 677 | 626 | # We use this script file to make the link, it avoids creating a new file |
| 678 | 627 | if test "$need_locks" = yes; then |
| 679 | - until $run ln "$progpath" "$lockfile" 2>/dev/null; do | |
| 628 | + until $run ln "$0" "$lockfile" 2>/dev/null; do | |
| 680 | 629 | $show "Waiting for $lockfile to be removed" |
| 681 | 630 | sleep 2 |
| 682 | 631 | done |
| ... | ... | @@ -694,7 +643,7 @@ avoid parallel builds (make -j) in this platform, or get a better |
| 694 | 643 | compiler." |
| 695 | 644 | |
| 696 | 645 | $run $rm $removelist |
| 697 | - exit $EXIT_FAILURE | |
| 646 | + exit 1 | |
| 698 | 647 | fi |
| 699 | 648 | $echo $srcfile > "$lockfile" |
| 700 | 649 | fi |
| ... | ... | @@ -749,7 +698,7 @@ EOF |
| 749 | 698 | if $run eval "$command"; then : |
| 750 | 699 | else |
| 751 | 700 | test -n "$output_obj" && $run $rm $removelist |
| 752 | - exit $EXIT_FAILURE | |
| 701 | + exit 1 | |
| 753 | 702 | fi |
| 754 | 703 | |
| 755 | 704 | if test "$need_locks" = warn && |
| ... | ... | @@ -769,7 +718,7 @@ avoid parallel builds (make -j) in this platform, or get a better |
| 769 | 718 | compiler." |
| 770 | 719 | |
| 771 | 720 | $run $rm $removelist |
| 772 | - exit $EXIT_FAILURE | |
| 721 | + exit 1 | |
| 773 | 722 | fi |
| 774 | 723 | |
| 775 | 724 | # Just move the object if needed, then go on to compile the next one |
| ... | ... | @@ -790,9 +739,7 @@ pic_object='$objdir/$objname' |
| 790 | 739 | EOF |
| 791 | 740 | |
| 792 | 741 | # Allow error messages only from the first compilation. |
| 793 | - if test "$suppress_opt" = yes; then | |
| 794 | - suppress_output=' >/dev/null 2>&1' | |
| 795 | - fi | |
| 742 | + suppress_output=' >/dev/null 2>&1' | |
| 796 | 743 | else |
| 797 | 744 | # No PIC object so indicate it doesn't exist in the libtool |
| 798 | 745 | # object file. |
| ... | ... | @@ -821,7 +768,7 @@ EOF |
| 821 | 768 | if $run eval "$command"; then : |
| 822 | 769 | else |
| 823 | 770 | $run $rm $removelist |
| 824 | - exit $EXIT_FAILURE | |
| 771 | + exit 1 | |
| 825 | 772 | fi |
| 826 | 773 | |
| 827 | 774 | if test "$need_locks" = warn && |
| ... | ... | @@ -841,7 +788,7 @@ avoid parallel builds (make -j) in this platform, or get a better |
| 841 | 788 | compiler." |
| 842 | 789 | |
| 843 | 790 | $run $rm $removelist |
| 844 | - exit $EXIT_FAILURE | |
| 791 | + exit 1 | |
| 845 | 792 | fi |
| 846 | 793 | |
| 847 | 794 | # Just move the object if needed |
| ... | ... | @@ -879,7 +826,7 @@ EOF |
| 879 | 826 | $run $rm "$lockfile" |
| 880 | 827 | fi |
| 881 | 828 | |
| 882 | - exit $EXIT_SUCCESS | |
| 829 | + exit 0 | |
| 883 | 830 | ;; |
| 884 | 831 | |
| 885 | 832 | # libtool link mode |
| ... | ... | @@ -905,7 +852,7 @@ EOF |
| 905 | 852 | ;; |
| 906 | 853 | esac |
| 907 | 854 | libtool_args="$nonopt" |
| 908 | - base_compile="$nonopt $@" | |
| 855 | + base_compile="$nonopt" | |
| 909 | 856 | compile_command="$nonopt" |
| 910 | 857 | finalize_command="$nonopt" |
| 911 | 858 | |
| ... | ... | @@ -937,7 +884,6 @@ EOF |
| 937 | 884 | no_install=no |
| 938 | 885 | objs= |
| 939 | 886 | non_pic_objects= |
| 940 | - precious_files_regex= | |
| 941 | 887 | prefer_static_libs=no |
| 942 | 888 | preload=no |
| 943 | 889 | prev= |
| ... | ... | @@ -951,8 +897,6 @@ EOF |
| 951 | 897 | vinfo= |
| 952 | 898 | vinfo_number=no |
| 953 | 899 | |
| 954 | - func_infer_tag $base_compile | |
| 955 | - | |
| 956 | 900 | # We need to know -static, to get the right output filenames. |
| 957 | 901 | for arg |
| 958 | 902 | do |
| ... | ... | @@ -984,6 +928,7 @@ EOF |
| 984 | 928 | # Go through the arguments, transforming them on the way. |
| 985 | 929 | while test "$#" -gt 0; do |
| 986 | 930 | arg="$1" |
| 931 | + base_compile="$base_compile $arg" | |
| 987 | 932 | shift |
| 988 | 933 | case $arg in |
| 989 | 934 | *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") |
| ... | ... | @@ -1047,7 +992,7 @@ EOF |
| 1047 | 992 | export_symbols="$arg" |
| 1048 | 993 | if test ! -f "$arg"; then |
| 1049 | 994 | $echo "$modename: symbol file \`$arg' does not exist" |
| 1050 | - exit $EXIT_FAILURE | |
| 995 | + exit 1 | |
| 1051 | 996 | fi |
| 1052 | 997 | prev= |
| 1053 | 998 | continue |
| ... | ... | @@ -1062,11 +1007,6 @@ EOF |
| 1062 | 1007 | prev= |
| 1063 | 1008 | continue |
| 1064 | 1009 | ;; |
| 1065 | - precious_regex) | |
| 1066 | - precious_files_regex="$arg" | |
| 1067 | - prev= | |
| 1068 | - continue | |
| 1069 | - ;; | |
| 1070 | 1010 | release) |
| 1071 | 1011 | release="-$arg" |
| 1072 | 1012 | prev= |
| ... | ... | @@ -1099,7 +1039,7 @@ EOF |
| 1099 | 1039 | test "$pic_object" = none && \ |
| 1100 | 1040 | test "$non_pic_object" = none; then |
| 1101 | 1041 | $echo "$modename: cannot find name of object for \`$arg'" 1>&2 |
| 1102 | - exit $EXIT_FAILURE | |
| 1042 | + exit 1 | |
| 1103 | 1043 | fi |
| 1104 | 1044 | |
| 1105 | 1045 | # Extract subdirectory from the argument. |
| ... | ... | @@ -1152,7 +1092,7 @@ EOF |
| 1152 | 1092 | # Only an error if not doing a dry-run. |
| 1153 | 1093 | if test -z "$run"; then |
| 1154 | 1094 | $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 |
| 1155 | - exit $EXIT_FAILURE | |
| 1095 | + exit 1 | |
| 1156 | 1096 | else |
| 1157 | 1097 | # Dry-run case. |
| 1158 | 1098 | |
| ... | ... | @@ -1173,7 +1113,7 @@ EOF |
| 1173 | 1113 | done |
| 1174 | 1114 | else |
| 1175 | 1115 | $echo "$modename: link input file \`$save_arg' does not exist" |
| 1176 | - exit $EXIT_FAILURE | |
| 1116 | + exit 1 | |
| 1177 | 1117 | fi |
| 1178 | 1118 | arg=$save_arg |
| 1179 | 1119 | prev= |
| ... | ... | @@ -1185,7 +1125,7 @@ EOF |
| 1185 | 1125 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 1186 | 1126 | *) |
| 1187 | 1127 | $echo "$modename: only absolute run-paths are allowed" 1>&2 |
| 1188 | - exit $EXIT_FAILURE | |
| 1128 | + exit 1 | |
| 1189 | 1129 | ;; |
| 1190 | 1130 | esac |
| 1191 | 1131 | if test "$prev" = rpath; then |
| ... | ... | @@ -1225,11 +1165,6 @@ EOF |
| 1225 | 1165 | finalize_command="$finalize_command $qarg" |
| 1226 | 1166 | continue |
| 1227 | 1167 | ;; |
| 1228 | - shrext) | |
| 1229 | - shrext_cmds="$arg" | |
| 1230 | - prev= | |
| 1231 | - continue | |
| 1232 | - ;; | |
| 1233 | 1168 | *) |
| 1234 | 1169 | eval "$prev=\"\$arg\"" |
| 1235 | 1170 | prev= |
| ... | ... | @@ -1278,7 +1213,7 @@ EOF |
| 1278 | 1213 | -export-symbols | -export-symbols-regex) |
| 1279 | 1214 | if test -n "$export_symbols" || test -n "$export_symbols_regex"; then |
| 1280 | 1215 | $echo "$modename: more than one -exported-symbols argument is not allowed" |
| 1281 | - exit $EXIT_FAILURE | |
| 1216 | + exit 1 | |
| 1282 | 1217 | fi |
| 1283 | 1218 | if test "X$arg" = "X-export-symbols"; then |
| 1284 | 1219 | prev=expsyms |
| ... | ... | @@ -1314,7 +1249,7 @@ EOF |
| 1314 | 1249 | absdir=`cd "$dir" && pwd` |
| 1315 | 1250 | if test -z "$absdir"; then |
| 1316 | 1251 | $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 |
| 1317 | - exit $EXIT_FAILURE | |
| 1252 | + exit 1 | |
| 1318 | 1253 | fi |
| 1319 | 1254 | dir="$absdir" |
| 1320 | 1255 | ;; |
| ... | ... | @@ -1369,11 +1304,6 @@ EOF |
| 1369 | 1304 | continue |
| 1370 | 1305 | ;; |
| 1371 | 1306 | |
| 1372 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) | |
| 1373 | - deplibs="$deplibs $arg" | |
| 1374 | - continue | |
| 1375 | - ;; | |
| 1376 | - | |
| 1377 | 1307 | -module) |
| 1378 | 1308 | module=yes |
| 1379 | 1309 | continue |
| ... | ... | @@ -1438,11 +1368,6 @@ EOF |
| 1438 | 1368 | |
| 1439 | 1369 | -o) prev=output ;; |
| 1440 | 1370 | |
| 1441 | - -precious-files-regex) | |
| 1442 | - prev=precious_regex | |
| 1443 | - continue | |
| 1444 | - ;; | |
| 1445 | - | |
| 1446 | 1371 | -release) |
| 1447 | 1372 | prev=release |
| 1448 | 1373 | continue |
| ... | ... | @@ -1465,7 +1390,7 @@ EOF |
| 1465 | 1390 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 1466 | 1391 | *) |
| 1467 | 1392 | $echo "$modename: only absolute run-paths are allowed" 1>&2 |
| 1468 | - exit $EXIT_FAILURE | |
| 1393 | + exit 1 | |
| 1469 | 1394 | ;; |
| 1470 | 1395 | esac |
| 1471 | 1396 | case "$xrpath " in |
| ... | ... | @@ -1588,7 +1513,7 @@ EOF |
| 1588 | 1513 | test "$pic_object" = none && \ |
| 1589 | 1514 | test "$non_pic_object" = none; then |
| 1590 | 1515 | $echo "$modename: cannot find name of object for \`$arg'" 1>&2 |
| 1591 | - exit $EXIT_FAILURE | |
| 1516 | + exit 1 | |
| 1592 | 1517 | fi |
| 1593 | 1518 | |
| 1594 | 1519 | # Extract subdirectory from the argument. |
| ... | ... | @@ -1641,7 +1566,7 @@ EOF |
| 1641 | 1566 | # Only an error if not doing a dry-run. |
| 1642 | 1567 | if test -z "$run"; then |
| 1643 | 1568 | $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 |
| 1644 | - exit $EXIT_FAILURE | |
| 1569 | + exit 1 | |
| 1645 | 1570 | else |
| 1646 | 1571 | # Dry-run case. |
| 1647 | 1572 | |
| ... | ... | @@ -1708,7 +1633,48 @@ EOF |
| 1708 | 1633 | if test -n "$prev"; then |
| 1709 | 1634 | $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 |
| 1710 | 1635 | $echo "$help" 1>&2 |
| 1711 | - exit $EXIT_FAILURE | |
| 1636 | + exit 1 | |
| 1637 | + fi | |
| 1638 | + | |
| 1639 | + # Infer tagged configuration to use if any are available and | |
| 1640 | + # if one wasn't chosen via the "--tag" command line option. | |
| 1641 | + # Only attempt this if the compiler in the base link | |
| 1642 | + # command doesn't match the default compiler. | |
| 1643 | + if test -n "$available_tags" && test -z "$tagname"; then | |
| 1644 | + case $base_compile in | |
| 1645 | + # Blanks in the command may have been stripped by the calling shell, | |
| 1646 | + # but not from the CC environment variable when configure was run. | |
| 1647 | + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; | |
| 1648 | + # Blanks at the start of $base_compile will cause this to fail | |
| 1649 | + # if we don't check for them as well. | |
| 1650 | + *) | |
| 1651 | + for z in $available_tags; do | |
| 1652 | + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then | |
| 1653 | + # Evaluate the configuration. | |
| 1654 | + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" | |
| 1655 | + case $base_compile in | |
| 1656 | + "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) | |
| 1657 | + # The compiler in $compile_command matches | |
| 1658 | + # the one in the tagged configuration. | |
| 1659 | + # Assume this is the tagged configuration we want. | |
| 1660 | + tagname=$z | |
| 1661 | + break | |
| 1662 | + ;; | |
| 1663 | + esac | |
| 1664 | + fi | |
| 1665 | + done | |
| 1666 | + # If $tagname still isn't set, then no tagged configuration | |
| 1667 | + # was found and let the user know that the "--tag" command | |
| 1668 | + # line option must be used. | |
| 1669 | + if test -z "$tagname"; then | |
| 1670 | + $echo "$modename: unable to infer tagged configuration" | |
| 1671 | + $echo "$modename: specify a tag with \`--tag'" 1>&2 | |
| 1672 | + exit 1 | |
| 1673 | +# else | |
| 1674 | +# $echo "$modename: using $tagname tagged configuration" | |
| 1675 | + fi | |
| 1676 | + ;; | |
| 1677 | + esac | |
| 1712 | 1678 | fi |
| 1713 | 1679 | |
| 1714 | 1680 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then |
| ... | ... | @@ -1752,7 +1718,7 @@ EOF |
| 1752 | 1718 | "") |
| 1753 | 1719 | $echo "$modename: you must specify an output file" 1>&2 |
| 1754 | 1720 | $echo "$help" 1>&2 |
| 1755 | - exit $EXIT_FAILURE | |
| 1721 | + exit 1 | |
| 1756 | 1722 | ;; |
| 1757 | 1723 | *.$libext) linkmode=oldlib ;; |
| 1758 | 1724 | *.lo | *.$objext) linkmode=obj ;; |
| ... | ... | @@ -1762,7 +1728,7 @@ EOF |
| 1762 | 1728 | |
| 1763 | 1729 | case $host in |
| 1764 | 1730 | *cygwin* | *mingw* | *pw32*) |
| 1765 | - # don't eliminate duplications in $postdeps and $predeps | |
| 1731 | + # don't eliminate duplcations in $postdeps and $predeps | |
| 1766 | 1732 | duplicate_compiler_generated_deps=yes |
| 1767 | 1733 | ;; |
| 1768 | 1734 | *) |
| ... | ... | @@ -1815,7 +1781,7 @@ EOF |
| 1815 | 1781 | *.la) ;; |
| 1816 | 1782 | *) |
| 1817 | 1783 | $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 |
| 1818 | - exit $EXIT_FAILURE | |
| 1784 | + exit 1 | |
| 1819 | 1785 | ;; |
| 1820 | 1786 | esac |
| 1821 | 1787 | done |
| ... | ... | @@ -1853,15 +1819,6 @@ EOF |
| 1853 | 1819 | lib= |
| 1854 | 1820 | found=no |
| 1855 | 1821 | case $deplib in |
| 1856 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) | |
| 1857 | - if test "$linkmode,$pass" = "prog,link"; then | |
| 1858 | - compile_deplibs="$deplib $compile_deplibs" | |
| 1859 | - finalize_deplibs="$deplib $finalize_deplibs" | |
| 1860 | - else | |
| 1861 | - deplibs="$deplib $deplibs" | |
| 1862 | - fi | |
| 1863 | - continue | |
| 1864 | - ;; | |
| 1865 | 1822 | -l*) |
| 1866 | 1823 | if test "$linkmode" != lib && test "$linkmode" != prog; then |
| 1867 | 1824 | $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 |
| ... | ... | @@ -1873,18 +1830,12 @@ EOF |
| 1873 | 1830 | fi |
| 1874 | 1831 | name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` |
| 1875 | 1832 | for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 1876 | - for search_ext in .la $std_shrext .so .a; do | |
| 1877 | - # Search the libtool library | |
| 1878 | - lib="$searchdir/lib${name}${search_ext}" | |
| 1879 | - if test -f "$lib"; then | |
| 1880 | - if test "$search_ext" = ".la"; then | |
| 1881 | - found=yes | |
| 1882 | - else | |
| 1883 | - found=no | |
| 1884 | - fi | |
| 1885 | - break 2 | |
| 1886 | - fi | |
| 1887 | - done | |
| 1833 | + # Search the libtool library | |
| 1834 | + lib="$searchdir/lib${name}.la" | |
| 1835 | + if test -f "$lib"; then | |
| 1836 | + found=yes | |
| 1837 | + break | |
| 1838 | + fi | |
| 1888 | 1839 | done |
| 1889 | 1840 | if test "$found" != yes; then |
| 1890 | 1841 | # deplib doesn't seem to be a libtool library |
| ... | ... | @@ -1949,11 +1900,11 @@ EOF |
| 1949 | 1900 | fi |
| 1950 | 1901 | if test "$pass" = scan; then |
| 1951 | 1902 | deplibs="$deplib $deplibs" |
| 1903 | + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` | |
| 1952 | 1904 | else |
| 1953 | 1905 | compile_deplibs="$deplib $compile_deplibs" |
| 1954 | 1906 | finalize_deplibs="$deplib $finalize_deplibs" |
| 1955 | 1907 | fi |
| 1956 | - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` | |
| 1957 | 1908 | ;; |
| 1958 | 1909 | *) |
| 1959 | 1910 | $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 |
| ... | ... | @@ -2032,14 +1983,14 @@ EOF |
| 2032 | 1983 | if test "$found" = yes || test -f "$lib"; then : |
| 2033 | 1984 | else |
| 2034 | 1985 | $echo "$modename: cannot find the library \`$lib'" 1>&2 |
| 2035 | - exit $EXIT_FAILURE | |
| 1986 | + exit 1 | |
| 2036 | 1987 | fi |
| 2037 | 1988 | |
| 2038 | 1989 | # Check to see that this really is a libtool archive. |
| 2039 | 1990 | if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
| 2040 | 1991 | else |
| 2041 | 1992 | $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
| 2042 | - exit $EXIT_FAILURE | |
| 1993 | + exit 1 | |
| 2043 | 1994 | fi |
| 2044 | 1995 | |
| 2045 | 1996 | ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` |
| ... | ... | @@ -2075,7 +2026,7 @@ EOF |
| 2075 | 2026 | if test -z "$libdir"; then |
| 2076 | 2027 | if test -z "$old_library"; then |
| 2077 | 2028 | $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 |
| 2078 | - exit $EXIT_FAILURE | |
| 2029 | + exit 1 | |
| 2079 | 2030 | fi |
| 2080 | 2031 | # It is a libtool convenience library, so add in its objects. |
| 2081 | 2032 | convenience="$convenience $ladir/$objdir/$old_library" |
| ... | ... | @@ -2092,12 +2043,12 @@ EOF |
| 2092 | 2043 | done |
| 2093 | 2044 | elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 2094 | 2045 | $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
| 2095 | - exit $EXIT_FAILURE | |
| 2046 | + exit 1 | |
| 2096 | 2047 | fi |
| 2097 | 2048 | continue |
| 2098 | 2049 | fi # $pass = conv |
| 2099 | 2050 | |
| 2100 | - | |
| 2051 | + | |
| 2101 | 2052 | # Get the name of the library we link against. |
| 2102 | 2053 | linklib= |
| 2103 | 2054 | for l in $old_library $library_names; do |
| ... | ... | @@ -2105,18 +2056,16 @@ EOF |
| 2105 | 2056 | done |
| 2106 | 2057 | if test -z "$linklib"; then |
| 2107 | 2058 | $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 |
| 2108 | - exit $EXIT_FAILURE | |
| 2059 | + exit 1 | |
| 2109 | 2060 | fi |
| 2110 | 2061 | |
| 2111 | 2062 | # This library was specified with -dlopen. |
| 2112 | 2063 | if test "$pass" = dlopen; then |
| 2113 | 2064 | if test -z "$libdir"; then |
| 2114 | 2065 | $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 |
| 2115 | - exit $EXIT_FAILURE | |
| 2066 | + exit 1 | |
| 2116 | 2067 | fi |
| 2117 | - if test -z "$dlname" || | |
| 2118 | - test "$dlopen_support" != yes || | |
| 2119 | - test "$build_libtool_libs" = no; then | |
| 2068 | + if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then | |
| 2120 | 2069 | # If there is no dlname, no dlopen support or we're linking |
| 2121 | 2070 | # statically, we need to preload. We also need to preload any |
| 2122 | 2071 | # dependent libraries so libltdl's deplib preloader doesn't |
| ... | ... | @@ -2165,7 +2114,7 @@ EOF |
| 2165 | 2114 | if test "$pass" = dlpreopen; then |
| 2166 | 2115 | if test -z "$libdir"; then |
| 2167 | 2116 | $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 |
| 2168 | - exit $EXIT_FAILURE | |
| 2117 | + exit 1 | |
| 2169 | 2118 | fi |
| 2170 | 2119 | # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 2171 | 2120 | # are required to link). |
| ... | ... | @@ -2192,7 +2141,7 @@ EOF |
| 2192 | 2141 | continue |
| 2193 | 2142 | fi |
| 2194 | 2143 | |
| 2195 | - | |
| 2144 | + | |
| 2196 | 2145 | if test "$linkmode" = prog && test "$pass" != link; then |
| 2197 | 2146 | newlib_search_path="$newlib_search_path $ladir" |
| 2198 | 2147 | deplibs="$lib $deplibs" |
| ... | ... | @@ -2279,18 +2228,17 @@ EOF |
| 2279 | 2228 | need_relink=yes |
| 2280 | 2229 | fi |
| 2281 | 2230 | # This is a shared library |
| 2282 | - | |
| 2283 | - # Warn about portability, can't link against -module's on | |
| 2284 | - # some systems (darwin) | |
| 2285 | - if test "$shouldnotlink" = yes && test "$pass" = link ; then | |
| 2231 | + | |
| 2232 | + # Warn about portability, can't link against -module's on some systems (darwin) | |
| 2233 | + if test "$shouldnotlink" = yes && test "$pass" = link ; then | |
| 2286 | 2234 | $echo |
| 2287 | 2235 | if test "$linkmode" = prog; then |
| 2288 | 2236 | $echo "*** Warning: Linking the executable $output against the loadable module" |
| 2289 | 2237 | else |
| 2290 | 2238 | $echo "*** Warning: Linking the shared library $output against the loadable module" |
| 2291 | 2239 | fi |
| 2292 | - $echo "*** $linklib is not portable!" | |
| 2293 | - fi | |
| 2240 | + $echo "*** $linklib is not portable!" | |
| 2241 | + fi | |
| 2294 | 2242 | if test "$linkmode" = lib && |
| 2295 | 2243 | test "$hardcode_into_libs" = yes; then |
| 2296 | 2244 | # Hardcode the library path. |
| ... | ... | @@ -2347,11 +2295,10 @@ EOF |
| 2347 | 2295 | if test -f "$output_objdir/$soname-def"; then : |
| 2348 | 2296 | else |
| 2349 | 2297 | $show "extracting exported symbol list from \`$soname'" |
| 2350 | - save_ifs="$IFS"; IFS='~' | |
| 2351 | - cmds=$extract_expsyms_cmds | |
| 2298 | + save_ifs="$IFS"; IFS=$_S_ | |
| 2299 | + eval cmds=\"$extract_expsyms_cmds\" | |
| 2352 | 2300 | for cmd in $cmds; do |
| 2353 | 2301 | IFS="$save_ifs" |
| 2354 | - eval cmd=\"$cmd\" | |
| 2355 | 2302 | $show "$cmd" |
| 2356 | 2303 | $run eval "$cmd" || exit $? |
| 2357 | 2304 | done |
| ... | ... | @@ -2361,11 +2308,10 @@ EOF |
| 2361 | 2308 | # Create $newlib |
| 2362 | 2309 | if test -f "$output_objdir/$newlib"; then :; else |
| 2363 | 2310 | $show "generating import library for \`$soname'" |
| 2364 | - save_ifs="$IFS"; IFS='~' | |
| 2365 | - cmds=$old_archive_from_expsyms_cmds | |
| 2311 | + save_ifs="$IFS"; IFS=$_S_ | |
| 2312 | + eval cmds=\"$old_archive_from_expsyms_cmds\" | |
| 2366 | 2313 | for cmd in $cmds; do |
| 2367 | 2314 | IFS="$save_ifs" |
| 2368 | - eval cmd=\"$cmd\" | |
| 2369 | 2315 | $show "$cmd" |
| 2370 | 2316 | $run eval "$cmd" || exit $? |
| 2371 | 2317 | done |
| ... | ... | @@ -2388,9 +2334,9 @@ EOF |
| 2388 | 2334 | case $host in |
| 2389 | 2335 | *-*-sco3.2v5* ) add_dir="-L$dir" ;; |
| 2390 | 2336 | *-*-darwin* ) |
| 2391 | - # if the lib is a module then we can not link against | |
| 2392 | - # it, someone is ignoring the new warnings I added | |
| 2393 | - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then | |
| 2337 | + # if the lib is a module then we can not link against it, someone | |
| 2338 | + # is ignoring the new warnings I added | |
| 2339 | + if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then | |
| 2394 | 2340 | $echo "** Warning, lib $linklib is a module, not a shared library" |
| 2395 | 2341 | if test -z "$old_library" ; then |
| 2396 | 2342 | $echo |
| ... | ... | @@ -2398,7 +2344,7 @@ EOF |
| 2398 | 2344 | $echo "** The link will probably fail, sorry" |
| 2399 | 2345 | else |
| 2400 | 2346 | add="$dir/$old_library" |
| 2401 | - fi | |
| 2347 | + fi | |
| 2402 | 2348 | fi |
| 2403 | 2349 | esac |
| 2404 | 2350 | elif test "$hardcode_minus_L" = no; then |
| ... | ... | @@ -2423,7 +2369,7 @@ EOF |
| 2423 | 2369 | if test -n "$inst_prefix_dir"; then |
| 2424 | 2370 | case "$libdir" in |
| 2425 | 2371 | [\\/]*) |
| 2426 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" | |
| 2372 | + add_dir="-L$inst_prefix_dir$libdir $add_dir" | |
| 2427 | 2373 | ;; |
| 2428 | 2374 | esac |
| 2429 | 2375 | fi |
| ... | ... | @@ -2440,7 +2386,7 @@ EOF |
| 2440 | 2386 | |
| 2441 | 2387 | if test "$lib_linked" != yes; then |
| 2442 | 2388 | $echo "$modename: configuration error: unsupported hardcode properties" |
| 2443 | - exit $EXIT_FAILURE | |
| 2389 | + exit 1 | |
| 2444 | 2390 | fi |
| 2445 | 2391 | |
| 2446 | 2392 | if test -n "$add_shlibpath"; then |
| ... | ... | @@ -2483,8 +2429,7 @@ EOF |
| 2483 | 2429 | esac |
| 2484 | 2430 | add="-l$name" |
| 2485 | 2431 | elif test "$hardcode_automatic" = yes; then |
| 2486 | - if test -n "$inst_prefix_dir" && | |
| 2487 | - test -f "$inst_prefix_dir$libdir/$linklib" ; then | |
| 2432 | + if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then | |
| 2488 | 2433 | add="$inst_prefix_dir$libdir/$linklib" |
| 2489 | 2434 | else |
| 2490 | 2435 | add="$libdir/$linklib" |
| ... | ... | @@ -2496,7 +2441,7 @@ EOF |
| 2496 | 2441 | if test -n "$inst_prefix_dir"; then |
| 2497 | 2442 | case "$libdir" in |
| 2498 | 2443 | [\\/]*) |
| 2499 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" | |
| 2444 | + add_dir="-L$inst_prefix_dir$libdir $add_dir" | |
| 2500 | 2445 | ;; |
| 2501 | 2446 | esac |
| 2502 | 2447 | fi |
| ... | ... | @@ -2564,8 +2509,7 @@ EOF |
| 2564 | 2509 | |
| 2565 | 2510 | if test "$linkmode" = lib; then |
| 2566 | 2511 | if test -n "$dependency_libs" && |
| 2567 | - { test "$hardcode_into_libs" != yes || | |
| 2568 | - test "$build_old_libs" = yes || | |
| 2512 | + { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || | |
| 2569 | 2513 | test "$link_static" = yes; }; then |
| 2570 | 2514 | # Extract -R from dependency_libs |
| 2571 | 2515 | temp_deplibs= |
| ... | ... | @@ -2622,7 +2566,7 @@ EOF |
| 2622 | 2566 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 2623 | 2567 | if test -z "$libdir"; then |
| 2624 | 2568 | $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 2625 | - exit $EXIT_FAILURE | |
| 2569 | + exit 1 | |
| 2626 | 2570 | fi |
| 2627 | 2571 | if test "$absdir" != "$libdir"; then |
| 2628 | 2572 | $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 |
| ... | ... | @@ -2632,8 +2576,7 @@ EOF |
| 2632 | 2576 | depdepl= |
| 2633 | 2577 | case $host in |
| 2634 | 2578 | *-*-darwin*) |
| 2635 | - # we do not want to link against static libs, | |
| 2636 | - # but need to link against shared | |
| 2579 | + # we do not want to link against static libs, but need to link against shared | |
| 2637 | 2580 | eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 2638 | 2581 | if test -n "$deplibrary_names" ; then |
| 2639 | 2582 | for tmp in $deplibrary_names ; do |
| ... | ... | @@ -2641,42 +2584,39 @@ EOF |
| 2641 | 2584 | done |
| 2642 | 2585 | if test -f "$path/$depdepl" ; then |
| 2643 | 2586 | depdepl="$path/$depdepl" |
| 2644 | - fi | |
| 2645 | - # do not add paths which are already there | |
| 2646 | - case " $newlib_search_path " in | |
| 2647 | - *" $path "*) ;; | |
| 2648 | - *) newlib_search_path="$newlib_search_path $path";; | |
| 2649 | - esac | |
| 2587 | + fi | |
| 2588 | + newlib_search_path="$newlib_search_path $path" | |
| 2589 | + path="" | |
| 2650 | 2590 | fi |
| 2651 | - path="" | |
| 2652 | 2591 | ;; |
| 2653 | 2592 | *) |
| 2654 | - path="-L$path" | |
| 2655 | - ;; | |
| 2656 | - esac | |
| 2593 | + path="-L$path" | |
| 2594 | + ;; | |
| 2595 | + esac | |
| 2596 | + | |
| 2657 | 2597 | ;; |
| 2658 | - -l*) | |
| 2598 | + -l*) | |
| 2659 | 2599 | case $host in |
| 2660 | 2600 | *-*-darwin*) |
| 2661 | - # Again, we only want to link against shared libraries | |
| 2662 | - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` | |
| 2663 | - for tmp in $newlib_search_path ; do | |
| 2664 | - if test -f "$tmp/lib$tmp_libs.dylib" ; then | |
| 2665 | - eval depdepl="$tmp/lib$tmp_libs.dylib" | |
| 2666 | - break | |
| 2667 | - fi | |
| 2668 | - done | |
| 2669 | - path="" | |
| 2601 | + # Again, we only want to link against shared libraries | |
| 2602 | + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` | |
| 2603 | + for tmp in $newlib_search_path ; do | |
| 2604 | + if test -f "$tmp/lib$tmp_libs.dylib" ; then | |
| 2605 | + eval depdepl="$tmp/lib$tmp_libs.dylib" | |
| 2606 | + break | |
| 2607 | + fi | |
| 2608 | + done | |
| 2609 | + path="" | |
| 2670 | 2610 | ;; |
| 2671 | 2611 | *) continue ;; |
| 2672 | - esac | |
| 2612 | + esac | |
| 2673 | 2613 | ;; |
| 2674 | 2614 | *) continue ;; |
| 2675 | 2615 | esac |
| 2676 | 2616 | case " $deplibs " in |
| 2677 | 2617 | *" $depdepl "*) ;; |
| 2678 | - *) deplibs="$depdepl $deplibs" ;; | |
| 2679 | - esac | |
| 2618 | + *) deplibs="$deplibs $depdepl" ;; | |
| 2619 | + esac | |
| 2680 | 2620 | case " $deplibs " in |
| 2681 | 2621 | *" $path "*) ;; |
| 2682 | 2622 | *) deplibs="$deplibs $path" ;; |
| ... | ... | @@ -2766,8 +2706,7 @@ EOF |
| 2766 | 2706 | eval $var=\"$tmp_libs\" |
| 2767 | 2707 | done # for var |
| 2768 | 2708 | fi |
| 2769 | - # Last step: remove runtime libs from dependency_libs | |
| 2770 | - # (they stay in deplibs) | |
| 2709 | + # Last step: remove runtime libs from dependency_libs (they stay in deplibs) | |
| 2771 | 2710 | tmp_libs= |
| 2772 | 2711 | for i in $dependency_libs ; do |
| 2773 | 2712 | case " $predeps $postdeps $compiler_lib_search_path " in |
| ... | ... | @@ -2827,19 +2766,19 @@ EOF |
| 2827 | 2766 | case $outputname in |
| 2828 | 2767 | lib*) |
| 2829 | 2768 | name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
| 2830 | - eval shared_ext=\"$shrext_cmds\" | |
| 2769 | + eval shared_ext=\"$shrext\" | |
| 2831 | 2770 | eval libname=\"$libname_spec\" |
| 2832 | 2771 | ;; |
| 2833 | 2772 | *) |
| 2834 | 2773 | if test "$module" = no; then |
| 2835 | 2774 | $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 |
| 2836 | 2775 | $echo "$help" 1>&2 |
| 2837 | - exit $EXIT_FAILURE | |
| 2776 | + exit 1 | |
| 2838 | 2777 | fi |
| 2839 | 2778 | if test "$need_lib_prefix" != no; then |
| 2840 | 2779 | # Add the "lib" prefix for modules if required |
| 2841 | 2780 | name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` |
| 2842 | - eval shared_ext=\"$shrext_cmds\" | |
| 2781 | + eval shared_ext=\"$shrext\" | |
| 2843 | 2782 | eval libname=\"$libname_spec\" |
| 2844 | 2783 | else |
| 2845 | 2784 | libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` |
| ... | ... | @@ -2850,7 +2789,7 @@ EOF |
| 2850 | 2789 | if test -n "$objs"; then |
| 2851 | 2790 | if test "$deplibs_check_method" != pass_all; then |
| 2852 | 2791 | $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 |
| 2853 | - exit $EXIT_FAILURE | |
| 2792 | + exit 1 | |
| 2854 | 2793 | else |
| 2855 | 2794 | $echo |
| 2856 | 2795 | $echo "*** Warning: Linking the shared library $output against the non-libtool" |
| ... | ... | @@ -2898,13 +2837,13 @@ EOF |
| 2898 | 2837 | if test -n "$8"; then |
| 2899 | 2838 | $echo "$modename: too many parameters to \`-version-info'" 1>&2 |
| 2900 | 2839 | $echo "$help" 1>&2 |
| 2901 | - exit $EXIT_FAILURE | |
| 2840 | + exit 1 | |
| 2902 | 2841 | fi |
| 2903 | 2842 | |
| 2904 | 2843 | # convert absolute version numbers to libtool ages |
| 2905 | 2844 | # this retains compatibility with .la files and attempts |
| 2906 | 2845 | # to make the code below a bit more comprehensible |
| 2907 | - | |
| 2846 | + | |
| 2908 | 2847 | case $vinfo_number in |
| 2909 | 2848 | yes) |
| 2910 | 2849 | number_major="$2" |
| ... | ... | @@ -2944,36 +2883,36 @@ EOF |
| 2944 | 2883 | |
| 2945 | 2884 | # Check that each of the things are valid numbers. |
| 2946 | 2885 | case $current in |
| 2947 | - [0-9]*) ;; | |
| 2886 | + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; | |
| 2948 | 2887 | *) |
| 2949 | 2888 | $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 |
| 2950 | 2889 | $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
| 2951 | - exit $EXIT_FAILURE | |
| 2890 | + exit 1 | |
| 2952 | 2891 | ;; |
| 2953 | 2892 | esac |
| 2954 | 2893 | |
| 2955 | 2894 | case $revision in |
| 2956 | - [0-9]*) ;; | |
| 2895 | + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; | |
| 2957 | 2896 | *) |
| 2958 | 2897 | $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 |
| 2959 | 2898 | $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
| 2960 | - exit $EXIT_FAILURE | |
| 2899 | + exit 1 | |
| 2961 | 2900 | ;; |
| 2962 | 2901 | esac |
| 2963 | 2902 | |
| 2964 | 2903 | case $age in |
| 2965 | - [0-9]*) ;; | |
| 2904 | + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; | |
| 2966 | 2905 | *) |
| 2967 | 2906 | $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 |
| 2968 | 2907 | $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
| 2969 | - exit $EXIT_FAILURE | |
| 2908 | + exit 1 | |
| 2970 | 2909 | ;; |
| 2971 | 2910 | esac |
| 2972 | 2911 | |
| 2973 | 2912 | if test "$age" -gt "$current"; then |
| 2974 | 2913 | $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 |
| 2975 | 2914 | $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
| 2976 | - exit $EXIT_FAILURE | |
| 2915 | + exit 1 | |
| 2977 | 2916 | fi |
| 2978 | 2917 | |
| 2979 | 2918 | # Calculate the version variables. |
| ... | ... | @@ -3062,7 +3001,7 @@ EOF |
| 3062 | 3001 | *) |
| 3063 | 3002 | $echo "$modename: unknown library version type \`$version_type'" 1>&2 |
| 3064 | 3003 | $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
| 3065 | - exit $EXIT_FAILURE | |
| 3004 | + exit 1 | |
| 3066 | 3005 | ;; |
| 3067 | 3006 | esac |
| 3068 | 3007 | |
| ... | ... | @@ -3116,12 +3055,6 @@ EOF |
| 3116 | 3055 | *.$objext) |
| 3117 | 3056 | ;; |
| 3118 | 3057 | $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) |
| 3119 | - if test "X$precious_files_regex" != "X"; then | |
| 3120 | - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 | |
| 3121 | - then | |
| 3122 | - continue | |
| 3123 | - fi | |
| 3124 | - fi | |
| 3125 | 3058 | removelist="$removelist $p" |
| 3126 | 3059 | ;; |
| 3127 | 3060 | *) ;; |
| ... | ... | @@ -3242,7 +3175,7 @@ EOF |
| 3242 | 3175 | int main() { return 0; } |
| 3243 | 3176 | EOF |
| 3244 | 3177 | $rm conftest |
| 3245 | - $LTCC -o conftest conftest.c $deplibs | |
| 3178 | + $LTCC $archargs -o conftest conftest.c $deplibs | |
| 3246 | 3179 | if test "$?" -eq 0 ; then |
| 3247 | 3180 | ldd_output=`ldd conftest` |
| 3248 | 3181 | for i in $deplibs; do |
| ... | ... | @@ -3287,7 +3220,7 @@ EOF |
| 3287 | 3220 | # If $name is empty we are operating on a -L argument. |
| 3288 | 3221 | if test "$name" != "" && test "$name" != "0"; then |
| 3289 | 3222 | $rm conftest |
| 3290 | - $LTCC -o conftest conftest.c $i | |
| 3223 | + $LTCC $archargs -o conftest conftest.c $i | |
| 3291 | 3224 | # Did it work? |
| 3292 | 3225 | if test "$?" -eq 0 ; then |
| 3293 | 3226 | ldd_output=`ldd conftest` |
| ... | ... | @@ -3601,7 +3534,7 @@ EOF |
| 3601 | 3534 | fi |
| 3602 | 3535 | |
| 3603 | 3536 | # Get the real and link names of the library. |
| 3604 | - eval shared_ext=\"$shrext_cmds\" | |
| 3537 | + eval shared_ext=\"$shrext\" | |
| 3605 | 3538 | eval library_names=\"$library_names_spec\" |
| 3606 | 3539 | set dummy $library_names |
| 3607 | 3540 | realname="$2" |
| ... | ... | @@ -3631,11 +3564,10 @@ EOF |
| 3631 | 3564 | $show "generating symbol list for \`$libname.la'" |
| 3632 | 3565 | export_symbols="$output_objdir/$libname.exp" |
| 3633 | 3566 | $run $rm $export_symbols |
| 3634 | - cmds=$export_symbols_cmds | |
| 3635 | - save_ifs="$IFS"; IFS='~' | |
| 3567 | + eval cmds=\"$export_symbols_cmds\" | |
| 3568 | + save_ifs="$IFS"; IFS=$_S_ | |
| 3636 | 3569 | for cmd in $cmds; do |
| 3637 | 3570 | IFS="$save_ifs" |
| 3638 | - eval cmd=\"$cmd\" | |
| 3639 | 3571 | if len=`expr "X$cmd" : ".*"` && |
| 3640 | 3572 | test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 3641 | 3573 | $show "$cmd" |
| ... | ... | @@ -3665,12 +3597,12 @@ EOF |
| 3665 | 3597 | for test_deplib in $deplibs; do |
| 3666 | 3598 | case " $convenience " in |
| 3667 | 3599 | *" $test_deplib "*) ;; |
| 3668 | - *) | |
| 3600 | + *) | |
| 3669 | 3601 | tmp_deplibs="$tmp_deplibs $test_deplib" |
| 3670 | 3602 | ;; |
| 3671 | 3603 | esac |
| 3672 | 3604 | done |
| 3673 | - deplibs="$tmp_deplibs" | |
| 3605 | + deplibs="$tmp_deplibs" | |
| 3674 | 3606 | |
| 3675 | 3607 | if test -n "$convenience"; then |
| 3676 | 3608 | if test -n "$whole_archive_flag_spec"; then |
| ... | ... | @@ -3705,34 +3637,80 @@ EOF |
| 3705 | 3637 | if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 3706 | 3638 | exit $status |
| 3707 | 3639 | fi |
| 3708 | - # We will extract separately just the conflicting names and we will no | |
| 3709 | - # longer touch any unique names. It is faster to leave these extract | |
| 3710 | - # automatically by $AR in one run. | |
| 3711 | - $show "(cd $xdir && $AR x $xabs)" | |
| 3712 | - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 3713 | - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 3714 | - : | |
| 3715 | - else | |
| 3716 | - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 3717 | - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 3718 | - $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 3719 | - do | |
| 3720 | - i=1 | |
| 3721 | - while test "$i" -le "$count" | |
| 3640 | + case $host in | |
| 3641 | + *-*-darwin*) | |
| 3642 | + # ranlib-ed archives of fat binaries are converted to a fat xabs that | |
| 3643 | + # ar can't use. So we to split the fat xabs into non-fat ones to unpack. | |
| 3644 | + # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work. | |
| 3645 | + d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'` | |
| 3646 | + if test -n "$d_archs"; then | |
| 3647 | + $echo "$modename: manually unpacking fat archive $xabs" 1>&2 | |
| 3648 | + d_name=`basename $xabs` | |
| 3649 | + d_dir="/tmp/fat_ar.$$" | |
| 3650 | + d_files='' | |
| 3651 | + | |
| 3652 | + for d_arch in $d_archs; do | |
| 3653 | + d_archdir="$d_dir/$d_arch" | |
| 3654 | + $show "$mkdir -p $d_archdir" | |
| 3655 | + $run $mkdir -p "$d_archdir" | |
| 3656 | + | |
| 3657 | + $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name" | |
| 3658 | + $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name" | |
| 3659 | + | |
| 3660 | + $show "(cd $d_archdir && $AR x $d_dir/$d_name)" | |
| 3661 | + $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $? | |
| 3662 | + | |
| 3663 | + $show "${rm} $d_dir/$d_name" | |
| 3664 | + $run ${rm} "$d_dir/$d_name" | |
| 3665 | + done | |
| 3666 | + | |
| 3667 | + # Can't deal with blanks in file names | |
| 3668 | + $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' -e '/__.SYMDEF/d' | sort -u\`" || exit $? | |
| 3669 | + | |
| 3670 | + for d_file in $d_files; do | |
| 3671 | + $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $? | |
| 3672 | + $show "lipo -create $d_f -o $xdir/$d_file" | |
| 3673 | + $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $? | |
| 3674 | + done | |
| 3675 | + | |
| 3676 | + $show "${rm}r $d_dir" | |
| 3677 | + $run ${rm}r "$d_dir" | |
| 3678 | + else | |
| 3679 | + $show "(cd $xdir && $AR x $xabs)" | |
| 3680 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 3681 | + fi | |
| 3682 | + ;; | |
| 3683 | + *) | |
| 3684 | + # We will extract separately just the conflicting names and we will no | |
| 3685 | + # longer touch any unique names. It is faster to leave these extract | |
| 3686 | + # automatically by $AR in one run. | |
| 3687 | + $show "(cd $xdir && $AR x $xabs)" | |
| 3688 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 3689 | + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 3690 | + : | |
| 3691 | + else | |
| 3692 | + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 3693 | + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 3694 | + $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 3722 | 3695 | do |
| 3723 | - # Put our $i before any first dot (extension) | |
| 3724 | - # Never overwrite any file | |
| 3725 | - name_to="$name" | |
| 3726 | - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 3727 | - do | |
| 3728 | - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 3729 | - done | |
| 3730 | - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 3731 | - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 3732 | - i=`expr $i + 1` | |
| 3696 | + i=1 | |
| 3697 | + while test "$i" -le "$count" | |
| 3698 | + do | |
| 3699 | + # Put our $i before any first dot (extension) | |
| 3700 | + # Never overwrite any file | |
| 3701 | + name_to="$name" | |
| 3702 | + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 3703 | + do | |
| 3704 | + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 3705 | + done | |
| 3706 | + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 3707 | + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 3708 | + i=`expr $i + 1` | |
| 3709 | + done | |
| 3733 | 3710 | done |
| 3734 | - done | |
| 3735 | - fi | |
| 3711 | + fi | |
| 3712 | + ;; | |
| 3713 | + esac | |
| 3736 | 3714 | |
| 3737 | 3715 | libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
| 3738 | 3716 | done |
| ... | ... | @@ -3752,23 +3730,19 @@ EOF |
| 3752 | 3730 | # Do each of the archive commands. |
| 3753 | 3731 | if test "$module" = yes && test -n "$module_cmds" ; then |
| 3754 | 3732 | if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then |
| 3755 | - eval test_cmds=\"$module_expsym_cmds\" | |
| 3756 | - cmds=$module_expsym_cmds | |
| 3733 | + eval cmds=\"$module_expsym_cmds\" | |
| 3757 | 3734 | else |
| 3758 | - eval test_cmds=\"$module_cmds\" | |
| 3759 | - cmds=$module_cmds | |
| 3735 | + eval cmds=\"$module_cmds\" | |
| 3760 | 3736 | fi |
| 3761 | 3737 | else |
| 3762 | 3738 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
| 3763 | - eval test_cmds=\"$archive_expsym_cmds\" | |
| 3764 | - cmds=$archive_expsym_cmds | |
| 3739 | + eval cmds=\"$archive_expsym_cmds\" | |
| 3765 | 3740 | else |
| 3766 | - eval test_cmds=\"$archive_cmds\" | |
| 3767 | - cmds=$archive_cmds | |
| 3741 | + eval cmds=\"$archive_cmds\" | |
| 3768 | 3742 | fi |
| 3769 | 3743 | fi |
| 3770 | 3744 | |
| 3771 | - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && | |
| 3745 | + if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && | |
| 3772 | 3746 | test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 3773 | 3747 | : |
| 3774 | 3748 | else |
| ... | ... | @@ -3814,7 +3788,7 @@ EOF |
| 3814 | 3788 | else |
| 3815 | 3789 | # All subsequent reloadable object files will link in |
| 3816 | 3790 | # the last one created. |
| 3817 | - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" | |
| 3791 | + eval concat_cmds=\"\$concat_cmds${_S_}$reload_cmds $objlist $last_robj\" | |
| 3818 | 3792 | fi |
| 3819 | 3793 | last_robj=$output_objdir/$save_output-${k}.$objext |
| 3820 | 3794 | k=`expr $k + 1` |
| ... | ... | @@ -3826,7 +3800,7 @@ EOF |
| 3826 | 3800 | # Handle the remaining objects by creating one last |
| 3827 | 3801 | # reloadable object file. All subsequent reloadable object |
| 3828 | 3802 | # files will link in the last one created. |
| 3829 | - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | |
| 3803 | + test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_} | |
| 3830 | 3804 | eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" |
| 3831 | 3805 | |
| 3832 | 3806 | if ${skipped_export-false}; then |
| ... | ... | @@ -3835,7 +3809,7 @@ EOF |
| 3835 | 3809 | $run $rm $export_symbols |
| 3836 | 3810 | libobjs=$output |
| 3837 | 3811 | # Append the command to create the export file. |
| 3838 | - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" | |
| 3812 | + eval concat_cmds=\"\$concat_cmds${_S_}$export_symbols_cmds\" | |
| 3839 | 3813 | fi |
| 3840 | 3814 | |
| 3841 | 3815 | # Set up a command to remove the reloadale object files |
| ... | ... | @@ -3850,7 +3824,7 @@ EOF |
| 3850 | 3824 | $echo "creating a temporary reloadable object file: $output" |
| 3851 | 3825 | |
| 3852 | 3826 | # Loop through the commands generated above and execute them. |
| 3853 | - save_ifs="$IFS"; IFS='~' | |
| 3827 | + save_ifs="$IFS"; IFS=$_S_ | |
| 3854 | 3828 | for cmd in $concat_cmds; do |
| 3855 | 3829 | IFS="$save_ifs" |
| 3856 | 3830 | $show "$cmd" |
| ... | ... | @@ -3869,28 +3843,19 @@ EOF |
| 3869 | 3843 | # value of $libobjs for piecewise linking. |
| 3870 | 3844 | |
| 3871 | 3845 | # Do each of the archive commands. |
| 3872 | - if test "$module" = yes && test -n "$module_cmds" ; then | |
| 3873 | - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then | |
| 3874 | - cmds=$module_expsym_cmds | |
| 3875 | - else | |
| 3876 | - cmds=$module_cmds | |
| 3877 | - fi | |
| 3878 | - else | |
| 3879 | 3846 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
| 3880 | - cmds=$archive_expsym_cmds | |
| 3847 | + eval cmds=\"$archive_expsym_cmds\" | |
| 3881 | 3848 | else |
| 3882 | - cmds=$archive_cmds | |
| 3883 | - fi | |
| 3849 | + eval cmds=\"$archive_cmds\" | |
| 3884 | 3850 | fi |
| 3885 | 3851 | |
| 3886 | 3852 | # Append the command to remove the reloadable object files |
| 3887 | 3853 | # to the just-reset $cmds. |
| 3888 | - eval cmds=\"\$cmds~\$rm $delfiles\" | |
| 3854 | + eval cmds=\"\$cmds${_S_}$rm $delfiles\" | |
| 3889 | 3855 | fi |
| 3890 | - save_ifs="$IFS"; IFS='~' | |
| 3856 | + save_ifs="$IFS"; IFS=$_S_ | |
| 3891 | 3857 | for cmd in $cmds; do |
| 3892 | 3858 | IFS="$save_ifs" |
| 3893 | - eval cmd=\"$cmd\" | |
| 3894 | 3859 | $show "$cmd" |
| 3895 | 3860 | $run eval "$cmd" || exit $? |
| 3896 | 3861 | done |
| ... | ... | @@ -3899,7 +3864,7 @@ EOF |
| 3899 | 3864 | # Restore the uninstalled library and exit |
| 3900 | 3865 | if test "$mode" = relink; then |
| 3901 | 3866 | $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? |
| 3902 | - exit $EXIT_SUCCESS | |
| 3867 | + exit 0 | |
| 3903 | 3868 | fi |
| 3904 | 3869 | |
| 3905 | 3870 | # Create links to the real library. |
| ... | ... | @@ -3947,7 +3912,7 @@ EOF |
| 3947 | 3912 | *.lo) |
| 3948 | 3913 | if test -n "$objs$old_deplibs"; then |
| 3949 | 3914 | $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 |
| 3950 | - exit $EXIT_FAILURE | |
| 3915 | + exit 1 | |
| 3951 | 3916 | fi |
| 3952 | 3917 | libobj="$output" |
| 3953 | 3918 | obj=`$echo "X$output" | $Xsed -e "$lo2o"` |
| ... | ... | @@ -4003,34 +3968,80 @@ EOF |
| 4003 | 3968 | if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 4004 | 3969 | exit $status |
| 4005 | 3970 | fi |
| 4006 | - # We will extract separately just the conflicting names and we will no | |
| 4007 | - # longer touch any unique names. It is faster to leave these extract | |
| 4008 | - # automatically by $AR in one run. | |
| 4009 | - $show "(cd $xdir && $AR x $xabs)" | |
| 4010 | - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 4011 | - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 4012 | - : | |
| 4013 | - else | |
| 4014 | - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 4015 | - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 4016 | - $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 4017 | - do | |
| 4018 | - i=1 | |
| 4019 | - while test "$i" -le "$count" | |
| 3971 | + case $host in | |
| 3972 | + *-*-darwin*) | |
| 3973 | + # ranlib-ed archives of fat binaries are converted to a fat xabs that | |
| 3974 | + # ar can't use. So we to split the fat xabs into non-fat ones to unpack. | |
| 3975 | + # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work. | |
| 3976 | + d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'` | |
| 3977 | + if test -n "$d_archs"; then | |
| 3978 | + $echo "$modename: manually unpacking fat archive $xabs" 1>&2 | |
| 3979 | + d_name=`basename $xabs` | |
| 3980 | + d_dir="/tmp/fat_ar.$$" | |
| 3981 | + d_files='' | |
| 3982 | + | |
| 3983 | + for d_arch in $d_archs; do | |
| 3984 | + d_archdir="$d_dir/$d_arch" | |
| 3985 | + $show "$mkdir -p $d_archdir" | |
| 3986 | + $run $mkdir -p "$d_archdir" | |
| 3987 | + | |
| 3988 | + $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name" | |
| 3989 | + $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name" | |
| 3990 | + | |
| 3991 | + $show "(cd $d_archdir && $AR x $d_dir/$d_name)" | |
| 3992 | + $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $? | |
| 3993 | + | |
| 3994 | + $show "${rm} $d_dir/$d_name" | |
| 3995 | + $run ${rm} "$d_dir/$d_name" | |
| 3996 | + done | |
| 3997 | + | |
| 3998 | + # Can't deal with blanks in file names | |
| 3999 | + $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' -e '/__.SYMDEF/d' | sort -u\`" || exit $? | |
| 4000 | + | |
| 4001 | + for d_file in $d_files; do | |
| 4002 | + $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $? | |
| 4003 | + $show "lipo -create $d_f -o $xdir/$d_file" | |
| 4004 | + $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $? | |
| 4005 | + done | |
| 4006 | + | |
| 4007 | + $show "${rm}r $d_dir" | |
| 4008 | + $run ${rm}r "$d_dir" | |
| 4009 | + else | |
| 4010 | + $show "(cd $xdir && $AR x $xabs)" | |
| 4011 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 4012 | + fi | |
| 4013 | + ;; | |
| 4014 | + *) | |
| 4015 | + # We will extract separately just the conflicting names and we will no | |
| 4016 | + # longer touch any unique names. It is faster to leave these extract | |
| 4017 | + # automatically by $AR in one run. | |
| 4018 | + $show "(cd $xdir && $AR x $xabs)" | |
| 4019 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 4020 | + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 4021 | + : | |
| 4022 | + else | |
| 4023 | + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 4024 | + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 4025 | + $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 4020 | 4026 | do |
| 4021 | - # Put our $i before any first dot (extension) | |
| 4022 | - # Never overwrite any file | |
| 4023 | - name_to="$name" | |
| 4024 | - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 4025 | - do | |
| 4026 | - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 4027 | - done | |
| 4028 | - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 4029 | - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 4030 | - i=`expr $i + 1` | |
| 4027 | + i=1 | |
| 4028 | + while test "$i" -le "$count" | |
| 4029 | + do | |
| 4030 | + # Put our $i before any first dot (extension) | |
| 4031 | + # Never overwrite any file | |
| 4032 | + name_to="$name" | |
| 4033 | + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 4034 | + do | |
| 4035 | + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 4036 | + done | |
| 4037 | + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 4038 | + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 4039 | + i=`expr $i + 1` | |
| 4040 | + done | |
| 4031 | 4041 | done |
| 4032 | - done | |
| 4033 | - fi | |
| 4042 | + fi | |
| 4043 | + ;; | |
| 4044 | + esac | |
| 4034 | 4045 | |
| 4035 | 4046 | reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
| 4036 | 4047 | done |
| ... | ... | @@ -4041,11 +4052,10 @@ EOF |
| 4041 | 4052 | reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test |
| 4042 | 4053 | |
| 4043 | 4054 | output="$obj" |
| 4044 | - cmds=$reload_cmds | |
| 4045 | - save_ifs="$IFS"; IFS='~' | |
| 4055 | + eval cmds=\"$reload_cmds\" | |
| 4056 | + save_ifs="$IFS"; IFS=$_S_ | |
| 4046 | 4057 | for cmd in $cmds; do |
| 4047 | 4058 | IFS="$save_ifs" |
| 4048 | - eval cmd=\"$cmd\" | |
| 4049 | 4059 | $show "$cmd" |
| 4050 | 4060 | $run eval "$cmd" || exit $? |
| 4051 | 4061 | done |
| ... | ... | @@ -4058,7 +4068,7 @@ EOF |
| 4058 | 4068 | $run ${rm}r $gentop |
| 4059 | 4069 | fi |
| 4060 | 4070 | |
| 4061 | - exit $EXIT_SUCCESS | |
| 4071 | + exit 0 | |
| 4062 | 4072 | fi |
| 4063 | 4073 | |
| 4064 | 4074 | if test "$build_libtool_libs" != yes; then |
| ... | ... | @@ -4071,18 +4081,17 @@ EOF |
| 4071 | 4081 | # accidentally link it into a program. |
| 4072 | 4082 | # $show "echo timestamp > $libobj" |
| 4073 | 4083 | # $run eval "echo timestamp > $libobj" || exit $? |
| 4074 | - exit $EXIT_SUCCESS | |
| 4084 | + exit 0 | |
| 4075 | 4085 | fi |
| 4076 | 4086 | |
| 4077 | 4087 | if test -n "$pic_flag" || test "$pic_mode" != default; then |
| 4078 | 4088 | # Only do commands if we really have different PIC objects. |
| 4079 | 4089 | reload_objs="$libobjs $reload_conv_objs" |
| 4080 | 4090 | output="$libobj" |
| 4081 | - cmds=$reload_cmds | |
| 4082 | - save_ifs="$IFS"; IFS='~' | |
| 4091 | + eval cmds=\"$reload_cmds\" | |
| 4092 | + save_ifs="$IFS"; IFS=$_S_ | |
| 4083 | 4093 | for cmd in $cmds; do |
| 4084 | 4094 | IFS="$save_ifs" |
| 4085 | - eval cmd=\"$cmd\" | |
| 4086 | 4095 | $show "$cmd" |
| 4087 | 4096 | $run eval "$cmd" || exit $? |
| 4088 | 4097 | done |
| ... | ... | @@ -4094,7 +4103,7 @@ EOF |
| 4094 | 4103 | $run ${rm}r $gentop |
| 4095 | 4104 | fi |
| 4096 | 4105 | |
| 4097 | - exit $EXIT_SUCCESS | |
| 4106 | + exit 0 | |
| 4098 | 4107 | ;; |
| 4099 | 4108 | |
| 4100 | 4109 | prog) |
| ... | ... | @@ -4399,8 +4408,8 @@ static const void *lt_preloaded_setup() { |
| 4399 | 4408 | esac |
| 4400 | 4409 | |
| 4401 | 4410 | # Now compile the dynamic symbol file. |
| 4402 | - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" | |
| 4403 | - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? | |
| 4411 | + $show "(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" | |
| 4412 | + $run eval '(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? | |
| 4404 | 4413 | |
| 4405 | 4414 | # Clean up the generated files. |
| 4406 | 4415 | $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" |
| ... | ... | @@ -4412,7 +4421,7 @@ static const void *lt_preloaded_setup() { |
| 4412 | 4421 | ;; |
| 4413 | 4422 | *) |
| 4414 | 4423 | $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 |
| 4415 | - exit $EXIT_FAILURE | |
| 4424 | + exit 1 | |
| 4416 | 4425 | ;; |
| 4417 | 4426 | esac |
| 4418 | 4427 | else |
| ... | ... | @@ -4500,7 +4509,7 @@ static const void *lt_preloaded_setup() { |
| 4500 | 4509 | # Link the executable and exit |
| 4501 | 4510 | $show "$link_command" |
| 4502 | 4511 | $run eval "$link_command" || exit $? |
| 4503 | - exit $EXIT_SUCCESS | |
| 4512 | + exit 0 | |
| 4504 | 4513 | fi |
| 4505 | 4514 | |
| 4506 | 4515 | if test "$hardcode_action" = relink; then |
| ... | ... | @@ -4555,10 +4564,10 @@ static const void *lt_preloaded_setup() { |
| 4555 | 4564 | fi |
| 4556 | 4565 | |
| 4557 | 4566 | # Quote $echo for shipping. |
| 4558 | - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then | |
| 4559 | - case $progpath in | |
| 4560 | - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; | |
| 4561 | - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; | |
| 4567 | + if test "X$echo" = "X$SHELL $0 --fallback-echo"; then | |
| 4568 | + case $0 in | |
| 4569 | + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; | |
| 4570 | + *) qecho="$SHELL `pwd`/$0 --fallback-echo";; | |
| 4562 | 4571 | esac |
| 4563 | 4572 | qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` |
| 4564 | 4573 | else |
| ... | ... | @@ -4584,7 +4593,7 @@ static const void *lt_preloaded_setup() { |
| 4584 | 4593 | cwrappersource=`$echo ${objdir}/lt-${output}.c` |
| 4585 | 4594 | cwrapper=`$echo ${output}.exe` |
| 4586 | 4595 | $rm $cwrappersource $cwrapper |
| 4587 | - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 | |
| 4596 | + trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 | |
| 4588 | 4597 | |
| 4589 | 4598 | cat > $cwrappersource <<EOF |
| 4590 | 4599 | |
| ... | ... | @@ -4593,7 +4602,7 @@ static const void *lt_preloaded_setup() { |
| 4593 | 4602 | |
| 4594 | 4603 | The $output program cannot be directly executed until all the libtool |
| 4595 | 4604 | libraries that it depends on are installed. |
| 4596 | - | |
| 4605 | + | |
| 4597 | 4606 | This wrapper executable should never be moved out of the build directory. |
| 4598 | 4607 | If it is, it will not operate correctly. |
| 4599 | 4608 | |
| ... | ... | @@ -4625,7 +4634,7 @@ EOF |
| 4625 | 4634 | #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ |
| 4626 | 4635 | defined (__OS2__) |
| 4627 | 4636 | #define HAVE_DOS_BASED_FILE_SYSTEM |
| 4628 | -#ifndef DIR_SEPARATOR_2 | |
| 4637 | +#ifndef DIR_SEPARATOR_2 | |
| 4629 | 4638 | #define DIR_SEPARATOR_2 '\\' |
| 4630 | 4639 | #endif |
| 4631 | 4640 | #endif |
| ... | ... | @@ -4656,7 +4665,7 @@ main (int argc, char *argv[]) |
| 4656 | 4665 | { |
| 4657 | 4666 | char **newargz; |
| 4658 | 4667 | int i; |
| 4659 | - | |
| 4668 | + | |
| 4660 | 4669 | program_name = (char *) xstrdup ((char *) basename (argv[0])); |
| 4661 | 4670 | newargz = XMALLOC(char *, argc+2); |
| 4662 | 4671 | EOF |
| ... | ... | @@ -4669,7 +4678,7 @@ EOF |
| 4669 | 4678 | newargz[1] = fnqualify(argv[0]); |
| 4670 | 4679 | /* we know the script has the same name, without the .exe */ |
| 4671 | 4680 | /* so make sure newargz[1] doesn't end in .exe */ |
| 4672 | - strendzap(newargz[1],".exe"); | |
| 4681 | + strendzap(newargz[1],".exe"); | |
| 4673 | 4682 | for (i = 1; i < argc; i++) |
| 4674 | 4683 | newargz[i+1] = xstrdup(argv[i]); |
| 4675 | 4684 | newargz[argc+1] = NULL; |
| ... | ... | @@ -4692,7 +4701,7 @@ xmalloc (size_t num) |
| 4692 | 4701 | return p; |
| 4693 | 4702 | } |
| 4694 | 4703 | |
| 4695 | -char * | |
| 4704 | +char * | |
| 4696 | 4705 | xstrdup (const char *string) |
| 4697 | 4706 | { |
| 4698 | 4707 | return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL |
| ... | ... | @@ -4706,7 +4715,7 @@ basename (const char *name) |
| 4706 | 4715 | |
| 4707 | 4716 | #if defined (HAVE_DOS_BASED_FILE_SYSTEM) |
| 4708 | 4717 | /* Skip over the disk name in MSDOS pathnames. */ |
| 4709 | - if (isalpha (name[0]) && name[1] == ':') | |
| 4718 | + if (isalpha (name[0]) && name[1] == ':') | |
| 4710 | 4719 | name += 2; |
| 4711 | 4720 | #endif |
| 4712 | 4721 | |
| ... | ... | @@ -4716,7 +4725,7 @@ basename (const char *name) |
| 4716 | 4725 | return (char *) base; |
| 4717 | 4726 | } |
| 4718 | 4727 | |
| 4719 | -char * | |
| 4728 | +char * | |
| 4720 | 4729 | fnqualify(const char *path) |
| 4721 | 4730 | { |
| 4722 | 4731 | size_t size; |
| ... | ... | @@ -4744,7 +4753,7 @@ fnqualify(const char *path) |
| 4744 | 4753 | } |
| 4745 | 4754 | |
| 4746 | 4755 | char * |
| 4747 | -strendzap(char *str, const char *pat) | |
| 4756 | +strendzap(char *str, const char *pat) | |
| 4748 | 4757 | { |
| 4749 | 4758 | size_t len, patlen; |
| 4750 | 4759 | |
| ... | ... | @@ -4764,7 +4773,7 @@ strendzap(char *str, const char *pat) |
| 4764 | 4773 | } |
| 4765 | 4774 | |
| 4766 | 4775 | static void |
| 4767 | -lt_error_core (int exit_status, const char * mode, | |
| 4776 | +lt_error_core (int exit_status, const char * mode, | |
| 4768 | 4777 | const char * message, va_list ap) |
| 4769 | 4778 | { |
| 4770 | 4779 | fprintf (stderr, "%s: %s: ", program_name, mode); |
| ... | ... | @@ -4789,11 +4798,11 @@ EOF |
| 4789 | 4798 | # are only useful if you want to execute the "real" binary. |
| 4790 | 4799 | # Since the "real" binary is built for $host, then this |
| 4791 | 4800 | # wrapper might as well be built for $host, too. |
| 4792 | - $run $LTCC -s -o $cwrapper $cwrappersource | |
| 4801 | + $run $LTCC $archargs -s -o $cwrapper $cwrappersource | |
| 4793 | 4802 | ;; |
| 4794 | 4803 | esac |
| 4795 | 4804 | $rm $output |
| 4796 | - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 | |
| 4805 | + trap "$rm $output; exit 1" 1 2 15 | |
| 4797 | 4806 | |
| 4798 | 4807 | $echo > $output "\ |
| 4799 | 4808 | #! $SHELL |
| ... | ... | @@ -4893,7 +4902,7 @@ else |
| 4893 | 4902 | else |
| 4894 | 4903 | $echo \"\$relink_command_output\" >&2 |
| 4895 | 4904 | $rm \"\$progdir/\$file\" |
| 4896 | - exit $EXIT_FAILURE | |
| 4905 | + exit 1 | |
| 4897 | 4906 | fi |
| 4898 | 4907 | fi |
| 4899 | 4908 | |
| ... | ... | @@ -4955,20 +4964,20 @@ else |
| 4955 | 4964 | esac |
| 4956 | 4965 | $echo >> $output "\ |
| 4957 | 4966 | \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" |
| 4958 | - exit $EXIT_FAILURE | |
| 4967 | + exit 1 | |
| 4959 | 4968 | fi |
| 4960 | 4969 | else |
| 4961 | 4970 | # The program doesn't exist. |
| 4962 | 4971 | \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 |
| 4963 | 4972 | \$echo \"This script is just a wrapper for \$program.\" 1>&2 |
| 4964 | 4973 | $echo \"See the $PACKAGE documentation for more information.\" 1>&2 |
| 4965 | - exit $EXIT_FAILURE | |
| 4974 | + exit 1 | |
| 4966 | 4975 | fi |
| 4967 | 4976 | fi\ |
| 4968 | 4977 | " |
| 4969 | 4978 | chmod +x $output |
| 4970 | 4979 | fi |
| 4971 | - exit $EXIT_SUCCESS | |
| 4980 | + exit 0 | |
| 4972 | 4981 | ;; |
| 4973 | 4982 | esac |
| 4974 | 4983 | |
| ... | ... | @@ -5019,34 +5028,80 @@ fi\ |
| 5019 | 5028 | if test "$status" -ne 0 && test ! -d "$xdir"; then |
| 5020 | 5029 | exit $status |
| 5021 | 5030 | fi |
| 5022 | - # We will extract separately just the conflicting names and we will no | |
| 5023 | - # longer touch any unique names. It is faster to leave these extract | |
| 5024 | - # automatically by $AR in one run. | |
| 5025 | - $show "(cd $xdir && $AR x $xabs)" | |
| 5026 | - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 5027 | - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 5028 | - : | |
| 5029 | - else | |
| 5030 | - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 5031 | - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 5032 | - $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 5033 | - do | |
| 5034 | - i=1 | |
| 5035 | - while test "$i" -le "$count" | |
| 5031 | + case $host in | |
| 5032 | + *-*-darwin*) | |
| 5033 | + # ranlib-ed archives of fat binaries are converted to a fat xabs that | |
| 5034 | + # ar can't use. So we to split the fat xabs into non-fat ones to unpack. | |
| 5035 | + # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work. | |
| 5036 | + d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'` | |
| 5037 | + if test -n "$d_archs"; then | |
| 5038 | + $echo "$modename: manually unpacking fat archive $xabs" 1>&2 | |
| 5039 | + d_name=`basename $xabs` | |
| 5040 | + d_dir="/tmp/fat_ar.$$" | |
| 5041 | + d_files='' | |
| 5042 | + | |
| 5043 | + for d_arch in $d_archs; do | |
| 5044 | + d_archdir="$d_dir/$d_arch" | |
| 5045 | + $show "$mkdir -p $d_archdir" | |
| 5046 | + $run $mkdir -p "$d_archdir" | |
| 5047 | + | |
| 5048 | + $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name" | |
| 5049 | + $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name" | |
| 5050 | + | |
| 5051 | + $show "(cd $d_archdir && $AR x $d_dir/$d_name)" | |
| 5052 | + $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $? | |
| 5053 | + | |
| 5054 | + $show "${rm} $d_dir/$d_name" | |
| 5055 | + $run ${rm} "$d_dir/$d_name" | |
| 5056 | + done | |
| 5057 | + | |
| 5058 | + # Can't deal with blanks in file names | |
| 5059 | + $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' -e '/__.SYMDEF/d' | sort -u\`" || exit $? | |
| 5060 | + | |
| 5061 | + for d_file in $d_files; do | |
| 5062 | + $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $? | |
| 5063 | + $show "lipo -create $d_f -o $xdir/$d_file" | |
| 5064 | + $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $? | |
| 5065 | + done | |
| 5066 | + | |
| 5067 | + $show "${rm}r $d_dir" | |
| 5068 | + $run ${rm}r "$d_dir" | |
| 5069 | + else | |
| 5070 | + $show "(cd $xdir && $AR x $xabs)" | |
| 5071 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 5072 | + fi | |
| 5073 | + ;; | |
| 5074 | + *) | |
| 5075 | + # We will extract separately just the conflicting names and we will no | |
| 5076 | + # longer touch any unique names. It is faster to leave these extract | |
| 5077 | + # automatically by $AR in one run. | |
| 5078 | + $show "(cd $xdir && $AR x $xabs)" | |
| 5079 | + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? | |
| 5080 | + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then | |
| 5081 | + : | |
| 5082 | + else | |
| 5083 | + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 | |
| 5084 | + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 | |
| 5085 | + $AR t "$xabs" | sort | uniq -cd | while read -r count name | |
| 5036 | 5086 | do |
| 5037 | - # Put our $i before any first dot (extension) | |
| 5038 | - # Never overwrite any file | |
| 5039 | - name_to="$name" | |
| 5040 | - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 5041 | - do | |
| 5042 | - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 5043 | - done | |
| 5044 | - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 5045 | - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 5046 | - i=`expr $i + 1` | |
| 5087 | + i=1 | |
| 5088 | + while test "$i" -le "$count" | |
| 5089 | + do | |
| 5090 | + # Put our $i before any first dot (extension) | |
| 5091 | + # Never overwrite any file | |
| 5092 | + name_to="$name" | |
| 5093 | + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" | |
| 5094 | + do | |
| 5095 | + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` | |
| 5096 | + done | |
| 5097 | + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" | |
| 5098 | + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? | |
| 5099 | + i=`expr $i + 1` | |
| 5100 | + done | |
| 5047 | 5101 | done |
| 5048 | - done | |
| 5049 | - fi | |
| 5102 | + fi | |
| 5103 | + ;; | |
| 5104 | + esac | |
| 5050 | 5105 | |
| 5051 | 5106 | oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` |
| 5052 | 5107 | done |
| ... | ... | @@ -5054,13 +5109,13 @@ fi\ |
| 5054 | 5109 | |
| 5055 | 5110 | # Do each command in the archive commands. |
| 5056 | 5111 | if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then |
| 5057 | - cmds=$old_archive_from_new_cmds | |
| 5112 | + eval cmds=\"$old_archive_from_new_cmds\" | |
| 5058 | 5113 | else |
| 5059 | 5114 | eval cmds=\"$old_archive_cmds\" |
| 5060 | 5115 | |
| 5061 | 5116 | if len=`expr "X$cmds" : ".*"` && |
| 5062 | 5117 | test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 5063 | - cmds=$old_archive_cmds | |
| 5118 | + : | |
| 5064 | 5119 | else |
| 5065 | 5120 | # the command line is too long to link in one step, link in parts |
| 5066 | 5121 | $echo "using piecewise archive linking..." |
| ... | ... | @@ -5087,7 +5142,7 @@ fi\ |
| 5087 | 5142 | for obj in $save_oldobjs |
| 5088 | 5143 | do |
| 5089 | 5144 | last_oldobj=$obj |
| 5090 | - done | |
| 5145 | + done | |
| 5091 | 5146 | for obj in $save_oldobjs |
| 5092 | 5147 | do |
| 5093 | 5148 | oldobjs="$objlist $obj" |
| ... | ... | @@ -5101,8 +5156,8 @@ fi\ |
| 5101 | 5156 | oldobjs=$objlist |
| 5102 | 5157 | if test "$obj" = "$last_oldobj" ; then |
| 5103 | 5158 | RANLIB=$save_RANLIB |
| 5104 | - fi | |
| 5105 | - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | |
| 5159 | + fi | |
| 5160 | + test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_} | |
| 5106 | 5161 | eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" |
| 5107 | 5162 | objlist= |
| 5108 | 5163 | fi |
| ... | ... | @@ -5112,13 +5167,12 @@ fi\ |
| 5112 | 5167 | if test "X$oldobjs" = "X" ; then |
| 5113 | 5168 | eval cmds=\"\$concat_cmds\" |
| 5114 | 5169 | else |
| 5115 | - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" | |
| 5170 | + eval cmds=\"\$concat_cmds${_S_}$old_archive_cmds\" | |
| 5116 | 5171 | fi |
| 5117 | 5172 | fi |
| 5118 | 5173 | fi |
| 5119 | - save_ifs="$IFS"; IFS='~' | |
| 5174 | + save_ifs="$IFS"; IFS=$_S_ | |
| 5120 | 5175 | for cmd in $cmds; do |
| 5121 | - eval cmd=\"$cmd\" | |
| 5122 | 5176 | IFS="$save_ifs" |
| 5123 | 5177 | $show "$cmd" |
| 5124 | 5178 | $run eval "$cmd" || exit $? |
| ... | ... | @@ -5150,12 +5204,8 @@ fi\ |
| 5150 | 5204 | fi |
| 5151 | 5205 | done |
| 5152 | 5206 | # Quote the link command for shipping. |
| 5153 | - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" | |
| 5207 | + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" | |
| 5154 | 5208 | relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
| 5155 | - if test "$hardcode_automatic" = yes ; then | |
| 5156 | - relink_command= | |
| 5157 | - fi | |
| 5158 | - | |
| 5159 | 5209 | |
| 5160 | 5210 | # Only create the output if not a dry run. |
| 5161 | 5211 | if test -z "$run"; then |
| ... | ... | @@ -5174,7 +5224,7 @@ fi\ |
| 5174 | 5224 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 5175 | 5225 | if test -z "$libdir"; then |
| 5176 | 5226 | $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
| 5177 | - exit $EXIT_FAILURE | |
| 5227 | + exit 1 | |
| 5178 | 5228 | fi |
| 5179 | 5229 | newdependency_libs="$newdependency_libs $libdir/$name" |
| 5180 | 5230 | ;; |
| ... | ... | @@ -5188,7 +5238,7 @@ fi\ |
| 5188 | 5238 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 5189 | 5239 | if test -z "$libdir"; then |
| 5190 | 5240 | $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
| 5191 | - exit $EXIT_FAILURE | |
| 5241 | + exit 1 | |
| 5192 | 5242 | fi |
| 5193 | 5243 | newdlfiles="$newdlfiles $libdir/$name" |
| 5194 | 5244 | done |
| ... | ... | @@ -5199,30 +5249,11 @@ fi\ |
| 5199 | 5249 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 5200 | 5250 | if test -z "$libdir"; then |
| 5201 | 5251 | $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
| 5202 | - exit $EXIT_FAILURE | |
| 5252 | + exit 1 | |
| 5203 | 5253 | fi |
| 5204 | 5254 | newdlprefiles="$newdlprefiles $libdir/$name" |
| 5205 | 5255 | done |
| 5206 | 5256 | dlprefiles="$newdlprefiles" |
| 5207 | - else | |
| 5208 | - newdlfiles= | |
| 5209 | - for lib in $dlfiles; do | |
| 5210 | - case $lib in | |
| 5211 | - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | |
| 5212 | - *) abs=`pwd`"/$lib" ;; | |
| 5213 | - esac | |
| 5214 | - newdlfiles="$newdlfiles $abs" | |
| 5215 | - done | |
| 5216 | - dlfiles="$newdlfiles" | |
| 5217 | - newdlprefiles= | |
| 5218 | - for lib in $dlprefiles; do | |
| 5219 | - case $lib in | |
| 5220 | - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | |
| 5221 | - *) abs=`pwd`"/$lib" ;; | |
| 5222 | - esac | |
| 5223 | - newdlprefiles="$newdlprefiles $abs" | |
| 5224 | - done | |
| 5225 | - dlprefiles="$newdlprefiles" | |
| 5226 | 5257 | fi |
| 5227 | 5258 | $rm $output |
| 5228 | 5259 | # place dlname in correct position for cygwin |
| ... | ... | @@ -5279,7 +5310,7 @@ relink_command=\"$relink_command\"" |
| 5279 | 5310 | $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? |
| 5280 | 5311 | ;; |
| 5281 | 5312 | esac |
| 5282 | - exit $EXIT_SUCCESS | |
| 5313 | + exit 0 | |
| 5283 | 5314 | ;; |
| 5284 | 5315 | |
| 5285 | 5316 | # libtool install mode |
| ... | ... | @@ -5368,13 +5399,13 @@ relink_command=\"$relink_command\"" |
| 5368 | 5399 | if test -z "$install_prog"; then |
| 5369 | 5400 | $echo "$modename: you must specify an install program" 1>&2 |
| 5370 | 5401 | $echo "$help" 1>&2 |
| 5371 | - exit $EXIT_FAILURE | |
| 5402 | + exit 1 | |
| 5372 | 5403 | fi |
| 5373 | 5404 | |
| 5374 | 5405 | if test -n "$prev"; then |
| 5375 | 5406 | $echo "$modename: the \`$prev' option requires an argument" 1>&2 |
| 5376 | 5407 | $echo "$help" 1>&2 |
| 5377 | - exit $EXIT_FAILURE | |
| 5408 | + exit 1 | |
| 5378 | 5409 | fi |
| 5379 | 5410 | |
| 5380 | 5411 | if test -z "$files"; then |
| ... | ... | @@ -5384,7 +5415,7 @@ relink_command=\"$relink_command\"" |
| 5384 | 5415 | $echo "$modename: you must specify a destination" 1>&2 |
| 5385 | 5416 | fi |
| 5386 | 5417 | $echo "$help" 1>&2 |
| 5387 | - exit $EXIT_FAILURE | |
| 5418 | + exit 1 | |
| 5388 | 5419 | fi |
| 5389 | 5420 | |
| 5390 | 5421 | # Strip any trailing slash from the destination. |
| ... | ... | @@ -5405,7 +5436,7 @@ relink_command=\"$relink_command\"" |
| 5405 | 5436 | if test "$#" -gt 2; then |
| 5406 | 5437 | $echo "$modename: \`$dest' is not a directory" 1>&2 |
| 5407 | 5438 | $echo "$help" 1>&2 |
| 5408 | - exit $EXIT_FAILURE | |
| 5439 | + exit 1 | |
| 5409 | 5440 | fi |
| 5410 | 5441 | fi |
| 5411 | 5442 | case $destdir in |
| ... | ... | @@ -5417,7 +5448,7 @@ relink_command=\"$relink_command\"" |
| 5417 | 5448 | *) |
| 5418 | 5449 | $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 |
| 5419 | 5450 | $echo "$help" 1>&2 |
| 5420 | - exit $EXIT_FAILURE | |
| 5451 | + exit 1 | |
| 5421 | 5452 | ;; |
| 5422 | 5453 | esac |
| 5423 | 5454 | done |
| ... | ... | @@ -5446,7 +5477,7 @@ relink_command=\"$relink_command\"" |
| 5446 | 5477 | else |
| 5447 | 5478 | $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 |
| 5448 | 5479 | $echo "$help" 1>&2 |
| 5449 | - exit $EXIT_FAILURE | |
| 5480 | + exit 1 | |
| 5450 | 5481 | fi |
| 5451 | 5482 | |
| 5452 | 5483 | library_names= |
| ... | ... | @@ -5488,7 +5519,7 @@ relink_command=\"$relink_command\"" |
| 5488 | 5519 | # but it's something to keep an eye on. |
| 5489 | 5520 | if test "$inst_prefix_dir" = "$destdir"; then |
| 5490 | 5521 | $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
| 5491 | - exit $EXIT_FAILURE | |
| 5522 | + exit 1 | |
| 5492 | 5523 | fi |
| 5493 | 5524 | |
| 5494 | 5525 | if test -n "$inst_prefix_dir"; then |
| ... | ... | @@ -5503,7 +5534,7 @@ relink_command=\"$relink_command\"" |
| 5503 | 5534 | if $run eval "$relink_command"; then : |
| 5504 | 5535 | else |
| 5505 | 5536 | $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 |
| 5506 | - exit $EXIT_FAILURE | |
| 5537 | + exit 1 | |
| 5507 | 5538 | fi |
| 5508 | 5539 | fi |
| 5509 | 5540 | |
| ... | ... | @@ -5538,11 +5569,10 @@ relink_command=\"$relink_command\"" |
| 5538 | 5569 | |
| 5539 | 5570 | # Do each command in the postinstall commands. |
| 5540 | 5571 | lib="$destdir/$realname" |
| 5541 | - cmds=$postinstall_cmds | |
| 5542 | - save_ifs="$IFS"; IFS='~' | |
| 5572 | + eval cmds=\"$postinstall_cmds\" | |
| 5573 | + save_ifs="$IFS"; IFS=$_S_ | |
| 5543 | 5574 | for cmd in $cmds; do |
| 5544 | 5575 | IFS="$save_ifs" |
| 5545 | - eval cmd=\"$cmd\" | |
| 5546 | 5576 | $show "$cmd" |
| 5547 | 5577 | $run eval "$cmd" || exit $? |
| 5548 | 5578 | done |
| ... | ... | @@ -5582,7 +5612,7 @@ relink_command=\"$relink_command\"" |
| 5582 | 5612 | *) |
| 5583 | 5613 | $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 |
| 5584 | 5614 | $echo "$help" 1>&2 |
| 5585 | - exit $EXIT_FAILURE | |
| 5615 | + exit 1 | |
| 5586 | 5616 | ;; |
| 5587 | 5617 | esac |
| 5588 | 5618 | |
| ... | ... | @@ -5600,7 +5630,7 @@ relink_command=\"$relink_command\"" |
| 5600 | 5630 | $show "$install_prog $staticobj $staticdest" |
| 5601 | 5631 | $run eval "$install_prog \$staticobj \$staticdest" || exit $? |
| 5602 | 5632 | fi |
| 5603 | - exit $EXIT_SUCCESS | |
| 5633 | + exit 0 | |
| 5604 | 5634 | ;; |
| 5605 | 5635 | |
| 5606 | 5636 | *) |
| ... | ... | @@ -5654,7 +5684,7 @@ relink_command=\"$relink_command\"" |
| 5654 | 5684 | # Check the variables that should have been set. |
| 5655 | 5685 | if test -z "$notinst_deplibs"; then |
| 5656 | 5686 | $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 |
| 5657 | - exit $EXIT_FAILURE | |
| 5687 | + exit 1 | |
| 5658 | 5688 | fi |
| 5659 | 5689 | |
| 5660 | 5690 | finalize=yes |
| ... | ... | @@ -5695,12 +5725,8 @@ relink_command=\"$relink_command\"" |
| 5695 | 5725 | tmpdir="/tmp" |
| 5696 | 5726 | test -n "$TMPDIR" && tmpdir="$TMPDIR" |
| 5697 | 5727 | tmpdir="$tmpdir/libtool-$$" |
| 5698 | - save_umask=`umask` | |
| 5699 | - umask 0077 | |
| 5700 | - if $mkdir "$tmpdir"; then | |
| 5701 | - umask $save_umask | |
| 5728 | + if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : | |
| 5702 | 5729 | else |
| 5703 | - umask $save_umask | |
| 5704 | 5730 | $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
| 5705 | 5731 | continue |
| 5706 | 5732 | fi |
| ... | ... | @@ -5759,17 +5785,16 @@ relink_command=\"$relink_command\"" |
| 5759 | 5785 | $show "$install_prog $file $oldlib" |
| 5760 | 5786 | $run eval "$install_prog \$file \$oldlib" || exit $? |
| 5761 | 5787 | |
| 5762 | - if test -n "$stripme" && test -n "$old_striplib"; then | |
| 5788 | + if test -n "$stripme" && test -n "$striplib"; then | |
| 5763 | 5789 | $show "$old_striplib $oldlib" |
| 5764 | 5790 | $run eval "$old_striplib $oldlib" || exit $? |
| 5765 | 5791 | fi |
| 5766 | 5792 | |
| 5767 | 5793 | # Do each command in the postinstall commands. |
| 5768 | - cmds=$old_postinstall_cmds | |
| 5769 | - save_ifs="$IFS"; IFS='~' | |
| 5794 | + eval cmds=\"$old_postinstall_cmds\" | |
| 5795 | + save_ifs="$IFS"; IFS=$_S_ | |
| 5770 | 5796 | for cmd in $cmds; do |
| 5771 | 5797 | IFS="$save_ifs" |
| 5772 | - eval cmd=\"$cmd\" | |
| 5773 | 5798 | $show "$cmd" |
| 5774 | 5799 | $run eval "$cmd" || exit $? |
| 5775 | 5800 | done |
| ... | ... | @@ -5783,9 +5808,9 @@ relink_command=\"$relink_command\"" |
| 5783 | 5808 | if test -n "$current_libdirs"; then |
| 5784 | 5809 | # Maybe just do a dry run. |
| 5785 | 5810 | test -n "$run" && current_libdirs=" -n$current_libdirs" |
| 5786 | - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' | |
| 5811 | + exec_cmd='$SHELL $0 --finish$current_libdirs' | |
| 5787 | 5812 | else |
| 5788 | - exit $EXIT_SUCCESS | |
| 5813 | + exit 0 | |
| 5789 | 5814 | fi |
| 5790 | 5815 | ;; |
| 5791 | 5816 | |
| ... | ... | @@ -5804,11 +5829,10 @@ relink_command=\"$relink_command\"" |
| 5804 | 5829 | for libdir in $libdirs; do |
| 5805 | 5830 | if test -n "$finish_cmds"; then |
| 5806 | 5831 | # Do each command in the finish commands. |
| 5807 | - cmds=$finish_cmds | |
| 5808 | - save_ifs="$IFS"; IFS='~' | |
| 5832 | + eval cmds=\"$finish_cmds\" | |
| 5833 | + save_ifs="$IFS"; IFS=$_S_ | |
| 5809 | 5834 | for cmd in $cmds; do |
| 5810 | 5835 | IFS="$save_ifs" |
| 5811 | - eval cmd=\"$cmd\" | |
| 5812 | 5836 | $show "$cmd" |
| 5813 | 5837 | $run eval "$cmd" || admincmds="$admincmds |
| 5814 | 5838 | $cmd" |
| ... | ... | @@ -5825,7 +5849,7 @@ relink_command=\"$relink_command\"" |
| 5825 | 5849 | fi |
| 5826 | 5850 | |
| 5827 | 5851 | # Exit here if they wanted silent mode. |
| 5828 | - test "$show" = : && exit $EXIT_SUCCESS | |
| 5852 | + test "$show" = : && exit 0 | |
| 5829 | 5853 | |
| 5830 | 5854 | $echo "----------------------------------------------------------------------" |
| 5831 | 5855 | $echo "Libraries have been installed in:" |
| ... | ... | @@ -5861,7 +5885,7 @@ relink_command=\"$relink_command\"" |
| 5861 | 5885 | $echo "See any operating system documentation about shared libraries for" |
| 5862 | 5886 | $echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 5863 | 5887 | $echo "----------------------------------------------------------------------" |
| 5864 | - exit $EXIT_SUCCESS | |
| 5888 | + exit 0 | |
| 5865 | 5889 | ;; |
| 5866 | 5890 | |
| 5867 | 5891 | # libtool execute mode |
| ... | ... | @@ -5873,7 +5897,7 @@ relink_command=\"$relink_command\"" |
| 5873 | 5897 | if test -z "$cmd"; then |
| 5874 | 5898 | $echo "$modename: you must specify a COMMAND" 1>&2 |
| 5875 | 5899 | $echo "$help" |
| 5876 | - exit $EXIT_FAILURE | |
| 5900 | + exit 1 | |
| 5877 | 5901 | fi |
| 5878 | 5902 | |
| 5879 | 5903 | # Handle -dlopen flags immediately. |
| ... | ... | @@ -5881,7 +5905,7 @@ relink_command=\"$relink_command\"" |
| 5881 | 5905 | if test ! -f "$file"; then |
| 5882 | 5906 | $echo "$modename: \`$file' is not a file" 1>&2 |
| 5883 | 5907 | $echo "$help" 1>&2 |
| 5884 | - exit $EXIT_FAILURE | |
| 5908 | + exit 1 | |
| 5885 | 5909 | fi |
| 5886 | 5910 | |
| 5887 | 5911 | dir= |
| ... | ... | @@ -5892,7 +5916,7 @@ relink_command=\"$relink_command\"" |
| 5892 | 5916 | else |
| 5893 | 5917 | $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
| 5894 | 5918 | $echo "$help" 1>&2 |
| 5895 | - exit $EXIT_FAILURE | |
| 5919 | + exit 1 | |
| 5896 | 5920 | fi |
| 5897 | 5921 | |
| 5898 | 5922 | # Read the libtool library. |
| ... | ... | @@ -5919,7 +5943,7 @@ relink_command=\"$relink_command\"" |
| 5919 | 5943 | dir="$dir/$objdir" |
| 5920 | 5944 | else |
| 5921 | 5945 | $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 |
| 5922 | - exit $EXIT_FAILURE | |
| 5946 | + exit 1 | |
| 5923 | 5947 | fi |
| 5924 | 5948 | ;; |
| 5925 | 5949 | |
| ... | ... | @@ -5999,7 +6023,7 @@ relink_command=\"$relink_command\"" |
| 5999 | 6023 | $echo "export $shlibpath_var" |
| 6000 | 6024 | fi |
| 6001 | 6025 | $echo "$cmd$args" |
| 6002 | - exit $EXIT_SUCCESS | |
| 6026 | + exit 0 | |
| 6003 | 6027 | fi |
| 6004 | 6028 | ;; |
| 6005 | 6029 | |
| ... | ... | @@ -6027,7 +6051,7 @@ relink_command=\"$relink_command\"" |
| 6027 | 6051 | if test -z "$rm"; then |
| 6028 | 6052 | $echo "$modename: you must specify an RM program" 1>&2 |
| 6029 | 6053 | $echo "$help" 1>&2 |
| 6030 | - exit $EXIT_FAILURE | |
| 6054 | + exit 1 | |
| 6031 | 6055 | fi |
| 6032 | 6056 | |
| 6033 | 6057 | rmdirs= |
| ... | ... | @@ -6082,11 +6106,10 @@ relink_command=\"$relink_command\"" |
| 6082 | 6106 | if test "$mode" = uninstall; then |
| 6083 | 6107 | if test -n "$library_names"; then |
| 6084 | 6108 | # Do each command in the postuninstall commands. |
| 6085 | - cmds=$postuninstall_cmds | |
| 6086 | - save_ifs="$IFS"; IFS='~' | |
| 6109 | + eval cmds=\"$postuninstall_cmds\" | |
| 6110 | + save_ifs="$IFS"; IFS=$_S_ | |
| 6087 | 6111 | for cmd in $cmds; do |
| 6088 | 6112 | IFS="$save_ifs" |
| 6089 | - eval cmd=\"$cmd\" | |
| 6090 | 6113 | $show "$cmd" |
| 6091 | 6114 | $run eval "$cmd" |
| 6092 | 6115 | if test "$?" -ne 0 && test "$rmforce" != yes; then |
| ... | ... | @@ -6098,11 +6121,10 @@ relink_command=\"$relink_command\"" |
| 6098 | 6121 | |
| 6099 | 6122 | if test -n "$old_library"; then |
| 6100 | 6123 | # Do each command in the old_postuninstall commands. |
| 6101 | - cmds=$old_postuninstall_cmds | |
| 6102 | - save_ifs="$IFS"; IFS='~' | |
| 6124 | + eval cmds=\"$old_postuninstall_cmds\" | |
| 6125 | + save_ifs="$IFS"; IFS=$_S_ | |
| 6103 | 6126 | for cmd in $cmds; do |
| 6104 | 6127 | IFS="$save_ifs" |
| 6105 | - eval cmd=\"$cmd\" | |
| 6106 | 6128 | $show "$cmd" |
| 6107 | 6129 | $run eval "$cmd" |
| 6108 | 6130 | if test "$?" -ne 0 && test "$rmforce" != yes; then |
| ... | ... | @@ -6141,7 +6163,7 @@ relink_command=\"$relink_command\"" |
| 6141 | 6163 | if test "$mode" = clean ; then |
| 6142 | 6164 | noexename=$name |
| 6143 | 6165 | case $file in |
| 6144 | - *.exe) | |
| 6166 | + *.exe) | |
| 6145 | 6167 | file=`$echo $file|${SED} 's,.exe$,,'` |
| 6146 | 6168 | noexename=`$echo $name|${SED} 's,.exe$,,'` |
| 6147 | 6169 | # $file with .exe has already been added to rmfiles, |
| ... | ... | @@ -6186,20 +6208,20 @@ relink_command=\"$relink_command\"" |
| 6186 | 6208 | "") |
| 6187 | 6209 | $echo "$modename: you must specify a MODE" 1>&2 |
| 6188 | 6210 | $echo "$generic_help" 1>&2 |
| 6189 | - exit $EXIT_FAILURE | |
| 6211 | + exit 1 | |
| 6190 | 6212 | ;; |
| 6191 | 6213 | esac |
| 6192 | 6214 | |
| 6193 | 6215 | if test -z "$exec_cmd"; then |
| 6194 | 6216 | $echo "$modename: invalid operation mode \`$mode'" 1>&2 |
| 6195 | 6217 | $echo "$generic_help" 1>&2 |
| 6196 | - exit $EXIT_FAILURE | |
| 6218 | + exit 1 | |
| 6197 | 6219 | fi |
| 6198 | 6220 | fi # test -z "$show_help" |
| 6199 | 6221 | |
| 6200 | 6222 | if test -n "$exec_cmd"; then |
| 6201 | 6223 | eval exec $exec_cmd |
| 6202 | - exit $EXIT_FAILURE | |
| 6224 | + exit 1 | |
| 6203 | 6225 | fi |
| 6204 | 6226 | |
| 6205 | 6227 | # We need to display help for each of the modes. |
| ... | ... | @@ -6235,7 +6257,7 @@ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for |
| 6235 | 6257 | a more detailed description of MODE. |
| 6236 | 6258 | |
| 6237 | 6259 | Report bugs to <bug-libtool@gnu.org>." |
| 6238 | - exit $EXIT_SUCCESS | |
| 6260 | + exit 0 | |
| 6239 | 6261 | ;; |
| 6240 | 6262 | |
| 6241 | 6263 | clean) |
| ... | ... | @@ -6347,8 +6369,6 @@ The following components of LINK-COMMAND are treated specially: |
| 6347 | 6369 | -no-undefined declare that a library does not refer to external symbols |
| 6348 | 6370 | -o OUTPUT-FILE create OUTPUT-FILE from the specified objects |
| 6349 | 6371 | -objectlist FILE Use a list of object files found in FILE to specify objects |
| 6350 | - -precious-files-regex REGEX | |
| 6351 | - don't remove output files matching REGEX | |
| 6352 | 6372 | -release RELEASE specify package release information |
| 6353 | 6373 | -rpath LIBDIR the created library will eventually be installed in LIBDIR |
| 6354 | 6374 | -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries |
| ... | ... | @@ -6390,14 +6410,14 @@ Otherwise, only FILE itself is deleted using RM." |
| 6390 | 6410 | *) |
| 6391 | 6411 | $echo "$modename: invalid operation mode \`$mode'" 1>&2 |
| 6392 | 6412 | $echo "$help" 1>&2 |
| 6393 | - exit $EXIT_FAILURE | |
| 6413 | + exit 1 | |
| 6394 | 6414 | ;; |
| 6395 | 6415 | esac |
| 6396 | 6416 | |
| 6397 | 6417 | $echo |
| 6398 | 6418 | $echo "Try \`$modename --help' for more information about other modes." |
| 6399 | 6419 | |
| 6400 | -exit $EXIT_SUCCESS | |
| 6420 | +exit 0 | |
| 6401 | 6421 | |
| 6402 | 6422 | # The TAGs below are defined such that we never get into a situation |
| 6403 | 6423 | # in which we disable both kinds of libraries. Given conflicting | ... | ... |
m4/ac_pkg_swig.m4
0 → 100644
| 1 | +##### http://autoconf-archive.cryp.to/ac_pkg_swig.html | |
| 2 | +# | |
| 3 | +# SYNOPSIS | |
| 4 | +# | |
| 5 | +# AC_PROG_SWIG([major.minor.micro]) | |
| 6 | +# | |
| 7 | +# DESCRIPTION | |
| 8 | +# | |
| 9 | +# This macro searches for a SWIG installation on your system. If | |
| 10 | +# found you should call SWIG via $(SWIG). You can use the optional | |
| 11 | +# first argument to check if the version of the available SWIG is | |
| 12 | +# greater than or equal to the value of the argument. It should have | |
| 13 | +# the format: N[.N[.N]] (N is a number between 0 and 999. Only the | |
| 14 | +# first N is mandatory.) | |
| 15 | +# | |
| 16 | +# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks | |
| 17 | +# that the swig package is this version number or higher. | |
| 18 | +# | |
| 19 | +# In configure.in, use as: | |
| 20 | +# | |
| 21 | +# AC_PROG_SWIG(1.3.17) | |
| 22 | +# SWIG_ENABLE_CXX | |
| 23 | +# SWIG_MULTI_MODULE_SUPPORT | |
| 24 | +# SWIG_PYTHON | |
| 25 | +# | |
| 26 | +# LAST MODIFICATION | |
| 27 | +# | |
| 28 | +# 2006-10-22 | |
| 29 | +# | |
| 30 | +# COPYLEFT | |
| 31 | +# | |
| 32 | +# Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de> | |
| 33 | +# Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca> | |
| 34 | +# Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net> | |
| 35 | +# Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za> | |
| 36 | +# | |
| 37 | +# This program is free software; you can redistribute it and/or | |
| 38 | +# modify it under the terms of the GNU General Public License as | |
| 39 | +# published by the Free Software Foundation; either version 2 of the | |
| 40 | +# License, or (at your option) any later version. | |
| 41 | +# | |
| 42 | +# This program is distributed in the hope that it will be useful, but | |
| 43 | +# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 44 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 45 | +# General Public License for more details. | |
| 46 | +# | |
| 47 | +# You should have received a copy of the GNU General Public License | |
| 48 | +# along with this program; if not, write to the Free Software | |
| 49 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 50 | +# 02111-1307, USA. | |
| 51 | +# | |
| 52 | +# As a special exception, the respective Autoconf Macro's copyright | |
| 53 | +# owner gives unlimited permission to copy, distribute and modify the | |
| 54 | +# configure scripts that are the output of Autoconf when processing | |
| 55 | +# the Macro. You need not follow the terms of the GNU General Public | |
| 56 | +# License when using or distributing such scripts, even though | |
| 57 | +# portions of the text of the Macro appear in them. The GNU General | |
| 58 | +# Public License (GPL) does govern all other use of the material that | |
| 59 | +# constitutes the Autoconf Macro. | |
| 60 | +# | |
| 61 | +# This special exception to the GPL applies to versions of the | |
| 62 | +# Autoconf Macro released by the Autoconf Macro Archive. When you | |
| 63 | +# make and distribute a modified version of the Autoconf Macro, you | |
| 64 | +# may extend this special exception to the GPL to apply to your | |
| 65 | +# modified version as well. | |
| 66 | + | |
| 67 | +AC_DEFUN([AC_PROG_SWIG],[ | |
| 68 | + AC_PATH_PROG([SWIG],[swig]) | |
| 69 | + if test -z "$SWIG" ; then | |
| 70 | + AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org]) | |
| 71 | + SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' | |
| 72 | + elif test -n "$1" ; then | |
| 73 | + AC_MSG_CHECKING([for SWIG version]) | |
| 74 | + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] | |
| 75 | + AC_MSG_RESULT([$swig_version]) | |
| 76 | + if test -n "$swig_version" ; then | |
| 77 | + # Calculate the required version number components | |
| 78 | + [required=$1] | |
| 79 | + [required_major=`echo $required | sed 's/[^0-9].*//'`] | |
| 80 | + if test -z "$required_major" ; then | |
| 81 | + [required_major=0] | |
| 82 | + fi | |
| 83 | + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] | |
| 84 | + [required_minor=`echo $required | sed 's/[^0-9].*//'`] | |
| 85 | + if test -z "$required_minor" ; then | |
| 86 | + [required_minor=0] | |
| 87 | + fi | |
| 88 | + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] | |
| 89 | + [required_patch=`echo $required | sed 's/[^0-9].*//'`] | |
| 90 | + if test -z "$required_patch" ; then | |
| 91 | + [required_patch=0] | |
| 92 | + fi | |
| 93 | + # Calculate the available version number components | |
| 94 | + [available=$swig_version] | |
| 95 | + [available_major=`echo $available | sed 's/[^0-9].*//'`] | |
| 96 | + if test -z "$available_major" ; then | |
| 97 | + [available_major=0] | |
| 98 | + fi | |
| 99 | + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] | |
| 100 | + [available_minor=`echo $available | sed 's/[^0-9].*//'`] | |
| 101 | + if test -z "$available_minor" ; then | |
| 102 | + [available_minor=0] | |
| 103 | + fi | |
| 104 | + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] | |
| 105 | + [available_patch=`echo $available | sed 's/[^0-9].*//'`] | |
| 106 | + if test -z "$available_patch" ; then | |
| 107 | + [available_patch=0] | |
| 108 | + fi | |
| 109 | + if test $available_major -ne $required_major \ | |
| 110 | + -o $available_minor -ne $required_minor \ | |
| 111 | + -o $available_patch -lt $required_patch ; then | |
| 112 | + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) | |
| 113 | + SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' | |
| 114 | + else | |
| 115 | + AC_MSG_NOTICE([SWIG executable is '$SWIG']) | |
| 116 | + SWIG_LIB=`$SWIG -swiglib` | |
| 117 | + AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB']) | |
| 118 | + fi | |
| 119 | + else | |
| 120 | + AC_MSG_WARN([cannot determine SWIG version]) | |
| 121 | + SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' | |
| 122 | + fi | |
| 123 | + fi | |
| 124 | + AC_SUBST([SWIG_LIB]) | |
| 125 | +]) | ... | ... |
m4/ac_python_devel.m4
0 → 100644
| 1 | +##### http://autoconf-archive.cryp.to/ac_python_devel.html | |
| 2 | +# | |
| 3 | +# SYNOPSIS | |
| 4 | +# | |
| 5 | +# AC_PYTHON_DEVEL([version]) | |
| 6 | +# | |
| 7 | +# DESCRIPTION | |
| 8 | +# | |
| 9 | +# Note: Defines as a precious variable "PYTHON_VERSION". Don't | |
| 10 | +# override it in your configure.ac. | |
| 11 | +# | |
| 12 | +# This macro checks for Python and tries to get the include path to | |
| 13 | +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and | |
| 14 | +# $(PYTHON_LDFLAGS) output variables. It also exports | |
| 15 | +# $(PYTHON_EXTRA_LIBS) and $(PYTHON_EXTRA_LDFLAGS) for embedding | |
| 16 | +# Python in your code. | |
| 17 | +# | |
| 18 | +# You can search for some particular version of Python by passing a | |
| 19 | +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". | |
| 20 | +# Please note that you *have* to pass also an operator along with the | |
| 21 | +# version to match, and pay special attention to the single quotes | |
| 22 | +# surrounding the version number. Don't use "PYTHON_VERSION" for | |
| 23 | +# this: that environment variable is declared as precious and thus | |
| 24 | +# reserved for the end-user. | |
| 25 | +# | |
| 26 | +# This macro should work for all versions of Python >= 2.1.0. As an | |
| 27 | +# end user, you can disable the check for the python version by | |
| 28 | +# setting the PYTHON_NOVERSIONCHECK environment variable to something | |
| 29 | +# else than the empty string. | |
| 30 | +# | |
| 31 | +# If you need to use this macro for an older Python version, please | |
| 32 | +# contact the authors. We're always open for feedback. | |
| 33 | +# | |
| 34 | +# LAST MODIFICATION | |
| 35 | +# | |
| 36 | +# 2007-07-31 | |
| 37 | +# | |
| 38 | +# COPYLEFT | |
| 39 | +# | |
| 40 | +# Copyright (c) 2007 Sebastian Huber <sebastian-huber@web.de> | |
| 41 | +# Copyright (c) 2007 Alan W. Irwin <irwin@beluga.phys.uvic.ca> | |
| 42 | +# Copyright (c) 2007 Rafael Laboissiere <rafael@laboissiere.net> | |
| 43 | +# Copyright (c) 2007 Andrew Collier <colliera@ukzn.ac.za> | |
| 44 | +# Copyright (c) 2007 Matteo Settenvini <matteo@member.fsf.org> | |
| 45 | +# Copyright (c) 2007 Horst Knorr <hk_classes@knoda.org> | |
| 46 | +# | |
| 47 | +# This program is free software: you can redistribute it and/or | |
| 48 | +# modify it under the terms of the GNU General Public License as | |
| 49 | +# published by the Free Software Foundation, either version 3 of the | |
| 50 | +# License, or (at your option) any later version. | |
| 51 | +# | |
| 52 | +# This program is distributed in the hope that it will be useful, but | |
| 53 | +# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 54 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 55 | +# General Public License for more details. | |
| 56 | +# | |
| 57 | +# You should have received a copy of the GNU General Public License | |
| 58 | +# along with this program. If not, see | |
| 59 | +# <http://www.gnu.org/licenses/>. | |
| 60 | +# | |
| 61 | +# As a special exception, the respective Autoconf Macro's copyright | |
| 62 | +# owner gives unlimited permission to copy, distribute and modify the | |
| 63 | +# configure scripts that are the output of Autoconf when processing | |
| 64 | +# the Macro. You need not follow the terms of the GNU General Public | |
| 65 | +# License when using or distributing such scripts, even though | |
| 66 | +# portions of the text of the Macro appear in them. The GNU General | |
| 67 | +# Public License (GPL) does govern all other use of the material that | |
| 68 | +# constitutes the Autoconf Macro. | |
| 69 | +# | |
| 70 | +# This special exception to the GPL applies to versions of the | |
| 71 | +# Autoconf Macro released by the Autoconf Macro Archive. When you | |
| 72 | +# make and distribute a modified version of the Autoconf Macro, you | |
| 73 | +# may extend this special exception to the GPL to apply to your | |
| 74 | +# modified version as well. | |
| 75 | + | |
| 76 | +AC_DEFUN([AC_PYTHON_DEVEL],[ | |
| 77 | + # | |
| 78 | + # Allow the use of a (user set) custom python version | |
| 79 | + # | |
| 80 | + AC_ARG_VAR([PYTHON_VERSION],[The installed Python | |
| 81 | + version to use, for example '2.3'. This string | |
| 82 | + will be appended to the Python interpreter | |
| 83 | + canonical name.]) | |
| 84 | + | |
| 85 | + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) | |
| 86 | + if test -z "$PYTHON"; then | |
| 87 | + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) | |
| 88 | + PYTHON_VERSION="" | |
| 89 | + fi | |
| 90 | + | |
| 91 | + # | |
| 92 | + # Check for a version of Python >= 2.1.0 | |
| 93 | + # | |
| 94 | + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) | |
| 95 | + ac_supports_python_ver=`$PYTHON -c "import sys, string; \ | |
| 96 | + ver = string.split(sys.version)[[0]]; \ | |
| 97 | + print ver >= '2.1.0'"` | |
| 98 | + if test "$ac_supports_python_ver" != "True"; then | |
| 99 | + if test -z "$PYTHON_NOVERSIONCHECK"; then | |
| 100 | + AC_MSG_RESULT([no]) | |
| 101 | + AC_MSG_FAILURE([ | |
| 102 | +This version of the AC@&t@_PYTHON_DEVEL macro | |
| 103 | +doesn't work properly with versions of Python before | |
| 104 | +2.1.0. You may need to re-run configure, setting the | |
| 105 | +variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, | |
| 106 | +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. | |
| 107 | +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK | |
| 108 | +to something else than an empty string. | |
| 109 | +]) | |
| 110 | + else | |
| 111 | + AC_MSG_RESULT([skip at user request]) | |
| 112 | + fi | |
| 113 | + else | |
| 114 | + AC_MSG_RESULT([yes]) | |
| 115 | + fi | |
| 116 | + | |
| 117 | + # | |
| 118 | + # if the macro parameter ``version'' is set, honour it | |
| 119 | + # | |
| 120 | + if test -n "$1"; then | |
| 121 | + AC_MSG_CHECKING([for a version of Python $1]) | |
| 122 | + ac_supports_python_ver=`$PYTHON -c "import sys, string; \ | |
| 123 | + ver = string.split(sys.version)[[0]]; \ | |
| 124 | + print ver $1"` | |
| 125 | + if test "$ac_supports_python_ver" = "True"; then | |
| 126 | + AC_MSG_RESULT([yes]) | |
| 127 | + else | |
| 128 | + AC_MSG_RESULT([no]) | |
| 129 | + AC_MSG_ERROR([this package requires Python $1. | |
| 130 | +If you have it installed, but it isn't the default Python | |
| 131 | +interpreter in your system path, please pass the PYTHON_VERSION | |
| 132 | +variable to configure. See ``configure --help'' for reference. | |
| 133 | +]) | |
| 134 | + PYTHON_VERSION="" | |
| 135 | + fi | |
| 136 | + fi | |
| 137 | + | |
| 138 | + # | |
| 139 | + # Check if you have distutils, else fail | |
| 140 | + # | |
| 141 | + AC_MSG_CHECKING([for the distutils Python package]) | |
| 142 | + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` | |
| 143 | + if test -z "$ac_distutils_result"; then | |
| 144 | + AC_MSG_RESULT([yes]) | |
| 145 | + else | |
| 146 | + AC_MSG_RESULT([no]) | |
| 147 | + AC_MSG_ERROR([cannot import Python module "distutils". | |
| 148 | +Please check your Python installation. The error was: | |
| 149 | +$ac_distutils_result]) | |
| 150 | + PYTHON_VERSION="" | |
| 151 | + fi | |
| 152 | + | |
| 153 | + # | |
| 154 | + # Check for Python include path | |
| 155 | + # | |
| 156 | + AC_MSG_CHECKING([for Python include path]) | |
| 157 | + if test -z "$PYTHON_CPPFLAGS"; then | |
| 158 | + python_path=`$PYTHON -c "import distutils.sysconfig; \ | |
| 159 | + print distutils.sysconfig.get_python_inc();"` | |
| 160 | + if test -n "${python_path}"; then | |
| 161 | + python_path="-I$python_path" | |
| 162 | + fi | |
| 163 | + PYTHON_CPPFLAGS=$python_path | |
| 164 | + fi | |
| 165 | + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) | |
| 166 | + AC_SUBST([PYTHON_CPPFLAGS]) | |
| 167 | + | |
| 168 | + # | |
| 169 | + # Check for Python library path | |
| 170 | + # | |
| 171 | + AC_MSG_CHECKING([for Python library path]) | |
| 172 | + if test -z "$PYTHON_LDFLAGS"; then | |
| 173 | + # (makes two attempts to ensure we've got a version number | |
| 174 | + # from the interpreter) | |
| 175 | + py_version=`$PYTHON -c "from distutils.sysconfig import *; \ | |
| 176 | + from string import join; \ | |
| 177 | + print join(get_config_vars('VERSION'))"` | |
| 178 | + if test "$py_version" == "[None]"; then | |
| 179 | + if test -n "$PYTHON_VERSION"; then | |
| 180 | + py_version=$PYTHON_VERSION | |
| 181 | + else | |
| 182 | + py_version=`$PYTHON -c "import sys; \ | |
| 183 | + print sys.version[[:3]]"` | |
| 184 | + fi | |
| 185 | + fi | |
| 186 | + | |
| 187 | + PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \ | |
| 188 | + from string import join; \ | |
| 189 | + print '-L' + get_python_lib(0,1), \ | |
| 190 | + '-lpython';"`$py_version | |
| 191 | + fi | |
| 192 | + AC_MSG_RESULT([$PYTHON_LDFLAGS]) | |
| 193 | + AC_SUBST([PYTHON_LDFLAGS]) | |
| 194 | + | |
| 195 | + # | |
| 196 | + # Check for site packages | |
| 197 | + # | |
| 198 | + AC_MSG_CHECKING([for Python site-packages path]) | |
| 199 | + if test -z "$PYTHON_SITE_PKG"; then | |
| 200 | + PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ | |
| 201 | + print distutils.sysconfig.get_python_lib(0,0);"` | |
| 202 | + fi | |
| 203 | + AC_MSG_RESULT([$PYTHON_SITE_PKG]) | |
| 204 | + AC_SUBST([PYTHON_SITE_PKG]) | |
| 205 | + | |
| 206 | + # | |
| 207 | + # libraries which must be linked in when embedding | |
| 208 | + # | |
| 209 | + AC_MSG_CHECKING(python extra libraries) | |
| 210 | + if test -z "$PYTHON_EXTRA_LIBS"; then | |
| 211 | + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ | |
| 212 | + conf = distutils.sysconfig.get_config_var; \ | |
| 213 | + print conf('LOCALMODLIBS'), conf('LIBS')"` | |
| 214 | + fi | |
| 215 | + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) | |
| 216 | + AC_SUBST(PYTHON_EXTRA_LIBS) | |
| 217 | + | |
| 218 | + # | |
| 219 | + # linking flags needed when embedding | |
| 220 | + # | |
| 221 | + AC_MSG_CHECKING(python extra linking flags) | |
| 222 | + if test -z "$PYTHON_EXTRA_LDFLAGS"; then | |
| 223 | + PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ | |
| 224 | + conf = distutils.sysconfig.get_config_var; \ | |
| 225 | + print conf('LINKFORSHARED')"` | |
| 226 | + fi | |
| 227 | + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) | |
| 228 | + AC_SUBST(PYTHON_EXTRA_LDFLAGS) | |
| 229 | + | |
| 230 | + # | |
| 231 | + # final check to see if everything compiles alright | |
| 232 | + # | |
| 233 | + AC_MSG_CHECKING([consistency of all components of python development environment]) | |
| 234 | + AC_LANG_PUSH([C]) | |
| 235 | + # save current global flags | |
| 236 | + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" | |
| 237 | + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" | |
| 238 | + AC_TRY_LINK([ | |
| 239 | + #include <Python.h> | |
| 240 | + ],[ | |
| 241 | + Py_Initialize(); | |
| 242 | + ],[pythonexists=yes],[pythonexists=no]) | |
| 243 | + | |
| 244 | + AC_MSG_RESULT([$pythonexists]) | |
| 245 | + | |
| 246 | + if test ! "$pythonexists" = "yes"; then | |
| 247 | + AC_MSG_ERROR([ | |
| 248 | + Could not link test program to Python. Maybe the main Python library has been | |
| 249 | + installed in some non-standard library path. If so, pass it to configure, | |
| 250 | + via the LDFLAGS environment variable. | |
| 251 | + Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" | |
| 252 | + ============================================================================ | |
| 253 | + ERROR! | |
| 254 | + You probably have to install the development version of the Python package | |
| 255 | + for your distribution. The exact name of this package varies among them. | |
| 256 | + ============================================================================ | |
| 257 | + ]) | |
| 258 | + PYTHON_VERSION="" | |
| 259 | + fi | |
| 260 | + AC_LANG_POP | |
| 261 | + # turn back to default flags | |
| 262 | + CPPFLAGS="$ac_save_CPPFLAGS" | |
| 263 | + LIBS="$ac_save_LIBS" | |
| 264 | + | |
| 265 | + # | |
| 266 | + # all done! | |
| 267 | + # | |
| 268 | +]) | ... | ... |
m4/swig_enable_cxx.m4
0 → 100644
| 1 | +##### http://autoconf-archive.cryp.to/swig_enable_cxx.html | |
| 2 | +# | |
| 3 | +# SYNOPSIS | |
| 4 | +# | |
| 5 | +# SWIG_ENABLE_CXX | |
| 6 | +# | |
| 7 | +# DESCRIPTION | |
| 8 | +# | |
| 9 | +# Enable SWIG C++ support. This affects all invocations of $(SWIG). | |
| 10 | +# | |
| 11 | +# LAST MODIFICATION | |
| 12 | +# | |
| 13 | +# 2006-10-22 | |
| 14 | +# | |
| 15 | +# COPYLEFT | |
| 16 | +# | |
| 17 | +# Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de> | |
| 18 | +# Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca> | |
| 19 | +# Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net> | |
| 20 | +# Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za> | |
| 21 | +# | |
| 22 | +# This program is free software; you can redistribute it and/or | |
| 23 | +# modify it under the terms of the GNU General Public License as | |
| 24 | +# published by the Free Software Foundation; either version 2 of the | |
| 25 | +# License, or (at your option) any later version. | |
| 26 | +# | |
| 27 | +# This program is distributed in the hope that it will be useful, but | |
| 28 | +# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 29 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 30 | +# General Public License for more details. | |
| 31 | +# | |
| 32 | +# You should have received a copy of the GNU General Public License | |
| 33 | +# along with this program; if not, write to the Free Software | |
| 34 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 35 | +# 02111-1307, USA. | |
| 36 | +# | |
| 37 | +# As a special exception, the respective Autoconf Macro's copyright | |
| 38 | +# owner gives unlimited permission to copy, distribute and modify the | |
| 39 | +# configure scripts that are the output of Autoconf when processing | |
| 40 | +# the Macro. You need not follow the terms of the GNU General Public | |
| 41 | +# License when using or distributing such scripts, even though | |
| 42 | +# portions of the text of the Macro appear in them. The GNU General | |
| 43 | +# Public License (GPL) does govern all other use of the material that | |
| 44 | +# constitutes the Autoconf Macro. | |
| 45 | +# | |
| 46 | +# This special exception to the GPL applies to versions of the | |
| 47 | +# Autoconf Macro released by the Autoconf Macro Archive. When you | |
| 48 | +# make and distribute a modified version of the Autoconf Macro, you | |
| 49 | +# may extend this special exception to the GPL to apply to your | |
| 50 | +# modified version as well. | |
| 51 | + | |
| 52 | +AC_DEFUN([SWIG_ENABLE_CXX],[ | |
| 53 | + AC_REQUIRE([AC_PROG_SWIG]) | |
| 54 | + AC_REQUIRE([AC_PROG_CXX]) | |
| 55 | + SWIG="$SWIG -c++" | |
| 56 | +]) | ... | ... |
m4/swig_multi_module_support.m4
0 → 100644
| 1 | +##### http://autoconf-archive.cryp.to/swig_multi_module_support.html | |
| 2 | +# | |
| 3 | +# SYNOPSIS | |
| 4 | +# | |
| 5 | +# SWIG_MULTI_MODULE_SUPPORT | |
| 6 | +# | |
| 7 | +# DESCRIPTION | |
| 8 | +# | |
| 9 | +# Enable support for multiple modules. This effects all invocations | |
| 10 | +# of $(SWIG). You have to link all generated modules against the | |
| 11 | +# appropriate SWIG runtime library. If you want to build Python | |
| 12 | +# modules for example, use the SWIG_PYTHON macro and link the modules | |
| 13 | +# against $(SWIG_PYTHON_LIBS). | |
| 14 | +# | |
| 15 | +# LAST MODIFICATION | |
| 16 | +# | |
| 17 | +# 2006-10-22 | |
| 18 | +# | |
| 19 | +# COPYLEFT | |
| 20 | +# | |
| 21 | +# Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de> | |
| 22 | +# Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca> | |
| 23 | +# Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net> | |
| 24 | +# Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za> | |
| 25 | +# | |
| 26 | +# This program is free software; you can redistribute it and/or | |
| 27 | +# modify it under the terms of the GNU General Public License as | |
| 28 | +# published by the Free Software Foundation; either version 2 of the | |
| 29 | +# License, or (at your option) any later version. | |
| 30 | +# | |
| 31 | +# This program is distributed in the hope that it will be useful, but | |
| 32 | +# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 33 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 34 | +# General Public License for more details. | |
| 35 | +# | |
| 36 | +# You should have received a copy of the GNU General Public License | |
| 37 | +# along with this program; if not, write to the Free Software | |
| 38 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 39 | +# 02111-1307, USA. | |
| 40 | +# | |
| 41 | +# As a special exception, the respective Autoconf Macro's copyright | |
| 42 | +# owner gives unlimited permission to copy, distribute and modify the | |
| 43 | +# configure scripts that are the output of Autoconf when processing | |
| 44 | +# the Macro. You need not follow the terms of the GNU General Public | |
| 45 | +# License when using or distributing such scripts, even though | |
| 46 | +# portions of the text of the Macro appear in them. The GNU General | |
| 47 | +# Public License (GPL) does govern all other use of the material that | |
| 48 | +# constitutes the Autoconf Macro. | |
| 49 | +# | |
| 50 | +# This special exception to the GPL applies to versions of the | |
| 51 | +# Autoconf Macro released by the Autoconf Macro Archive. When you | |
| 52 | +# make and distribute a modified version of the Autoconf Macro, you | |
| 53 | +# may extend this special exception to the GPL to apply to your | |
| 54 | +# modified version as well. | |
| 55 | + | |
| 56 | +AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[ | |
| 57 | + AC_REQUIRE([AC_PROG_SWIG]) | |
| 58 | + SWIG="$SWIG -noruntime" | |
| 59 | +]) | ... | ... |
m4/swig_python.m4
0 → 100644
| 1 | +##### http://autoconf-archive.cryp.to/swig_python.html | |
| 2 | +# | |
| 3 | +# SYNOPSIS | |
| 4 | +# | |
| 5 | +# SWIG_PYTHON([use-shadow-classes = {no, yes}]) | |
| 6 | +# | |
| 7 | +# DESCRIPTION | |
| 8 | +# | |
| 9 | +# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), and | |
| 10 | +# $(SWIG_PYTHON_OPT) output variables. | |
| 11 | +# | |
| 12 | +# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate | |
| 13 | +# code for Python. Shadow classes are enabled unless the value of the | |
| 14 | +# optional first argument is exactly 'no'. If you need multi module | |
| 15 | +# support (provided by the SWIG_MULTI_MODULE_SUPPORT macro) use | |
| 16 | +# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It | |
| 17 | +# contains the SWIG Python runtime library that is needed by the type | |
| 18 | +# check system for example. | |
| 19 | +# | |
| 20 | +# LAST MODIFICATION | |
| 21 | +# | |
| 22 | +# 2006-10-22 | |
| 23 | +# | |
| 24 | +# COPYLEFT | |
| 25 | +# | |
| 26 | +# Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de> | |
| 27 | +# Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca> | |
| 28 | +# Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net> | |
| 29 | +# Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za> | |
| 30 | +# | |
| 31 | +# This program is free software; you can redistribute it and/or | |
| 32 | +# modify it under the terms of the GNU General Public License as | |
| 33 | +# published by the Free Software Foundation; either version 2 of the | |
| 34 | +# License, or (at your option) any later version. | |
| 35 | +# | |
| 36 | +# This program is distributed in the hope that it will be useful, but | |
| 37 | +# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 38 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 39 | +# General Public License for more details. | |
| 40 | +# | |
| 41 | +# You should have received a copy of the GNU General Public License | |
| 42 | +# along with this program; if not, write to the Free Software | |
| 43 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 44 | +# 02111-1307, USA. | |
| 45 | +# | |
| 46 | +# As a special exception, the respective Autoconf Macro's copyright | |
| 47 | +# owner gives unlimited permission to copy, distribute and modify the | |
| 48 | +# configure scripts that are the output of Autoconf when processing | |
| 49 | +# the Macro. You need not follow the terms of the GNU General Public | |
| 50 | +# License when using or distributing such scripts, even though | |
| 51 | +# portions of the text of the Macro appear in them. The GNU General | |
| 52 | +# Public License (GPL) does govern all other use of the material that | |
| 53 | +# constitutes the Autoconf Macro. | |
| 54 | +# | |
| 55 | +# This special exception to the GPL applies to versions of the | |
| 56 | +# Autoconf Macro released by the Autoconf Macro Archive. When you | |
| 57 | +# make and distribute a modified version of the Autoconf Macro, you | |
| 58 | +# may extend this special exception to the GPL to apply to your | |
| 59 | +# modified version as well. | |
| 60 | + | |
| 61 | +AC_DEFUN([SWIG_PYTHON],[ | |
| 62 | + AC_REQUIRE([AC_PROG_SWIG]) | |
| 63 | + AC_REQUIRE([AC_PYTHON_DEVEL]) | |
| 64 | + test "x$1" != "xno" || swig_shadow=" -noproxy" | |
| 65 | + AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow]) | |
| 66 | + AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) | |
| 67 | +]) | ... | ... |
pyext/GException.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * GException.i - exception handler * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2008 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | +%module GException | |
| 14 | +%{ | |
| 15 | +/* Put headers and other declarations here */ | |
| 16 | +#include <string> // string | |
| 17 | +#include <sstream> // ostringstream | |
| 18 | +#include <stdexcept> // exception | |
| 19 | +%} | |
| 20 | +#include "GException.hpp" | ... | ... |
pyext/GFitPar.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * GFitPar.i - Fit parameter class SWIG file * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2008 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | +%{ | |
| 14 | +/* Put headers and other declarations here that are needed for compilation */ | |
| 15 | +#include "GFitPar.hpp" | |
| 16 | +%} | |
| 17 | + | |
| 18 | + | |
| 19 | +/*************************************************************************** | |
| 20 | + * GFitPar class definition * | |
| 21 | + ***************************************************************************/ | |
| 22 | +class GFitPar { | |
| 23 | +public: | |
| 24 | + // Constructors and destructors | |
| 25 | + GFitPar(void); | |
| 26 | + GFitPar(const GFitPar& p); | |
| 27 | + ~GFitPar(); | |
| 28 | + | |
| 29 | + // Fit parameter methods | |
| 30 | + double error(void) const; // Get error value | |
| 31 | + double min(void) const; // Get minimum value boundary | |
| 32 | + double max(void) const; // Get maximum value boundary | |
| 33 | + void min_set(double& min); // Set minimum value boundary | |
| 34 | + void max_set(double& max); // Set maximum value boundary | |
| 35 | + void min_remove(void); // Remove minimum value boundary | |
| 36 | + void max_remove(void); // Remove maximum value boundary | |
| 37 | + void free(void); // Free parameter | |
| 38 | + void fix(void); // Fix parameter | |
| 39 | + | |
| 40 | +private: | |
| 41 | + // Private methods | |
| 42 | + void constructor(void); | |
| 43 | + void init_members(void); | |
| 44 | + void copy_members(const GFitPar& p); | |
| 45 | + void free_members(void); | |
| 46 | + | |
| 47 | + // Private data members | |
| 48 | + double m_value; // Parameter value | |
| 49 | + double m_error; // Parameter error | |
| 50 | + double m_value_min; // Minimum parameter value | |
| 51 | + double m_value_max; // Maximum parameter value | |
| 52 | + int m_has_error; // Parameter has error | |
| 53 | + int m_has_min; // Parameter has a minimum boundary | |
| 54 | + int m_has_max; // Parameter has a maximum boundary | |
| 55 | + int m_free; // Parameter is free | |
| 56 | + std::string m_name; // Parameter name | |
| 57 | +}; | |
| 58 | + | |
| 59 | + | |
| 60 | +/*************************************************************************** | |
| 61 | + * GFitPar class SWIG extension * | |
| 62 | + ***************************************************************************/ | |
| 63 | +%extend GFitPar { | |
| 64 | + char *__str__() { | |
| 65 | + std::ostringstream buffer; | |
| 66 | + buffer << *self; | |
| 67 | + std::string str = buffer.str(); | |
| 68 | + char* ptr = (char*)str.c_str(); | |
| 69 | + return ptr; | |
| 70 | + } | |
| 71 | + double value(void) const { | |
| 72 | + return double(*self); | |
| 73 | + } | |
| 74 | + void set(const double val) { | |
| 75 | + (*self) = val; | |
| 76 | + } | |
| 77 | + void min_set(const double val) { | |
| 78 | + double arg = val; | |
| 79 | + (*self).min_set(arg); | |
| 80 | + } | |
| 81 | + void max_set(const double val) { | |
| 82 | + double arg = val; | |
| 83 | + (*self).max_set(arg); | |
| 84 | + } | |
| 85 | + GFitPar copy() { | |
| 86 | + return (*self); | |
| 87 | + } | |
| 88 | +} | ... | ... |
pyext/GMatrix.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * GMatrix.hpp - Matrix class SWIG file * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2008 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | +%{ | |
| 14 | +/* Put headers and other declarations here that are needed for compilation */ | |
| 15 | +#include "GMatrix.hpp" | |
| 16 | +%} | |
| 17 | + | |
| 18 | +%feature("notabstract") GMatrix; | |
| 19 | + | |
| 20 | +/*************************************************************************** | |
| 21 | + * GMatrix class definition * | |
| 22 | + * ----------------------------------------------------------------------- * | |
| 23 | + * GMatrix implements a full matrix storage class. It derives from the * | |
| 24 | + * abstract base class GMatrixBase. * | |
| 25 | + ***************************************************************************/ | |
| 26 | +class GMatrix : public GMatrixBase { | |
| 27 | +public: | |
| 28 | + // Constructors and destructors | |
| 29 | + GMatrix(int rows, int cols); | |
| 30 | + GMatrix(const GMatrix& m); | |
| 31 | + GMatrix(const GSymMatrix& m); | |
| 32 | + GMatrix(const GSparseMatrix& m); | |
| 33 | + virtual ~GMatrix(); | |
| 34 | + | |
| 35 | + // Operators | |
| 36 | + virtual GMatrix operator+ (const GMatrix& m) const; | |
| 37 | + virtual GMatrix operator- (const GMatrix& m) const; | |
| 38 | + virtual GMatrix operator* (const GMatrix& m) const; | |
| 39 | + virtual GVector operator* (const GVector& v) const; | |
| 40 | + //_USE_BASE virtual int operator== (const GMatrix& m) const; | |
| 41 | + //_USE_BASE virtual int operator!= (const GMatrix& m) const; | |
| 42 | + virtual GMatrix operator- () const; | |
| 43 | + virtual GMatrix& operator+= (const GMatrix& m); | |
| 44 | + virtual GMatrix& operator-= (const GMatrix& m); | |
| 45 | + virtual GMatrix& operator*= (const GMatrix& m); | |
| 46 | + virtual GMatrix& operator*= (const double& s); | |
| 47 | + virtual GMatrix& operator/= (const double& s); | |
| 48 | + | |
| 49 | + // Methods | |
| 50 | + virtual void add_col(const GVector& v, int col); | |
| 51 | + //TBD virtual void cholesky_decompose(int compress = 1); | |
| 52 | + //TBD virtual GVector cholesky_solver(const GVector& v, int compress = 1); | |
| 53 | + //TBD virtual void cholesky_invert(int compress = 1); | |
| 54 | + virtual void clear(); | |
| 55 | + virtual GVector extract_row(int row) const; | |
| 56 | + virtual GVector extract_col(int col) const; | |
| 57 | + virtual GMatrix extract_lower_triangle() const; | |
| 58 | + virtual GMatrix extract_upper_triangle() const; | |
| 59 | + virtual double fill() const; | |
| 60 | + virtual void insert_col(const GVector& v, int col); | |
| 61 | + virtual double min() const; | |
| 62 | + virtual double max() const; | |
| 63 | + virtual double sum() const; | |
| 64 | + virtual void transpose(); | |
| 65 | + | |
| 66 | +private: | |
| 67 | + // Private methods | |
| 68 | + void constructor(int rows, int cols); | |
| 69 | + void init_members(void) { ; } | |
| 70 | + void copy_members(const GMatrix& m) { ; } | |
| 71 | + void free_members(void) { ; } | |
| 72 | +}; | |
| 73 | + | |
| 74 | + | |
| 75 | +/*************************************************************************** | |
| 76 | + * GMatrix class SWIG extension * | |
| 77 | + ***************************************************************************/ | |
| 78 | +%extend GMatrix { | |
| 79 | + char *__str__() { | |
| 80 | + std::ostringstream buffer; | |
| 81 | + buffer << *self; | |
| 82 | + std::string str = buffer.str(); | |
| 83 | + char* ptr = (char*)str.c_str(); | |
| 84 | + return ptr; | |
| 85 | + } | |
| 86 | + void __setslice__(int row, int col, const double val) throw (std::out_of_range) { | |
| 87 | + if (row >=0 && row < (int)self->rows() && col >= 0 || col < (int)self->cols()) | |
| 88 | + (*self)(row,col) = val; | |
| 89 | + else | |
| 90 | + throw std::out_of_range("row,column"); | |
| 91 | + } | |
| 92 | + double __getslice__(int row, int col) throw (std::out_of_range) { | |
| 93 | + if (row >=0 && row < (int)self->rows() && col >= 0 || col < (int)self->cols()) | |
| 94 | + return (*self)(row,col); | |
| 95 | + else | |
| 96 | + throw std::out_of_range("row,column"); | |
| 97 | + } | |
| 98 | + GMatrix __mul__(const double &a) { | |
| 99 | + return (*self) * a; | |
| 100 | + } | |
| 101 | + GMatrix __div__(const double &a) { | |
| 102 | + return (*self) / a; | |
| 103 | + } | |
| 104 | + GMatrix transpose(const GMatrix& m) { | |
| 105 | + return transpose(m); | |
| 106 | + } | |
| 107 | + GMatrix abs(const GMatrix& m) { | |
| 108 | + return fabs(m); | |
| 109 | + } | |
| 110 | + GMatrix copy() { | |
| 111 | + return (*self); | |
| 112 | + } | |
| 113 | +}; | ... | ... |
pyext/GMatrixBase.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * GMatrixBase.hpp - Matrix abstract base class SWIG file * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2006 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | +%{ | |
| 14 | +/* Put headers and other declarations here that are needed for compilation */ | |
| 15 | +#include "GMatrixBase.hpp" | |
| 16 | +%} | |
| 17 | + | |
| 18 | + | |
| 19 | +/*************************************************************************** | |
| 20 | + * GMatrixBase class definition * | |
| 21 | + * ----------------------------------------------------------------------- * | |
| 22 | + * GMatrixBase is an abstract base class for all matrix classes. It * | |
| 23 | + * defines the common interfaces of the matrix objects and provides some * | |
| 24 | + * common services to the derived classes. * | |
| 25 | + ***************************************************************************/ | |
| 26 | +class GMatrixBase { | |
| 27 | + | |
| 28 | +// Methods that are available to everybody | |
| 29 | +public: | |
| 30 | + // Constructors and destructors | |
| 31 | + GMatrixBase(); | |
| 32 | + GMatrixBase(const GMatrixBase& m); | |
| 33 | + virtual ~GMatrixBase(); | |
| 34 | + | |
| 35 | + // Operators (first virtual, then pure virtual) | |
| 36 | + virtual int operator== (const GMatrixBase& m) const; | |
| 37 | + virtual int operator!= (const GMatrixBase& m) const; | |
| 38 | + // | |
| 39 | + //virtual GMatrixBase operator+ (const GMatrixBase& m) const = 0; | |
| 40 | + //virtual GMatrixBase operator- (const GMatrixBase& m) const = 0; | |
| 41 | + //virtual GMatrixBase operator* (const GMatrixBase& m) const = 0; | |
| 42 | + virtual GVector operator* (const GVector& v) const = 0; | |
| 43 | + //virtual GMatrixBase operator- () const = 0; | |
| 44 | + //virtual GMatrixBase& operator+= (const GMatrixBase& m) = 0; | |
| 45 | + //virtual GMatrixBase& operator-= (const GMatrixBase& m) = 0; | |
| 46 | + //virtual GMatrixBase& operator*= (const GMatrixBase& m) = 0; | |
| 47 | + //virtual GMatrixBase& operator*= (const double& s) = 0; | |
| 48 | + //virtual GMatrixBase& operator/= (const double& s) = 0; | |
| 49 | + | |
| 50 | + // Methods (first virtual, then pure virtual) | |
| 51 | + virtual int cols(void) const { return m_cols; } | |
| 52 | + virtual int rows(void) const { return m_rows; } | |
| 53 | + // | |
| 54 | + //virtual void add_col(const GVector& v, int col) = 0; | |
| 55 | + //virtual void cholesky_decompose(int compress = 1) = 0; | |
| 56 | + //virtual GVector cholesky_solver(const GVector& v, int compress = 1) = 0; | |
| 57 | + //virtual void cholesky_invert(int compress = 1) = 0; | |
| 58 | + virtual void clear() = 0; | |
| 59 | + virtual GVector extract_row(int row) const = 0; | |
| 60 | + virtual GVector extract_col(int col) const = 0; | |
| 61 | + //virtual GMatrix extract_lower_triangle() const = 0; | |
| 62 | + //virtual GMatrix extract_upper_triangle() const = 0; | |
| 63 | + //virtual void insert_col(const GVector& v, int col) = 0; | |
| 64 | + virtual double fill() const = 0; | |
| 65 | + virtual double min() const = 0; | |
| 66 | + virtual double max() const = 0; | |
| 67 | + virtual double sum() const = 0; | |
| 68 | + virtual void transpose() = 0; | |
| 69 | + | |
| 70 | +// Methods and data that are available to derived classes | |
| 71 | +protected: | |
| 72 | + // Protected methods | |
| 73 | + void select_non_zero(); | |
| 74 | + void negation(); | |
| 75 | + void addition(const GMatrixBase& m); | |
| 76 | + void subtraction(const GMatrixBase& m); | |
| 77 | + void multiplication(const double& s); | |
| 78 | + void set_all_elements(const double& s); | |
| 79 | + double get_min_element() const; | |
| 80 | + double get_max_element() const; | |
| 81 | + double get_element_sum() const; | |
| 82 | + void dump_elements(ostream& os) const; | |
| 83 | + void dump_row_comp(ostream& os) const; | |
| 84 | + void dump_col_comp(ostream& os) const; | |
| 85 | + | |
| 86 | + // Protected data area | |
| 87 | + int m_rows; // Number of rows | |
| 88 | + int m_cols; // Number of columns | |
| 89 | + int m_elements; // Number of elements stored in matrix | |
| 90 | + int m_alloc; // Size of allocated matrix memory | |
| 91 | + int m_num_rowsel; // Number of selected rows (for compressed decomposition) | |
| 92 | + int m_num_colsel; // Number of selected columns (for compressed decomposition) | |
| 93 | + int* m_colstart; // Column start indices (m_cols+1) | |
| 94 | + int* m_rowsel; // Row selection (for compressed decomposition) | |
| 95 | + int* m_colsel; // Column selection (for compressed decomposition) | |
| 96 | + double* m_data; // Matrix data | |
| 97 | + | |
| 98 | +// Methods that are available to the base class only | |
| 99 | +private: | |
| 100 | + void init_members(void); | |
| 101 | + void copy_members(const GMatrixBase& m); | |
| 102 | + void free_members(void); | |
| 103 | +}; | ... | ... |
pyext/GVector.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * GVector.i - Vector class SWIG file * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2008 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | +%{ | |
| 14 | +/* Put headers and other declarations here that are needed for compilation */ | |
| 15 | +#include "GVector.hpp" | |
| 16 | +%} | |
| 17 | + | |
| 18 | + | |
| 19 | +/*************************************************************************** | |
| 20 | + * GVector class definition * | |
| 21 | + ***************************************************************************/ | |
| 22 | +class GVector { | |
| 23 | +public: | |
| 24 | + | |
| 25 | + // Constructors and destructors | |
| 26 | + explicit GVector(int num); | |
| 27 | + GVector(const GVector& v); | |
| 28 | + ~GVector(); | |
| 29 | + | |
| 30 | + // Vector operators | |
| 31 | + GVector& operator+= (const GVector& v); | |
| 32 | + GVector& operator-= (const GVector& v); | |
| 33 | + GVector& operator+= (const double& v); | |
| 34 | + GVector& operator-= (const double& v); | |
| 35 | + GVector& operator*= (const double& v); | |
| 36 | + GVector& operator/= (const double& v); | |
| 37 | + GVector operator- () const; | |
| 38 | + | |
| 39 | + // Vector functions | |
| 40 | + int size() const; // Return dimension of vector | |
| 41 | + int non_zeros() const; // Returns # of non zeros in vector | |
| 42 | +}; | |
| 43 | + | |
| 44 | + | |
| 45 | +/*************************************************************************** | |
| 46 | + * GVector class SWIG extension * | |
| 47 | + ***************************************************************************/ | |
| 48 | +%extend GVector { | |
| 49 | + char *__str__() { | |
| 50 | + std::ostringstream buffer; | |
| 51 | + buffer << *self; | |
| 52 | + std::string str = buffer.str(); | |
| 53 | + char* ptr = (char*)str.c_str(); | |
| 54 | + return ptr; | |
| 55 | + } | |
| 56 | + double __getitem__(int index) throw (std::out_of_range) { | |
| 57 | + if (index >= 0 && index < (int)self->size()) | |
| 58 | + return (*self)(index); | |
| 59 | + else | |
| 60 | + throw std::out_of_range("index"); | |
| 61 | + } | |
| 62 | + void __setitem__(int index, const double val) throw (std::out_of_range) { | |
| 63 | + if (index>=0 && index < (int)self->size()) | |
| 64 | + (*self)(index) = val; | |
| 65 | + else | |
| 66 | + throw std::out_of_range("index"); | |
| 67 | + } | |
| 68 | + GVector __add__(const GVector &a) { | |
| 69 | + return (*self) + a; | |
| 70 | + } | |
| 71 | + GVector __add__(const double &a) { | |
| 72 | + return (*self) + a; | |
| 73 | + } | |
| 74 | + GVector __sub__(const GVector &a) { | |
| 75 | + return (*self) - a; | |
| 76 | + } | |
| 77 | + GVector __sub__(const double &a) { | |
| 78 | + return (*self) - a; | |
| 79 | + } | |
| 80 | + double __mul__(const GVector &a) { | |
| 81 | + return (*self) * a; | |
| 82 | + } | |
| 83 | + GVector __mul__(const double &a) { | |
| 84 | + return (*self) * a; | |
| 85 | + } | |
| 86 | + GVector __div__(const double &a) { | |
| 87 | + return (*self) / a; | |
| 88 | + } | |
| 89 | + int __is__(const GVector &a) { | |
| 90 | + return (*self) == a; | |
| 91 | + } | |
| 92 | + GVector copy() { | |
| 93 | + return (*self); | |
| 94 | + } | |
| 95 | + GVector cross(const GVector &a) { | |
| 96 | + return cross(*self, a); | |
| 97 | + } | |
| 98 | + double norm() { | |
| 99 | + return norm(*self); | |
| 100 | + } | |
| 101 | + double min() { | |
| 102 | + return min(*self); | |
| 103 | + } | |
| 104 | + double max() { | |
| 105 | + return max(*self); | |
| 106 | + } | |
| 107 | + double sum() { | |
| 108 | + return sum(*self); | |
| 109 | + } | |
| 110 | + GVector acos() { | |
| 111 | + return acos(*self); | |
| 112 | + } | |
| 113 | + GVector acosh() { | |
| 114 | + return acosh(*self); | |
| 115 | + } | |
| 116 | + GVector asin() { | |
| 117 | + return asin(*self); | |
| 118 | + } | |
| 119 | + GVector asinh() { | |
| 120 | + return asinh(*self); | |
| 121 | + } | |
| 122 | + GVector atan() { | |
| 123 | + return atan(*self); | |
| 124 | + } | |
| 125 | + GVector atanh() { | |
| 126 | + return atanh(*self); | |
| 127 | + } | |
| 128 | + GVector cos() { | |
| 129 | + return cos(*self); | |
| 130 | + } | |
| 131 | + GVector cosh() { | |
| 132 | + return cosh(*self); | |
| 133 | + } | |
| 134 | + GVector exp() { | |
| 135 | + return exp(*self); | |
| 136 | + } | |
| 137 | + GVector abs() { | |
| 138 | + return fabs(*self); | |
| 139 | + } | |
| 140 | + GVector log() { | |
| 141 | + return log(*self); | |
| 142 | + } | |
| 143 | + GVector log10() { | |
| 144 | + return log10(*self); | |
| 145 | + } | |
| 146 | + GVector sin() { | |
| 147 | + return sin(*self); | |
| 148 | + } | |
| 149 | + GVector sinh() { | |
| 150 | + return sinh(*self); | |
| 151 | + } | |
| 152 | + GVector sqrt() { | |
| 153 | + return sqrt(*self); | |
| 154 | + } | |
| 155 | + GVector tan() { | |
| 156 | + return tan(*self); | |
| 157 | + } | |
| 158 | + GVector tanh() { | |
| 159 | + return tanh(*self); | |
| 160 | + } | |
| 161 | +}; | ... | ... |
pyext/Makefile.am
0 → 100755
| 1 | +## Process this file with automake to produce Makefile.in | |
| 2 | + | |
| 3 | +if HAVE_SWIG | |
| 4 | +if HAVE_PYTHON | |
| 5 | +if ENABLE_PYTHON_BINDING | |
| 6 | + | |
| 7 | +SWIG_INTERFACE = gammalib.i | |
| 8 | + | |
| 9 | +BUILT_SOURCES = gammalib_wrap.cpp gammalib.py | |
| 10 | +CLEANFILES = gammalib_wrap.cpp gammalib.py | |
| 11 | + | |
| 12 | +EXTRA_DIST = runme.py | |
| 13 | + | |
| 14 | +all-local: gammalib_wrap.cpp gammalib.py | |
| 15 | + $(PYTHON) setup.py build | |
| 16 | + | |
| 17 | +install-exec-local: | |
| 18 | + $(PYTHON) setup.py install --prefix=$(prefix) | |
| 19 | + | |
| 20 | +clean-local: | |
| 21 | + rm -rf build | |
| 22 | + | |
| 23 | +gammalib_wrap.cpp gammalib.py: $(SWIG_INTERFACE) | |
| 24 | + $(SWIG) -c++ -python -Wall -includeall -I$(top_srcdir)/src -o gammalib_wrap.cpp -outdir . $(srcdir)/$(SWIG_INTERFACE) | |
| 25 | + @if test "x`uname -o`" = "xCygwin"; then \ | |
| 26 | + echo "WARNING: working around bug in SWIG on Windows/Cygwin platforms ONLY"; \ | |
| 27 | + sed -i.bak -f $(srcdir)/fix_wrapper.sed gammalib_wrap.cpp; \ | |
| 28 | + fi | |
| 29 | + | |
| 30 | +endif # ENABLE_PYTHON_BINDING | |
| 31 | +endif # HAVE_PYTHON | |
| 32 | +endif # HAVE_SWIG | ... | ... |
pyext/gammalib.i
0 → 100755
| 1 | +/*************************************************************************** | |
| 2 | + * gammalib - SWIG file * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2008 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + * ----------------------------------------------------------------------- * | |
| 13 | + * Usage: * | |
| 14 | + * swig -c++ -python -Wall -includeall gammalib.i * | |
| 15 | + ***************************************************************************/ | |
| 16 | +%module gammalib | |
| 17 | + | |
| 18 | +#include "GVector.i" | |
| 19 | +#include "GMatrixBase.i" | |
| 20 | +#include "GMatrix.i" | |
| 21 | +#include "GFitPar.i" | ... | ... |
pyext/setup.py.in
0 → 100644
| 1 | +from distutils.core import setup, Extension | |
| 2 | +setup(name='@PACKAGE_NAME@', | |
| 3 | + version='@PACKAGE_VERSION@', | |
| 4 | + description='gammalib Python binding', | |
| 5 | + author='Jurgen Knodlseder', | |
| 6 | + author_email='@PACKAGE_BUGREPORT@', | |
| 7 | + url='http://gammalib.sourceforge.net/', | |
| 8 | + py_modules=['gammalib'], | |
| 9 | + ext_modules=[Extension('_gammalib', ['gammalib_wrap.cpp'], | |
| 10 | + include_dirs=['@top_srcdir@/src'], | |
| 11 | + library_dirs=['../src/.libs'], | |
| 12 | + libraries=['gamma'])], | |
| 13 | + ) | |
| 0 | 14 | \ No newline at end of file | ... | ... |
src/GFitPar.cpp
0 → 100644
| 1 | +/*************************************************************************** | |
| 2 | + * GFitPar.cpp - fit parameter class * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2007 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + * ----------------------------------------------------------------------- * | |
| 13 | + ***************************************************************************/ | |
| 14 | + | |
| 15 | +/* __ Includes ___________________________________________________________ */ | |
| 16 | +#include "GException.hpp" | |
| 17 | +#include "GFitPar.hpp" | |
| 18 | + | |
| 19 | +/* __ Namespaces _________________________________________________________ */ | |
| 20 | +using namespace std; | |
| 21 | + | |
| 22 | +/* __ Method name definitions ____________________________________________ */ | |
| 23 | +//#define G_OP_MUL_VEC "GSparseMatrix::operator* (const GVector&) const" | |
| 24 | + | |
| 25 | +/* __ Macros _____________________________________________________________ */ | |
| 26 | +//#define G_MIN(a,b) (((a) < (b)) ? (a) : (b)) | |
| 27 | + | |
| 28 | +/* __ Coding definitions _________________________________________________ */ | |
| 29 | +//#define G_USE_MEMCPY | |
| 30 | + | |
| 31 | +/* __ Debug definitions __________________________________________________ */ | |
| 32 | +//#define G_DEBUG_SPARSE_PENDING // Analyse pending values | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | +/*========================================================================== | |
| 37 | + = = | |
| 38 | + = GFitPar constructors/destructors = | |
| 39 | + = = | |
| 40 | + ==========================================================================*/ | |
| 41 | + | |
| 42 | +/*************************************************************************** | |
| 43 | + * Constructor * | |
| 44 | + * ----------------------------------------------------------------------- * | |
| 45 | + ***************************************************************************/ | |
| 46 | +GFitPar::GFitPar(void) | |
| 47 | +{ | |
| 48 | + // Initialise private members for clean destruction | |
| 49 | + init_members(); | |
| 50 | + | |
| 51 | + // Construct fit parameter | |
| 52 | + constructor(); | |
| 53 | + | |
| 54 | + // Return | |
| 55 | + return; | |
| 56 | +} | |
| 57 | + | |
| 58 | + | |
| 59 | +/*************************************************************************** | |
| 60 | + * Copy constructor * | |
| 61 | + * ----------------------------------------------------------------------- * | |
| 62 | + ***************************************************************************/ | |
| 63 | +GFitPar::GFitPar(const GFitPar& p) | |
| 64 | +{ | |
| 65 | + // Initialise private members for clean destruction | |
| 66 | + init_members(); | |
| 67 | + | |
| 68 | + // Copy members | |
| 69 | + copy_members(p); | |
| 70 | + | |
| 71 | + // Return | |
| 72 | + return; | |
| 73 | +} | |
| 74 | + | |
| 75 | + | |
| 76 | +/*************************************************************************** | |
| 77 | + * Destructor * | |
| 78 | + * ----------------------------------------------------------------------- * | |
| 79 | + ***************************************************************************/ | |
| 80 | +GFitPar::~GFitPar() | |
| 81 | +{ | |
| 82 | + // Free members | |
| 83 | + free_members(); | |
| 84 | + | |
| 85 | + // Return | |
| 86 | + return; | |
| 87 | +} | |
| 88 | + | |
| 89 | + | |
| 90 | +/*========================================================================== | |
| 91 | + = = | |
| 92 | + = GFitPar operators = | |
| 93 | + = = | |
| 94 | + ==========================================================================*/ | |
| 95 | + | |
| 96 | +/*************************************************************************** | |
| 97 | + * Assignment operator * | |
| 98 | + * ----------------------------------------------------------------------- * | |
| 99 | + ***************************************************************************/ | |
| 100 | +GFitPar& GFitPar::operator= (const GFitPar& p) | |
| 101 | +{ | |
| 102 | + // Execute only if object is not identical | |
| 103 | + if (this != &p) { | |
| 104 | + | |
| 105 | + // Free members | |
| 106 | + free_members(); | |
| 107 | + | |
| 108 | + // Initialise private members for clean destruction | |
| 109 | + init_members(); | |
| 110 | + | |
| 111 | + // Copy members | |
| 112 | + copy_members(p); | |
| 113 | + | |
| 114 | + } // endif: object was not identical | |
| 115 | + | |
| 116 | + // Return | |
| 117 | + return *this; | |
| 118 | +} | |
| 119 | + | |
| 120 | + | |
| 121 | +/*========================================================================== | |
| 122 | + = = | |
| 123 | + = GFitPar methods = | |
| 124 | + = = | |
| 125 | + ==========================================================================*/ | |
| 126 | + | |
| 127 | +/*************************************************************************** | |
| 128 | + * Assign value to parameter * | |
| 129 | + * ----------------------------------------------------------------------- * | |
| 130 | + ***************************************************************************/ | |
| 131 | +GFitPar& GFitPar::operator= (const double& v) | |
| 132 | +{ | |
| 133 | + // Assign value | |
| 134 | + m_value = v; | |
| 135 | + | |
| 136 | + // If there is a minimum boundary then make sure that the value is above | |
| 137 | + // the boundary | |
| 138 | + if (m_has_min && m_value < m_value_min) | |
| 139 | + m_value = m_value_min; | |
| 140 | + | |
| 141 | + // If there is a maximum boundary then make sure that the value is below | |
| 142 | + // the boundary | |
| 143 | + if (m_has_max && m_value > m_value_max) | |
| 144 | + m_value = m_value_max; | |
| 145 | + | |
| 146 | + // Return | |
| 147 | + return *this; | |
| 148 | +} | |
| 149 | + | |
| 150 | + | |
| 151 | +/*************************************************************************** | |
| 152 | + * Set minimum parameter boundary * | |
| 153 | + * ----------------------------------------------------------------------- * | |
| 154 | + ***************************************************************************/ | |
| 155 | +void GFitPar::min_set(double& min) | |
| 156 | +{ | |
| 157 | + // Assign minimum boundary and set flag | |
| 158 | + m_value_min = min; | |
| 159 | + m_has_min = 1; | |
| 160 | + | |
| 161 | + // If there is a maximum boundary then make sure that the minimum boundary | |
| 162 | + // is below the maximum boundary | |
| 163 | + if (m_has_max && m_value_min > m_value_max) | |
| 164 | + m_value_min = m_value_max; | |
| 165 | + | |
| 166 | + // Make sure that the parameter falls within the boundaries | |
| 167 | + if (m_has_min && m_value < m_value_min) | |
| 168 | + m_value = m_value_min; | |
| 169 | + if (m_has_max && m_value > m_value_max) | |
| 170 | + m_value = m_value_max; | |
| 171 | + | |
| 172 | + // Return | |
| 173 | + return; | |
| 174 | +} | |
| 175 | + | |
| 176 | + | |
| 177 | +/*************************************************************************** | |
| 178 | + * Set maximum parameter boundary * | |
| 179 | + * ----------------------------------------------------------------------- * | |
| 180 | + ***************************************************************************/ | |
| 181 | +void GFitPar::max_set(double& max) | |
| 182 | +{ | |
| 183 | + // Assign maximum boundary and set flag | |
| 184 | + m_value_max = max; | |
| 185 | + m_has_max = 1; | |
| 186 | + | |
| 187 | + // If there is a minimum boundary then make sure that the minimum boundary | |
| 188 | + // is below the maximum boundary | |
| 189 | + if (m_has_min && m_value_max < m_value_min) | |
| 190 | + m_value_max = m_value_min; | |
| 191 | + | |
| 192 | + // Make sure that the parameter falls within the boundaries | |
| 193 | + if (m_has_min && m_value < m_value_min) | |
| 194 | + m_value = m_value_min; | |
| 195 | + if (m_has_max && m_value > m_value_max) | |
| 196 | + m_value = m_value_max; | |
| 197 | + | |
| 198 | + // Return | |
| 199 | + return; | |
| 200 | +} | |
| 201 | + | |
| 202 | + | |
| 203 | +/*========================================================================== | |
| 204 | + = = | |
| 205 | + = GFitPar private functions = | |
| 206 | + = = | |
| 207 | + ==========================================================================*/ | |
| 208 | + | |
| 209 | +/*************************************************************************** | |
| 210 | + * Constructor method * | |
| 211 | + * ----------------------------------------------------------------------- * | |
| 212 | + ***************************************************************************/ | |
| 213 | +void GFitPar::constructor(void) | |
| 214 | +{ | |
| 215 | + | |
| 216 | + // Return | |
| 217 | + return; | |
| 218 | +} | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | +/*************************************************************************** | |
| 223 | + * Initialise class members * | |
| 224 | + * ----------------------------------------------------------------------- * | |
| 225 | + ***************************************************************************/ | |
| 226 | +void GFitPar::init_members(void) | |
| 227 | +{ | |
| 228 | + // Initialise sparse matrix members | |
| 229 | + m_value = 0.0; | |
| 230 | + m_error = 0.0; | |
| 231 | + m_value_min = 0.0; | |
| 232 | + m_value_max = 0.0; | |
| 233 | + m_has_error = 0; // Parameter has no associated error | |
| 234 | + m_has_min = 0; // Parameter has no maximum boundary | |
| 235 | + m_has_max = 0; // Parameter has no minimum boundary | |
| 236 | + m_free = 1; // Parameter is free | |
| 237 | + m_name = ""; // Parameter has blank name | |
| 238 | + | |
| 239 | + // Return | |
| 240 | + return; | |
| 241 | +} | |
| 242 | + | |
| 243 | + | |
| 244 | +/*************************************************************************** | |
| 245 | + * Copy class members * | |
| 246 | + * ----------------------------------------------------------------------- * | |
| 247 | + ***************************************************************************/ | |
| 248 | +void GFitPar::copy_members(const GFitPar& p) | |
| 249 | +{ | |
| 250 | + // Copy members | |
| 251 | + m_value = p.m_value; | |
| 252 | + m_error = p.m_error; | |
| 253 | + m_value_min = p.m_value_min; | |
| 254 | + m_value_max = p.m_value_max; | |
| 255 | + m_has_error = p.m_has_error; | |
| 256 | + m_has_min = p.m_has_min; | |
| 257 | + m_has_max = p.m_has_max; | |
| 258 | + m_free = p.m_free; | |
| 259 | + m_name = p.m_name; | |
| 260 | + | |
| 261 | + // Return | |
| 262 | + return; | |
| 263 | +} | |
| 264 | + | |
| 265 | + | |
| 266 | +/*************************************************************************** | |
| 267 | + * Delete class members * | |
| 268 | + * ----------------------------------------------------------------------- * | |
| 269 | + ***************************************************************************/ | |
| 270 | +void GFitPar::free_members(void) | |
| 271 | +{ | |
| 272 | + | |
| 273 | + // Return | |
| 274 | + return; | |
| 275 | +} | |
| 276 | + | |
| 277 | + | |
| 278 | +/*========================================================================== | |
| 279 | + = = | |
| 280 | + = GFitPar friends = | |
| 281 | + = = | |
| 282 | + ==========================================================================*/ | |
| 283 | + | |
| 284 | +/*************************************************************************** | |
| 285 | + * Output operator * | |
| 286 | + * ----------------------------------------------------------------------- * | |
| 287 | + ***************************************************************************/ | |
| 288 | +ostream& operator<< (ostream& os, const GFitPar& p) | |
| 289 | +{ | |
| 290 | + // Put header in stream | |
| 291 | + os << "=== GFitPar ===" << endl; | |
| 292 | + os << " Value .....................: " << p.m_value; | |
| 293 | + if (p.m_free == 0) | |
| 294 | + os << " (fixed)" << endl; | |
| 295 | + else | |
| 296 | + os << " (free)" << endl; | |
| 297 | + if (p.m_has_error) | |
| 298 | + os << " Error .....................: " << p.m_error << endl; | |
| 299 | + if (p.m_has_min) | |
| 300 | + os << " Minimum boundary ..........: " << p.m_value_min << endl; | |
| 301 | + if (p.m_has_max) | |
| 302 | + os << " Maximum boundary ..........: " << p.m_value_max << endl; | |
| 303 | + | |
| 304 | + // Return output stream | |
| 305 | + return os; | |
| 306 | +} | |
| 307 | + | |
| 308 | + | |
| 309 | +/*========================================================================== | |
| 310 | + = = | |
| 311 | + = Other functions used by GFitPar = | |
| 312 | + = = | |
| 313 | + ==========================================================================*/ | ... | ... |
src/GFitPar.hpp
0 → 100644
| 1 | +/*************************************************************************** | |
| 2 | + * GFitPar.hpp - fit parameter class * | |
| 3 | + * ----------------------------------------------------------------------- * | |
| 4 | + * copyright : (C) 2007 by Jurgen Knodlseder * | |
| 5 | + * ----------------------------------------------------------------------- * | |
| 6 | + * * | |
| 7 | + * This program is free software; you can redistribute it and/or modify * | |
| 8 | + * it under the terms of the GNU General Public License as published by * | |
| 9 | + * the Free Software Foundation; either version 2 of the License, or * | |
| 10 | + * (at your option) any later version. * | |
| 11 | + * * | |
| 12 | + ***************************************************************************/ | |
| 13 | + | |
| 14 | +#ifndef GFITPAR_HPP | |
| 15 | +#define GFITPAR_HPP | |
| 16 | + | |
| 17 | +/* __ Includes ___________________________________________________________ */ | |
| 18 | +#include "GException.hpp" | |
| 19 | +#include <iostream> // std::ostream | |
| 20 | + | |
| 21 | +/* __ Namespaces _________________________________________________________ */ | |
| 22 | +using namespace std; | |
| 23 | + | |
| 24 | + | |
| 25 | +/*************************************************************************** | |
| 26 | + * GFitPar class definition * | |
| 27 | + ***************************************************************************/ | |
| 28 | +class GFitPar { | |
| 29 | + // Friend classes | |
| 30 | + | |
| 31 | + // Operator friends | |
| 32 | + | |
| 33 | + // I/O friends | |
| 34 | + friend ostream& operator<< (ostream& os, const GFitPar& p); | |
| 35 | + | |
| 36 | + // Friend functions | |
| 37 | + | |
| 38 | +public: | |
| 39 | + // Constructors and destructors | |
| 40 | + GFitPar(void); | |
| 41 | + GFitPar(const GFitPar& p); | |
| 42 | + ~GFitPar(); | |
| 43 | + | |
| 44 | + // Conversion operators | |
| 45 | + operator double() const; // Get parameter value | |
| 46 | + | |
| 47 | + // Fit parameter operators | |
| 48 | + GFitPar& operator= (const GFitPar& p); // Copy parameter | |
| 49 | + GFitPar& operator= (const double& v); // Assign parameter value | |
| 50 | + | |
| 51 | + // Fit parameter methods | |
| 52 | + double error(void) const; // Get error value | |
| 53 | + double min(void) const; // Get minimum value boundary | |
| 54 | + double max(void) const; // Get maximum value boundary | |
| 55 | + void min_set(double& min); // Set minimum value boundary | |
| 56 | + void max_set(double& max); // Set maximum value boundary | |
| 57 | + void min_remove(void); // Remove minimum value boundary | |
| 58 | + void max_remove(void); // Remove maximum value boundary | |
| 59 | + void free(void); // Free parameter | |
| 60 | + void fix(void); // Fix parameter | |
| 61 | + | |
| 62 | +private: | |
| 63 | + // Private methods | |
| 64 | + void constructor(void); | |
| 65 | + void init_members(void); | |
| 66 | + void copy_members(const GFitPar& p); | |
| 67 | + void free_members(void); | |
| 68 | + | |
| 69 | + // Private data members | |
| 70 | + double m_value; // Parameter value | |
| 71 | + double m_error; // Parameter error | |
| 72 | + double m_value_min; // Minimum parameter value | |
| 73 | + double m_value_max; // Maximum parameter value | |
| 74 | + int m_has_error; // Parameter has error | |
| 75 | + int m_has_min; // Parameter has a minimum boundary | |
| 76 | + int m_has_max; // Parameter has a maximum boundary | |
| 77 | + int m_free; // Parameter is free | |
| 78 | + std::string m_name; // Parameter name | |
| 79 | +}; | |
| 80 | + | |
| 81 | + | |
| 82 | +/*************************************************************************** | |
| 83 | + * Inline members * | |
| 84 | + ***************************************************************************/ | |
| 85 | +// Conversion operator: double value = parameter | |
| 86 | +inline | |
| 87 | +GFitPar::operator double() const | |
| 88 | +{ | |
| 89 | + return m_value; | |
| 90 | +} | |
| 91 | + | |
| 92 | +// Return associated parameter error | |
| 93 | +inline | |
| 94 | +double GFitPar::error() const | |
| 95 | +{ | |
| 96 | + return m_error; | |
| 97 | +} | |
| 98 | + | |
| 99 | +// Return minimum parameter boundary | |
| 100 | +inline | |
| 101 | +double GFitPar::min() const | |
| 102 | +{ | |
| 103 | + return m_value_min; | |
| 104 | +} | |
| 105 | + | |
| 106 | +// Return maximum parameter boundary | |
| 107 | +inline | |
| 108 | +double GFitPar::max() const | |
| 109 | +{ | |
| 110 | + return m_value_max; | |
| 111 | +} | |
| 112 | + | |
| 113 | +// Remove minimum parameter boundary | |
| 114 | +inline | |
| 115 | +void GFitPar::min_remove(void) | |
| 116 | +{ | |
| 117 | + m_value_min = 0.0; | |
| 118 | + m_has_min = 0; | |
| 119 | + return; | |
| 120 | +} | |
| 121 | + | |
| 122 | +// Remove maximum parameter boundary | |
| 123 | +inline | |
| 124 | +void GFitPar::max_remove(void) | |
| 125 | +{ | |
| 126 | + m_value_max = 0.0; | |
| 127 | + m_has_max = 0; | |
| 128 | + return; | |
| 129 | +} | |
| 130 | + | |
| 131 | +// Free parameter | |
| 132 | +inline | |
| 133 | +void GFitPar::free(void) | |
| 134 | +{ | |
| 135 | + m_free = 1; | |
| 136 | + return; | |
| 137 | +} | |
| 138 | + | |
| 139 | +// Fix parameter | |
| 140 | +inline | |
| 141 | +void GFitPar::fix(void) | |
| 142 | +{ | |
| 143 | + m_free = 0; | |
| 144 | + return; | |
| 145 | +} | |
| 146 | + | |
| 147 | + | |
| 148 | +/*************************************************************************** | |
| 149 | + * Inline friends * | |
| 150 | + ***************************************************************************/ | |
| 151 | + | |
| 152 | +#endif /* GFITPAR_HPP */ | ... | ... |
src/GMatrix.hpp
| ... | ... | @@ -99,7 +99,7 @@ inline |
| 99 | 99 | double& GMatrix::operator() (int row, int col) |
| 100 | 100 | { |
| 101 | 101 | #if defined(G_RANGE_CHECK) |
| 102 | - if (row >= m_rows || col >= m_cols) | |
| 102 | + if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) | |
| 103 | 103 | throw out_of_range("GMatrix::operator(int,int)", row, col, m_rows, m_cols); |
| 104 | 104 | #endif |
| 105 | 105 | return m_data[m_colstart[col]+row]; |
| ... | ... | @@ -110,7 +110,7 @@ inline |
| 110 | 110 | const double& GMatrix::operator() (int row, int col) const |
| 111 | 111 | { |
| 112 | 112 | #if defined(G_RANGE_CHECK) |
| 113 | - if (row >= m_rows || col >= m_cols) | |
| 113 | + if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) | |
| 114 | 114 | throw out_of_range("GMatrix::operator(int,int) const", row, col, m_rows, m_cols); |
| 115 | 115 | #endif |
| 116 | 116 | return m_data[m_colstart[col]+row]; | ... | ... |
src/GVector.hpp
| ... | ... | @@ -133,7 +133,7 @@ inline |
| 133 | 133 | double& GVector::operator() (int inx) |
| 134 | 134 | { |
| 135 | 135 | #if defined(G_RANGE_CHECK) |
| 136 | - if (inx >= m_num) | |
| 136 | + if (inx < 0 || inx >= m_num) | |
| 137 | 137 | throw out_of_range("GVector access", inx, m_num); |
| 138 | 138 | #endif |
| 139 | 139 | return m_data[inx]; |
| ... | ... | @@ -144,7 +144,7 @@ inline |
| 144 | 144 | const double& GVector::operator() (int inx) const |
| 145 | 145 | { |
| 146 | 146 | #if defined(G_RANGE_CHECK) |
| 147 | - if (inx >= m_num) | |
| 147 | + if (inx < 0 || inx >= m_num) | |
| 148 | 148 | throw out_of_range("const GVector access", inx, m_num); |
| 149 | 149 | #endif |
| 150 | 150 | return m_data[inx]; | ... | ... |
src/Makefile.am
| ... | ... | @@ -2,6 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | files = GammaLib.hpp \ |
| 4 | 4 | GException.hpp GException.cpp \ |
| 5 | + GFitPar.hpp GFitPar.cpp \ | |
| 5 | 6 | GVector.hpp GVector.cpp \ |
| 6 | 7 | GMatrixBase.hpp GMatrixBase.cpp \ |
| 7 | 8 | GMatrix.hpp GMatrix.cpp \ |
| ... | ... | @@ -13,6 +14,7 @@ files = GammaLib.hpp \ |
| 13 | 14 | # Define package included headers (to be installed) |
| 14 | 15 | pkginclude_HEADERS = GammaLib.hpp \ |
| 15 | 16 | GException.hpp \ |
| 17 | + GFitPar.hpp \ | |
| 16 | 18 | GVector.hpp \ |
| 17 | 19 | GMatrix.hpp \ |
| 18 | 20 | GSymMatrix.hpp \ | ... | ... |
src/Makefile.in
| 1 | -# Makefile.in generated by automake 1.9.2 from Makefile.am. | |
| 1 | +# Makefile.in generated by automake 1.6.3 from Makefile.am. | |
| 2 | 2 | # @configure_input@ |
| 3 | 3 | |
| 4 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| 5 | -# 2003, 2004 Free Software Foundation, Inc. | |
| 4 | +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 | |
| 5 | +# Free Software Foundation, Inc. | |
| 6 | 6 | # This Makefile.in is free software; the Free Software Foundation |
| 7 | 7 | # gives unlimited permission to copy and/or distribute it, |
| 8 | 8 | # with or without modifications, as long as this notice is preserved. |
| ... | ... | @@ -13,171 +13,100 @@ |
| 13 | 13 | # PARTICULAR PURPOSE. |
| 14 | 14 | |
| 15 | 15 | @SET_MAKE@ |
| 16 | - | |
| 17 | - | |
| 18 | -SOURCES = $(libgamma_la_SOURCES) | |
| 16 | +SHELL = @SHELL@ | |
| 19 | 17 | |
| 20 | 18 | srcdir = @srcdir@ |
| 21 | 19 | top_srcdir = @top_srcdir@ |
| 22 | 20 | VPATH = @srcdir@ |
| 21 | +prefix = @prefix@ | |
| 22 | +exec_prefix = @exec_prefix@ | |
| 23 | + | |
| 24 | +bindir = @bindir@ | |
| 25 | +sbindir = @sbindir@ | |
| 26 | +libexecdir = @libexecdir@ | |
| 27 | +datadir = @datadir@ | |
| 28 | +sysconfdir = @sysconfdir@ | |
| 29 | +sharedstatedir = @sharedstatedir@ | |
| 30 | +localstatedir = @localstatedir@ | |
| 31 | +libdir = @libdir@ | |
| 32 | +infodir = @infodir@ | |
| 33 | +mandir = @mandir@ | |
| 34 | +includedir = @includedir@ | |
| 35 | +oldincludedir = /usr/include | |
| 23 | 36 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 24 | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
| 25 | 38 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 26 | 39 | top_builddir = .. |
| 40 | + | |
| 41 | +ACLOCAL = @ACLOCAL@ | |
| 42 | +AUTOCONF = @AUTOCONF@ | |
| 43 | +AUTOMAKE = @AUTOMAKE@ | |
| 44 | +AUTOHEADER = @AUTOHEADER@ | |
| 45 | + | |
| 27 | 46 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
| 28 | 47 | INSTALL = @INSTALL@ |
| 48 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 49 | +INSTALL_DATA = @INSTALL_DATA@ | |
| 29 | 50 | install_sh_DATA = $(install_sh) -c -m 644 |
| 30 | 51 | install_sh_PROGRAM = $(install_sh) -c |
| 31 | 52 | install_sh_SCRIPT = $(install_sh) -c |
| 53 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 32 | 54 | INSTALL_HEADER = $(INSTALL_DATA) |
| 33 | -transform = $(program_transform_name) | |
| 55 | +transform = @program_transform_name@ | |
| 34 | 56 | NORMAL_INSTALL = : |
| 35 | 57 | PRE_INSTALL = : |
| 36 | 58 | POST_INSTALL = : |
| 37 | 59 | NORMAL_UNINSTALL = : |
| 38 | 60 | PRE_UNINSTALL = : |
| 39 | 61 | POST_UNINSTALL = : |
| 40 | -build_triplet = @build@ | |
| 62 | +host_alias = @host_alias@ | |
| 41 | 63 | host_triplet = @host@ |
| 42 | -subdir = src | |
| 43 | -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ | |
| 44 | - $(srcdir)/Makefile.in | |
| 45 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| 46 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac | |
| 47 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |
| 48 | - $(ACLOCAL_M4) | |
| 49 | -mkinstalldirs = $(install_sh) -d | |
| 50 | -CONFIG_HEADER = $(top_builddir)/config.h | |
| 51 | -CONFIG_CLEAN_FILES = | |
| 52 | -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | |
| 53 | -am__vpath_adj = case $$p in \ | |
| 54 | - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | |
| 55 | - *) f=$$p;; \ | |
| 56 | - esac; | |
| 57 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | |
| 58 | -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" | |
| 59 | -libLTLIBRARIES_INSTALL = $(INSTALL) | |
| 60 | -LTLIBRARIES = $(lib_LTLIBRARIES) | |
| 61 | -libgamma_la_LIBADD = | |
| 62 | -am__objects_1 = GException.lo GVector.lo GMatrixBase.lo GMatrix.lo \ | |
| 63 | - GSymMatrix.lo GSparseMatrix.lo GSparseSymbolic.lo \ | |
| 64 | - GSparseNumeric.lo | |
| 65 | -am_libgamma_la_OBJECTS = $(am__objects_1) | |
| 66 | -libgamma_la_OBJECTS = $(am_libgamma_la_OBJECTS) | |
| 67 | -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| 68 | -depcomp = | |
| 69 | -am__depfiles_maybe = | |
| 70 | -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| 71 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 72 | -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ | |
| 73 | - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| 74 | - $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 75 | -CXXLD = $(CXX) | |
| 76 | -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ | |
| 77 | - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 78 | -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | |
| 79 | - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| 80 | -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ | |
| 81 | - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| 82 | - $(AM_CFLAGS) $(CFLAGS) | |
| 83 | -CCLD = $(CC) | |
| 84 | -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| 85 | - $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 86 | -SOURCES = $(libgamma_la_SOURCES) | |
| 87 | -DIST_SOURCES = $(libgamma_la_SOURCES) | |
| 88 | -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) | |
| 89 | -HEADERS = $(pkginclude_HEADERS) | |
| 90 | -ETAGS = etags | |
| 91 | -CTAGS = ctags | |
| 92 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 93 | -ACLOCAL = @ACLOCAL@ | |
| 64 | + | |
| 65 | +EXEEXT = @EXEEXT@ | |
| 66 | +OBJEXT = @OBJEXT@ | |
| 67 | +PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 94 | 68 | AMTAR = @AMTAR@ |
| 95 | 69 | AR = @AR@ |
| 96 | -AUTOCONF = @AUTOCONF@ | |
| 97 | -AUTOHEADER = @AUTOHEADER@ | |
| 98 | -AUTOMAKE = @AUTOMAKE@ | |
| 70 | +AS = @AS@ | |
| 99 | 71 | AWK = @AWK@ |
| 100 | 72 | CC = @CC@ |
| 101 | -CFLAGS = @CFLAGS@ | |
| 102 | -CPP = @CPP@ | |
| 103 | -CPPFLAGS = @CPPFLAGS@ | |
| 104 | 73 | CXX = @CXX@ |
| 105 | 74 | CXXCPP = @CXXCPP@ |
| 106 | -CXXFLAGS = @CXXFLAGS@ | |
| 107 | -CYGPATH_W = @CYGPATH_W@ | |
| 108 | -DEFS = @DEFS@ | |
| 75 | +DEPDIR = @DEPDIR@ | |
| 76 | +DLLTOOL = @DLLTOOL@ | |
| 109 | 77 | ECHO = @ECHO@ |
| 110 | -ECHO_C = @ECHO_C@ | |
| 111 | -ECHO_N = @ECHO_N@ | |
| 112 | -ECHO_T = @ECHO_T@ | |
| 113 | 78 | EGREP = @EGREP@ |
| 114 | -EXEEXT = @EXEEXT@ | |
| 115 | 79 | F77 = @F77@ |
| 116 | -FFLAGS = @FFLAGS@ | |
| 117 | 80 | GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@ |
| 118 | -INSTALL_DATA = @INSTALL_DATA@ | |
| 119 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 120 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 81 | +GCJ = @GCJ@ | |
| 82 | +GCJFLAGS = @GCJFLAGS@ | |
| 121 | 83 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
| 122 | -LDFLAGS = @LDFLAGS@ | |
| 123 | -LIBOBJS = @LIBOBJS@ | |
| 124 | -LIBS = @LIBS@ | |
| 125 | 84 | LIBTOOL = @LIBTOOL@ |
| 126 | 85 | LN_S = @LN_S@ |
| 127 | -LTLIBOBJS = @LTLIBOBJS@ | |
| 128 | -MAKEINFO = @MAKEINFO@ | |
| 129 | -OBJEXT = @OBJEXT@ | |
| 86 | +MAINT = @MAINT@ | |
| 87 | +OBJDUMP = @OBJDUMP@ | |
| 130 | 88 | PACKAGE = @PACKAGE@ |
| 131 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| 132 | -PACKAGE_NAME = @PACKAGE_NAME@ | |
| 133 | -PACKAGE_STRING = @PACKAGE_STRING@ | |
| 134 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ | |
| 135 | -PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| 136 | -PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 89 | +PYTHON = @PYTHON@ | |
| 90 | +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | |
| 91 | +PYTHON_PLATFORM = @PYTHON_PLATFORM@ | |
| 92 | +PYTHON_PREFIX = @PYTHON_PREFIX@ | |
| 93 | +PYTHON_VERSION = @PYTHON_VERSION@ | |
| 137 | 94 | RANLIB = @RANLIB@ |
| 138 | -SET_MAKE = @SET_MAKE@ | |
| 139 | -SHELL = @SHELL@ | |
| 95 | +RC = @RC@ | |
| 140 | 96 | STRIP = @STRIP@ |
| 97 | +SWIG = @SWIG@ | |
| 141 | 98 | VERSION = @VERSION@ |
| 142 | -ac_ct_AR = @ac_ct_AR@ | |
| 143 | -ac_ct_CC = @ac_ct_CC@ | |
| 144 | -ac_ct_CXX = @ac_ct_CXX@ | |
| 145 | -ac_ct_F77 = @ac_ct_F77@ | |
| 146 | -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| 147 | -ac_ct_STRIP = @ac_ct_STRIP@ | |
| 148 | -am__leading_dot = @am__leading_dot@ | |
| 149 | -am__tar = @am__tar@ | |
| 150 | -am__untar = @am__untar@ | |
| 151 | -bindir = @bindir@ | |
| 152 | -build = @build@ | |
| 153 | -build_alias = @build_alias@ | |
| 154 | -build_cpu = @build_cpu@ | |
| 155 | -build_os = @build_os@ | |
| 156 | -build_vendor = @build_vendor@ | |
| 157 | -datadir = @datadir@ | |
| 158 | -exec_prefix = @exec_prefix@ | |
| 159 | -host = @host@ | |
| 160 | -host_alias = @host_alias@ | |
| 161 | -host_cpu = @host_cpu@ | |
| 162 | -host_os = @host_os@ | |
| 163 | -host_vendor = @host_vendor@ | |
| 164 | -includedir = @includedir@ | |
| 165 | -infodir = @infodir@ | |
| 99 | +am__include = @am__include@ | |
| 100 | +am__quote = @am__quote@ | |
| 166 | 101 | install_sh = @install_sh@ |
| 167 | -libdir = @libdir@ | |
| 168 | -libexecdir = @libexecdir@ | |
| 169 | -localstatedir = @localstatedir@ | |
| 170 | -mandir = @mandir@ | |
| 171 | -mkdir_p = @mkdir_p@ | |
| 172 | -oldincludedir = @oldincludedir@ | |
| 173 | -prefix = @prefix@ | |
| 174 | -program_transform_name = @program_transform_name@ | |
| 175 | -sbindir = @sbindir@ | |
| 176 | -sharedstatedir = @sharedstatedir@ | |
| 177 | -sysconfdir = @sysconfdir@ | |
| 178 | -target_alias = @target_alias@ | |
| 102 | +pkgpyexecdir = @pkgpyexecdir@ | |
| 103 | +pkgpythondir = @pkgpythondir@ | |
| 104 | +pyexecdir = @pyexecdir@ | |
| 105 | +pythondir = @pythondir@ | |
| 106 | + | |
| 179 | 107 | files = GammaLib.hpp \ |
| 180 | 108 | GException.hpp GException.cpp \ |
| 109 | + GFitPar.hpp GFitPar.cpp \ | |
| 181 | 110 | GVector.hpp GVector.cpp \ |
| 182 | 111 | GMatrixBase.hpp GMatrixBase.cpp \ |
| 183 | 112 | GMatrix.hpp GMatrix.cpp \ |
| ... | ... | @@ -190,6 +119,7 @@ files = GammaLib.hpp \ |
| 190 | 119 | # Define package included headers (to be installed) |
| 191 | 120 | pkginclude_HEADERS = GammaLib.hpp \ |
| 192 | 121 | GException.hpp \ |
| 122 | + GFitPar.hpp \ | |
| 193 | 123 | GVector.hpp \ |
| 194 | 124 | GMatrix.hpp \ |
| 195 | 125 | GSymMatrix.hpp \ |
| ... | ... | @@ -202,63 +132,83 @@ pkginclude_HEADERS = GammaLib.hpp \ |
| 202 | 132 | lib_LTLIBRARIES = libgamma.la |
| 203 | 133 | libgamma_la_SOURCES = $(files) |
| 204 | 134 | libgamma_la_LDFLAGS = -version-info $(GAMMALIB_LT_VERSION) |
| 135 | +subdir = src | |
| 136 | +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
| 137 | +CONFIG_HEADER = $(top_builddir)/config.h | |
| 138 | +CONFIG_CLEAN_FILES = | |
| 139 | +LTLIBRARIES = $(lib_LTLIBRARIES) | |
| 140 | + | |
| 141 | +libgamma_la_LIBADD = | |
| 142 | +am__objects_1 = GException.lo GFitPar.lo GVector.lo GMatrixBase.lo \ | |
| 143 | + GMatrix.lo GSymMatrix.lo GSparseMatrix.lo GSparseSymbolic.lo \ | |
| 144 | + GSparseNumeric.lo | |
| 145 | +am_libgamma_la_OBJECTS = $(am__objects_1) | |
| 146 | +libgamma_la_OBJECTS = $(am_libgamma_la_OBJECTS) | |
| 147 | + | |
| 148 | +DEFS = @DEFS@ | |
| 149 | +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| 150 | +CPPFLAGS = @CPPFLAGS@ | |
| 151 | +LDFLAGS = @LDFLAGS@ | |
| 152 | +LIBS = @LIBS@ | |
| 153 | +depcomp = | |
| 154 | +am__depfiles_maybe = | |
| 155 | +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| 156 | + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 157 | +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ | |
| 158 | + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| 159 | + $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 160 | +CXXLD = $(CXX) | |
| 161 | +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ | |
| 162 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 163 | +CXXFLAGS = @CXXFLAGS@ | |
| 164 | +CFLAGS = @CFLAGS@ | |
| 165 | +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | |
| 166 | + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| 167 | +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ | |
| 168 | + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| 169 | +CCLD = $(CC) | |
| 170 | +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| 171 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 172 | +DIST_SOURCES = $(libgamma_la_SOURCES) | |
| 173 | +HEADERS = $(pkginclude_HEADERS) | |
| 174 | + | |
| 175 | +DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in | |
| 176 | +SOURCES = $(libgamma_la_SOURCES) | |
| 177 | + | |
| 205 | 178 | all: all-am |
| 206 | 179 | |
| 207 | 180 | .SUFFIXES: |
| 208 | 181 | .SUFFIXES: .cpp .lo .o .obj |
| 209 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
| 210 | - @for dep in $?; do \ | |
| 211 | - case '$(am__configure_deps)' in \ | |
| 212 | - *$$dep*) \ | |
| 213 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ | |
| 214 | - && exit 0; \ | |
| 215 | - exit 1;; \ | |
| 216 | - esac; \ | |
| 217 | - done; \ | |
| 218 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps src/Makefile'; \ | |
| 182 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) | |
| 219 | 183 | cd $(top_srcdir) && \ |
| 220 | - $(AUTOMAKE) --gnu --ignore-deps src/Makefile | |
| 221 | -.PRECIOUS: Makefile | |
| 222 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 223 | - @case '$?' in \ | |
| 224 | - *config.status*) \ | |
| 225 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | |
| 226 | - *) \ | |
| 227 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | |
| 228 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | |
| 229 | - esac; | |
| 230 | - | |
| 231 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
| 232 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 233 | - | |
| 234 | -$(top_srcdir)/configure: $(am__configure_deps) | |
| 235 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 236 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
| 237 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 184 | + $(AUTOMAKE) --gnu src/Makefile | |
| 185 | +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 186 | + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) | |
| 187 | +libLTLIBRARIES_INSTALL = $(INSTALL) | |
| 238 | 188 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
| 239 | 189 | @$(NORMAL_INSTALL) |
| 240 | - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" | |
| 190 | + $(mkinstalldirs) $(DESTDIR)$(libdir) | |
| 241 | 191 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
| 242 | 192 | if test -f $$p; then \ |
| 243 | - f=$(am__strip_dir) \ | |
| 244 | - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | |
| 245 | - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | |
| 193 | + f="`echo $$p | sed -e 's|^.*/||'`"; \ | |
| 194 | + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ | |
| 195 | + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ | |
| 246 | 196 | else :; fi; \ |
| 247 | 197 | done |
| 248 | 198 | |
| 249 | 199 | uninstall-libLTLIBRARIES: |
| 250 | 200 | @$(NORMAL_UNINSTALL) |
| 251 | - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |
| 252 | - p=$(am__strip_dir) \ | |
| 253 | - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | |
| 254 | - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | |
| 201 | + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |
| 202 | + p="`echo $$p | sed -e 's|^.*/||'`"; \ | |
| 203 | + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ | |
| 204 | + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ | |
| 255 | 205 | done |
| 256 | 206 | |
| 257 | 207 | clean-libLTLIBRARIES: |
| 258 | 208 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
| 259 | 209 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
| 260 | 210 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
| 261 | - test "$$dir" != "$$p" || dir=.; \ | |
| 211 | + test -z "$dir" && dir=.; \ | |
| 262 | 212 | echo "rm -f \"$${dir}/so_locations\""; \ |
| 263 | 213 | rm -f "$${dir}/so_locations"; \ |
| 264 | 214 | done |
| ... | ... | @@ -266,19 +216,19 @@ libgamma.la: $(libgamma_la_OBJECTS) $(libgamma_la_DEPENDENCIES) |
| 266 | 216 | $(CXXLINK) -rpath $(libdir) $(libgamma_la_LDFLAGS) $(libgamma_la_OBJECTS) $(libgamma_la_LIBADD) $(LIBS) |
| 267 | 217 | |
| 268 | 218 | mostlyclean-compile: |
| 269 | - -rm -f *.$(OBJEXT) | |
| 219 | + -rm -f *.$(OBJEXT) core *.core | |
| 270 | 220 | |
| 271 | 221 | distclean-compile: |
| 272 | 222 | -rm -f *.tab.c |
| 273 | 223 | |
| 274 | 224 | .cpp.o: |
| 275 | - $(CXXCOMPILE) -c -o $@ $< | |
| 225 | + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< | |
| 276 | 226 | |
| 277 | 227 | .cpp.obj: |
| 278 | - $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | |
| 228 | + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` | |
| 279 | 229 | |
| 280 | 230 | .cpp.lo: |
| 281 | - $(LTCXXCOMPILE) -c -o $@ $< | |
| 231 | + $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< | |
| 282 | 232 | |
| 283 | 233 | mostlyclean-libtool: |
| 284 | 234 | -rm -f *.lo |
| ... | ... | @@ -289,24 +239,30 @@ clean-libtool: |
| 289 | 239 | distclean-libtool: |
| 290 | 240 | -rm -f libtool |
| 291 | 241 | uninstall-info-am: |
| 242 | +pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) | |
| 292 | 243 | install-pkgincludeHEADERS: $(pkginclude_HEADERS) |
| 293 | 244 | @$(NORMAL_INSTALL) |
| 294 | - test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" | |
| 245 | + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) | |
| 295 | 246 | @list='$(pkginclude_HEADERS)'; for p in $$list; do \ |
| 296 | 247 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 297 | - f=$(am__strip_dir) \ | |
| 298 | - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ | |
| 299 | - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ | |
| 248 | + f="`echo $$p | sed -e 's|^.*/||'`"; \ | |
| 249 | + echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ | |
| 250 | + $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ | |
| 300 | 251 | done |
| 301 | 252 | |
| 302 | 253 | uninstall-pkgincludeHEADERS: |
| 303 | 254 | @$(NORMAL_UNINSTALL) |
| 304 | 255 | @list='$(pkginclude_HEADERS)'; for p in $$list; do \ |
| 305 | - f=$(am__strip_dir) \ | |
| 306 | - echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ | |
| 307 | - rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ | |
| 256 | + f="`echo $$p | sed -e 's|^.*/||'`"; \ | |
| 257 | + echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ | |
| 258 | + rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ | |
| 308 | 259 | done |
| 309 | 260 | |
| 261 | +ETAGS = etags | |
| 262 | +ETAGSFLAGS = | |
| 263 | + | |
| 264 | +tags: TAGS | |
| 265 | + | |
| 310 | 266 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 311 | 267 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
| 312 | 268 | unique=`for i in $$list; do \ |
| ... | ... | @@ -315,7 +271,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 315 | 271 | $(AWK) ' { files[$$0] = 1; } \ |
| 316 | 272 | END { for (i in files) print i; }'`; \ |
| 317 | 273 | mkid -fID $$unique |
| 318 | -tags: TAGS | |
| 319 | 274 | |
| 320 | 275 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
| 321 | 276 | $(TAGS_FILES) $(LISP) |
| ... | ... | @@ -327,24 +282,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
| 327 | 282 | done | \ |
| 328 | 283 | $(AWK) ' { files[$$0] = 1; } \ |
| 329 | 284 | END { for (i in files) print i; }'`; \ |
| 330 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| 331 | - test -n "$$unique" || unique=$$empty_fix; \ | |
| 332 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 333 | - $$tags $$unique; \ | |
| 334 | - fi | |
| 335 | -ctags: CTAGS | |
| 336 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | |
| 337 | - $(TAGS_FILES) $(LISP) | |
| 338 | - tags=; \ | |
| 339 | - here=`pwd`; \ | |
| 340 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| 341 | - unique=`for i in $$list; do \ | |
| 342 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| 343 | - done | \ | |
| 344 | - $(AWK) ' { files[$$0] = 1; } \ | |
| 345 | - END { for (i in files) print i; }'`; \ | |
| 346 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| 347 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| 285 | + test -z "$(ETAGS_ARGS)$$tags$$unique" \ | |
| 286 | + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 348 | 287 | $$tags $$unique |
| 349 | 288 | |
| 350 | 289 | GTAGS: |
| ... | ... | @@ -353,21 +292,19 @@ GTAGS: |
| 353 | 292 | && gtags -i $(GTAGS_ARGS) $$here |
| 354 | 293 | |
| 355 | 294 | distclean-tags: |
| 356 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| 295 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH | |
| 296 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 297 | + | |
| 298 | +top_distdir = .. | |
| 299 | +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) | |
| 357 | 300 | |
| 358 | 301 | distdir: $(DISTFILES) |
| 359 | - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| 360 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| 361 | - list='$(DISTFILES)'; for file in $$list; do \ | |
| 362 | - case $$file in \ | |
| 363 | - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| 364 | - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| 365 | - esac; \ | |
| 302 | + @list='$(DISTFILES)'; for file in $$list; do \ | |
| 366 | 303 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
| 367 | 304 | dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
| 368 | 305 | if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
| 369 | 306 | dir="/$$dir"; \ |
| 370 | - $(mkdir_p) "$(distdir)$$dir"; \ | |
| 307 | + $(mkinstalldirs) "$(distdir)$$dir"; \ | |
| 371 | 308 | else \ |
| 372 | 309 | dir=''; \ |
| 373 | 310 | fi; \ |
| ... | ... | @@ -385,10 +322,10 @@ distdir: $(DISTFILES) |
| 385 | 322 | check-am: all-am |
| 386 | 323 | check: check-am |
| 387 | 324 | all-am: Makefile $(LTLIBRARIES) $(HEADERS) |
| 325 | + | |
| 388 | 326 | installdirs: |
| 389 | - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"; do \ | |
| 390 | - test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
| 391 | - done | |
| 327 | + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir) | |
| 328 | + | |
| 392 | 329 | install: install-am |
| 393 | 330 | install-exec: install-exec-am |
| 394 | 331 | install-data: install-data-am |
| ... | ... | @@ -400,7 +337,7 @@ install-am: all-am |
| 400 | 337 | installcheck: installcheck-am |
| 401 | 338 | install-strip: |
| 402 | 339 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| 403 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| 340 | + INSTALL_STRIP_FLAG=-s \ | |
| 404 | 341 | `test -z '$(STRIP)' || \ |
| 405 | 342 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
| 406 | 343 | mostlyclean-generic: |
| ... | ... | @@ -408,7 +345,7 @@ mostlyclean-generic: |
| 408 | 345 | clean-generic: |
| 409 | 346 | |
| 410 | 347 | distclean-generic: |
| 411 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | |
| 348 | + -rm -f Makefile $(CONFIG_CLEAN_FILES) | |
| 412 | 349 | |
| 413 | 350 | maintainer-clean-generic: |
| 414 | 351 | @echo "This command is intended for maintainers to use" |
| ... | ... | @@ -419,7 +356,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
| 419 | 356 | mostlyclean-am |
| 420 | 357 | |
| 421 | 358 | distclean: distclean-am |
| 422 | - -rm -f Makefile | |
| 359 | + | |
| 423 | 360 | distclean-am: clean-am distclean-compile distclean-generic \ |
| 424 | 361 | distclean-libtool distclean-tags |
| 425 | 362 | |
| ... | ... | @@ -427,8 +364,6 @@ dvi: dvi-am |
| 427 | 364 | |
| 428 | 365 | dvi-am: |
| 429 | 366 | |
| 430 | -html: html-am | |
| 431 | - | |
| 432 | 367 | info: info-am |
| 433 | 368 | |
| 434 | 369 | info-am: |
| ... | ... | @@ -444,7 +379,7 @@ install-man: |
| 444 | 379 | installcheck-am: |
| 445 | 380 | |
| 446 | 381 | maintainer-clean: maintainer-clean-am |
| 447 | - -rm -f Makefile | |
| 382 | + | |
| 448 | 383 | maintainer-clean-am: distclean-am maintainer-clean-generic |
| 449 | 384 | |
| 450 | 385 | mostlyclean: mostlyclean-am |
| ... | ... | @@ -452,29 +387,20 @@ mostlyclean: mostlyclean-am |
| 452 | 387 | mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
| 453 | 388 | mostlyclean-libtool |
| 454 | 389 | |
| 455 | -pdf: pdf-am | |
| 456 | - | |
| 457 | -pdf-am: | |
| 458 | - | |
| 459 | -ps: ps-am | |
| 460 | - | |
| 461 | -ps-am: | |
| 462 | - | |
| 463 | 390 | uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ |
| 464 | 391 | uninstall-pkgincludeHEADERS |
| 465 | 392 | |
| 466 | -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | |
| 467 | - clean-libLTLIBRARIES clean-libtool ctags distclean \ | |
| 468 | - distclean-compile distclean-generic distclean-libtool \ | |
| 469 | - distclean-tags distdir dvi dvi-am html html-am info info-am \ | |
| 470 | - install install-am install-data install-data-am install-exec \ | |
| 471 | - install-exec-am install-info install-info-am \ | |
| 472 | - install-libLTLIBRARIES install-man install-pkgincludeHEADERS \ | |
| 473 | - install-strip installcheck installcheck-am installdirs \ | |
| 474 | - maintainer-clean maintainer-clean-generic mostlyclean \ | |
| 475 | - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |
| 476 | - pdf pdf-am ps ps-am tags uninstall uninstall-am \ | |
| 477 | - uninstall-info-am uninstall-libLTLIBRARIES \ | |
| 393 | +.PHONY: GTAGS all all-am check check-am clean clean-generic \ | |
| 394 | + clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ | |
| 395 | + distclean-generic distclean-libtool distclean-tags distdir dvi \ | |
| 396 | + dvi-am info info-am install install-am install-data \ | |
| 397 | + install-data-am install-exec install-exec-am install-info \ | |
| 398 | + install-info-am install-libLTLIBRARIES install-man \ | |
| 399 | + install-pkgincludeHEADERS install-strip installcheck \ | |
| 400 | + installcheck-am installdirs maintainer-clean \ | |
| 401 | + maintainer-clean-generic mostlyclean mostlyclean-compile \ | |
| 402 | + mostlyclean-generic mostlyclean-libtool tags uninstall \ | |
| 403 | + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ | |
| 478 | 404 | uninstall-pkgincludeHEADERS |
| 479 | 405 | |
| 480 | 406 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ... | ... |
test/Makefile.in
| 1 | -# Makefile.in generated by automake 1.9.2 from Makefile.am. | |
| 1 | +# Makefile.in generated by automake 1.6.3 from Makefile.am. | |
| 2 | 2 | # @configure_input@ |
| 3 | 3 | |
| 4 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| 5 | -# 2003, 2004 Free Software Foundation, Inc. | |
| 4 | +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 | |
| 5 | +# Free Software Foundation, Inc. | |
| 6 | 6 | # This Makefile.in is free software; the Free Software Foundation |
| 7 | 7 | # gives unlimited permission to copy and/or distribute it, |
| 8 | 8 | # with or without modifications, as long as this notice is preserved. |
| ... | ... | @@ -13,157 +13,102 @@ |
| 13 | 13 | # PARTICULAR PURPOSE. |
| 14 | 14 | |
| 15 | 15 | @SET_MAKE@ |
| 16 | -SOURCES = $(test_GMatrix_SOURCES) $(test_GSparseMatrix_SOURCES) $(test_GSymMatrix_SOURCES) $(test_GVector_SOURCES) | |
| 16 | +SHELL = @SHELL@ | |
| 17 | 17 | |
| 18 | 18 | srcdir = @srcdir@ |
| 19 | 19 | top_srcdir = @top_srcdir@ |
| 20 | 20 | VPATH = @srcdir@ |
| 21 | +prefix = @prefix@ | |
| 22 | +exec_prefix = @exec_prefix@ | |
| 23 | + | |
| 24 | +bindir = @bindir@ | |
| 25 | +sbindir = @sbindir@ | |
| 26 | +libexecdir = @libexecdir@ | |
| 27 | +datadir = @datadir@ | |
| 28 | +sysconfdir = @sysconfdir@ | |
| 29 | +sharedstatedir = @sharedstatedir@ | |
| 30 | +localstatedir = @localstatedir@ | |
| 31 | +libdir = @libdir@ | |
| 32 | +infodir = @infodir@ | |
| 33 | +mandir = @mandir@ | |
| 34 | +includedir = @includedir@ | |
| 35 | +oldincludedir = /usr/include | |
| 21 | 36 | pkgdatadir = $(datadir)/@PACKAGE@ |
| 22 | 37 | pkglibdir = $(libdir)/@PACKAGE@ |
| 23 | 38 | pkgincludedir = $(includedir)/@PACKAGE@ |
| 24 | 39 | top_builddir = .. |
| 40 | + | |
| 41 | +ACLOCAL = @ACLOCAL@ | |
| 42 | +AUTOCONF = @AUTOCONF@ | |
| 43 | +AUTOMAKE = @AUTOMAKE@ | |
| 44 | +AUTOHEADER = @AUTOHEADER@ | |
| 45 | + | |
| 25 | 46 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
| 26 | 47 | INSTALL = @INSTALL@ |
| 48 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 49 | +INSTALL_DATA = @INSTALL_DATA@ | |
| 27 | 50 | install_sh_DATA = $(install_sh) -c -m 644 |
| 28 | 51 | install_sh_PROGRAM = $(install_sh) -c |
| 29 | 52 | install_sh_SCRIPT = $(install_sh) -c |
| 53 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 30 | 54 | INSTALL_HEADER = $(INSTALL_DATA) |
| 31 | -transform = $(program_transform_name) | |
| 55 | +transform = @program_transform_name@ | |
| 32 | 56 | NORMAL_INSTALL = : |
| 33 | 57 | PRE_INSTALL = : |
| 34 | 58 | POST_INSTALL = : |
| 35 | 59 | NORMAL_UNINSTALL = : |
| 36 | 60 | PRE_UNINSTALL = : |
| 37 | 61 | POST_UNINSTALL = : |
| 38 | -build_triplet = @build@ | |
| 62 | +host_alias = @host_alias@ | |
| 39 | 63 | host_triplet = @host@ |
| 40 | -check_PROGRAMS = test_GVector$(EXEEXT) test_GMatrix$(EXEEXT) \ | |
| 41 | - test_GSymMatrix$(EXEEXT) test_GSparseMatrix$(EXEEXT) | |
| 42 | -subdir = test | |
| 43 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | |
| 44 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| 45 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac | |
| 46 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |
| 47 | - $(ACLOCAL_M4) | |
| 48 | -mkinstalldirs = $(install_sh) -d | |
| 49 | -CONFIG_HEADER = $(top_builddir)/config.h | |
| 50 | -CONFIG_CLEAN_FILES = | |
| 51 | -am_test_GMatrix_OBJECTS = test_GMatrix.$(OBJEXT) | |
| 52 | -test_GMatrix_OBJECTS = $(am_test_GMatrix_OBJECTS) | |
| 53 | -test_GMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 54 | -am_test_GSparseMatrix_OBJECTS = test_GSparseMatrix.$(OBJEXT) | |
| 55 | -test_GSparseMatrix_OBJECTS = $(am_test_GSparseMatrix_OBJECTS) | |
| 56 | -test_GSparseMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 57 | -am_test_GSymMatrix_OBJECTS = test_GSymMatrix.$(OBJEXT) | |
| 58 | -test_GSymMatrix_OBJECTS = $(am_test_GSymMatrix_OBJECTS) | |
| 59 | -test_GSymMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 60 | -am_test_GVector_OBJECTS = test_GVector.$(OBJEXT) | |
| 61 | -test_GVector_OBJECTS = $(am_test_GVector_OBJECTS) | |
| 62 | -test_GVector_DEPENDENCIES = ../src/libgamma.la | |
| 63 | -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| 64 | -depcomp = | |
| 65 | -am__depfiles_maybe = | |
| 66 | -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| 67 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 68 | -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ | |
| 69 | - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| 70 | - $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 71 | -CXXLD = $(CXX) | |
| 72 | -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ | |
| 73 | - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 74 | -SOURCES = $(test_GMatrix_SOURCES) $(test_GSparseMatrix_SOURCES) \ | |
| 75 | - $(test_GSymMatrix_SOURCES) $(test_GVector_SOURCES) | |
| 76 | -DIST_SOURCES = $(test_GMatrix_SOURCES) $(test_GSparseMatrix_SOURCES) \ | |
| 77 | - $(test_GSymMatrix_SOURCES) $(test_GVector_SOURCES) | |
| 78 | -ETAGS = etags | |
| 79 | -CTAGS = ctags | |
| 80 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 81 | -ACLOCAL = @ACLOCAL@ | |
| 64 | + | |
| 65 | +EXEEXT = @EXEEXT@ | |
| 66 | +OBJEXT = @OBJEXT@ | |
| 67 | +PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 82 | 68 | AMTAR = @AMTAR@ |
| 83 | 69 | AR = @AR@ |
| 84 | -AUTOCONF = @AUTOCONF@ | |
| 85 | -AUTOHEADER = @AUTOHEADER@ | |
| 86 | -AUTOMAKE = @AUTOMAKE@ | |
| 70 | +AS = @AS@ | |
| 87 | 71 | AWK = @AWK@ |
| 88 | 72 | CC = @CC@ |
| 89 | -CFLAGS = @CFLAGS@ | |
| 90 | -CPP = @CPP@ | |
| 91 | -CPPFLAGS = @CPPFLAGS@ | |
| 92 | 73 | CXX = @CXX@ |
| 93 | 74 | CXXCPP = @CXXCPP@ |
| 94 | -CXXFLAGS = @CXXFLAGS@ | |
| 95 | -CYGPATH_W = @CYGPATH_W@ | |
| 96 | -DEFS = @DEFS@ | |
| 75 | +DEPDIR = @DEPDIR@ | |
| 76 | +DLLTOOL = @DLLTOOL@ | |
| 97 | 77 | ECHO = @ECHO@ |
| 98 | -ECHO_C = @ECHO_C@ | |
| 99 | -ECHO_N = @ECHO_N@ | |
| 100 | -ECHO_T = @ECHO_T@ | |
| 101 | 78 | EGREP = @EGREP@ |
| 102 | -EXEEXT = @EXEEXT@ | |
| 103 | 79 | F77 = @F77@ |
| 104 | -FFLAGS = @FFLAGS@ | |
| 105 | 80 | GAMMALIB_LT_VERSION = @GAMMALIB_LT_VERSION@ |
| 106 | -INSTALL_DATA = @INSTALL_DATA@ | |
| 107 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| 108 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| 81 | +GCJ = @GCJ@ | |
| 82 | +GCJFLAGS = @GCJFLAGS@ | |
| 109 | 83 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
| 110 | -LDFLAGS = @LDFLAGS@ | |
| 111 | -LIBOBJS = @LIBOBJS@ | |
| 112 | -LIBS = @LIBS@ | |
| 113 | 84 | LIBTOOL = @LIBTOOL@ |
| 114 | 85 | LN_S = @LN_S@ |
| 115 | -LTLIBOBJS = @LTLIBOBJS@ | |
| 116 | -MAKEINFO = @MAKEINFO@ | |
| 117 | -OBJEXT = @OBJEXT@ | |
| 86 | +MAINT = @MAINT@ | |
| 87 | +OBJDUMP = @OBJDUMP@ | |
| 118 | 88 | PACKAGE = @PACKAGE@ |
| 119 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| 120 | -PACKAGE_NAME = @PACKAGE_NAME@ | |
| 121 | -PACKAGE_STRING = @PACKAGE_STRING@ | |
| 122 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ | |
| 123 | -PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| 124 | -PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| 89 | +PYTHON = @PYTHON@ | |
| 90 | +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | |
| 91 | +PYTHON_PLATFORM = @PYTHON_PLATFORM@ | |
| 92 | +PYTHON_PREFIX = @PYTHON_PREFIX@ | |
| 93 | +PYTHON_VERSION = @PYTHON_VERSION@ | |
| 125 | 94 | RANLIB = @RANLIB@ |
| 126 | -SET_MAKE = @SET_MAKE@ | |
| 127 | -SHELL = @SHELL@ | |
| 95 | +RC = @RC@ | |
| 128 | 96 | STRIP = @STRIP@ |
| 97 | +SWIG = @SWIG@ | |
| 129 | 98 | VERSION = @VERSION@ |
| 130 | -ac_ct_AR = @ac_ct_AR@ | |
| 131 | -ac_ct_CC = @ac_ct_CC@ | |
| 132 | -ac_ct_CXX = @ac_ct_CXX@ | |
| 133 | -ac_ct_F77 = @ac_ct_F77@ | |
| 134 | -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| 135 | -ac_ct_STRIP = @ac_ct_STRIP@ | |
| 136 | -am__leading_dot = @am__leading_dot@ | |
| 137 | -am__tar = @am__tar@ | |
| 138 | -am__untar = @am__untar@ | |
| 139 | -bindir = @bindir@ | |
| 140 | -build = @build@ | |
| 141 | -build_alias = @build_alias@ | |
| 142 | -build_cpu = @build_cpu@ | |
| 143 | -build_os = @build_os@ | |
| 144 | -build_vendor = @build_vendor@ | |
| 145 | -datadir = @datadir@ | |
| 146 | -exec_prefix = @exec_prefix@ | |
| 147 | -host = @host@ | |
| 148 | -host_alias = @host_alias@ | |
| 149 | -host_cpu = @host_cpu@ | |
| 150 | -host_os = @host_os@ | |
| 151 | -host_vendor = @host_vendor@ | |
| 152 | -includedir = @includedir@ | |
| 153 | -infodir = @infodir@ | |
| 99 | +am__include = @am__include@ | |
| 100 | +am__quote = @am__quote@ | |
| 154 | 101 | install_sh = @install_sh@ |
| 155 | -libdir = @libdir@ | |
| 156 | -libexecdir = @libexecdir@ | |
| 157 | -localstatedir = @localstatedir@ | |
| 158 | -mandir = @mandir@ | |
| 159 | -mkdir_p = @mkdir_p@ | |
| 160 | -oldincludedir = @oldincludedir@ | |
| 161 | -prefix = @prefix@ | |
| 162 | -program_transform_name = @program_transform_name@ | |
| 163 | -sbindir = @sbindir@ | |
| 164 | -sharedstatedir = @sharedstatedir@ | |
| 165 | -sysconfdir = @sysconfdir@ | |
| 166 | -target_alias = @target_alias@ | |
| 102 | +pkgpyexecdir = @pkgpyexecdir@ | |
| 103 | +pkgpythondir = @pkgpythondir@ | |
| 104 | +pyexecdir = @pyexecdir@ | |
| 105 | +pythondir = @pythondir@ | |
| 106 | + | |
| 107 | +check_PROGRAMS = test_GVector \ | |
| 108 | + test_GMatrix \ | |
| 109 | + test_GSymMatrix \ | |
| 110 | + test_GSparseMatrix | |
| 111 | + | |
| 167 | 112 | TESTS = test_GVector \ |
| 168 | 113 | test_GMatrix \ |
| 169 | 114 | test_GSymMatrix \ |
| ... | ... | @@ -177,39 +122,59 @@ test_GSymMatrix_SOURCES = test_GSymMatrix.cpp |
| 177 | 122 | test_GSymMatrix_LDADD = ../src/libgamma.la |
| 178 | 123 | test_GSparseMatrix_SOURCES = test_GSparseMatrix.cpp |
| 179 | 124 | test_GSparseMatrix_LDADD = ../src/libgamma.la |
| 125 | +subdir = test | |
| 126 | +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
| 127 | +CONFIG_HEADER = $(top_builddir)/config.h | |
| 128 | +CONFIG_CLEAN_FILES = | |
| 129 | +check_PROGRAMS = test_GVector$(EXEEXT) test_GMatrix$(EXEEXT) \ | |
| 130 | + test_GSymMatrix$(EXEEXT) test_GSparseMatrix$(EXEEXT) | |
| 131 | +am_test_GMatrix_OBJECTS = test_GMatrix.$(OBJEXT) | |
| 132 | +test_GMatrix_OBJECTS = $(am_test_GMatrix_OBJECTS) | |
| 133 | +test_GMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 134 | +test_GMatrix_LDFLAGS = | |
| 135 | +am_test_GSparseMatrix_OBJECTS = test_GSparseMatrix.$(OBJEXT) | |
| 136 | +test_GSparseMatrix_OBJECTS = $(am_test_GSparseMatrix_OBJECTS) | |
| 137 | +test_GSparseMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 138 | +test_GSparseMatrix_LDFLAGS = | |
| 139 | +am_test_GSymMatrix_OBJECTS = test_GSymMatrix.$(OBJEXT) | |
| 140 | +test_GSymMatrix_OBJECTS = $(am_test_GSymMatrix_OBJECTS) | |
| 141 | +test_GSymMatrix_DEPENDENCIES = ../src/libgamma.la | |
| 142 | +test_GSymMatrix_LDFLAGS = | |
| 143 | +am_test_GVector_OBJECTS = test_GVector.$(OBJEXT) | |
| 144 | +test_GVector_OBJECTS = $(am_test_GVector_OBJECTS) | |
| 145 | +test_GVector_DEPENDENCIES = ../src/libgamma.la | |
| 146 | +test_GVector_LDFLAGS = | |
| 147 | + | |
| 148 | +DEFS = @DEFS@ | |
| 149 | +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| 150 | +CPPFLAGS = @CPPFLAGS@ | |
| 151 | +LDFLAGS = @LDFLAGS@ | |
| 152 | +LIBS = @LIBS@ | |
| 153 | +depcomp = | |
| 154 | +am__depfiles_maybe = | |
| 155 | +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| 156 | + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 157 | +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ | |
| 158 | + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| 159 | + $(AM_CXXFLAGS) $(CXXFLAGS) | |
| 160 | +CXXLD = $(CXX) | |
| 161 | +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ | |
| 162 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| 163 | +CXXFLAGS = @CXXFLAGS@ | |
| 164 | +DIST_SOURCES = $(test_GMatrix_SOURCES) $(test_GSparseMatrix_SOURCES) \ | |
| 165 | + $(test_GSymMatrix_SOURCES) $(test_GVector_SOURCES) | |
| 166 | +DIST_COMMON = Makefile.am Makefile.in | |
| 167 | +SOURCES = $(test_GMatrix_SOURCES) $(test_GSparseMatrix_SOURCES) $(test_GSymMatrix_SOURCES) $(test_GVector_SOURCES) | |
| 168 | + | |
| 180 | 169 | all: all-am |
| 181 | 170 | |
| 182 | 171 | .SUFFIXES: |
| 183 | 172 | .SUFFIXES: .cpp .lo .o .obj |
| 184 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
| 185 | - @for dep in $?; do \ | |
| 186 | - case '$(am__configure_deps)' in \ | |
| 187 | - *$$dep*) \ | |
| 188 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ | |
| 189 | - && exit 0; \ | |
| 190 | - exit 1;; \ | |
| 191 | - esac; \ | |
| 192 | - done; \ | |
| 193 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps test/Makefile'; \ | |
| 173 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) | |
| 194 | 174 | cd $(top_srcdir) && \ |
| 195 | - $(AUTOMAKE) --gnu --ignore-deps test/Makefile | |
| 196 | -.PRECIOUS: Makefile | |
| 197 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 198 | - @case '$?' in \ | |
| 199 | - *config.status*) \ | |
| 200 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | |
| 201 | - *) \ | |
| 202 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | |
| 203 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | |
| 204 | - esac; | |
| 205 | - | |
| 206 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | |
| 207 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 208 | - | |
| 209 | -$(top_srcdir)/configure: $(am__configure_deps) | |
| 210 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 211 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
| 212 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| 175 | + $(AUTOMAKE) --gnu test/Makefile | |
| 176 | +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| 177 | + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) | |
| 213 | 178 | |
| 214 | 179 | clean-checkPROGRAMS: |
| 215 | 180 | @list='$(check_PROGRAMS)'; for p in $$list; do \ |
| ... | ... | @@ -231,19 +196,19 @@ test_GVector$(EXEEXT): $(test_GVector_OBJECTS) $(test_GVector_DEPENDENCIES) |
| 231 | 196 | $(CXXLINK) $(test_GVector_LDFLAGS) $(test_GVector_OBJECTS) $(test_GVector_LDADD) $(LIBS) |
| 232 | 197 | |
| 233 | 198 | mostlyclean-compile: |
| 234 | - -rm -f *.$(OBJEXT) | |
| 199 | + -rm -f *.$(OBJEXT) core *.core | |
| 235 | 200 | |
| 236 | 201 | distclean-compile: |
| 237 | 202 | -rm -f *.tab.c |
| 238 | 203 | |
| 239 | 204 | .cpp.o: |
| 240 | - $(CXXCOMPILE) -c -o $@ $< | |
| 205 | + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< | |
| 241 | 206 | |
| 242 | 207 | .cpp.obj: |
| 243 | - $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` | |
| 208 | + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` | |
| 244 | 209 | |
| 245 | 210 | .cpp.lo: |
| 246 | - $(LTCXXCOMPILE) -c -o $@ $< | |
| 211 | + $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< | |
| 247 | 212 | |
| 248 | 213 | mostlyclean-libtool: |
| 249 | 214 | -rm -f *.lo |
| ... | ... | @@ -255,6 +220,11 @@ distclean-libtool: |
| 255 | 220 | -rm -f libtool |
| 256 | 221 | uninstall-info-am: |
| 257 | 222 | |
| 223 | +ETAGS = etags | |
| 224 | +ETAGSFLAGS = | |
| 225 | + | |
| 226 | +tags: TAGS | |
| 227 | + | |
| 258 | 228 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 259 | 229 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
| 260 | 230 | unique=`for i in $$list; do \ |
| ... | ... | @@ -263,7 +233,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
| 263 | 233 | $(AWK) ' { files[$$0] = 1; } \ |
| 264 | 234 | END { for (i in files) print i; }'`; \ |
| 265 | 235 | mkid -fID $$unique |
| 266 | -tags: TAGS | |
| 267 | 236 | |
| 268 | 237 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
| 269 | 238 | $(TAGS_FILES) $(LISP) |
| ... | ... | @@ -275,24 +244,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
| 275 | 244 | done | \ |
| 276 | 245 | $(AWK) ' { files[$$0] = 1; } \ |
| 277 | 246 | END { for (i in files) print i; }'`; \ |
| 278 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| 279 | - test -n "$$unique" || unique=$$empty_fix; \ | |
| 280 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 281 | - $$tags $$unique; \ | |
| 282 | - fi | |
| 283 | -ctags: CTAGS | |
| 284 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | |
| 285 | - $(TAGS_FILES) $(LISP) | |
| 286 | - tags=; \ | |
| 287 | - here=`pwd`; \ | |
| 288 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| 289 | - unique=`for i in $$list; do \ | |
| 290 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| 291 | - done | \ | |
| 292 | - $(AWK) ' { files[$$0] = 1; } \ | |
| 293 | - END { for (i in files) print i; }'`; \ | |
| 294 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| 295 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| 247 | + test -z "$(ETAGS_ARGS)$$tags$$unique" \ | |
| 248 | + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| 296 | 249 | $$tags $$unique |
| 297 | 250 | |
| 298 | 251 | GTAGS: |
| ... | ... | @@ -301,10 +254,10 @@ GTAGS: |
| 301 | 254 | && gtags -i $(GTAGS_ARGS) $$here |
| 302 | 255 | |
| 303 | 256 | distclean-tags: |
| 304 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| 257 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH | |
| 305 | 258 | |
| 306 | 259 | check-TESTS: $(TESTS) |
| 307 | - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ | |
| 260 | + @failed=0; all=0; xfail=0; xpass=0; \ | |
| 308 | 261 | srcdir=$(srcdir); export srcdir; \ |
| 309 | 262 | list='$(TESTS)'; \ |
| 310 | 263 | if test -n "$$list"; then \ |
| ... | ... | @@ -316,29 +269,26 @@ check-TESTS: $(TESTS) |
| 316 | 269 | all=`expr $$all + 1`; \ |
| 317 | 270 | case " $(XFAIL_TESTS) " in \ |
| 318 | 271 | *" $$tst "*) \ |
| 319 | - xpass=`expr $$xpass + 1`; \ | |
| 320 | - failed=`expr $$failed + 1`; \ | |
| 321 | - echo "XPASS: $$tst"; \ | |
| 272 | + xpass=`expr $$xpass + 1`; \ | |
| 273 | + failed=`expr $$failed + 1`; \ | |
| 274 | + echo "XPASS: $$tst"; \ | |
| 322 | 275 | ;; \ |
| 323 | 276 | *) \ |
| 324 | - echo "PASS: $$tst"; \ | |
| 277 | + echo "PASS: $$tst"; \ | |
| 325 | 278 | ;; \ |
| 326 | 279 | esac; \ |
| 327 | 280 | elif test $$? -ne 77; then \ |
| 328 | 281 | all=`expr $$all + 1`; \ |
| 329 | 282 | case " $(XFAIL_TESTS) " in \ |
| 330 | 283 | *" $$tst "*) \ |
| 331 | - xfail=`expr $$xfail + 1`; \ | |
| 332 | - echo "XFAIL: $$tst"; \ | |
| 284 | + xfail=`expr $$xfail + 1`; \ | |
| 285 | + echo "XFAIL: $$tst"; \ | |
| 333 | 286 | ;; \ |
| 334 | 287 | *) \ |
| 335 | - failed=`expr $$failed + 1`; \ | |
| 336 | - echo "FAIL: $$tst"; \ | |
| 288 | + failed=`expr $$failed + 1`; \ | |
| 289 | + echo "FAIL: $$tst"; \ | |
| 337 | 290 | ;; \ |
| 338 | 291 | esac; \ |
| 339 | - else \ | |
| 340 | - skip=`expr $$skip + 1`; \ | |
| 341 | - echo "SKIP: $$tst"; \ | |
| 342 | 292 | fi; \ |
| 343 | 293 | done; \ |
| 344 | 294 | if test "$$failed" -eq 0; then \ |
| ... | ... | @@ -354,41 +304,24 @@ check-TESTS: $(TESTS) |
| 354 | 304 | banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ |
| 355 | 305 | fi; \ |
| 356 | 306 | fi; \ |
| 357 | - dashes="$$banner"; \ | |
| 358 | - skipped=""; \ | |
| 359 | - if test "$$skip" -ne 0; then \ | |
| 360 | - skipped="($$skip tests were not run)"; \ | |
| 361 | - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ | |
| 362 | - dashes="$$skipped"; \ | |
| 363 | - fi; \ | |
| 364 | - report=""; \ | |
| 365 | - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ | |
| 366 | - report="Please report to $(PACKAGE_BUGREPORT)"; \ | |
| 367 | - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ | |
| 368 | - dashes="$$report"; \ | |
| 369 | - fi; \ | |
| 370 | - dashes=`echo "$$dashes" | sed s/./=/g`; \ | |
| 307 | + dashes=`echo "$$banner" | sed s/./=/g`; \ | |
| 371 | 308 | echo "$$dashes"; \ |
| 372 | 309 | echo "$$banner"; \ |
| 373 | - test -z "$$skipped" || echo "$$skipped"; \ | |
| 374 | - test -z "$$report" || echo "$$report"; \ | |
| 375 | 310 | echo "$$dashes"; \ |
| 376 | 311 | test "$$failed" -eq 0; \ |
| 377 | 312 | else :; fi |
| 313 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 314 | + | |
| 315 | +top_distdir = .. | |
| 316 | +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) | |
| 378 | 317 | |
| 379 | 318 | distdir: $(DISTFILES) |
| 380 | - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| 381 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| 382 | - list='$(DISTFILES)'; for file in $$list; do \ | |
| 383 | - case $$file in \ | |
| 384 | - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| 385 | - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| 386 | - esac; \ | |
| 319 | + @list='$(DISTFILES)'; for file in $$list; do \ | |
| 387 | 320 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
| 388 | 321 | dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
| 389 | 322 | if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
| 390 | 323 | dir="/$$dir"; \ |
| 391 | - $(mkdir_p) "$(distdir)$$dir"; \ | |
| 324 | + $(mkinstalldirs) "$(distdir)$$dir"; \ | |
| 392 | 325 | else \ |
| 393 | 326 | dir=''; \ |
| 394 | 327 | fi; \ |
| ... | ... | @@ -408,7 +341,9 @@ check-am: all-am |
| 408 | 341 | $(MAKE) $(AM_MAKEFLAGS) check-TESTS |
| 409 | 342 | check: check-am |
| 410 | 343 | all-am: Makefile |
| 344 | + | |
| 411 | 345 | installdirs: |
| 346 | + | |
| 412 | 347 | install: install-am |
| 413 | 348 | install-exec: install-exec-am |
| 414 | 349 | install-data: install-data-am |
| ... | ... | @@ -420,7 +355,7 @@ install-am: all-am |
| 420 | 355 | installcheck: installcheck-am |
| 421 | 356 | install-strip: |
| 422 | 357 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
| 423 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| 358 | + INSTALL_STRIP_FLAG=-s \ | |
| 424 | 359 | `test -z '$(STRIP)' || \ |
| 425 | 360 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
| 426 | 361 | mostlyclean-generic: |
| ... | ... | @@ -428,18 +363,17 @@ mostlyclean-generic: |
| 428 | 363 | clean-generic: |
| 429 | 364 | |
| 430 | 365 | distclean-generic: |
| 431 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | |
| 366 | + -rm -f Makefile $(CONFIG_CLEAN_FILES) | |
| 432 | 367 | |
| 433 | 368 | maintainer-clean-generic: |
| 434 | 369 | @echo "This command is intended for maintainers to use" |
| 435 | 370 | @echo "it deletes files that may require special tools to rebuild." |
| 436 | 371 | clean: clean-am |
| 437 | 372 | |
| 438 | -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ | |
| 439 | - mostlyclean-am | |
| 373 | +clean-am: clean-checkPROGRAMS clean-generic clean-libtool mostlyclean-am | |
| 440 | 374 | |
| 441 | 375 | distclean: distclean-am |
| 442 | - -rm -f Makefile | |
| 376 | + | |
| 443 | 377 | distclean-am: clean-am distclean-compile distclean-generic \ |
| 444 | 378 | distclean-libtool distclean-tags |
| 445 | 379 | |
| ... | ... | @@ -447,8 +381,6 @@ dvi: dvi-am |
| 447 | 381 | |
| 448 | 382 | dvi-am: |
| 449 | 383 | |
| 450 | -html: html-am | |
| 451 | - | |
| 452 | 384 | info: info-am |
| 453 | 385 | |
| 454 | 386 | info-am: |
| ... | ... | @@ -464,7 +396,7 @@ install-man: |
| 464 | 396 | installcheck-am: |
| 465 | 397 | |
| 466 | 398 | maintainer-clean: maintainer-clean-am |
| 467 | - -rm -f Makefile | |
| 399 | + | |
| 468 | 400 | maintainer-clean-am: distclean-am maintainer-clean-generic |
| 469 | 401 | |
| 470 | 402 | mostlyclean: mostlyclean-am |
| ... | ... | @@ -472,26 +404,17 @@ mostlyclean: mostlyclean-am |
| 472 | 404 | mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
| 473 | 405 | mostlyclean-libtool |
| 474 | 406 | |
| 475 | -pdf: pdf-am | |
| 476 | - | |
| 477 | -pdf-am: | |
| 478 | - | |
| 479 | -ps: ps-am | |
| 480 | - | |
| 481 | -ps-am: | |
| 482 | - | |
| 483 | 407 | uninstall-am: uninstall-info-am |
| 484 | 408 | |
| 485 | -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ | |
| 486 | - clean-checkPROGRAMS clean-generic clean-libtool ctags \ | |
| 487 | - distclean distclean-compile distclean-generic \ | |
| 488 | - distclean-libtool distclean-tags distdir dvi dvi-am html \ | |
| 489 | - html-am info info-am install install-am install-data \ | |
| 490 | - install-data-am install-exec install-exec-am install-info \ | |
| 491 | - install-info-am install-man install-strip installcheck \ | |
| 492 | - installcheck-am installdirs maintainer-clean \ | |
| 493 | - maintainer-clean-generic mostlyclean mostlyclean-compile \ | |
| 494 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |
| 409 | +.PHONY: GTAGS all all-am check check-TESTS check-am clean \ | |
| 410 | + clean-checkPROGRAMS clean-generic clean-libtool distclean \ | |
| 411 | + distclean-compile distclean-generic distclean-libtool \ | |
| 412 | + distclean-tags distdir dvi dvi-am info info-am install \ | |
| 413 | + install-am install-data install-data-am install-exec \ | |
| 414 | + install-exec-am install-info install-info-am install-man \ | |
| 415 | + install-strip installcheck installcheck-am installdirs \ | |
| 416 | + maintainer-clean maintainer-clean-generic mostlyclean \ | |
| 417 | + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |
| 495 | 418 | tags uninstall uninstall-am uninstall-info-am |
| 496 | 419 | |
| 497 | 420 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ... | ... |