#! /bin/sh
#
# To apply this patch, cd to the top level Octave source directory and
# run this file through /bin/sh. It will first remove any files that
# have been deleted from the source distribution since the last
# release and then update the sources with patch(1).
#
# Diffs for updating *.ps, *.dvi, *.info*, and *.html files are not
# included because they can be recreated from the Texinfo files using
# TeX, makeinfo, or texi2html.
#
# Diffs for updating parse.cc and y.tab.h are not included because
# they can be recreated from the file parse.y using bison.
#
# Diffs for updating lex.cc are not included because it can be
# recreated from lex.l using flex.
#
# John W. Eaton
# jwe@bevo.che.wisc.edu
# University of Wisconsin-Madison
# Department of Chemical Engineering
if test -f src/octave.cc ; then
true
else
echo '***********************************************************' 1>&2
echo 'You must run this script in the top-level octave directory!' 1>&2
echo '***********************************************************' 1>&2
exit 1
fi
###
### Special commands should go here.
###
echo 'patching existing files'
patch -p1 << \PATCH_EOF
diff -cNr octave-3.4.0/acinclude.m4 octave-3.4.1/acinclude.m4
*** octave-3.4.0/acinclude.m4 2011-02-08 05:00:51.000000000 -0500
--- octave-3.4.1/acinclude.m4 1969-12-31 19:00:00.000000000 -0500
***************
*** 1,1597 ****
- dnl aclocal.m4 -- extra macros for configuring Octave
- dnl
- dnl Copyright (C) 1995-2011 John W. Eaton
- dnl
- dnl This file is part of Octave.
- dnl
- dnl Octave is free software; you can redistribute it and/or modify it
- dnl under the terms of the GNU General Public License as published by the
- dnl Free Software Foundation; either version 3 of the License, or (at
- dnl your option) any later version.
- dnl
- dnl Octave is distributed in the hope that it will be useful, but WITHOUT
- dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- dnl for more details.
- dnl
- dnl You should have received a copy of the GNU General Public License
- dnl along with Octave; see the file COPYING. If not, see
- dnl .
- dnl
- dnl
- dnl Copyright (C) 2008 - 2009 Free Software Foundation, Inc.
- dnl
- dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64
- dnl This allows us to run with earlier Autoconfs as well.
- dnl FIXME: these should go away once Autoconf 2.64 is required or ubiquitous.
- dnl
- ifdef([m4_ifblank],[],[
- m4_define([m4_ifblank],
- [m4_if(m4_translit([[$1]], [ ][ ][
- ]), [], [$2], [$3])])])
- dnl
- ifdef([m4_ifnblank],[],[
- m4_define([m4_ifnblank],
- [m4_if(m4_translit([[$1]], [ ][ ][
- ]), [], [$3], [$2])])])
- dnl
- dnl ----------------------------------------------------------------------
- dnl
- dnl Figure out the hardware-vendor-os info.
- dnl
- dnl OCTAVE_HOST_TYPE
- AC_DEFUN([OCTAVE_HOST_TYPE],
- [AC_CANONICAL_HOST
- if test -z "$host"; then
- host=unknown
- fi
- canonical_host_type=$host
- if test "$host" = unknown; then
- AC_MSG_WARN([configuring Octave for unknown system type
- ])
- fi
- AC_SUBST(canonical_host_type)])
- dnl
- dnl Set default value for a variable and substitute it.
- dnl
- dnl OCTAVE_SET_DEFAULT
- AC_DEFUN([OCTAVE_SET_DEFAULT],
- [ifelse($#, 2, [: ${$1=$2}
- ])dnl
- AC_MSG_RESULT([defining $1 to be $$1])
- AC_SUBST($1)])
- dnl
- dnl Check for ar.
- dnl
- AC_DEFUN([OCTAVE_PROG_AR],
- [if test -z "$AR"; then
- AR=ar
- fi
- AC_SUBST(AR)
-
- if test -z "$ARFLAGS"; then
- ARFLAGS="rc"
- fi
- AC_SUBST(ARFLAGS)
- ])
- dnl
- dnl See if the compiler supports placement delete
- dnl
- AC_DEFUN([OCTAVE_PLACEMENT_DELETE],
- [AC_CACHE_CHECK([whether defines placement delete operator],
- octave_cv_placement_delete,
- [AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]],
- [[operator delete((void *)0, (void *)0);]])],
- octave_cv_placement_delete=yes, octave_cv_placement_delete=no)])
- if test $octave_cv_placement_delete = yes; then
- AC_DEFINE(HAVE_PLACEMENT_DELETE,1,[Define if C++ supports operator delete(void *, void *)])
- fi
- AC_LANG_POP(C++)
- ])
- dnl
- dnl See if the compiler dynamic auto arrays
- dnl
- AC_DEFUN([OCTAVE_DYNAMIC_AUTO_ARRAYS],
- [AC_CACHE_CHECK([whether C++ supports dynamic auto arrays],
- octave_cv_dynamic_auto_arrays,
- [AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- [[void test(char *); int length(); char x[length()]; test(x);]])],
- octave_cv_dynamic_auto_arrays=yes, octave_cv_dynamic_auto_arrays=no)])
- if test $octave_cv_dynamic_auto_arrays = yes; then
- AC_DEFINE(HAVE_DYNAMIC_AUTO_ARRAYS,1,[Define if C++ supports dynamic auto arrays])
- fi
- AC_LANG_POP(C++)
- ])
- dnl
- dnl See if the C++ library has functions to set real and imaginary
- dnl parts of complex numbers independently.
- dnl
- AC_DEFUN([OCTAVE_CXX_COMPLEX_SETTERS],
- [AC_CACHE_CHECK([whether complex class can set components independently],
- octave_cv_cxx_complex_setters,
- [AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]],
- [[std::complex x; x.real (1.0); x.imag (2.0);]])],
- octave_cv_cxx_complex_setters=yes, octave_cv_cxx_complex_setters=no)])
- if test $octave_cv_cxx_complex_setters = yes; then
- AC_DEFINE(HAVE_CXX_COMPLEX_SETTERS,1,[Define if C++ complex class has void real (T) and void imag (T) methods])
- fi
- AC_LANG_POP(C++)
- ])
- dnl
- dnl See if the C++ library has functions to access real and imaginary
- dnl parts of complex numbers independently via references.
- dnl
- AC_DEFUN([OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS],
- [AC_CACHE_CHECK([whether complex class can reference components independently],
- octave_cv_cxx_complex_reference_accessors,
- [AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]],
- [[std::complex x; x.real () = 1.0; x.imag () = 1.0;]])],
- octave_cv_cxx_complex_reference_accessors=yes, octave_cv_cxx_complex_reference_accessors=no)])
- if test $octave_cv_cxx_complex_reference_accessors = yes; then
- AC_DEFINE(HAVE_CXX_COMPLEX_REFERENCE_ACCESSORS,1,[Define if C++ complex class has T& real (void) and T& imag (void) methods])
- fi
- AC_LANG_POP(C++)
- ])
- dnl
- dnl The following test is from Karl Berry's Kpathseach library. I'm
- dnl including it here in case we someday want to make the use of
- dnl kpathsea optional.
- dnl
- dnl Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
- dnl This test program is due to Mike Hibler .
- dnl We don't actually need to run this if we don't have putenv, but it
- dnl doesn't hurt.
- AC_DEFUN([OCTAVE_SMART_PUTENV],
- [AC_MSG_CHECKING([whether putenv uses malloc])
- AC_CACHE_VAL(octave_cv_func_putenv_malloc,
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #define VAR "YOW_VAR"
- #define STRING1 "GabbaGabbaHey"
- #define STRING2 "Yow!!" /* should be shorter than STRING1 */
- extern char *getenv (); /* in case char* and int don't mix gracefully */
- main ()
- {
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
- #if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
- #endif
- exit (rstr1 == rstr2 ? 0 : 1);
- }]])], octave_cv_func_putenv_malloc=yes, octave_cv_func_putenv_malloc=no,
- octave_cv_func_putenv_malloc=no)])dnl
- AC_MSG_RESULT([$octave_cv_func_putenv_malloc])
- if test $octave_cv_func_putenv_malloc = yes; then
- AC_DEFINE(SMART_PUTENV,1,[To quiet autoheader.])
- fi])
- dnl
- dnl Check to see if C++ compiler needs the new friend template declaration
- dnl syntax.
- dnl
- dnl OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL
- AC_DEFUN([OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL], [
- AC_REQUIRE([AC_PROG_CXX])
- AC_MSG_CHECKING([for C++ support for new friend template declaration])
- AC_CACHE_VAL(octave_cv_cxx_new_friend_template_decl, [
- AC_LANG_PUSH(C++)
- rm -f conftest.h
- cat > conftest.h < int
- operator== (const T&, const T&)
- {
- return 0;
- }
- EOB
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "conftest.h"]],
- [[A a (1);
- return a == A(1);]])],
- [octave_cv_cxx_new_friend_template_decl=no],
- [octave_cv_cxx_new_friend_template_decl=yes])
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT([$octave_cv_cxx_new_friend_template_decl])
- if test $octave_cv_cxx_new_friend_template_decl = yes; then
- AC_DEFINE(CXX_NEW_FRIEND_TEMPLATE_DECL,1,[Define if your compiler supports `<>' stuff for template friends.])
- fi
- ])
- dnl
- dnl Check to see if C compiler handles FLAG command line option. If
- dnl two arguments are specified, execute the second arg as shell
- dnl commands. Otherwise, add FLAG to CFLAGS if the compiler accepts
- dnl the flag.
- dnl
- dnl OCTAVE_CC_FLAG
- AC_DEFUN([OCTAVE_CC_FLAG], [
- ac_safe=`echo "$1" | sed 'y%./+-:=%__p___%'`
- AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
- AC_CACHE_VAL(octave_cv_cc_flag_$ac_safe, [
- AC_LANG_PUSH(C)
- XCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- eval "octave_cv_cc_flag_$ac_safe=yes",
- eval "octave_cv_cc_flag_$ac_safe=no")
- CFLAGS="$XCFLAGS"
- AC_LANG_POP(C)
- ])
- if eval "test \"`echo '$octave_cv_cc_flag_'$ac_safe`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , [
- CFLAGS="$CFLAGS $1"
- AC_MSG_RESULT([adding $1 to CFLAGS])], [$2])
- else
- AC_MSG_RESULT(no)
- ifelse([$3], , , [$3])
- fi
- ])
- dnl
- dnl Check to see if C++ compiler handles FLAG command line option. If
- dnl two arguments are specified, execute the second arg as shell
- dnl commands. Otherwise, add FLAG to CXXFLAGS if the compiler accepts
- dnl the flag.
- dnl
- dnl OCTAVE_CXX_FLAG
- AC_DEFUN([OCTAVE_CXX_FLAG], [
- ac_safe=`echo "$1" | sed 'y%./+-:=%__p___%'`
- AC_MSG_CHECKING([whether ${CXX-g++} accepts $1])
- AC_CACHE_VAL(octave_cv_cxx_flag_$ac_safe, [
- AC_LANG_PUSH(C++)
- XCXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $1"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- eval "octave_cv_cxx_flag_$ac_safe=yes",
- eval "octave_cv_cxx_flag_$ac_safe=no")
- CXXFLAGS="$XCXXFLAGS"
- AC_LANG_POP(C++)
- ])
- if eval "test \"`echo '$octave_cv_cxx_flag_'$ac_safe`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , [
- CXXFLAGS="$CXXFLAGS $1"
- AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2])
- else
- AC_MSG_RESULT(no)
- ifelse([$3], , , [$3])
- fi
- ])
- dnl
- dnl Check to see if Fortran compiler handles FLAG command line option. If
- dnl two arguments are specified, execute the second arg as shell
- dnl commands. Otherwise, add FLAG to FFLAGS if the compiler accepts
- dnl the flag.
- dnl
- dnl OCTAVE_F77_FLAG
- AC_DEFUN([OCTAVE_F77_FLAG], [
- ac_safe=`echo "$1" | sed 'y%./+-:=%__p___%'`
- AC_MSG_CHECKING([whether ${F77-g77} accepts $1])
- AC_CACHE_VAL(octave_cv_f77_flag_$ac_safe, [
- AC_LANG_PUSH(Fortran 77)
- XFFLAGS="$FFLAGS"
- FFLAGS="$FFLAGS $1"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- eval "octave_cv_f77_flag_$ac_safe=yes",
- eval "octave_cv_f77_flag_$ac_safe=no")
- FFLAGS="$XFFLAGS"
- AC_LANG_POP(Fortran 77)
- ])
- if eval "test \"`echo '$octave_cv_f77_flag_'$ac_safe`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , [
- FFLAGS="$FFLAGS $1"
- AC_MSG_RESULT([adding $1 to FFLAGS])], [$2])
- else
- AC_MSG_RESULT(no)
- ifelse([$3], , , [$3])
- fi
- ])
- dnl
- dnl Check to see whether the default Fortran INTEGER is 64 bits wide.
- dnl
- AC_DEFUN([OCTAVE_CHECK_FORTRAN_INTEGER_SIZE], [
- octave_fintsize_save_FFLAGS="$FFLAGS"
- FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
- AC_LANG_PUSH(Fortran 77)
- AC_CACHE_CHECK([whether $F77 generates correct size integers],
- [octave_cv_fortran_integer_size],
- [AC_COMPILE_IFELSE(
- [ subroutine foo(n, in, out)
- integer n, in(n), out(n)
- integer i
- do 10 i = 1, n
- out(i) = in(i)
- 10 continue
- return
- end],
- [mv conftest.$ac_objext fintsize.$ac_objext
-
- octave_fintsize_save_LIBS="$LIBS"
- LIBS="fintsize.$ac_objext $[]_AC_LANG_PREFIX[]LIBS"
- AC_LANG_PUSH(C)dnl
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[
- #ifdef USE_64_BIT_IDX_T
- #if IDX_TYPE_LONG
- typedef long octave_idx_type;
- #else
- typedef int octave_idx_type;
- #endif
- #else
- typedef int octave_idx_type;
- #endif
- octave_idx_type n = 2;
- octave_idx_type in[2];
- octave_idx_type out[2];
- in[0] = 13;
- in[0] = 42;
- F77_FUNC(foo,FOO) (&n, &in, &out);
- assert (in[0] == out[0] && in[1] == out[1]);
- ]])],
- [octave_cv_fortran_integer_size=yes],
- [octave_cv_fortran_integer_size=no])
- AC_LANG_POP(C)dnl
- LIBS="$octave_fintsize_save_LIBS"
- rm -f conftest.$ac_objext fintsize.$ac_objext
- ], [
- rm -f conftest.$ac_objext
- AC_MSG_FAILURE([cannot compile a simple Fortran program])
- octave_cv_fortran_integer_size=no])])
- AC_LANG_POP(Fortran 77)
- FFLAGS="$octave_fintsize_save_FFLAGS"
- ])
- dnl
- dnl
- dnl
- dnl OCTAVE_CHECK_LIBRARY(LIBRARY, DOC-NAME, WARN-MSG, HEADER, FUNC,
- dnl LANG, DOC-STRING, EXTRA-CHECK)
- AC_DEFUN([OCTAVE_CHECK_LIBRARY], [
- AC_ARG_WITH([$1-includedir],
- [AS_HELP_STRING([--with-$1-includedir=DIR],
- [look for $2 include files in DIR])],
- [m4_toupper([$1])_CPPFLAGS="-I$withval"])
- AC_SUBST(m4_toupper([$1])_CPPFLAGS)
-
- AC_ARG_WITH([$1-libdir],
- [AS_HELP_STRING([--with-$1-libdir=DIR],
- [look for $2 libraries in DIR])],
- [m4_toupper([$1])_LDFLAGS="-L$withval"])
- AC_SUBST(m4_toupper([$1])_LDFLAGS)
-
- AC_ARG_WITH([$1],
- [m4_ifblank([$7],
- [AS_HELP_STRING([--without-$1], [don't use $2 library])],
- [AS_HELP_STRING([--without-$1], [$7])])],
- with_$1=$withval, with_$1=yes)
-
- m4_toupper([$1])_LIBS=
- case $with_$1 in
- no)
- m4_toupper([$1])_LIBS=
- ;;
- yes | "")
- m4_toupper([$1])_LIBS="-l$1"
- ;;
- -* | */* | *.a | *.so | *.so.* | *.o)
- m4_toupper([$1])_LIBS="$with_$1"
- ;;
- *)
- m4_toupper([$1])_LIBS="-l$with_$1"
- ;;
- esac
-
- [TEXINFO_]m4_toupper([$1])=
- warn_$1="$3"
- if test -n "$m4_toupper([$1])_LIBS"; then
- octave_check_library_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$m4_toupper([$1])_CPPFLAGS $CPPFLAGS"
- m4_ifnblank([$6], [AC_LANG_PUSH($6)])
- octave_$1_check_for_lib=false
- m4_ifblank([$4], [octave_$1_check_for_lib=true],
- [AC_CHECK_HEADERS($4, [octave_$1_check_for_lib=true; break])])
- if $octave_$1_check_for_lib; then
- octave_check_library_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$m4_toupper([$1])_LDFLAGS $LDFLAGS"
- octave_check_library_save_LIBS="$LIBS"
- LIBS="$m4_toupper([$1])_LIBS $LIBS"
- octave_$1_ok=no
- AC_MSG_CHECKING([for $5 in $m4_toupper([$1])_LIBS])
- AC_LINK_IFELSE([AC_LANG_CALL([], [$5])],
- [octave_$1_ok=yes])
- AC_MSG_RESULT([$octave_$1_ok])
- if test $octave_$1_ok = yes; then
- m4_ifblank([$8], [
- warn_$1=
- AC_DEFINE([HAVE_]m4_toupper([$1]), 1,
- [Define if $2 is available.])
- [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8])
- fi
- LIBS="$octave_check_library_save_LIBS"
- LDFLAGS="$octave_check_library_save_LDFLAGS"
- fi
- m4_ifnblank([$6], [AC_LANG_POP($6)])
- CPPFLAGS="$octave_check_library_save_CPPFLAGS"
- fi
- AC_SUBST(m4_toupper([$1])_LIBS)
- AC_SUBST([TEXINFO_]m4_toupper([$1]))
- if test -n "$warn_$1"; then
- AC_MSG_WARN([$warn_$1])
- m4_toupper([$1])_LIBS=
- fi
- ])
- dnl
- dnl Check for flex
- dnl
- AC_DEFUN([OCTAVE_PROG_FLEX], [
- ### For now, don't define LEXLIB to be -lfl -- we don't use anything in
- ### it, and it might not be installed.
- ###
- ### Also make sure that we generate an interactive scanner if we are
- ### using flex.
- AC_PROG_LEX
- case "$LEX" in
- flex*)
- LFLAGS="-I"
- AC_MSG_RESULT([defining LFLAGS to be $LFLAGS])
- LEXLIB=
- ;;
- *)
- LEX='$(top_srcdir)/missing flex'
- warn_flex="I didn't find flex, but it's only a problem if you need to reconstruct lex.cc"
- AC_MSG_WARN([$warn_flex])
- ;;
- esac
- AC_SUBST(LFLAGS)
- ])
- dnl
- dnl Check for bison
- dnl
- AC_DEFUN([OCTAVE_PROG_BISON], [
- AC_PROG_YACC
- case "$YACC" in
- bison*)
- ;;
- *)
- YACC='$(top_srcdir)/missing bison'
- warn_bison="I didn't find bison, but it's only a problem if you need to reconstruct parse.cc"
- AC_MSG_WARN([$warn_bison])
- ;;
- esac
- ])
- dnl
- dnl What pager should we use?
- dnl
- AC_DEFUN([OCTAVE_PROG_PAGER],
- [if test "$cross_compiling" = yes; then
- DEFAULT_PAGER=less
- AC_MSG_RESULT([assuming $DEFAULT_PAGER exists on $canonical_host_type host])
- AC_SUBST(DEFAULT_PAGER)
- else
- octave_possible_pagers="less more page pg"
- case "$canonical_host_type" in
- *-*-cygwin* | *-*-mingw32* | *-*-msdosmsvc)
- octave_possible_pagers="$octave_possible_pagers more.com"
- ;;
- esac
-
- AC_CHECK_PROGS(DEFAULT_PAGER, $octave_possible_pagers, [])
- if test -z "$DEFAULT_PAGER"; then
- warn_less="I couldn't find \`less', \`more', \`page', or \`pg'"
- AC_MSG_WARN([$warn_less])
- fi
- fi
- ])
- dnl
- dnl Does gnuplot exist?
- dnl
- AC_DEFUN([OCTAVE_PROG_GNUPLOT], [
- gp_names="gnuplot"
- gp_default="gnuplot"
- if test "$cross_compiling" = yes; then
- GNUPLOT="$gp_default"
- AC_MSG_RESULT([assuming $GNUPLOT exists on $canonical_host_type host])
- else
- AC_CHECK_PROGS(GNUPLOT, [$gp_names])
- if test -z "$GNUPLOT"; then
- warn_gnuplot=yes
-
- GNUPLOT="$gp_default"
-
- AC_MSG_WARN([gnuplot not found. It isn't necessary to have gnuplot])
- AC_MSG_WARN([installed, but without native graphics or gnuplot])
- AC_MSG_WARN([you won't be able to use any of Octave's plotting commands.])
- fi
- fi
- AC_SUBST(GNUPLOT)
- ])
- dnl
- dnl Is gperf installed?
- dnl
- dnl OCTAVE_PROG_GPERF
- AC_DEFUN([OCTAVE_PROG_GPERF], [
- AC_CHECK_PROG(GPERF, gperf, gperf, [])
- if test -z "$GPERF"; then
- GPERF='$(top_srcdir)/missing gperf'
- warn_gperf="I didn't find gperf, but it's only a problem if you need to reconstruct oct-gperf.h"
- AC_MSG_WARN([$warn_gperf])
- fi
- AC_SUBST(GPERF)
- ])
- dnl
- dnl Is ghostscript installed?
- dnl
- dnl OCTAVE_PROG_GHOSTSCRIPT
- AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [
- case "$canonical_host_type" in
- *-*-mingw* | *-*-msdosmsvc)
- gs_names="gswin32c gs"
- ;;
- *)
- gs_names="gs"
- ;;
- esac
- AC_CHECK_PROGS(GHOSTSCRIPT, [$gs_names])
- if test -z "$GHOSTSCRIPT"; then
- GHOSTSCRIPT='$(top_srcdir)/missing gs'
- warn_ghostscript="I didn't find ghostscript, so reconstructing figures for the manual will fail, and saving graphics in some output formats will fail when using Octave"
- AC_MSG_WARN([$warn_ghostscript])
- fi
- AC_SUBST(GHOSTSCRIPT)
- ])
- dnl
- dnl Is texi2dvi installed?
- dnl
- dnl OCTAVE_PROG_TEXI2DVI
- AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
- AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
- if test -z "$TEXI2DVI"; then
- TEXI2DVI='$(top_srcdir)/missing texi2dvi'
- warn_texi2dvi="I didn't find texi2dvi, but it's only a problem if you need to reconstruct the DVI version of the manual"
- AC_MSG_WARN([$warn_texi2dvi])
- fi
- AC_SUBST(TEXI2DVI)
- ])
- dnl
- dnl Is texi2pdf installed?
- dnl
- dnl OCTAVE_PROG_TEXI2PDF
- AC_DEFUN([OCTAVE_PROG_TEXI2PDF], [
- AC_REQUIRE([OCTAVE_PROG_TEXI2DVI])
- AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, [])
- if test -z "$TEXI2PDF"; then
- missing=true;
- if test -n "$TEXI2DVI"; then
- TEXI2PDF="$TEXI2DVI --pdf"
- missing=false;
- fi
- else
- missing=false;
- fi
- if $missing; then
- TEXI2PDF='$(top_srcdir)/missing texi2pdf'
- warn_texi2pdf="I didn't find texi2pdf, but it's only a problem if you need to reconstruct the PDF version of the manual"
- AC_MSG_WARN([$warn_texi2pdf])
- fi
- AC_SUBST(TEXI2PDF)
- ])
- dnl
- dnl See if the C++ library is ISO compliant.
- dnl FIXME: This is obviously very simplistic, and trivially fooled.
- dnl
- dnl OCTAVE_CXX_ISO_COMPLIANT_LIBRARY
- AC_DEFUN([OCTAVE_CXX_ISO_COMPLIANT_LIBRARY], [
- AC_REQUIRE([AC_PROG_CXX])
- AC_MSG_CHECKING([if C++ library is ISO compliant])
- AC_CACHE_VAL(octave_cv_cxx_iso_compliant_library, [
- AC_LANG_PUSH(C++)
- rm -f conftest.h
- ### Omitting cwctype for now, since it is broken with gcc-3.0.x and
- ### possibly other versions...
- for inc in algorithm bitset cassert cctype cerrno cfloat ciso646 \
- climits clocale cmath complex csetjmp csignal cstdarg cstddef \
- cstdio cstdlib cstring ctime cwchar deque exception \
- fstream functional iomanip ios iosfwd iostream istream iterator \
- limits list locale map memory new numeric ostream queue set \
- sstream stack stdexcept streambuf string strstream typeinfo \
- utility valarray vector; do
- echo "#include <$inc>" >> conftest.h
- done
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "conftest.h"]],
- [[std::bitset<50> flags;
- flags.set();
- int digits = std::numeric_limits::digits;
- digits = 0;]])],
- [octave_cv_cxx_iso_compliant_library=yes],
- [octave_cv_cxx_iso_compliant_library=no])
- AC_LANG_POP(C++)
- ])
- AC_MSG_RESULT([$octave_cv_cxx_iso_compliant_library])
- if test $octave_cv_cxx_iso_compliant_library = yes; then
- AC_DEFINE(CXX_ISO_COMPLIANT_LIBRARY, 1, [Define if your C++ runtime library is ISO compliant.])
- fi
- ])
- dnl
- dnl Allow the user disable support for command line editing using GNU
- dnl readline.
- dnl
- dnl OCTAVE_ENABLE_READLINE
- AC_DEFUN([OCTAVE_ENABLE_READLINE], [
- USE_READLINE=true
- READLINE_LIBS=
- AC_ARG_ENABLE(readline,
- [ --enable-readline use readline library (default is yes)],
- [if test "$enableval" = no; then
- USE_READLINE=false
- warn_readline="command editing and history features require GNU Readline"
- fi])
- if $USE_READLINE; then
- save_LIBS="$LIBS"
- LIBS="$TERM_LIBS"
- AC_CHECK_LIB(readline, rl_set_keyboard_input_timeout, [
- READLINE_LIBS="-lreadline"
- AC_DEFINE(USE_READLINE, 1, [Define to use the readline library.])
- ], [
- AC_MSG_WARN([I need GNU Readline 4.2 or later])
- AC_MSG_ERROR([this is fatal unless you specify --disable-readline])
- ])
- LIBS="$save_LIBS"
- fi
- AC_SUBST(READLINE_LIBS)
- ])
- dnl
- dnl Check to see if C++ reintrepret cast works for function pointers.
- dnl
- dnl OCTAVE_CXX_BROKEN_REINTERPRET_CAST
- dnl
- AC_DEFUN([OCTAVE_CXX_BROKEN_REINTERPRET_CAST], [
- AC_REQUIRE([AC_PROG_CXX])
- AC_LANG_PUSH(C++)
- AC_CACHE_CHECK([for broken C++ reinterpret_cast],
- octave_cv_cxx_broken_reinterpret_cast, [
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[
- typedef double (*fptr) (double);
- fptr psin = sin;
- void *vptr = reinterpret_cast (psin);
- psin = reinterpret_cast (vptr);]])],
- octave_cv_cxx_broken_reinterpret_cast=no,
- octave_cv_cxx_broken_reinterpret_cast=yes)])
- if test $octave_cv_cxx_broken_reinterpret_cast = yes ; then
- AC_DEFINE(CXX_BROKEN_REINTERPRET_CAST, 1, [Define if C++ reinterpret_cast fails for function pointers.])
- fi
- AC_LANG_POP(C++)])
- dnl
- dnl Find find.
- dnl
- # Prefer GNU find if found.
- AN_MAKEVAR([FIND], [OCTAVE_PROG_FIND])
- AN_PROGRAM([gfind], [OCTAVE_PROG_FIND])
- AN_PROGRAM([find], [OCTAVE_PROG_FIND])
- AC_DEFUN([OCTAVE_PROG_FIND],
- [AC_CHECK_PROGS(FIND, gfind find, )])
- dnl
- dnl Find sed.
- dnl
- # Check for a fully-functional sed program, that truncates
- # as few characters as possible and that supports "\(X\|Y\)"
- # style regular expression alternation. Prefer GNU sed if found.
- AC_DEFUN([OCTAVE_PROG_SED],
- [AC_MSG_CHECKING([for a usable sed])
- if test -z "$SED"; then
- AC_CACHE_VAL(ac_cv_path_sed, [
- # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
- _AS_PATH_WALK([$PATH],
- [for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then
- _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
- fi
- done
- done
- ])
- AS_TMPDIR(sed)
- _max=0
- _count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for _sed in $_sed_list /usr/xpg4/bin/sed; do
- test ! -f ${_sed} && break
- cat /dev/null > "$tmp/sed.in"
- _count=0
- echo $ECHO_N "0123456789$ECHO_C" >"$tmp/sed.in"
- # Check for GNU sed and select it if it is found.
- if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
- octave_cv_path_sed=${_sed}
- break;
- fi
- # Reject if RE alternation is not handled.
- if test "`echo 'this and that' | ${_sed} -n 's/\(this\|that\).*$/\1/p'`" != "this"; then
- continue;
- fi
- while true; do
- cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
- mv "$tmp/sed.tmp" "$tmp/sed.in"
- cp "$tmp/sed.in" "$tmp/sed.nl"
- echo >>"$tmp/sed.nl"
- ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
- cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
- # 10000 chars as input seems more than enough
- test $_count -gt 10 && break
- _count=`expr $_count + 1`
- if test $_count -gt $_max; then
- _max=$_count
- octave_cv_path_sed=$_sed
- fi
- done
- done
- rm -rf "$tmp"
- ])
- SED=$octave_cv_path_sed
- if test -z "$SED"; then
- AC_MSG_ERROR([no usable version of sed found])
- fi
- fi
- AC_SUBST(SED)
- AC_MSG_RESULT([$SED])
- ])
- dnl
- dnl Find Perl.
- dnl
- dnl OCTAVE_PROG_PERL
- AC_DEFUN([OCTAVE_PROG_PERL],
- [AC_CHECK_PROG(PERL, perl, perl, [])
- AC_SUBST(PERL)
- ])
- dnl
- dnl Find Python.
- dnl
- dnl OCTAVE_PROG_PYTHON
- AC_DEFUN([OCTAVE_PROG_PYTHON],
- [AC_CHECK_PROG(PYTHON, python, python, [])
- AC_SUBST(PYTHON)
- ])
- dnl
- dnl Find desktop-file-install.
- dnl
- dnl OCTAVE_PROG_DESKTOP_FILE_INSTALL
- AC_DEFUN([OCTAVE_PROG_DESKTOP_FILE_INSTALL],
- [AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop-file-install, [])
- AC_SUBST(DESKTOP_FILE_INSTALL)
- ])
- dnl
- dnl Check for IEEE 754 data format.
- dnl
- AC_DEFUN([OCTAVE_IEEE754_DATA_FORMAT],
- [AC_MSG_CHECKING([for IEEE 754 data format])
- AC_CACHE_VAL(octave_cv_ieee754_data_format,
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
- int
- main (void)
- {
- typedef union { unsigned char c[8]; double d; } ieeebytes;
-
- ieeebytes l = {0x1c, 0xbc, 0x6e, 0xf2, 0x54, 0x8b, 0x11, 0x43};
- ieeebytes b = {0x43, 0x11, 0x8b, 0x54, 0xf2, 0x6e, 0xbc, 0x1c};
-
- return l.d != 1234567891234567.0 && b.d != 1234567891234567.0;
- }]])],
- octave_cv_ieee754_data_format=yes,
- octave_cv_ieee754_data_format=no,
- octave_cv_ieee754_data_format=no)])
- if test "$cross_compiling" = yes; then
- AC_MSG_RESULT([$octave_cv_ieee754_data_format assumed for cross compilation])
- else
- AC_MSG_RESULT([$octave_cv_ieee754_data_format])
- fi
- if test "$octave_cv_ieee754_data_format" = yes; then
- AC_DEFINE(HAVE_IEEE754_DATA_FORMAT, 1, [Define if your system uses IEEE 754 data format.])
- else
- ## If the format is unknown, then you will probably not have a
- ## useful system, so we will abort here. Anyone wishing to
- ## experiment with building Octave on a system without IEEE
- ## floating point should be capable of removing this check and
- ## the one in the octave_ieee_init function in liboctave/lo-ieee.cc.
- AC_MSG_ERROR([IEEE 754 data format required for building Octave])
- fi
- ])
- dnl
- dnl Check for UMFPACK seperately split complex matrix and RHS. Note
- dnl that as umfpack.h can be in three different places, rather than
- dnl include it, just declare the functions needed.
- dnl
- dnl Assumes that the check for umfpack has already been performed.
- dnl
- AC_DEFUN([OCTAVE_UMFPACK_SEPERATE_SPLIT],
- [AC_MSG_CHECKING([for UMFPACK seperate complex matrix and rhs split])
- AC_CACHE_VAL(octave_cv_umfpack_seperate_split,
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include
- #if defined (HAVE_UFSPARSE_UMFPACK_h)
- #include
- #elif defined (HAVE_UMFPACK_UMFPACK_H)
- #include
- #elif defined (HAVE_UMFPACK_H)
- #include
- #endif
- int n = 5;
- int Ap[] = {0, 2, 5, 9, 10, 12};
- int Ai[] = {0, 1, 0, 2, 4, 1, 2, 3, 4, 2, 1, 4};
- double Ax[] = {2., 0., 3., 0., 3., 0., -1., 0., 4., 0., 4., 0.,
- -3., 0., 1., 0., 2., 0., 2., 0., 6., 0., 1., 0.};
- double br[] = {8., 45., -3., 3., 19.};
- double bi[] = {0., 0., 0., 0., 0.};
- int main (void)
- {
- double *null = (double *) NULL ;
- double *x = (double *)malloc (2 * n * sizeof(double));
- int i ;
- void *Symbolic, *Numeric ;
- (void) umfpack_zi_symbolic (n, n, Ap, Ai, Ax, null, &Symbolic, null, null) ;
- (void) umfpack_zi_numeric (Ap, Ai, Ax, null, Symbolic, &Numeric, null, null) ;
- umfpack_zi_free_symbolic (&Symbolic) ;
- (void) umfpack_zi_solve (0, Ap, Ai, Ax, null, x, null, br, bi,
- Numeric, null, null) ;
- umfpack_zi_free_numeric (&Numeric) ;
- for (i = 0; i < n; i++, x+=2)
- if (fabs(*x - i - 1.) > 1.e-13)
- return (1);
- return (0) ;
- }
- ]])],
- octave_cv_umfpack_seperate_split=yes,
- octave_cv_umfpack_seperate_split=no,
- octave_cv_umfpack_seperate_split=no)])
- if test "$cross_compiling" = yes; then
- AC_MSG_RESULT([$octave_cv_umfpack_seperate_split assumed for cross compilation])
- else
- AC_MSG_RESULT([$octave_cv_umfpack_seperate_split])
- fi
- if test "$octave_cv_umfpack_seperate_split" = yes; then
- AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1, [Define if the UMFPACK Complex solver allow matrix and RHS to be split independently])
- fi
- ])
- dnl
- dnl Check whether using HDF5 DLL under Windows. This is done by
- dnl testing for a data symbol in the HDF5 library, which would
- dnl requires the definition of _HDF5USEDL_ under MSVC compiler.
- dnl
- AC_DEFUN([OCTAVE_HDF5_DLL], [
- AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],octave_cv_hdf5_dll, [
- AC_TRY_LINK([#include ], [hid_t x = H5T_NATIVE_DOUBLE; return x],
- octave_cv_hdf5_dll=no, [
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_"
- save_LIBS="$LIBS"
- LIBS="$HDF5_LIBS $LIBS"
- AC_TRY_LINK([#include ], [hid_t x = H5T_NATIVE_DOUBLE; return x],
- octave_cv_hdf5_dll=yes,
- octave_cv_hdf5_dll=no)
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"])])
- if test "$octave_cv_hdf5_dll" = yes; then
- AC_DEFINE(_HDF5USEDLL_, 1, [Define if using HDF5 dll (Win32)])
- fi])
- dnl
- dnl Check whether HDF5 library has version 1.6 API functions.
- dnl
- AC_DEFUN([OCTAVE_HDF5_HAS_ENFORCED_16_API], [
- AC_CACHE_CHECK([whether HDF5 library has enforced version 1.6 API],
- octave_cv_hdf5_has_enforced_16_api, [
- AC_TRY_LINK([
- #include
- ], [
- H5Eset_auto (0, 0);], [
- octave_cv_hdf5_has_enforced_16_api=yes], [
- octave_cv_hdf5_has_enforced_16_api=no])])
- if test "$octave_cv_hdf5_has_enforced_16_api" != "yes"; then
- AC_DEFINE(HAVE_HDF5_18, 1, [Define if >=HDF5-1.8 is available.])
- fi
- ])
- dnl
- dnl Check for the QHull version.
- dnl
- AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION],
- [AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
- octave_cv_lib_qhull_version, [
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include
- ]], [[
- const char *tmp = qh_version;
- ]])], [octave_cv_lib_qhull_version=yes], [octave_cv_lib_qhull_version=no])])
- if test "$octave_cv_lib_qhull_version" = no; then
- AC_DEFINE(NEED_QHULL_VERSION, 1,
- [Define if the QHull library needs a qh_version variable defined.])
- fi
- ])
- dnl
- dnl Check whether QHull works (does not crash)
- dnl
- AC_DEFUN([OCTAVE_CHECK_QHULL_OK],
- [AC_CACHE_CHECK([whether the qhull library works],
- octave_cv_lib_qhull_ok, [
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include
- #ifdef NEED_QHULL_VERSION
- char *qh_version = "version";
- #endif
- ]], [[
- int dim = 2;
- int n = 4;
- coordT points[8] = { -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5 };
- boolT ismalloc = 0;
- return qh_new_qhull (dim, n, points, ismalloc, "qhull ", 0, stderr);
- ]])], [octave_cv_lib_qhull_ok=yes], [octave_cv_lib_qhull_ok=no])])
- if test "$octave_cv_lib_qhull_ok" = "yes"; then
- $1
- else
- $2
- fi
- ])
- dnl
- dnl Check for OpenGL. If found, define OPENGL_LIBS
- dnl
- dnl FIXME -- the following tests should probably check for the
- dnl libraries separately.
- dnl
- dnl FIXME -- should we allow a way to specify a directory for OpenGL
- dnl libraries and header files?
- dnl
- AC_DEFUN([OCTAVE_OPENGL], [
- OPENGL_LIBS=
-
- ### On MacOSX systems the OpenGL framework can be used
- OCTAVE_HAVE_FRAMEWORK(OpenGL, [
- #include
- #include ], [GLint par; glGetIntegerv (GL_VIEWPORT, &par);],
- [have_framework_opengl="yes"], [have_framework_opengl="no"])
-
- if test $have_framework_opengl = "yes"; then
- AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1, [Define if framework OPENGL is available.])
- OPENGL_LIBS="-Wl,-framework -Wl,OpenGL"
- AC_MSG_NOTICE([adding -Wl,-framework -Wl,OpenGL to OPENGL_LIBS])
- OCTAVE_GLUTESSCALLBACK_THREEDOTS
- else
- case $canonical_host_type in
- *-*-mingw32* | *-*-msdosmsvc)
- AC_CHECK_HEADERS(windows.h)
- ;;
- esac
- have_opengl_incs=no
- AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], [
- AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], [
- have_opengl_incs=yes; break], [], [
- #ifdef HAVE_WINDOWS_H
- #include
- #endif
- ])
- break
- ], [], [
- #ifdef HAVE_WINDOWS_H
- #include
- #endif
- ])
-
- if test "$have_opengl_incs" = "yes"; then
- case $canonical_host_type in
- *-*-mingw32* | *-*-msdosmsvc)
- save_LIBS="$LIBS"
- LIBS="$LIBS -lopengl32"
- AC_MSG_CHECKING([for glEnable in -lopengl32])
- AC_TRY_LINK([
- #if HAVE_WINDOWS_H
- #include
- #endif
- #if defined (HAVE_GL_GL_H)
- #include
- #elif defined (HAVE_OPENGL_GL_H)
- #include
- #endif
- ], [glEnable(GL_SMOOTH);], OPENGL_LIBS="-lopengl32 -lglu32")
- LIBS="$save_LIBS"
- if test "x$OPENGL_LIBS" != "x"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- ;;
- *)
- AC_CHECK_LIB(GL, glEnable, OPENGL_LIBS="-lGL -lGLU")
- ;;
- esac
- fi
- fi
- AC_SUBST(OPENGL_LIBS)
- ])
- dnl
- dnl See if function gluTessCallback is called with "(...)"
- dnl
- dnl OCTAVE_GLUTESSCALLBACK_THREEDOTS
- AC_DEFUN([OCTAVE_GLUTESSCALLBACK_THREEDOTS],
- [AC_CACHE_CHECK([whether gluTessCallback is called with "(...)"],
- octave_cv_glutesscallback_threedots,
- [AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #ifdef HAVE_GL_GLU_H
- #include
- #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL
- #include
- #endif]],
- [[GLvoid (*func)(...); gluTessCallback(0, 0, func);]])],
- octave_cv_glutesscallback_threedots="yes", octave_cv_glutesscallback_threedots="no")])
- AC_LANG_POP(C++)
- if test $octave_cv_glutesscallback_threedots = "yes"; then
- AC_DEFINE(HAVE_GLUTESSCALLBACK_THREEDOTS, 1,
- [Define if gluTessCallback is called with (...)])
- fi
- ])
- dnl
- dnl Check for support of OpenMP with a given compiler flag. If
- dnl found define HAVE_OPENMP and add the compile flag to CFLAGS
- dnl and CXXFLAGS.
- dnl
- AC_DEFUN([OCTAVE_CHECK_OPENMP],
- [AC_MSG_CHECKING([for support of OpenMP])
- XCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
- AC_CACHE_VAL(octave_cv_check_openmp,[
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include
- ]], [[
- int main(int argc, char* argv[])
- {
- _Pragma("omp parallel")
- printf("Hello, world.\n");
- return 0;
- }
- ]])],octave_cv_openmp=yes, octave_cv_openmmp=no, octave_cv_openmp=no)])
- AC_MSG_RESULT($octave_cv_openmp)
- if test "$octave_cv_openmp" = yes; then
- AC_DEFINE(HAVE_OPENMP,1,[Define if compiler supports OpenMP])
- CXXFLAGS="$CXXFLAGS $1"
- else
- CFLAGS="$XCFLAGS"
- fi
- ])
- dnl
- dnl Configure paths for FreeType2
- dnl Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
- dnl
- dnl Copyright 2001, 2003 by
- dnl David Turner, Robert Wilhelm, and Werner Lemberg.
- dnl
- dnl This file is part of the FreeType project, and may only be used, modified,
- dnl and distributed under the terms of the FreeType project license,
- dnl LICENSE.TXT. By continuing to use, modify, or distribute this file you
- dnl indicate that you have read the license and understand and accept it
- dnl fully.
- dnl
- dnl As a special exception to the FreeType project license, this file may be
- dnl distributed as part of a program that contains a configuration script
- dnl generated by Autoconf, under the same distribution terms as the rest of
- dnl that program.
- dnl
- dnl serial 2
- dnl
- dnl AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
- dnl MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
- dnl FreeType 2.0.4).
- dnl
- AC_DEFUN([AC_CHECK_FT2],
- [dnl Get the cflags and libraries from the freetype-config script
- dnl
- AC_ARG_WITH([ft-prefix],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--with-ft-prefix=PREFIX],
- [Prefix where FreeType is installed (optional)]),
- [ft_config_prefix="$withval"],
- [ft_config_prefix=""])
-
- AC_ARG_WITH([ft-exec-prefix],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
- [Exec prefix where FreeType is installed (optional)]),
- [ft_config_exec_prefix="$withval"],
- [ft_config_exec_prefix=""])
-
- AC_ARG_ENABLE([freetypetest],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--disable-freetypetest],
- [Do not try to compile and run a test FreeType program]),
- [],
- [enable_fttest=yes])
-
- if test x$ft_config_exec_prefix != x ; then
- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
- if test x${FT2_CONFIG+set} != xset ; then
- FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
- fi
- fi
-
- if test x$ft_config_prefix != x ; then
- ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
- if test x${FT2_CONFIG+set} != xset ; then
- FT2_CONFIG=$ft_config_prefix/bin/freetype-config
- fi
- fi
-
- AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
-
- min_ft_version=m4_if([$1], [], [7.0.1], [$1])
- AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
- no_ft=""
- if test "$FT2_CONFIG" = "no" ; then
- no_ft=yes
- else
- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- ft_min_major_version=`echo $min_ft_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- ft_min_minor_version=`echo $min_ft_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- ft_min_micro_version=`echo $min_ft_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test x$enable_fttest = xyes ; then
- ft_config_is_lt=""
- if test $ft_config_major_version -lt $ft_min_major_version ; then
- ft_config_is_lt=yes
- else
- if test $ft_config_major_version -eq $ft_min_major_version ; then
- if test $ft_config_minor_version -lt $ft_min_minor_version ; then
- ft_config_is_lt=yes
- else
- if test $ft_config_minor_version -eq $ft_min_minor_version ; then
- if test $ft_config_micro_version -lt $ft_min_micro_version ; then
- ft_config_is_lt=yes
- fi
- fi
- fi
- fi
- fi
- if test x$ft_config_is_lt = xyes ; then
- no_ft=yes
- else
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $FT2_CFLAGS"
- LIBS="$FT2_LIBS $LIBS"
-
- dnl
- dnl Sanity checks for the results of freetype-config to some extent.
- dnl
- AC_RUN_IFELSE([
- AC_LANG_SOURCE([[
-
- #include
- #include FT_FREETYPE_H
- #include
- #include
-
- int
- main()
- {
- FT_Library library;
- FT_Error error;
-
- error = FT_Init_FreeType(&library);
-
- if (error)
- return 1;
- else
- {
- FT_Done_FreeType(library);
- return 0;
- }
- }
-
- ]])
- ],
- [],
- [no_ft=yes],
- [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi dnl test $ft_config_version -lt $ft_min_version
- fi dnl test x$enable_fttest = xyes
- fi dnl test "$FT2_CONFIG" = "no"
-
- if test x$no_ft = x ; then
- AC_MSG_RESULT([yes])
- m4_if([$2], [], [:], [$2])
- else
- AC_MSG_RESULT([no])
- if test "$FT2_CONFIG" = "no" ; then
- AC_MSG_WARN([
-
- The freetype-config script installed by FreeType 2 could not be found.
- If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
- your path, or set the FT2_CONFIG environment variable to the
- full path to freetype-config.
- ])
- else
- if test x$ft_config_is_lt = xyes ; then
- AC_MSG_WARN([
-
- Your installed version of the FreeType 2 library is too old.
- If you have different versions of FreeType 2, make sure that
- correct values for --with-ft-prefix or --with-ft-exec-prefix
- are used, or set the FT2_CONFIG environment variable to the
- full path to freetype-config.
- ])
- else
- AC_MSG_WARN([
-
- The FreeType test program failed to run. If your system uses
- shared libraries and they are installed outside the normal
- system library path, make sure the variable LD_LIBRARY_PATH
- (or whatever is appropiate for your system) is correctly set.
- ])
- fi
- fi
-
- FT2_CFLAGS=""
- FT2_LIBS=""
- m4_if([$3], [], [:], [$3])
- fi
-
- AC_SUBST([FT2_CFLAGS])
- AC_SUBST([FT2_LIBS])])
- dnl end of freetype2.m4
-
- dnl Check whether a math mapper function is available in .
- dnl Will define HAVE_CMATH_FUNC if there is a double variant and
- dnl HAVE_CMATH_FUNCF if there is a float variant.
- dnl Currently capable of checking for functions with single
- dnl argument and returning bool/int/real.
- AC_DEFUN([OCTAVE_CMATH_FUNC],[
- AC_MSG_CHECKING([for std::$1 in ])
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include
- void take_func (bool (*func) (double x));
- void take_func (int (*func) (double x));
- void take_func (double (*func) (double x));
- ]],
- [[
- take_func(std::$1);
- ]])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_CMATH_[]AS_TR_CPP($1),1,[Define if provides $1])],
- [AC_MSG_RESULT([no])])
- AC_MSG_CHECKING([for std::$1 (float variant) in ])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include
- void take_func (bool (*func) (float x));
- void take_func (int (*func) (float x));
- void take_func (float (*func) (float x));
- ]],
- [[
- take_func(std::$1);
- ]])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_CMATH_[]AS_TR_CPP($1)F,1,[Define if provides float variant of $1])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP(C++)
- ])
-
- dnl Check whether fast signed integer arithmetics using bit tricks
- dnl can be used in oct-inttypes.h. Defines HAVE_FAST_INT_OPS if
- dnl the following conditions hold:
- dnl 1. Signed numbers are represented by twos complement
- dnl (see )
- dnl 2. static_cast to unsigned int counterpart works like interpreting
- dnl the signed bit pattern as unsigned (and is thus zero-cost).
- dnl 3. Signed addition and subtraction yield the same bit results as unsigned.
- dnl (We use casts to prevent optimization interference, so there is no
- dnl need for things like -ftrapv).
- dnl 4. Bit operations on signed integers work like on unsigned integers,
- dnl except for the shifts. Shifts are arithmetic.
- dnl
- AC_DEFUN([OCTAVE_FAST_INT_OPS],[
- AC_MSG_CHECKING([whether fast integer arithmetics is usable])
- AC_LANG_PUSH(C++)
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include
- template
- static bool
- do_test (UT, ST)
- {
- volatile ST s = std::numeric_limits::min () / 3;
- volatile UT u = static_cast (s);
- if (*(reinterpret_cast (&u)) != s) return true;
-
- u = 0; u = ~u;
- if (*(reinterpret_cast (&u)) != -1) return true;
-
- ST sx, sy;
- sx = std::numeric_limits::max () / 2 + 1;
- sy = std::numeric_limits::max () / 2 + 2;
- if (static_cast (static_cast (sx) + static_cast (sy))
- != std::numeric_limits::min () + 1) return true;
- if (static_cast (static_cast (sx) - static_cast (sy))
- != -1) return true;
-
- if ((sx & sy) != (static_cast (sx) & static_cast (sy)))
- return true;
- if ((sx | sy) != (static_cast (sx) | static_cast (sy)))
- return true;
- if ((sx ^ sy) != (static_cast (sx) ^ static_cast (sy)))
- return true;
- if ((-1 >> 1) != -1) return true;
- return false;
- }
-
- #define DO_TEST(T) \
- if (do_test (static_cast (0), static_cast (0))) \
- return sizeof (T);
- ]],[[
- DO_TEST(char)
- DO_TEST(short)
- DO_TEST(int)
- DO_TEST(long)
- #if (defined(HAVE_LONG_LONG_INT) && defined(HAVE_UNSIGNED_LONG_LONG_INT))
- DO_TEST(long long)
- #endif
- ]])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_FAST_INT_OPS,1,[Define if signed integers use two's complement])],
- [AC_MSG_RESULT([no])])
- AC_LANG_POP(C++)])
- dnl
- dnl Check to see if the compiler and the linker can handle the flags
- dnl "-framework $1" for the given prologue $2 and the given body $3 of
- dnl a source file. Arguments 2 and 3 optionally can also be empty.
- dnl Add options (lower case letters $1) "--with-framework-$1" and
- dnl "--without-framework-$1". If this test is successful then perform
- dnl $4, otherwise do $5.
- dnl
- dnl OCTAVE_HAVE_FRAMEWORK
- AC_DEFUN([OCTAVE_HAVE_FRAMEWORK], [
- AC_MSG_CHECKING([whether ${LD-ld} accepts -framework $1])
- AC_CACHE_VAL(octave_cv_framework_$1, [
- XLDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -framework $1"
- AC_LANG_PUSH(C++)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([$2], [$3])],
- eval "octave_cv_framework_$1=yes",
- eval "octave_cv_framework_$1=no")
- AC_LANG_POP(C++)
- LDFLAGS="$XLDFLAGS"
- ])
- if test "$octave_cv_framework_$1" = "yes"; then
- AC_MSG_RESULT(yes)
- AC_ARG_WITH(framework-m4_tolower($1),
- [AS_HELP_STRING([--without-framework-m4_tolower($1)],
- [don't use framework $1])],
- with_have_framework=$withval, with_have_framework="yes")
- if test "$with_have_framework" = "yes"; then
- [$4]
- else
- AC_MSG_NOTICE([framework rejected by --without-framework-m4_tolower($1)])
- [$5]
- fi
- else
- AC_MSG_RESULT(no)
- [$5]
- fi
- ])
-
- ##############################################################################
- ##############################################################################
-
- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
- #
- # Copyright © 2004 Scott James Remnant .
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
- # WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
- # PKG_PROG_PKG_CONFIG([MIN-VERSION])
- # ----------------------------------
- AC_DEFUN([PKG_PROG_PKG_CONFIG],
- [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
- m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
- AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-
- fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
-
- # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
- #
- # Check to see whether a particular set of modules exists. Similar
- # to PKG_CHECK_MODULES(), but does not set variables or print errors.
- #
- #
- # Similar to PKG_CHECK_MODULES, make sure that the first instance of
- # this or PKG_CHECK_MODULES is called, or make sure to call
- # PKG_CHECK_EXISTS manually
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_EXISTS],
- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
- if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
- m4_ifvaln([$3], [else
- $3])dnl
- fi])
-
-
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
- [if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
- else
- pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
- # _PKG_SHORT_ERRORS_SUPPORTED
- # -----------------------------
- AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
- else
- _pkg_short_errors_supported=no
- fi[]dnl
- ])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
- # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
- # [ACTION-IF-NOT-FOUND])
- #
- #
- # Note that if there is a possibility the first call to
- # PKG_CHECK_MODULES might not happen, you should be sure to include an
- # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
- #
- #
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_MODULES],
- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
- AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
- AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
- pkg_failed=no
- AC_MSG_CHECKING([for $1])
-
- _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
- _PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
- m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
- and $1[]_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.])
-
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- ifelse([$4], , [AC_MSG_ERROR(dnl
- [Package requirements ($2) were not met:
-
- $$1_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
- _PKG_TEXT
- ])],
- [AC_MSG_RESULT([no])
- $4])
- elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
- [The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
- _PKG_TEXT
-
- To get pkg-config, see .])],
- [$4])
- else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
- dnl
- dnl External macros.
- dnl
-
- m4_include([m4/ax_pthread.m4])
- m4_include([m4/ax_blas.m4])
- m4_include([m4/ax_blas_f77_func.m4])
- m4_include([m4/ax_lapack.m4])
--- 0 ----
diff -cNr octave-3.4.0/aclocal.m4 octave-3.4.1/aclocal.m4
*** octave-3.4.0/aclocal.m4 2011-02-08 05:03:29.000000000 -0500
--- octave-3.4.1/aclocal.m4 2011-06-15 11:31:20.000000000 -0400
***************
*** 13,20 ****
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
! [m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
--- 13,20 ----
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
! [m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
***************
*** 1417,1424 ****
]) # _AM_PROG_TAR
m4_include([m4/00gnulib.m4])
m4_include([m4/alloca.m4])
- m4_include([m4/asm-underscore.m4])
m4_include([m4/canonicalize.m4])
m4_include([m4/ceil.m4])
m4_include([m4/ceilf.m4])
--- 1417,1424 ----
]) # _AM_PROG_TAR
m4_include([m4/00gnulib.m4])
+ m4_include([m4/acinclude.m4])
m4_include([m4/alloca.m4])
m4_include([m4/canonicalize.m4])
m4_include([m4/ceil.m4])
m4_include([m4/ceilf.m4])
***************
*** 1434,1440 ****
m4_include([m4/dirent_h.m4])
m4_include([m4/dirfd.m4])
m4_include([m4/dirname.m4])
- m4_include([m4/dos.m4])
m4_include([m4/double-slash-root.m4])
m4_include([m4/dup2.m4])
m4_include([m4/eealloc.m4])
--- 1434,1439 ----
***************
*** 1447,1457 ****
--- 1446,1464 ----
m4_include([m4/fcntl.m4])
m4_include([m4/fcntl_h.m4])
m4_include([m4/fdopendir.m4])
+ m4_include([m4/fflush.m4])
m4_include([m4/filemode.m4])
+ m4_include([m4/filenamecat.m4])
m4_include([m4/float_h.m4])
m4_include([m4/floor.m4])
m4_include([m4/floorf.m4])
m4_include([m4/fnmatch.m4])
+ m4_include([m4/fpurge.m4])
+ m4_include([m4/freading.m4])
+ m4_include([m4/fseek.m4])
+ m4_include([m4/fseeko.m4])
+ m4_include([m4/ftell.m4])
+ m4_include([m4/ftello.m4])
m4_include([m4/getcwd-abort-bug.m4])
m4_include([m4/getcwd-path-max.m4])
m4_include([m4/getcwd.m4])
***************
*** 1475,1480 ****
--- 1482,1488 ----
m4_include([m4/locale-ja.m4])
m4_include([m4/locale-zh.m4])
m4_include([m4/longlong.m4])
+ m4_include([m4/lseek.m4])
m4_include([m4/lstat.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
***************
*** 1500,1505 ****
--- 1508,1515 ----
m4_include([m4/mode_t.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nanosleep.m4])
+ m4_include([m4/nocrash.m4])
+ m4_include([m4/nproc.m4])
m4_include([m4/open.m4])
m4_include([m4/openat.m4])
m4_include([m4/pathmax.m4])
***************
*** 1528,1539 ****
m4_include([m4/stdint_h.m4])
m4_include([m4/stdio_h.m4])
m4_include([m4/stdlib_h.m4])
- m4_include([m4/strcase.m4])
m4_include([m4/strdup.m4])
m4_include([m4/strerror.m4])
m4_include([m4/strftime.m4])
m4_include([m4/string_h.m4])
- m4_include([m4/strings_h.m4])
m4_include([m4/strptime.m4])
m4_include([m4/symlink.m4])
m4_include([m4/sys_select_h.m4])
--- 1538,1547 ----
***************
*** 1541,1546 ****
--- 1549,1555 ----
m4_include([m4/sys_stat_h.m4])
m4_include([m4/sys_time_h.m4])
m4_include([m4/sys_times_h.m4])
+ m4_include([m4/sys_uio_h.m4])
m4_include([m4/tempname.m4])
m4_include([m4/time_h.m4])
m4_include([m4/time_r.m4])
***************
*** 1559,1562 ****
m4_include([m4/wctype_h.m4])
m4_include([m4/wint_t.m4])
m4_include([m4/xsize.m4])
- m4_include([acinclude.m4])
--- 1568,1570 ----
diff -cNr octave-3.4.0/AUTHORS octave-3.4.1/AUTHORS
*** octave-3.4.0/AUTHORS 2011-02-08 05:13:03.000000000 -0500
--- octave-3.4.1/AUTHORS 2011-06-15 11:41:22.000000000 -0400
***************
*** 40,89 ****
Fotios Kasolis Thomas Kasper Joel Keay
Mumit Khan Paul Kienzle Aaron A. King
Arno J. Klaassen Geoffrey Knauth Heine Kolltveit
! Ken Kouno Kacper Kowalik Oyvind Kristiansen
! Piotr Krzyzanowski Volker Kuhlmann Tetsuro Kurita
! Miroslaw Kwasniak Rafael Laboissiere Kai Labusch
! Claude Lacoursiere Walter Landry Bill Lash
! Dirk Laurie Maurice LeBrun Friedrich Leisch
! Timo Lindfors Benjamin Lindner Ross Lippert
! David Livings Erik de Castro Lopo Massimo Lorenzin
! Emil Lucretiu Hoxide Ma James Macnicol
! Jens-Uwe Mager Ricardo Marranita Orestes Mas
! Makoto Matsumoto Tatsuro Matsuoka Laurent Mazet
! G. D. McBain Alexander Mamonov Christoph Mayer
! Thorsten Meyer Petr Mikulik Stefan Monnier
! Antoine Moreau Kai P. Mueller Victor Munoz
! Carmen Navarrete Todd Neal Al Niessner
! Rick Niles Takuji Nishimura Kai Noda
! Eric Norum Krzesimir Nowak Michael O'Brien
! Peter O'Gorman Thorsten Ohl Arno Onken
! Luis F. Ortiz Scott Pakin Gabriele Pannocchia
! Sylvain Pelissier Per Persson Primozz Peterlin
! Jim Peterson Danilo Piazzalunga Nicholas Piper
! Robert Platt Hans Ekkehard Plesser Tom Poage
! Orion Poplawski Ondrej Popp Jef Poskanzer
! Francesco Potorti Konstantinos Poulios James B. Rawlings
! Eric S. Raymond Balint Reczey Michael Reifenberger
! Jason Riedy Petter Risholm Matthew W. Roberts
! Andrew Ross Mark van Rossum Kevin Ruland
! Kristian Rumberg Ryan Rusaw Olli Saarela
! Toni Saarela Juhani Saastamoinen Radek Salac
! Ben Sapp Aleksej Saushev Alois Schloegl
! Michel D. Schmid Julian Schnidder Nicol N. Schraudolph
! Sebastian Schubert Ludwig Schwardt Thomas L. Scofield
! Daniel J. Sebald Dmitri A. Sergatskov Baylis Shanks
! Joseph P. Skudlarek John Smith Julius Smith
! Shan G. Smith Joerg Specht Quentin H. Spencer
! Christoph Spiel Richard Stallman Russell Standish
! Doug Stewart Jonathan Stickel Judd Storrs
! Thomas Stuart Ivan Sutoris John Swensen
! Daisuke Takago Ariel Tankus Georg Thimm
! Duncan Temple Lang Kris Thielemans Olaf Till
! Christophe Tournery Thomas Treichl Frederick Umminger
! Utkarsh Upadhyay Stefan van der Walt Peter Van Wieren
! James R. Van Zandt Gregory Vanuxem Ivana Varekova
! Thomas Walter Olaf Weber Thomas Weber
! Rik Wehbring Bob Weigel Andreas Weingessel
! Michael Weitzel Fook Fah Yap Michael Zeising
! Federico Zenith Alex Zvoleff
--- 40,89 ----
Fotios Kasolis Thomas Kasper Joel Keay
Mumit Khan Paul Kienzle Aaron A. King
Arno J. Klaassen Geoffrey Knauth Heine Kolltveit
! Ken Kouno Kacper Kowalik Daniel Kraft
! Oyvind Kristiansen Piotr Krzyzanowski Volker Kuhlmann
! Tetsuro Kurita Miroslaw Kwasniak Rafael Laboissiere
! Kai Labusch Claude Lacoursiere Walter Landry
! Bill Lash Dirk Laurie Maurice LeBrun
! Friedrich Leisch Timo Lindfors Benjamin Lindner
! Ross Lippert David Livings Erik de Castro Lopo
! Massimo Lorenzin Emil Lucretiu Hoxide Ma
! James Macnicol Jens-Uwe Mager Ricardo Marranita
! Orestes Mas Makoto Matsumoto Tatsuro Matsuoka
! Laurent Mazet G. D. McBain Alexander Mamonov
! Christoph Mayer Thorsten Meyer Petr Mikulik
! Stefan Monnier Antoine Moreau Kai P. Mueller
! Victor Munoz Carmen Navarrete Todd Neal
! Al Niessner Rick Niles Takuji Nishimura
! Kai Noda Eric Norum Krzesimir Nowak
! Michael O'Brien Peter O'Gorman Thorsten Ohl
! Arno Onken Luis F. Ortiz Scott Pakin
! Gabriele Pannocchia Sylvain Pelissier Per Persson
! Primozz Peterlin Jim Peterson Danilo Piazzalunga
! Nicholas Piper Robert Platt Hans Ekkehard Plesser
! Tom Poage Orion Poplawski Ondrej Popp
! Jef Poskanzer Francesco Potorti Konstantinos Poulios
! James B. Rawlings Eric S. Raymond Balint Reczey
! Michael Reifenberger Jason Riedy Petter Risholm
! Matthew W. Roberts Andrew Ross Mark van Rossum
! Kevin Ruland Kristian Rumberg Ryan Rusaw
! Olli Saarela Toni Saarela Juhani Saastamoinen
! Radek Salac Ben Sapp Aleksej Saushev
! Alois Schloegl Michel D. Schmid Julian Schnidder
! Nicol N. Schraudolph Sebastian Schubert Ludwig Schwardt
! Thomas L. Scofield Daniel J. Sebald Dmitri A. Sergatskov
! Baylis Shanks Joseph P. Skudlarek John Smith
! Julius Smith Shan G. Smith Joerg Specht
! Quentin H. Spencer Christoph Spiel Richard Stallman
! Russell Standish Doug Stewart Jonathan Stickel
! Judd Storrs Thomas Stuart Ivan Sutoris
! John Swensen Daisuke Takago Ariel Tankus
! Georg Thimm Duncan Temple Lang Kris Thielemans
! Olaf Till Christophe Tournery Thomas Treichl
! Frederick Umminger Utkarsh Upadhyay Stefan van der Walt
! Peter Van Wieren James R. Van Zandt Gregory Vanuxem
! Ivana Varekova Thomas Walter Olaf Weber
! Thomas Weber Rik Wehbring Bob Weigel
! Andreas Weingessel Michael Weitzel Fook Fah Yap
! Michael Zeising Federico Zenith Alex Zvoleff
diff -cNr octave-3.4.0/autogen.sh octave-3.4.1/autogen.sh
*** octave-3.4.0/autogen.sh 2011-02-08 05:00:51.000000000 -0500
--- octave-3.4.1/autogen.sh 2011-06-15 11:11:27.000000000 -0400
***************
*** 15,21 ****
## building the rest of Octave, and INSTALL, which is linked from
## gnulib/doc/INSTALL by the bootstrap script.
! for f in NEWS README ChangeLog COPYING; do
if ! test -f $f; then
echo "required file $f is missing" 2>&1
exit 1
--- 15,21 ----
## building the rest of Octave, and INSTALL, which is linked from
## gnulib/doc/INSTALL by the bootstrap script.
! for f in NEWS README COPYING; do
if ! test -f $f; then
echo "required file $f is missing" 2>&1
exit 1
***************
*** 36,39 ****
echo "bootstrapping..."
! ./bootstrap "$@"
--- 36,39 ----
echo "bootstrapping..."
! build-aux/bootstrap "$@"
diff -cNr octave-3.4.0/bootstrap octave-3.4.1/bootstrap
*** octave-3.4.0/bootstrap 2011-02-08 05:00:51.000000000 -0500
--- octave-3.4.1/bootstrap 1969-12-31 19:00:00.000000000 -0500
***************
*** 1,946 ****
- #! /bin/sh
- # Print a version string.
- scriptversion=2011-01-21.16; # UTC
-
- # Bootstrap this package from checked-out sources.
-
- # Copyright (C) 2003-2011 Free Software Foundation, Inc.
-
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
-
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see .
-
- # Originally written by Paul Eggert. The canonical version of this
- # script is maintained as build-aux/bootstrap in gnulib, however, to
- # be useful to your project, you should place a copy of it under
- # version control in the top-level directory of your project. The
- # intent is that all customization can be done with a bootstrap.conf
- # file also maintained in your version control; gnulib comes with a
- # template build-aux/bootstrap.conf to get you started.
-
- # Please report bugs or propose patches to bug-gnulib@gnu.org.
-
- nl='
- '
-
- # Ensure file names are sorted consistently across platforms.
- LC_ALL=C
- export LC_ALL
-
- local_gl_dir=gl
-
- # Temporary directory names.
- bt='._bootmp'
- bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
- bt2=${bt}2
- me=$0
-
- usage() {
- cat </dev/null 2>&1; then
- find_tool_res=$i
- break
- fi
- done
- else
- find_tool_error_prefix="\$$find_tool_envvar: "
- fi
- if test x"$find_tool_res" = x; then
- echo >&2 "$me: one of these is required: $find_tool_names"
- exit 1
- fi
- ($find_tool_res --version /dev/null 2>&1 || {
- echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
- exit 1
- }
- eval "$find_tool_envvar=\$find_tool_res"
- eval "export $find_tool_envvar"
- }
-
- # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
- find_tool SHA1SUM sha1sum gsha1sum shasum
-
- # Override the default configuration, if necessary.
- # Make sure that bootstrap.conf is sourced from the current directory
- # if we were invoked as "sh bootstrap".
- case "$0" in
- */*) test -r "$0.conf" && . "$0.conf" ;;
- *) test -r "$0.conf" && . ./"$0.conf" ;;
- esac
-
-
- if test "$vc_ignore" = auto; then
- vc_ignore=
- test -d .git && vc_ignore=.gitignore
- test -d CVS && vc_ignore="$vc_ignore .cvsignore"
- fi
-
- # Translate configuration into internal form.
-
- # Parse options.
-
- for option
- do
- case $option in
- --help)
- usage
- exit;;
- --gnulib-srcdir=*)
- GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
- --skip-po)
- SKIP_PO=t;;
- --force)
- checkout_only_file=;;
- --copy)
- copy=true;;
- --bootstrap-sync)
- bootstrap_sync=true;;
- --no-bootstrap-sync)
- bootstrap_sync=false;;
- --no-git)
- use_git=false;;
- *)
- echo >&2 "$0: $option: unknown option"
- exit 1;;
- esac
- done
-
- if $use_git || test -d "$GNULIB_SRCDIR"; then
- :
- else
- echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
- exit 1
- fi
-
- if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
- echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
- exit 1
- fi
-
- # If $STR is not already on a line by itself in $FILE, insert it,
- # sorting the new contents of the file and replacing $FILE with the result.
- insert_sorted_if_absent() {
- file=$1
- str=$2
- test -f $file || touch $file
- echo "$str" | sort -u - $file | cmp - $file > /dev/null \
- || echo "$str" | sort -u - $file -o $file \
- || exit 1
- }
-
- # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
- # insert_sorted_if_absent.
- insert_vc_ignore() {
- vc_ignore_file="$1"
- pattern="$2"
- case $vc_ignore_file in
- *.gitignore)
- # A .gitignore entry that does not start with `/' applies
- # recursively to subdirectories, so prepend `/' to every
- # .gitignore entry.
- pattern=`echo "$pattern" | sed s,^,/,`;;
- esac
- insert_sorted_if_absent "$vc_ignore_file" "$pattern"
- }
-
- # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
- found_aux_dir=no
- grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
- >/dev/null && found_aux_dir=yes
- grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
- >/dev/null && found_aux_dir=yes
- if test $found_aux_dir = no; then
- echo "$0: expected line not found in configure.ac. Add the following:" >&2
- echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
- exit 1
- fi
-
- # If $build_aux doesn't exist, create it now, otherwise some bits
- # below will malfunction. If creating it, also mark it as ignored.
- if test ! -d $build_aux; then
- mkdir $build_aux
- for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- insert_vc_ignore $dot_ig $build_aux
- done
- fi
-
- # Note this deviates from the version comparison in automake
- # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
- # but this should suffice as we won't be specifying old
- # version formats or redundant trailing .0 in bootstrap.conf.
- # If we did want full compatibility then we should probably
- # use m4_version_compare from autoconf.
- sort_ver() { # sort -V is not generally available
- ver1="$1"
- ver2="$2"
-
- # split on '.' and compare each component
- i=1
- while : ; do
- p1=$(echo "$ver1" | cut -d. -f$i)
- p2=$(echo "$ver2" | cut -d. -f$i)
- if [ ! "$p1" ]; then
- echo "$1 $2"
- break
- elif [ ! "$p2" ]; then
- echo "$2 $1"
- break
- elif [ ! "$p1" = "$p2" ]; then
- if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
- echo "$2 $1"
- elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
- echo "$1 $2"
- else # numeric, then lexicographic comparison
- lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
- if [ "$lp" = "$p2" ]; then
- echo "$1 $2"
- else
- echo "$2 $1"
- fi
- fi
- break
- fi
- i=$(($i+1))
- done
- }
-
- get_version() {
- app=$1
-
- $app --version >/dev/null 2>&1 || return 1
-
- $app --version 2>&1 |
- sed -n '# Move version to start of line.
- s/.*[v ]\([0-9]\)/\1/
-
- # Skip lines that do not start with version.
- /^[0-9]/!d
-
- # Remove characters after the version.
- s/[^.a-z0-9-].*//
-
- # The first component must be digits only.
- s/^\([0-9]*\)[a-z-].*/\1/
-
- #the following essentially does s/5.005/5.5/
- s/\.0*\([1-9]\)/.\1/g
- p
- q'
- }
-
- check_versions() {
- ret=0
-
- while read app req_ver; do
- # We only need libtoolize from the libtool package.
- if test "$app" = libtool; then
- app=libtoolize
- fi
- # Exempt git if --no-git is in effect.
- if test "$app" = git; then
- $use_git || continue
- fi
- # Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
- test "$appvar" = TAR && appvar=AMTAR
- eval "app=\${$appvar-$app}"
- inst_ver=$(get_version $app)
- if [ ! "$inst_ver" ]; then
- echo "$me: Error: '$app' not found" >&2
- ret=1
- elif [ ! "$req_ver" = "-" ]; then
- latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
- if [ ! "$latest_ver" = "$inst_ver" ]; then
- echo "$me: Error: '$app' version == $inst_ver is too old" >&2
- echo " '$app' version >= $req_ver is required" >&2
- ret=1
- fi
- fi
- done
-
- return $ret
- }
-
- print_versions() {
- echo "Program Min_version"
- echo "----------------------"
- printf %s "$buildreq"
- echo "----------------------"
- # can't depend on column -t
- }
-
- use_libtool=0
- # We'd like to use grep -E, to see if any of LT_INIT,
- # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
- # but that's not portable enough (e.g., for Solaris).
- grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
- && use_libtool=1
- grep '^[ ]*LT_INIT' configure.ac >/dev/null \
- && use_libtool=1
- if test $use_libtool = 1; then
- find_tool LIBTOOLIZE glibtoolize libtoolize
- fi
-
- if ! printf "$buildreq" | check_versions; then
- echo >&2
- if test -f README-prereq; then
- echo "$0: See README-prereq for how to get the prerequisite programs" >&2
- else
- echo "$0: Please install the prerequisite programs" >&2
- fi
- exit 1
- fi
-
- echo "$0: Bootstrapping from checked-out $package sources..."
-
- # See if we can use gnulib's git-merge-changelog merge driver.
- if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
- if git config merge.merge-changelog.driver >/dev/null ; then
- :
- elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
- echo "$0: initializing git-merge-changelog driver"
- git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
- git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
- else
- echo "$0: consider installing git-merge-changelog from gnulib"
- fi
- fi
-
-
- cleanup_gnulib() {
- status=$?
- rm -fr "$gnulib_path"
- exit $status
- }
-
- git_modules_config () {
- test -f .gitmodules && git config --file .gitmodules "$@"
- }
-
- gnulib_path=`git_modules_config submodule.gnulib.path`
- test -z "$gnulib_path" && gnulib_path=gnulib
-
- # Get gnulib files.
-
- case ${GNULIB_SRCDIR--} in
- -)
- if git_modules_config submodule.gnulib.url >/dev/null; then
- echo "$0: getting gnulib files..."
- git submodule init || exit $?
- git submodule update || exit $?
-
- elif [ ! -d "$gnulib_path" ]; then
- echo "$0: getting gnulib files..."
-
- trap cleanup_gnulib 1 2 13 15
-
- shallow=
- git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
- git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
- cleanup_gnulib
-
- trap - 1 2 13 15
- fi
- GNULIB_SRCDIR=$gnulib_path
- ;;
- *)
- # Use GNULIB_SRCDIR as a reference.
- if test -d "$GNULIB_SRCDIR"/.git && \
- git_modules_config submodule.gnulib.url >/dev/null; then
- echo "$0: getting gnulib files..."
- if git submodule -h|grep -- --reference > /dev/null; then
- # Prefer the one-liner available in git 1.6.4 or newer.
- git submodule update --init --reference "$GNULIB_SRCDIR" \
- "$gnulib_path" || exit $?
- else
- # This fallback allows at least git 1.5.5.
- if test -f "$gnulib_path"/gnulib-tool; then
- # Since file already exists, assume submodule init already complete.
- git submodule update || exit $?
- else
- # Older git can't clone into an empty directory.
- rmdir "$gnulib_path" 2>/dev/null
- git clone --reference "$GNULIB_SRCDIR" \
- "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
- && git submodule init && git submodule update \
- || exit $?
- fi
- fi
- GNULIB_SRCDIR=$gnulib_path
- fi
- ;;
- esac
-
- if $bootstrap_sync; then
- cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
- echo "$0: updating bootstrap and restarting..."
- exec sh -c \
- 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
- -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
- "$0" "$@" --no-bootstrap-sync
- }
- fi
-
- gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
- <$gnulib_tool || exit
-
- # Get translations.
-
- download_po_files() {
- subdir=$1
- domain=$2
- echo "$me: getting translations into $subdir for $domain..."
- cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
- eval "$cmd"
- }
-
- # Mirror .po files to $po_dir/.reference and copy only the new
- # or modified ones into $po_dir. Also update $po_dir/LINGUAS.
- # Note po files that exist locally only are left in $po_dir but will
- # not be included in LINGUAS and hence will not be distributed.
- update_po_files() {
- # Directory containing primary .po files.
- # Overwrite them only when we're sure a .po file is new.
- po_dir=$1
- domain=$2
-
- # Mirror *.po files into this dir.
- # Usually contains *.s1 checksum files.
- ref_po_dir="$po_dir/.reference"
-
- test -d $ref_po_dir || mkdir $ref_po_dir || return
- download_po_files $ref_po_dir $domain \
- && ls "$ref_po_dir"/*.po 2>/dev/null |
- sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
-
- langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
- test "$langs" = '*' && langs=x
- for po in $langs; do
- case $po in x) continue;; esac
- new_po="$ref_po_dir/$po.po"
- cksum_file="$ref_po_dir/$po.s1"
- if ! test -f "$cksum_file" ||
- ! test -f "$po_dir/$po.po" ||
- ! $SHA1SUM -c --status "$cksum_file" \
- < "$new_po" > /dev/null; then
- echo "$me: updated $po_dir/$po.po..."
- cp "$new_po" "$po_dir/$po.po" \
- && $SHA1SUM < "$new_po" > "$cksum_file"
- fi
- done
- }
-
- case $SKIP_PO in
- '')
- if test -d po; then
- update_po_files po $package || exit
- fi
-
- if test -d runtime-po; then
- update_po_files runtime-po $package-runtime || exit
- fi;;
- esac
-
- symlink_to_dir()
- {
- src=$1/$2
- dst=${3-$2}
-
- test -f "$src" && {
-
- # If the destination directory doesn't exist, create it.
- # This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$dst"`
- if ! test -d "$dst_dir"; then
- mkdir -p "$dst_dir"
-
- # If we've just created a directory like lib/uniwidth,
- # tell version control system(s) it's ignorable.
- # FIXME: for now, this does only one level
- parent=`dirname "$dst_dir"`
- for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$parent/$dot_ig
- insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
- done
- fi
-
- if $copy; then
- {
- test ! -h "$dst" || {
- echo "$me: rm -f $dst" &&
- rm -f "$dst"
- }
- } &&
- test -f "$dst" &&
- cmp -s "$src" "$dst" || {
- echo "$me: cp -fp $src $dst" &&
- cp -fp "$src" "$dst"
- }
- else
- test -h "$dst" &&
- src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
- dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
- test "$src_i" = "$dst_i" || {
- dot_dots=
- case $src in
- /*) ;;
- *)
- case /$dst/ in
- *//* | */../* | */./* | /*/*/*/*/*/)
- echo >&2 "$me: invalid symlink calculation: $src -> $dst"
- exit 1;;
- /*/*/*/*/) dot_dots=../../../;;
- /*/*/*/) dot_dots=../../;;
- /*/*/) dot_dots=../;;
- esac;;
- esac
-
- echo "$me: ln -fs $dot_dots$src $dst" &&
- ln -fs "$dot_dots$src" "$dst"
- }
- fi
- }
- }
-
- cp_mark_as_generated()
- {
- cp_src=$1
- cp_dst=$2
-
- if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
- symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
- elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
- symlink_to_dir $local_gl_dir "$cp_dst"
- else
- case $cp_dst in
- *.[ch]) c1='/* '; c2=' */';;
- *.texi) c1='@c '; c2= ;;
- *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
- *) c1= ; c2= ;;
- esac
-
- # If the destination directory doesn't exist, create it.
- # This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$cp_dst"`
- test -d "$dst_dir" || mkdir -p "$dst_dir"
-
- if test -z "$c1"; then
- cmp -s "$cp_src" "$cp_dst" || {
- # Copy the file first to get proper permissions if it
- # doesn't already exist. Then overwrite the copy.
- echo "$me: cp -f $cp_src $cp_dst" &&
- rm -f "$cp_dst" &&
- cp "$cp_src" "$cp_dst-t" &&
- sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
- mv -f "$cp_dst-t" "$cp_dst"
- }
- else
- # Copy the file first to get proper permissions if it
- # doesn't already exist. Then overwrite the copy.
- cp "$cp_src" "$cp_dst-t" &&
- (
- echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
- echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
- sed "s!$bt_regex/!!g" "$cp_src"
- ) > $cp_dst-t &&
- if cmp -s "$cp_dst-t" "$cp_dst"; then
- rm -f "$cp_dst-t"
- else
- echo "$me: cp $cp_src $cp_dst # with edits" &&
- mv -f "$cp_dst-t" "$cp_dst"
- fi
- fi
- fi
- }
-
- version_controlled_file() {
- dir=$1
- file=$2
- found=no
- if test -d CVS; then
- grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
- grep '^/[^/]*/[0-9]' > /dev/null && found=yes
- elif test -d .git; then
- git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
- elif test -d .svn; then
- svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
- else
- echo "$me: no version control for $dir/$file?" >&2
- fi
- test $found = yes
- }
-
- slurp() {
- for dir in . `(cd $1 && find * -type d -print)`; do
- copied=
- sep=
- for file in `ls -a $1/$dir`; do
- case $file in
- .|..) continue;;
- # FIXME: should all file names starting with "." be ignored?
- .*) continue;;
- esac
- test -d $1/$dir/$file && continue
- for excluded_file in $excluded_files; do
- test "$dir/$file" = "$excluded_file" && continue 2
- done
- if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
- copied=$copied${sep}$gnulib_mk; sep=$nl
- remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
- sed "$remove_intl" $1/$dir/$file |
- cmp - $dir/$gnulib_mk > /dev/null || {
- echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
- rm -f $dir/$gnulib_mk &&
- sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
- gnulib_mk_hook $dir/$gnulib_mk
- }
- elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
- version_controlled_file $dir $file; then
- echo "$me: $dir/$file overrides $1/$dir/$file"
- else
- copied=$copied$sep$file; sep=$nl
- if test $file = gettext.m4; then
- echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
- rm -f $dir/$file
- sed '
- /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
- AC_DEFUN([AM_INTL_SUBDIR], [])
- /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
- AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
- $a\
- AC_DEFUN([gl_LOCK_EARLY], [])
- ' $1/$dir/$file >$dir/$file
- else
- cp_mark_as_generated $1/$dir/$file $dir/$file
- fi
- fi || exit
- done
-
- for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$dir/$dot_ig
- if test -n "$copied"; then
- insert_vc_ignore $ig "$copied"
- # If an ignored file name ends with .in.h, then also add
- # the name with just ".h". Many gnulib headers are generated,
- # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
- # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
- f=`echo "$copied" |
- sed '
- s/\.in\.h$/.h/
- s/\.sin$/.sed/
- s/\.y$/.c/
- s/\.gperf$/.h/
- '
- `
- insert_vc_ignore $ig "$f"
-
- # For files like sys_stat.in.h and sys_time.in.h, record as
- # ignorable the directory we might eventually create: sys/.
- f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
- insert_vc_ignore $ig "$f"
- fi
- done
- done
- }
-
-
- # Create boot temporary directories to import from gnulib and gettext.
- rm -fr $bt $bt2 &&
- mkdir $bt $bt2 || exit
-
- # Import from gnulib.
-
- gnulib_tool_options="\
- --import\
- --no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
- --lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$tests_base\
- --local-dir $local_gl_dir\
- $gnulib_tool_option_extras\
- "
- if test $use_libtool = 1; then
- case "$gnulib_tool_options " in
- *' --libtool '*) ;;
- *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
- esac
- fi
- echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
- $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
- slurp $bt || exit
-
- for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
- done
-
-
- # Import from gettext.
- with_gettext=yes
- grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
- with_gettext=no
-
- if test $with_gettext = yes; then
- echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
- cp configure.ac $bt2 &&
- (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
- slurp $bt2 $bt || exit
- fi
- rm -fr $bt $bt2 || exit
-
- # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
- # gnulib-populated directories. Such .m4 files would cause aclocal to fail.
- # The following requires GNU find 4.2.3 or newer. Considering the usual
- # portability constraints of this script, that may seem a very demanding
- # requirement, but it should be ok. Ignore any failure, which is fine,
- # since this is only a convenience to help developers avoid the relatively
- # unusual case in which a symlinked-to .m4 file is git-removed from gnulib
- # between successive runs of this script.
- find "$m4_base" "$source_base" \
- -depth \( -name '*.m4' -o -name '*.[ch]' \) \
- -type l -xtype l -delete > /dev/null 2>&1
-
- # Reconfigure, getting other files.
-
- # Skip autoheader if it's not needed.
- grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
- AUTOHEADER=true
-
- for command in \
- libtool \
- "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
- "${AUTOCONF-autoconf} --force" \
- "${AUTOHEADER-autoheader} --force" \
- "${AUTOMAKE-automake} --add-missing --copy --force-missing"
- do
- if test "$command" = libtool; then
- test $use_libtool = 0 \
- && continue
- command="${LIBTOOLIZE-libtoolize} -c -f"
- fi
- echo "$0: $command ..."
- $command || exit
- done
-
-
- # Get some extra files from gnulib, overriding existing files.
- for file in $gnulib_extra_files; do
- case $file in
- */INSTALL) dst=INSTALL;;
- build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
- *) dst=$file;;
- esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
- done
-
- if test $with_gettext = yes; then
- # Create gettext configuration.
- echo "$0: Creating po/Makevars from po/Makevars.template ..."
- rm -f po/Makevars
- sed '
- /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
- /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
- /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
- /^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
- }
- ' po/Makevars.template >po/Makevars || exit 1
-
- if test -d runtime-po; then
- # Similarly for runtime-po/Makevars, but not quite the same.
- rm -f runtime-po/Makevars
- sed '
- /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
- /^subdir *=.*/s/=.*/= runtime-po/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
- /^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
- }
- ' po/Makevars.template >runtime-po/Makevars || exit 1
-
- # Copy identical files from po to runtime-po.
- (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
- fi
- fi
-
- bootstrap_epilogue
-
- echo "$0: done. Now you can run './configure'."
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
- # time-stamp-time-zone: "UTC"
- # time-stamp-end: "; # UTC"
- # End:
--- 0 ----
diff -cNr octave-3.4.0/bootstrap.conf octave-3.4.1/bootstrap.conf
*** octave-3.4.0/bootstrap.conf 2011-02-08 05:00:51.000000000 -0500
--- octave-3.4.1/bootstrap.conf 1969-12-31 19:00:00.000000000 -0500
***************
*** 1,116 ****
- # Bootstrap configuration.
-
- # Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
-
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
-
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see .
-
-
- # gnulib modules used by this package.
- gnulib_modules="
- c-strcase
- copysign
- crypto/md5
- fcntl
- filemode
- fnmatch
- getcwd
- gethostname
- getopt-gnu
- gettimeofday
- glob
- link
- lstat
- mkdir
- mkfifo
- mkstemp
- mktime
- nanosleep
- pathmax
- progname
- readlink
- rename
- rmdir
- round
- roundf
- sigaction
- signal
- sigprocmask
- sleep
- sleep
- stat
- stdint
- strftime
- strptime
- symlink
- sys_stat
- sys_time
- sys_times
- time
- times
- trunc
- truncf
- unistd
- unlink
- vsnprintf
- "
-
- # Additional xgettext options to use. Use "\\\newline" to break lines.
- XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
- --from-code=UTF-8\\\
- --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
- --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
- --flag=wrapf:1:c-format\\\
- '
-
- # If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
- # appears in configure.ac, exclude some unnecessary files.
- # Without grep's -E option (not portable enough, pre-configure),
- # the following test is ugly. Also, this depends on the existence
- # of configure.ac, not the obsolescent-named configure.in. But if
- # you're using this infrastructure, you should care about such things.
-
- gettext_external=0
- grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
- gettext_external=1
- grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
- gettext_external=1
-
- if test $gettext_external = 1; then
- # Gettext supplies these files, but we don't need them since
- # we don't have an intl subdirectory.
- excluded_files='
- m4/glibc2.m4
- m4/intdiv0.m4
- m4/lcmessage.m4
- m4/lock.m4
- m4/printf-posix.m4
- m4/size_max.m4
- m4/uintmax_t.m4
- m4/ulonglong.m4
- m4/visibility.m4
- m4/xsize.m4
- '
- fi
-
- # Build prerequisites
- buildreq="\
- autoconf 2.59
- automake 1.9.6
- git 1.5.5
- tar -
- "
- checkout_only_file=HACKING
- gnulib_tool_option_extras="--libtool"
- gnulib_name="libgnu"
- source_base="libgnu"
--- 0 ----
diff -cNr octave-3.4.0/build-aux/arg-nonnull.h octave-3.4.1/build-aux/arg-nonnull.h
*** octave-3.4.0/build-aux/arg-nonnull.h 2011-02-08 05:03:17.000000000 -0500
--- octave-3.4.1/build-aux/arg-nonnull.h 2011-06-15 11:31:05.000000000 -0400
***************
*** 11,17 ****
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! Lesser General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
--- 11,17 ----
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
diff -cNr octave-3.4.0/build-aux/bootstrap octave-3.4.1/build-aux/bootstrap
*** octave-3.4.0/build-aux/bootstrap 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/bootstrap 2011-06-15 11:11:27.000000000 -0400
***************
*** 0 ****
--- 1,946 ----
+ #! /bin/sh
+ # Print a version string.
+ scriptversion=2011-01-21.16; # UTC
+
+ # Bootstrap this package from checked-out sources.
+
+ # Copyright (C) 2003-2011 Free Software Foundation, Inc.
+
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see .
+
+ # Originally written by Paul Eggert. The canonical version of this
+ # script is maintained as build-aux/bootstrap in gnulib, however, to
+ # be useful to your project, you should place a copy of it under
+ # version control in the top-level directory of your project. The
+ # intent is that all customization can be done with a bootstrap.conf
+ # file also maintained in your version control; gnulib comes with a
+ # template build-aux/bootstrap.conf to get you started.
+
+ # Please report bugs or propose patches to bug-gnulib@gnu.org.
+
+ nl='
+ '
+
+ # Ensure file names are sorted consistently across platforms.
+ LC_ALL=C
+ export LC_ALL
+
+ local_gl_dir=gl
+
+ # Temporary directory names.
+ bt='._bootmp'
+ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+ bt2=${bt}2
+ me=$0
+
+ usage() {
+ cat </dev/null 2>&1; then
+ find_tool_res=$i
+ break
+ fi
+ done
+ else
+ find_tool_error_prefix="\$$find_tool_envvar: "
+ fi
+ if test x"$find_tool_res" = x; then
+ echo >&2 "$me: one of these is required: $find_tool_names"
+ exit 1
+ fi
+ ($find_tool_res --version /dev/null 2>&1 || {
+ echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+ exit 1
+ }
+ eval "$find_tool_envvar=\$find_tool_res"
+ eval "export $find_tool_envvar"
+ }
+
+ # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+ find_tool SHA1SUM sha1sum gsha1sum shasum
+
+ # Override the default configuration, if necessary.
+ # Make sure that bootstrap.conf is sourced from the current directory
+ # if we were invoked as "sh bootstrap".
+ case "$0" in
+ */*) test -r "$0.conf" && . "$0.conf" ;;
+ *) test -r "$0.conf" && . ./"$0.conf" ;;
+ esac
+
+
+ if test "$vc_ignore" = auto; then
+ vc_ignore=
+ test -d .git && vc_ignore=.gitignore
+ test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+ fi
+
+ # Translate configuration into internal form.
+
+ # Parse options.
+
+ for option
+ do
+ case $option in
+ --help)
+ usage
+ exit;;
+ --gnulib-srcdir=*)
+ GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
+ --skip-po)
+ SKIP_PO=t;;
+ --force)
+ checkout_only_file=;;
+ --copy)
+ copy=true;;
+ --bootstrap-sync)
+ bootstrap_sync=true;;
+ --no-bootstrap-sync)
+ bootstrap_sync=false;;
+ --no-git)
+ use_git=false;;
+ *)
+ echo >&2 "$0: $option: unknown option"
+ exit 1;;
+ esac
+ done
+
+ if $use_git || test -d "$GNULIB_SRCDIR"; then
+ :
+ else
+ echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
+ exit 1
+ fi
+
+ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+ echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+ exit 1
+ fi
+
+ # If $STR is not already on a line by itself in $FILE, insert it,
+ # sorting the new contents of the file and replacing $FILE with the result.
+ insert_sorted_if_absent() {
+ file=$1
+ str=$2
+ test -f $file || touch $file
+ echo "$str" | sort -u - $file | cmp - $file > /dev/null \
+ || echo "$str" | sort -u - $file -o $file \
+ || exit 1
+ }
+
+ # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+ # insert_sorted_if_absent.
+ insert_vc_ignore() {
+ vc_ignore_file="$1"
+ pattern="$2"
+ case $vc_ignore_file in
+ *.gitignore)
+ # A .gitignore entry that does not start with `/' applies
+ # recursively to subdirectories, so prepend `/' to every
+ # .gitignore entry.
+ pattern=`echo "$pattern" | sed s,^,/,`;;
+ esac
+ insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+ }
+
+ # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+ found_aux_dir=no
+ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+ >/dev/null && found_aux_dir=yes
+ grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+ >/dev/null && found_aux_dir=yes
+ if test $found_aux_dir = no; then
+ echo "$0: expected line not found in configure.ac. Add the following:" >&2
+ echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
+ exit 1
+ fi
+
+ # If $build_aux doesn't exist, create it now, otherwise some bits
+ # below will malfunction. If creating it, also mark it as ignored.
+ if test ! -d $build_aux; then
+ mkdir $build_aux
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ insert_vc_ignore $dot_ig $build_aux
+ done
+ fi
+
+ # Note this deviates from the version comparison in automake
+ # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+ # but this should suffice as we won't be specifying old
+ # version formats or redundant trailing .0 in bootstrap.conf.
+ # If we did want full compatibility then we should probably
+ # use m4_version_compare from autoconf.
+ sort_ver() { # sort -V is not generally available
+ ver1="$1"
+ ver2="$2"
+
+ # split on '.' and compare each component
+ i=1
+ while : ; do
+ p1=$(echo "$ver1" | cut -d. -f$i)
+ p2=$(echo "$ver2" | cut -d. -f$i)
+ if [ ! "$p1" ]; then
+ echo "$1 $2"
+ break
+ elif [ ! "$p2" ]; then
+ echo "$2 $1"
+ break
+ elif [ ! "$p1" = "$p2" ]; then
+ if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+ echo "$2 $1"
+ elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+ echo "$1 $2"
+ else # numeric, then lexicographic comparison
+ lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+ if [ "$lp" = "$p2" ]; then
+ echo "$1 $2"
+ else
+ echo "$2 $1"
+ fi
+ fi
+ break
+ fi
+ i=$(($i+1))
+ done
+ }
+
+ get_version() {
+ app=$1
+
+ $app --version >/dev/null 2>&1 || return 1
+
+ $app --version 2>&1 |
+ sed -n '# Move version to start of line.
+ s/.*[v ]\([0-9]\)/\1/
+
+ # Skip lines that do not start with version.
+ /^[0-9]/!d
+
+ # Remove characters after the version.
+ s/[^.a-z0-9-].*//
+
+ # The first component must be digits only.
+ s/^\([0-9]*\)[a-z-].*/\1/
+
+ #the following essentially does s/5.005/5.5/
+ s/\.0*\([1-9]\)/.\1/g
+ p
+ q'
+ }
+
+ check_versions() {
+ ret=0
+
+ while read app req_ver; do
+ # We only need libtoolize from the libtool package.
+ if test "$app" = libtool; then
+ app=libtoolize
+ fi
+ # Exempt git if --no-git is in effect.
+ if test "$app" = git; then
+ $use_git || continue
+ fi
+ # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+ appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+ test "$appvar" = TAR && appvar=AMTAR
+ eval "app=\${$appvar-$app}"
+ inst_ver=$(get_version $app)
+ if [ ! "$inst_ver" ]; then
+ echo "$me: Error: '$app' not found" >&2
+ ret=1
+ elif [ ! "$req_ver" = "-" ]; then
+ latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+ if [ ! "$latest_ver" = "$inst_ver" ]; then
+ echo "$me: Error: '$app' version == $inst_ver is too old" >&2
+ echo " '$app' version >= $req_ver is required" >&2
+ ret=1
+ fi
+ fi
+ done
+
+ return $ret
+ }
+
+ print_versions() {
+ echo "Program Min_version"
+ echo "----------------------"
+ printf %s "$buildreq"
+ echo "----------------------"
+ # can't depend on column -t
+ }
+
+ use_libtool=0
+ # We'd like to use grep -E, to see if any of LT_INIT,
+ # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+ # but that's not portable enough (e.g., for Solaris).
+ grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+ && use_libtool=1
+ grep '^[ ]*LT_INIT' configure.ac >/dev/null \
+ && use_libtool=1
+ if test $use_libtool = 1; then
+ find_tool LIBTOOLIZE glibtoolize libtoolize
+ fi
+
+ if ! printf "$buildreq" | check_versions; then
+ echo >&2
+ if test -f README-prereq; then
+ echo "$0: See README-prereq for how to get the prerequisite programs" >&2
+ else
+ echo "$0: Please install the prerequisite programs" >&2
+ fi
+ exit 1
+ fi
+
+ echo "$0: Bootstrapping from checked-out $package sources..."
+
+ # See if we can use gnulib's git-merge-changelog merge driver.
+ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+ if git config merge.merge-changelog.driver >/dev/null ; then
+ :
+ elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+ echo "$0: initializing git-merge-changelog driver"
+ git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ else
+ echo "$0: consider installing git-merge-changelog from gnulib"
+ fi
+ fi
+
+
+ cleanup_gnulib() {
+ status=$?
+ rm -fr "$gnulib_path"
+ exit $status
+ }
+
+ git_modules_config () {
+ test -f .gitmodules && git config --file .gitmodules "$@"
+ }
+
+ gnulib_path=`git_modules_config submodule.gnulib.path`
+ test -z "$gnulib_path" && gnulib_path=gnulib
+
+ # Get gnulib files.
+
+ case ${GNULIB_SRCDIR--} in
+ -)
+ if git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ git submodule init || exit $?
+ git submodule update || exit $?
+
+ elif [ ! -d "$gnulib_path" ]; then
+ echo "$0: getting gnulib files..."
+
+ trap cleanup_gnulib 1 2 13 15
+
+ shallow=
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
+ cleanup_gnulib
+
+ trap - 1 2 13 15
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ ;;
+ *)
+ # Use GNULIB_SRCDIR as a reference.
+ if test -d "$GNULIB_SRCDIR"/.git && \
+ git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ if git submodule -h|grep -- --reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
+ "$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init && git submodule update \
+ || exit $?
+ fi
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ fi
+ ;;
+ esac
+
+ if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+ fi
+
+ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+ <$gnulib_tool || exit
+
+ # Get translations.
+
+ download_po_files() {
+ subdir=$1
+ domain=$2
+ echo "$me: getting translations into $subdir for $domain..."
+ cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+ eval "$cmd"
+ }
+
+ # Mirror .po files to $po_dir/.reference and copy only the new
+ # or modified ones into $po_dir. Also update $po_dir/LINGUAS.
+ # Note po files that exist locally only are left in $po_dir but will
+ # not be included in LINGUAS and hence will not be distributed.
+ update_po_files() {
+ # Directory containing primary .po files.
+ # Overwrite them only when we're sure a .po file is new.
+ po_dir=$1
+ domain=$2
+
+ # Mirror *.po files into this dir.
+ # Usually contains *.s1 checksum files.
+ ref_po_dir="$po_dir/.reference"
+
+ test -d $ref_po_dir || mkdir $ref_po_dir || return
+ download_po_files $ref_po_dir $domain \
+ && ls "$ref_po_dir"/*.po 2>/dev/null |
+ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
+
+ langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+ test "$langs" = '*' && langs=x
+ for po in $langs; do
+ case $po in x) continue;; esac
+ new_po="$ref_po_dir/$po.po"
+ cksum_file="$ref_po_dir/$po.s1"
+ if ! test -f "$cksum_file" ||
+ ! test -f "$po_dir/$po.po" ||
+ ! $SHA1SUM -c --status "$cksum_file" \
+ < "$new_po" > /dev/null; then
+ echo "$me: updated $po_dir/$po.po..."
+ cp "$new_po" "$po_dir/$po.po" \
+ && $SHA1SUM < "$new_po" > "$cksum_file"
+ fi
+ done
+ }
+
+ case $SKIP_PO in
+ '')
+ if test -d po; then
+ update_po_files po $package || exit
+ fi
+
+ if test -d runtime-po; then
+ update_po_files runtime-po $package-runtime || exit
+ fi;;
+ esac
+
+ symlink_to_dir()
+ {
+ src=$1/$2
+ dst=${3-$2}
+
+ test -f "$src" && {
+
+ # If the destination directory doesn't exist, create it.
+ # This is required at least for "lib/uniwidth/cjk.h".
+ dst_dir=`dirname "$dst"`
+ if ! test -d "$dst_dir"; then
+ mkdir -p "$dst_dir"
+
+ # If we've just created a directory like lib/uniwidth,
+ # tell version control system(s) it's ignorable.
+ # FIXME: for now, this does only one level
+ parent=`dirname "$dst_dir"`
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
+ done
+ fi
+
+ if $copy; then
+ {
+ test ! -h "$dst" || {
+ echo "$me: rm -f $dst" &&
+ rm -f "$dst"
+ }
+ } &&
+ test -f "$dst" &&
+ cmp -s "$src" "$dst" || {
+ echo "$me: cp -fp $src $dst" &&
+ cp -fp "$src" "$dst"
+ }
+ else
+ test -h "$dst" &&
+ src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
+ dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
+ test "$src_i" = "$dst_i" || {
+ dot_dots=
+ case $src in
+ /*) ;;
+ *)
+ case /$dst/ in
+ *//* | */../* | */./* | /*/*/*/*/*/)
+ echo >&2 "$me: invalid symlink calculation: $src -> $dst"
+ exit 1;;
+ /*/*/*/*/) dot_dots=../../../;;
+ /*/*/*/) dot_dots=../../;;
+ /*/*/) dot_dots=../;;
+ esac;;
+ esac
+
+ echo "$me: ln -fs $dot_dots$src $dst" &&
+ ln -fs "$dot_dots$src" "$dst"
+ }
+ fi
+ }
+ }
+
+ cp_mark_as_generated()
+ {
+ cp_src=$1
+ cp_dst=$2
+
+ if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
+ symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
+ elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
+ symlink_to_dir $local_gl_dir "$cp_dst"
+ else
+ case $cp_dst in
+ *.[ch]) c1='/* '; c2=' */';;
+ *.texi) c1='@c '; c2= ;;
+ *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
+ *) c1= ; c2= ;;
+ esac
+
+ # If the destination directory doesn't exist, create it.
+ # This is required at least for "lib/uniwidth/cjk.h".
+ dst_dir=`dirname "$cp_dst"`
+ test -d "$dst_dir" || mkdir -p "$dst_dir"
+
+ if test -z "$c1"; then
+ cmp -s "$cp_src" "$cp_dst" || {
+ # Copy the file first to get proper permissions if it
+ # doesn't already exist. Then overwrite the copy.
+ echo "$me: cp -f $cp_src $cp_dst" &&
+ rm -f "$cp_dst" &&
+ cp "$cp_src" "$cp_dst-t" &&
+ sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+ mv -f "$cp_dst-t" "$cp_dst"
+ }
+ else
+ # Copy the file first to get proper permissions if it
+ # doesn't already exist. Then overwrite the copy.
+ cp "$cp_src" "$cp_dst-t" &&
+ (
+ echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+ echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+ sed "s!$bt_regex/!!g" "$cp_src"
+ ) > $cp_dst-t &&
+ if cmp -s "$cp_dst-t" "$cp_dst"; then
+ rm -f "$cp_dst-t"
+ else
+ echo "$me: cp $cp_src $cp_dst # with edits" &&
+ mv -f "$cp_dst-t" "$cp_dst"
+ fi
+ fi
+ fi
+ }
+
+ version_controlled_file() {
+ dir=$1
+ file=$2
+ found=no
+ if test -d CVS; then
+ grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
+ grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+ elif test -d .git; then
+ git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ elif test -d .svn; then
+ svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
+ else
+ echo "$me: no version control for $dir/$file?" >&2
+ fi
+ test $found = yes
+ }
+
+ slurp() {
+ for dir in . `(cd $1 && find * -type d -print)`; do
+ copied=
+ sep=
+ for file in `ls -a $1/$dir`; do
+ case $file in
+ .|..) continue;;
+ # FIXME: should all file names starting with "." be ignored?
+ .*) continue;;
+ esac
+ test -d $1/$dir/$file && continue
+ for excluded_file in $excluded_files; do
+ test "$dir/$file" = "$excluded_file" && continue 2
+ done
+ if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
+ copied=$copied${sep}$gnulib_mk; sep=$nl
+ remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+ sed "$remove_intl" $1/$dir/$file |
+ cmp - $dir/$gnulib_mk > /dev/null || {
+ echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+ rm -f $dir/$gnulib_mk &&
+ sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+ gnulib_mk_hook $dir/$gnulib_mk
+ }
+ elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
+ version_controlled_file $dir $file; then
+ echo "$me: $dir/$file overrides $1/$dir/$file"
+ else
+ copied=$copied$sep$file; sep=$nl
+ if test $file = gettext.m4; then
+ echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
+ rm -f $dir/$file
+ sed '
+ /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+ AC_DEFUN([AM_INTL_SUBDIR], [])
+ /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+ AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
+ $a\
+ AC_DEFUN([gl_LOCK_EARLY], [])
+ ' $1/$dir/$file >$dir/$file
+ else
+ cp_mark_as_generated $1/$dir/$file $dir/$file
+ fi
+ fi || exit
+ done
+
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$dir/$dot_ig
+ if test -n "$copied"; then
+ insert_vc_ignore $ig "$copied"
+ # If an ignored file name ends with .in.h, then also add
+ # the name with just ".h". Many gnulib headers are generated,
+ # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+ # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+ f=`echo "$copied" |
+ sed '
+ s/\.in\.h$/.h/
+ s/\.sin$/.sed/
+ s/\.y$/.c/
+ s/\.gperf$/.h/
+ '
+ `
+ insert_vc_ignore $ig "$f"
+
+ # For files like sys_stat.in.h and sys_time.in.h, record as
+ # ignorable the directory we might eventually create: sys/.
+ f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+ insert_vc_ignore $ig "$f"
+ fi
+ done
+ done
+ }
+
+
+ # Create boot temporary directories to import from gnulib and gettext.
+ rm -fr $bt $bt2 &&
+ mkdir $bt $bt2 || exit
+
+ # Import from gnulib.
+
+ gnulib_tool_options="\
+ --import\
+ --no-changelog\
+ --aux-dir $bt/$build_aux\
+ --doc-base $bt/$doc_base\
+ --lib $gnulib_name\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\
+ --local-dir $local_gl_dir\
+ $gnulib_tool_option_extras\
+ "
+ if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+ fi
+ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+ $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+ slurp $bt || exit
+
+ for file in $gnulib_files; do
+ symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ done
+
+
+ # Import from gettext.
+ with_gettext=yes
+ grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
+
+ if test $with_gettext = yes; then
+ echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
+ cp configure.ac $bt2 &&
+ (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
+ slurp $bt2 $bt || exit
+ fi
+ rm -fr $bt $bt2 || exit
+
+ # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+ # gnulib-populated directories. Such .m4 files would cause aclocal to fail.
+ # The following requires GNU find 4.2.3 or newer. Considering the usual
+ # portability constraints of this script, that may seem a very demanding
+ # requirement, but it should be ok. Ignore any failure, which is fine,
+ # since this is only a convenience to help developers avoid the relatively
+ # unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+ # between successive runs of this script.
+ find "$m4_base" "$source_base" \
+ -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+ -type l -xtype l -delete > /dev/null 2>&1
+
+ # Reconfigure, getting other files.
+
+ # Skip autoheader if it's not needed.
+ grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+ AUTOHEADER=true
+
+ for command in \
+ libtool \
+ "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
+ "${AUTOCONF-autoconf} --force" \
+ "${AUTOHEADER-autoheader} --force" \
+ "${AUTOMAKE-automake} --add-missing --copy --force-missing"
+ do
+ if test "$command" = libtool; then
+ test $use_libtool = 0 \
+ && continue
+ command="${LIBTOOLIZE-libtoolize} -c -f"
+ fi
+ echo "$0: $command ..."
+ $command || exit
+ done
+
+
+ # Get some extra files from gnulib, overriding existing files.
+ for file in $gnulib_extra_files; do
+ case $file in
+ */INSTALL) dst=INSTALL;;
+ build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
+ *) dst=$file;;
+ esac
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ done
+
+ if test $with_gettext = yes; then
+ # Create gettext configuration.
+ echo "$0: Creating po/Makevars from po/Makevars.template ..."
+ rm -f po/Makevars
+ sed '
+ /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+ /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+ /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+ }
+ ' po/Makevars.template >po/Makevars || exit 1
+
+ if test -d runtime-po; then
+ # Similarly for runtime-po/Makevars, but not quite the same.
+ rm -f runtime-po/Makevars
+ sed '
+ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+ /^subdir *=.*/s/=.*/= runtime-po/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ }
+ ' po/Makevars.template >runtime-po/Makevars || exit 1
+
+ # Copy identical files from po to runtime-po.
+ (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ fi
+ fi
+
+ bootstrap_epilogue
+
+ echo "$0: done. Now you can run './configure'."
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
diff -cNr octave-3.4.0/build-aux/bootstrap.conf octave-3.4.1/build-aux/bootstrap.conf
*** octave-3.4.0/build-aux/bootstrap.conf 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/bootstrap.conf 2011-06-15 11:11:27.000000000 -0400
***************
*** 0 ****
--- 1,117 ----
+ # Bootstrap configuration.
+
+ # Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
+
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see .
+
+
+ # gnulib modules used by this package.
+ gnulib_modules="
+ c-strcase
+ copysign
+ crypto/md5
+ fcntl
+ filemode
+ fnmatch
+ getcwd
+ gethostname
+ getopt-gnu
+ gettimeofday
+ glob
+ link
+ lstat
+ mkdir
+ mkfifo
+ mkstemp
+ mktime
+ nanosleep
+ nproc
+ pathmax
+ progname
+ readlink
+ rename
+ rmdir
+ round
+ roundf
+ sigaction
+ signal
+ sigprocmask
+ sleep
+ sleep
+ stat
+ stdint
+ strftime
+ strptime
+ symlink
+ sys_stat
+ sys_time
+ sys_times
+ time
+ times
+ trunc
+ truncf
+ unistd
+ unlink
+ vsnprintf
+ "
+
+ # Additional xgettext options to use. Use "\\\newline" to break lines.
+ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --from-code=UTF-8\\\
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
+ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
+ --flag=wrapf:1:c-format\\\
+ '
+
+ # If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+ # appears in configure.ac, exclude some unnecessary files.
+ # Without grep's -E option (not portable enough, pre-configure),
+ # the following test is ugly. Also, this depends on the existence
+ # of configure.ac, not the obsolescent-named configure.in. But if
+ # you're using this infrastructure, you should care about such things.
+
+ gettext_external=0
+ grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+ gettext_external=1
+ grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+ gettext_external=1
+
+ if test $gettext_external = 1; then
+ # Gettext supplies these files, but we don't need them since
+ # we don't have an intl subdirectory.
+ excluded_files='
+ m4/glibc2.m4
+ m4/intdiv0.m4
+ m4/lcmessage.m4
+ m4/lock.m4
+ m4/printf-posix.m4
+ m4/size_max.m4
+ m4/uintmax_t.m4
+ m4/ulonglong.m4
+ m4/visibility.m4
+ m4/xsize.m4
+ '
+ fi
+
+ # Build prerequisites
+ buildreq="\
+ autoconf 2.59
+ automake 1.9.6
+ git 1.5.5
+ tar -
+ "
+ checkout_only_file=etc/HACKING
+ gnulib_tool_option_extras="--libtool"
+ gnulib_name="libgnu"
+ source_base="libgnu"
diff -cNr octave-3.4.0/build-aux/c++defs.h octave-3.4.1/build-aux/c++defs.h
*** octave-3.4.0/build-aux/c++defs.h 2011-02-08 05:03:17.000000000 -0500
--- octave-3.4.1/build-aux/c++defs.h 2011-06-15 11:31:05.000000000 -0400
***************
*** 11,17 ****
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! Lesser General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
--- 11,17 ----
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
diff -cNr octave-3.4.0/build-aux/common.mk octave-3.4.1/build-aux/common.mk
*** octave-3.4.0/build-aux/common.mk 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/common.mk 2011-06-15 11:11:27.000000000 -0400
***************
*** 0 ****
--- 1,668 ----
+ AWK = @AWK@
+ export AWK
+
+ SED = @SED@
+ export SED
+
+ FIND = @FIND@
+ export FIND
+
+ PERL = @PERL@
+ export PERL
+
+ PYTHON = @PYTHON@
+
+ GNUPLOT = @GNUPLOT@
+
+ DESKTOP_FILE_INSTALL = @DESKTOP_FILE_INSTALL@
+
+ OCTAVE_VERSION = @OCTAVE_VERSION@
+ OCTAVE_API_VERSION_NUMBER = @OCTAVE_API_VERSION_NUMBER@
+ OCTAVE_API_VERSION = @OCTAVE_API_VERSION@
+ OCTAVE_RELEASE_DATE = @OCTAVE_RELEASE_DATE@
+ OCTAVE_COPYRIGHT = @OCTAVE_COPYRIGHT@
+
+ version = $(OCTAVE_VERSION)
+ api_version = $(OCTAVE_API_VERSION)
+
+ ## AM_LIBTOOLFLAGS = --silent
+
+ #### Start of system configuration section. ####
+
+ EXEEXT = @EXEEXT@
+
+ BUILD_EXEEXT = @BUILD_EXEEXT@
+
+ LEX = @LEX@
+ AM_LFLAGS = @LFLAGS@
+ LEXLIB = @LEXLIB@
+
+ YACC = @YACC@
+ AM_YFLAGS = -dv
+
+ GPERF = @GPERF@
+
+ AR = @AR@
+ ARFLAGS = @ARFLAGS@
+
+ TEMPLATE_AR = @TEMPLATE_AR@
+ TEMPLATE_ARFLAGS = @TEMPLATE_ARFLAGS@
+
+ RANLIB = @RANLIB@
+
+ LN_S = @LN_S@
+
+ MAKEINFO = @MAKEINFO@
+ TEXI2DVI = @TEXI2DVI@
+ TEXI2PDF = @TEXI2PDF@
+
+ GHOSTSCRIPT = @GHOSTSCRIPT@
+
+ DEFAULT_PAGER = @DEFAULT_PAGER@
+
+ ENABLE_DYNAMIC_LINKING = @ENABLE_DYNAMIC_LINKING@
+
+ SHLEXT = @SHLEXT@
+ SHLEXT_VER = @SHLEXT_VER@
+ SHLLIB = @SHLLIB@
+ SHLLIB_VER = @SHLLIB_VER@
+ SHLBIN = @SHLBIN@
+ SHLBIN_VER = @SHLBIN_VER@
+ SHLLINKEXT=
+
+ LIBEXT = a
+ LIBPRE = @LIBPRE@
+ SHLPRE = @SHLPRE@
+ SHLLIBPRE = @SHLLIBPRE@
+ SHLBINPRE = @SHLBINPRE@
+
+ # Fortran compiler flags.
+
+ FC = @FC@
+ F77 = @F77@
+ AM_FFLAGS = @FFLAGS@
+ FPICFLAG = @FPICFLAG@
+ ALL_FFLAGS = $(FFLAGS)
+ F77_FLOAT_STORE_FLAG = @F77_FLOAT_STORE_FLAG@
+ F77_INTEGER_8_FLAG = @F77_INTEGER_8_FLAG@
+
+ F77_TOLOWER=@F77_TOLOWER@
+ F77_APPEND_UNDERSCORE=@F77_TOLOWER@
+ F77_APPEND_EXTRA_UNDERSCORE=@F77_TOLOWER@
+
+ X11_INCFLAGS = @X11_INCFLAGS@
+ X11_LIBS = @X11_LIBS@
+
+ CARBON_LIBS = @CARBON_LIBS@
+
+ MAGICK_CPPFLAGS = @MAGICK_CPPFLAGS@
+ MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
+ MAGICK_LIBS = @MAGICK_LIBS@
+
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+
+ LIBFLAGS = -L$(top_builddir)
+
+ DEFS = @DEFS@
+
+ UGLY_DEFS = @UGLY_DEFS@
+
+ CC = @CC@
+ CC_VERSION = @CC_VERSION@
+ CONFIGURE_CFLAGS = @CFLAGS@
+ CPICFLAG = @CPICFLAG@
+ XTRA_CFLAGS = @XTRA_CFLAGS@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ AM_CFLAGS = $(CONFIGURE_CFLAGS) \
+ $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
+ BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
+
+ BUILD_CC = @BUILD_CC@
+ BUILD_CFLAGS = @BUILD_CFLAGS@
+
+ DEPEND_FLAGS = @DEPEND_FLAGS@
+ DEPEND_EXTRA_SED_PATTERN = @DEPEND_EXTRA_SED_PATTERN@
+ INCLUDE_DEPS = @INCLUDE_DEPS@
+ # ifeq ($(INCLUDE_DEPS),false)
+ # omit_deps = true;
+ # endif
+
+ GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
+
+ CXX = @CXX@
+ CXX_VERSION = @CXX_VERSION@
+ CXXCPP = @CXXCPP@
+ CONFIGURE_CXXFLAGS = @CXXFLAGS@
+ CXXPICFLAG = @CXXPICFLAG@
+ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
+ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \
+ $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS)
+ BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
+
+ BUILD_CXX = @BUILD_CXX@
+ BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
+
+ NO_UNDEFINED_LDFLAG = @NO_UNDEFINED_LDFLAG@
+
+ LD_CXX = @LD_CXX@
+ LD_STATIC_FLAG = @LD_STATIC_FLAG@
+ #ALL_LDFLAGS = $(LIBFLAGS) $(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS)
+
+ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+
+ SH_LD = @SH_LD@
+ SH_LDFLAGS = @SH_LDFLAGS@
+
+ DL_LD = @DL_LD@
+ DL_LDFLAGS = @DL_LDFLAGS@
+
+ SONAME_FLAGS = @SONAME_FLAGS@
+
+ RDYNAMIC_FLAG = @RDYNAMIC_FLAG@
+
+ RLD_FLAG = @RLD_FLAG@
+
+ FLIBS = @FLIBS@
+
+ LIBOCTINTERP = @LIBOCTINTERP@
+ LIBOCTAVE = @LIBOCTAVE@
+ LIBCRUFT = @LIBCRUFT@
+
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
+
+ HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
+ HDF5_LDFLAGS = @HDF5_LDFLAGS@
+ HDF5_LIBS = @HDF5_LIBS@
+
+ Z_CPPFLAGS = @Z_CPPFLAGS@
+ Z_LDFLAGS = @Z_LDFLAGS@
+ Z_LIBS = @Z_LIBS@
+
+ GRAPHICS_LIBS = @GRAPHICS_LIBS@
+
+ QHULL_CPPFLAGS = @QHULL_CPPFLAGS@
+ QHULL_LDFLAGS = @QHULL_LDFLAGS@
+ QHULL_LIBS = @QHULL_LIBS@
+
+ REGEX_LIBS = @REGEX_LIBS@
+
+ LAPACK_LIBS = @LAPACK_LIBS@
+ BLAS_LIBS = @BLAS_LIBS@
+
+ FFTW3_CPPFLAGS = @FFTW3_CPPFLAGS@
+ FFTW3_LDFLAGS = @FFTW3_LDFLAGS@
+ FFTW3_LIBS = @FFTW3_LIBS@
+
+ FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@
+ FFTW3F_LDFLAGS = @FFTW3F_LDFLAGS@
+ FFTW3F_LIBS = @FFTW3F_LIBS@
+
+ GLPK_CPPFLAGS = @GLPK_CPPFLAGS@
+ GLPK_LDFLAGS = @GLPK_LDFLAGS@
+ GLPK_LIBS = @GLPK_LIBS@
+
+ CURL_CPPFLAGS = @CURL_CPPFLAGS@
+ CURL_LDFLAGS = @CURL_LDFLAGS@
+ CURL_LIBS = @CURL_LIBS@
+
+ AMD_CPPFLAGS = @AMD_CPPFLAGS@
+ AMD_LDFLAGS = @AMD_LDFLAGS@
+ AMD_LIBS = @AMD_LIBS@
+
+ CAMD_CPPFLAGS = @CAMD_CPPFLAGS@
+ CAMD_LDFLAGS = @CAMD_LDFLAGS@
+ CAMD_LIBS = @CAMD_LIBS@
+
+ COLAMD_CPPFLAGS = @COLAMD_CPPFLAGS@
+ COLAMD_LDFLAGS = @COLAMD_LDFLAGS@
+ COLAMD_LIBS = @COLAMD_LIBS@
+
+ CCOLAMD_CPPFLAGS = @CCOLAMD_CPPFLAGS@
+ CCOLAMD_LDFLAGS = @CCOLAMD_LDFLAGS@
+ CCOLAMD_LIBS = @CCOLAMD_LIBS@
+
+ CHOLMOD_CPPFLAGS = @CHOLMOD_CPPFLAGS@
+ CHOLMOD_LDFLAGS = @CHOLMOD_LDFLAGS@
+ CHOLMOD_LIBS = @CHOLMOD_LIBS@
+
+ CXSPARSE_CPPFLAGS = @CXSPARSE_CPPFLAGS@
+ CXSPARSE_LDFLAGS = @CXSPARSE_LDFLAGS@
+ CXSPARSE_LIBS = @CXSPARSE_LIBS@
+
+ UMFPACK_CPPFLAGS = @UMFPACK_CPPFLAGS@
+ UMFPACK_LDFLAGS = @UMFPACK_LDFLAGS@
+ UMFPACK_LIBS = @UMFPACK_LIBS@
+
+ OPENGL_LIBS = @OPENGL_LIBS@
+
+ QRUPDATE_CPPFLAGS = @QRUPDATE_CPPFLAGS@
+ QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@
+ QRUPDATE_LIBS = @QRUPDATE_LIBS@
+
+ READLINE_LIBS = @READLINE_LIBS@
+ TERM_LIBS = @TERM_LIBS@
+
+ DL_LIBS = @DL_LIBS@
+ LIBS = @LIBS@
+
+ ALL_CPPFLAGS = $(CPPFLAGS) $(HDF5_CPPFLAGS) $(Z_CPPFLAGS)
+
+ SPARSE_XCPPFLAGS = \
+ $(CHOLMOD_CPPFLAGS) $(UMFPACK_CPPFLAGS) \
+ $(AMD_CPPFLAGS) $(CAMD_CPPFLAGS) $(COLAMD_CPPFLAGS) \
+ $(CCOLAMD_CPPFLAGS) $(CXSPARSE_CPPFLAGS)
+
+ SPARSE_XLDFLAGS = \
+ $(CHOLMOD_LDFLAGS) $(UMFPACK_LDFLAGS) \
+ $(AMD_LDFLAGS) $(CAMD_LDFLAGS) $(COLAMD_LDFLAGS) \
+ $(CCOLAMD_LDFLAGS) $(CXSPARSE_LDFLAGS)
+
+ ## Order matters, at least on some systems (Cygwin, for example).
+ SPARSE_XLIBS = \
+ $(CHOLMOD_LIBS) $(UMFPACK_LIBS) \
+ $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \
+ $(CCOLAMD_LIBS) $(CXSPARSE_LIBS)
+
+ FFTW_XCPPFLAGS = $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS)
+
+ FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)
+
+ FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)
+
+ USE_64_BIT_IDX_T = @USE_64_BIT_IDX_T@
+ OCTAVE_IDX_TYPE = @OCTAVE_IDX_TYPE@
+
+ TEXINFO_COLAMD = @TEXINFO_COLAMD@
+ TEXINFO_CHOLMOD = @TEXINFO_CHOLMOD@
+ TEXINFO_UMFPACK = @TEXINFO_UMFPACK@
+ TEXINFO_QHULL = @TEXINFO_QHULL@
+
+ # The arguments passed to configure.
+ config_opts = @config_opts@
+
+ CONFIG_SUBDIRS = @subdirs@
+
+ # ==================== Where To Install Things ====================
+
+ # The default location for installation. Everything is placed in
+ # subdirectories of this directory. The default values for many of
+ # the variables below are expressed in terms of this one, so you may
+ # not need to change them. This defaults to /usr/local.
+ prefix = @prefix@
+
+ # Like `prefix', but used for architecture-specific files.
+ exec_prefix = @exec_prefix@
+
+ # Where to install Octave and other binaries that people will want to
+ # run directly.
+ bindir = @bindir@
+
+ # Normally the directory for installing executables that system
+ # administrators run. This is the same as libexecdir on Cygwin systems.
+ sbindir = @sbindir@
+
+ # The root of the directory tree for read-only
+ # architecture-independent data files.
+ datarootdir = @datarootdir@
+
+ # Where to install architecture-independent data files. ${fcnfiledir}
+ # and ${localfcnfiledir} are subdirectories of this.
+ datadir = @datadir@
+
+ libdir = @libdir@
+
+ # Where to install and expect extra files like NEWS and doc-cache.
+ octetcdir = @octetcdir@
+
+ # Where to install and expect libraries like libcruft.a, liboctave.a,
+ # and other architecture-dependent data.
+ octlibdir = @octlibdir@
+
+ # Where to install and expect executable programs to be run by Octave
+ # rather than directly by users.
+ libexecdir = @libexecdir@
+
+ # The prefix for Octave's include file directory. The default is
+ # ${prefix}/include
+ includedir = @includedir@
+
+ # Where to install Octave's man pages, and what extension they should
+ # have. The default is ${prefix}/man/man1
+ mandir = @mandir@
+ man1dir = @man1dir@
+ man1ext = @man1ext@
+
+ # The full path to the default doc cache file.
+ doc_cache_file = @doc_cache_file@
+
+ # Where to install and expect the info files describing Octave..
+ infodir = @infodir@
+
+ # The full path to the default info file.
+ infofile = @infofile@
+
+ # ==================== Octave-specific directories ====================
+
+ # These variables hold the values specific to Octave. They are
+ # based on the values of the standard Make variables above.
+
+ # What is the path separation character
+ sepchar = @sepchar@
+
+ # Where to install Octave's include files. The default is
+ # ${includedir}/octave-${version}/octave
+ octincludedir = @octincludedir@
+
+ # Where to install the function file distributed with
+ # Octave. This includes the Octave version, so that the
+ # function files for different versions of Octave will install
+ # themselves in separate directories.
+ fcnfiledir = @fcnfiledir@
+
+ # Directories Octave should search for function files specific
+ # to this site (i.e. customizations), before consulting
+ # ${fcnfiledir}. This should be a colon-separated list of
+ # directories.
+ localfcnfiledir = @localfcnfiledir@
+ localapifcnfiledir = @localapifcnfiledir@
+ localverfcnfiledir = @localverfcnfiledir@
+
+ # Where to put executables to be run by Octave rather than
+ # the user. This path usually includes the Octave version
+ # and configuration name, so that multiple configurations
+ # for multiple versions of Octave may be installed at once.
+ archlibdir = @archlibdir@
+
+ # Where to put executables to be run by Octave rather than by the
+ # user that are specific to this site.
+ localarchlibdir = @localarchlibdir@
+ localapiarchlibdir = @localapiarchlibdir@
+ localverarchlibdir = @localverarchlibdir@
+
+ # Where to put object files that will by dynamically loaded.
+ # This path usually includes the Octave version and configuration
+ # name, so that multiple configurations for multiple versions of
+ # Octave may be installed at once.
+ octfiledir = @octfiledir@
+
+ # Directories Octave should search for object files that will be
+ # dynamically loaded and that are specific to this site
+ # (i.e. customizations), before consulting ${octfiledir}. This should
+ # be a colon-separated list of directories.
+ localoctfiledir = @localoctfiledir@
+ localapioctfiledir = @localapioctfiledir@
+ localveroctfiledir = @localveroctfiledir@
+
+ # Where Octave will search to find image files.
+ imagedir = @imagedir@
+
+ # The type of computer we are running on.
+ canonical_host_type = @canonical_host_type@
+
+ # Where Octave will look for startup files
+ startupfiledir = ${fcnfiledir}/startup
+ localstartupfiledir = ${localfcnfiledir}/startup
+
+ # LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PATH, ...
+ library_path_var = @library_path_var@
+
+ # The separator used for elements of the LD_PRELOAD variable (might be
+ # a space, so protect with $(null))
+ null =
+ ldpreloadsep = $(null)@ldpreloadsep@$(null)
+
+ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+
+ # The following pattern rules and the substitution functions require
+ # GNU make. If you don't have it, get it!
+
+ define simple_move_if_change_rule
+ if [ -s $@-t ]; then \
+ $(top_srcdir)/build-aux/move-if-change $@-t $@; \
+ else \
+ echo "$@-t is empty!" 1>&2; \
+ rm -f $@-t; \
+ exit 1; \
+ fi
+ endef
+
+ define cp_update_rule
+ if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/$@ ] && [ ! -f $@ ]; then \
+ cp $(srcdir)/$@ $@; \
+ touch -r $(srcdir)/$@ $@; \
+ fi
+ endef
+
+ # Yes, the second sed command near the end is needed, to avoid limits
+ # in command lengths for some versions of sed. UGLY_DEFS is often
+ # quite large, so it makes sense to split this command there.
+
+ define do_subst_config_vals
+ echo "making $@ from $<"
+ $(SED) < $< \
+ -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \
+ -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \
+ -e "s|%OCTAVE_CONF_ALL_CFLAGS%|\"${ALL_CFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_ALL_CXXFLAGS%|\"${ALL_CXXFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_ALL_FFLAGS%|\"${ALL_FFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_ALL_LDFLAGS%|\"${ALL_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_AMD_CPPFLAGS%|\"${AMD_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_AMD_LDFLAGS%|\"${AMD_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_AMD_LIBS%|\"${AMD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_AR%|\"${AR}\"|" \
+ -e "s|%OCTAVE_CONF_ARFLAGS%|\"${ARFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_BLAS_LIBS%|\"${BLAS_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CAMD_CPPFLAGS%|\"${CAMD_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CAMD_LDFLAGS%|\"${CAMD_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CAMD_LIBS%|\"${CAMD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \
+ -e "s|%OCTAVE_CONF_CARBON_LIBS%|\"${CARBON_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CC%|\"${CC}\"|" \
+ -e "s|%OCTAVE_CONF_CC_VERSION%|\"${CC_VERSION}\"|" \
+ -e "s|%OCTAVE_CONF_CCOLAMD_CPPFLAGS%|\"${CCOLAMD_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CCOLAMD_LDFLAGS%|\"${CCOLAMD_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CCOLAMD_LIBS%|\"${CCOLAMD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CFLAGS%|\"${CFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CHOLMOD_CPPFLAGS%|\"${CHOLMOD_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CHOLMOD_LDFLAGS%|\"${CHOLMOD_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CHOLMOD_LIBS%|\"${CHOLMOD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_COLAMD_CPPFLAGS%|\"${COLAMD_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_COLAMD_LDFLAGS%|\"${COLAMD_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_COLAMD_LIBS%|\"${COLAMD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CPICFLAG%|\"${CPICFLAG}\"|" \
+ -e "s|%OCTAVE_CONF_CPPFLAGS%|\"${CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CURL_CPPFLAGS%|\"${CURL_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CURL_LDFLAGS%|\"${CURL_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CURL_LIBS%|\"${CURL_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CXSPARSE_CPPFLAGS%|\"${CXSPARSE_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CXSPARSE_LDFLAGS%|\"${CXSPARSE_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CXSPARSE_LIBS%|\"${CXSPARSE_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_CXX%|\"${CXX}\"|" \
+ -e "s|%OCTAVE_CONF_CXXCPP%|\"${CXXCPP}\"|" \
+ -e "s|%OCTAVE_CONF_CXXFLAGS%|\"${CXXFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_CXXPICFLAG%|\"${CXXPICFLAG}\"|" \
+ -e "s|%OCTAVE_CONF_CXX_VERSION%|\"${CXX_VERSION}\"|" \
+ -e "s|%OCTAVE_CONF_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \
+ -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \
+ -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
+ -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
+ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
+ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \
+ -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \
+ -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \
+ -e "s|%OCTAVE_CONF_FFLAGS%|\"${FFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3_CPPFLAGS%|\"${FFTW3_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3_LDFLAGS%|\"${FFTW3_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3_LIBS%|\"${FFTW3_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3F_CPPFLAGS%|\"${FFTW3F_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \
+ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \
+ -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_GLPK_CPPFLAGS%|\"${GLPK_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_GLPK_LIBS%|\"${GLPK_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_GNUPLOT%|\"${GNUPLOT}\"|" \
+ -e "s|%OCTAVE_CONF_GRAPHICS_LIBS%|\"${GRAPHICS_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_HDF5_CPPFLAGS%|\"${HDF5_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_INCFLAGS%|\"${INCFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \
+ -e "s|%OCTAVE_CONF_LAPACK_LIBS%|\"${LAPACK_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \
+ -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_LD_STATIC_FLAG%|\"${LD_STATIC_FLAG}\"|" \
+ -e "s|%OCTAVE_CONF_LEX%|\"${LEX}\"|" \
+ -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \
+ -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_LIBCRUFT%|\"${LIBCRUFT}\"|" \
+ -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \
+ -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \
+ -e "s|%OCTAVE_CONF_LIBFLAGS%|\"${LIBFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_LIBOCTAVE%|\"${LIBOCTAVE}\"|" \
+ -e "s|%OCTAVE_CONF_LIBOCTINTERP%|\"${LIBOCTINTERP}\"|" \
+ -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \
+ -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
+ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \
+ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
+ -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \
+ -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
+ -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_QHULL_CPPFLAGS%|\"${QHULL_CPPFLAGSS}\"|" \
+ -e "s|%OCTAVE_CONF_QHULL_LDFLAGS%|\"${QHULL_LDFLAGSS}\"|" \
+ -e "s|%OCTAVE_CONF_QHULL_LIBS%|\"${QHULL_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_QRUPDATE_CPPFLAGS%|\"${QRUPDATE_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_QRUPDATE_LDFLAGS%|\"${QRUPDATE_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
+ -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
+ -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_RLD_FLAG%|\"${RLD_FLAG}\"|" \
+ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
+ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \
+ -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \
+ -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \
+ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \
+ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_SONAME_FLAGS%|\"${SONAME_FLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_TERM_LIBS%|\"${TERM_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_UGLY_DEFS%|\"${UGLY_DEFS}\"|" \
+ -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_UMFPACK_LIBS%|\"${UMFPACK_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \
+ -e "s|%OCTAVE_CONF_VERSION%|\"${version}\"|" \
+ -e "s|%OCTAVE_CONF_ENABLE_DYNAMIC_LINKING%|\"${ENABLE_DYNAMIC_LINKING}\"|" \
+ -e "s|%OCTAVE_CONF_X11_INCFLAGS%|\"${X11_INCFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_X11_LIBS%|\"${X11_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_XTRA_CFLAGS%|\"${XTRA_CFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_XTRA_CXXFLAGS%|\"${XTRA_CXXFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_YACC%|\"${YACC}\"|" \
+ -e "s|%OCTAVE_CONF_YFLAGS%|\"${YFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_Z_CPPFLAGS%|\"${Z_CPPFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_Z_LDFLAGS%|\"${Z_LDFLAGS}\"|" \
+ -e "s|%OCTAVE_CONF_Z_LIBS%|\"${Z_LIBS}\"|" \
+ -e "s|%OCTAVE_CONF_config_opts%|\"${config_opts}\"|" | \
+ $(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > $@-t
+ $(simple_move_if_change_rule)
+ endef
+
+ define do_subst_default_vals
+ echo "making $@ from $<"
+ $(SED) < $< > $@-t \
+ -e "s|%OCTAVE_ARCHLIBDIR%|\"${archlibdir}\"|" \
+ -e "s|%OCTAVE_BINDIR%|\"${bindir}\"|" \
+ -e "s|%OCTAVE_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \
+ -e "s|%OCTAVE_DATADIR%|\"${datadir}\"|" \
+ -e "s|%OCTAVE_DATAROOTDIR%|\"${datarootdir}\"|" \
+ -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \
+ -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \
+ -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \
+ -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \
+ -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \
+ -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \
+ -e "s|%OCTAVE_INFODIR%|\"${infodir}\"|" \
+ -e "s|%OCTAVE_INFOFILE%|\"${infofile}\"|" \
+ -e "s|%OCTAVE_LIBDIR%|\"${libdir}\"|" \
+ -e "s|%OCTAVE_LIBEXECDIR%|\"${libexecdir}\"|" \
+ -e "s|%OCTAVE_LOCALAPIFCNFILEDIR%|\"${localapifcnfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALAPIOCTFILEDIR%|\"${localapioctfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALARCHLIBDIR%|\"${localarchlibdir}\"|" \
+ -e "s|%OCTAVE_LOCALFCNFILEDIR%|\"${localfcnfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALOCTFILEDIR%|\"${localoctfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALSTARTUPFILEDIR%|\"${localstartupfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALAPIARCHLIBDIR%|\"${localapiarchlibdir}\"|" \
+ -e "s|%OCTAVE_LOCALVERARCHLIBDIR%|\"${localverarchlibdir}\"|" \
+ -e "s|%OCTAVE_LOCALVERFCNFILEDIR%|\"${localverfcnfiledir}\"|" \
+ -e "s|%OCTAVE_LOCALVEROCTFILEDIR%|\"${localveroctfiledir}\"|" \
+ -e "s|%OCTAVE_MAN1DIR%|\"${man1dir}\"|" \
+ -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \
+ -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \
+ -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \
+ -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \
+ -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
+ -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \
+ -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \
+ -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \
+ -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \
+ -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \
+ -e "s|%OCTAVE_VERSION%|\"${version}\"|"
+ $(simple_move_if_change_rule)
+ endef
+
+ define do_subst_script_vals
+ echo "making $@ from $<"
+ $(SED) < $< \
+ -e "s|%AWK%|${AWK}|g" \
+ -e "s|%FIND%|${FIND}|g" \
+ -e "s|%SED%|${SED}|g" \
+ -e "s|%library_path_var%|${library_path_var}|g" \
+ -e "s|%liboctinterp%|${SHLPRE}octinterp.${SHLEXT}|g" \
+ -e "s|%liboctave%|${SHLPRE}octave.${SHLEXT}|g" \
+ -e "s|%libcruft%|${SHLPRE}cruft.${SHLEXT}|g" \
+ -e "s|%ldpreloadsep%|${ldpreloadsep}|g" \
+ -e "s|%srcdir%|${srcdir}|" \
+ -e "s|%top_srcdir%|${top_srcdir}|" \
+ -e "s|%abs_top_srcdir%|${abs_top_srcdir}|" \
+ -e "s|%builddir%|$(shell pwd)|" > $@-t
+ $(simple_move_if_change_rule)
+ endef
+
+ define do_script_install
+ $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)
+ for f in $(FCN_FILES); do \
+ fbase=`basename $$f`; \
+ rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$fbase; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$fbase; \
+ done
+ $(top_srcdir)/mkpkgadd $(DESTDIR)$(fcnfiledir)/$(script_sub_dir) > $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t
+ if [ -n "`cat $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t`" ]; then \
+ $(INSTALL_DATA) $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD ; \
+ else \
+ rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD.t ; \
+ fi
+ endef
+
+ define do_script_uninstall
+ for f in $(FCN_FILES_NO_DIR); \
+ do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \
+ done
+ rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD
+ -rmdir $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)
+ endef
diff -cNr octave-3.4.0/build-aux/config.guess octave-3.4.1/build-aux/config.guess
*** octave-3.4.0/build-aux/config.guess 2011-02-08 05:02:34.000000000 -0500
--- octave-3.4.1/build-aux/config.guess 2011-06-15 11:13:47.000000000 -0400
***************
*** 4,10 ****
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
! timestamp='2011-02-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
--- 4,10 ----
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
! timestamp='2011-06-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
***************
*** 882,888 ****
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
! echo ${UNAME_MACHINE}-unknown-linux-gnueabi
fi
exit ;;
avr32*:Linux:*:*)
--- 882,894 ----
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
! if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
! | grep -q __ARM_PCS_VFP
! then
! echo ${UNAME_MACHINE}-unknown-linux-gnueabi
! else
! echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
! fi
fi
exit ;;
avr32*:Linux:*:*)
***************
*** 972,978 ****
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
! echo ${UNAME_MACHINE}-tilera-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
--- 978,984 ----
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
! echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
diff -cNr octave-3.4.0/build-aux/config.sub octave-3.4.1/build-aux/config.sub
*** octave-3.4.0/build-aux/config.sub 2011-02-08 05:02:34.000000000 -0500
--- octave-3.4.1/build-aux/config.sub 2011-06-15 11:13:47.000000000 -0400
***************
*** 4,10 ****
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
! timestamp='2011-02-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
--- 4,10 ----
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
! timestamp='2011-06-03'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
***************
*** 76,82 ****
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
--- 76,82 ----
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
***************
*** 286,294 ****
| nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
| pdp10 | pdp11 | pj | pjl \
! | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| rx \
| score \
--- 286,295 ----
| nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
! | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
***************
*** 296,307 ****
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
! | spu | strongarm \
! | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
! | v850 | v850e \
| we32k \
! | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
--- 297,308 ----
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
! | spu \
! | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
! | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
! | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
***************
*** 325,330 ****
--- 326,343 ----
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
***************
*** 382,405 ****
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
! | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
! | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! | tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
! | v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
--- 395,420 ----
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
! | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
! | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
! | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! | tile*-* \
| tron-* \
| ubicom32-* \
! | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
! | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
***************
*** 950,958 ****
;;
power) basic_machine=power-ibm
;;
! ppc) basic_machine=powerpc-unknown
;;
! ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
--- 965,974 ----
;;
power) basic_machine=power-ibm
;;
! ppc | ppcbe) basic_machine=powerpc-unknown
;;
! ppc-* | ppcbe-*)
! basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
***************
*** 1046,1051 ****
--- 1062,1070 ----
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
***************
*** 1102,1114 ****
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
! basic_machine=tile-unknown
os=-linux-gnu
;;
tx39)
--- 1121,1128 ----
basic_machine=t90-cray
os=-unicos
;;
tile*)
! basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
***************
*** 1178,1183 ****
--- 1192,1200 ----
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
diff -cNr octave-3.4.0/build-aux/depcomp octave-3.4.1/build-aux/depcomp
*** octave-3.4.0/build-aux/depcomp 2011-02-08 05:02:34.000000000 -0500
--- octave-3.4.1/build-aux/depcomp 2011-06-15 11:13:47.000000000 -0400
***************
*** 1,10 ****
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
! scriptversion=2010-10-07.20; # UTC
! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010
! # Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
--- 1,10 ----
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
! scriptversion=2011-04-16.09; # UTC
! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
! # 2011 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
***************
*** 166,175 ****
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
! ## well.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
! sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
--- 166,177 ----
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
! ## well. hp depmode also adds that space, but also prefixes the VPATH
! ## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
! sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
! | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
***************
*** 557,563 ****
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
! cat < "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
--- 559,567 ----
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
! # makedepend may prepend the VPATH from the source file name to the object.
! # No need to regex-escape $object, excess matching of '.' is harmless.
! sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
diff -cNr octave-3.4.0/build-aux/install-sh octave-3.4.1/build-aux/install-sh
*** octave-3.4.0/build-aux/install-sh 2011-02-08 05:02:34.000000000 -0500
--- octave-3.4.1/build-aux/install-sh 2011-06-15 11:13:47.000000000 -0400
***************
*** 1,7 ****
#!/bin/sh
# install - install a program, script, or datafile
! scriptversion=2010-02-06.18; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
--- 1,7 ----
#!/bin/sh
# install - install a program, script, or datafile
! scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
***************
*** 156,161 ****
--- 156,165 ----
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
***************
*** 186,191 ****
--- 190,199 ----
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
***************
*** 232,240 ****
for src
do
! # Protect names starting with `-'.
case $src in
! -*) src=./$src;;
esac
if test -n "$dir_arg"; then
--- 240,248 ----
for src
do
! # Protect names problematic for `test' and other utilities.
case $src in
! -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
***************
*** 256,267 ****
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
--- 264,270 ----
***************
*** 389,395 ****
case $dstdir in
/*) prefix='/';;
! -*) prefix='./';;
*) prefix='';;
esac
--- 392,398 ----
case $dstdir in
/*) prefix='/';;
! [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
***************
*** 407,413 ****
for d
do
! test -z "$d" && continue
prefix=$prefix$d
if test -d "$prefix"; then
--- 410,416 ----
for d
do
! test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
diff -cNr octave-3.4.0/build-aux/ltmain.sh octave-3.4.1/build-aux/ltmain.sh
*** octave-3.4.0/build-aux/ltmain.sh 2011-02-08 05:03:20.000000000 -0500
--- octave-3.4.1/build-aux/ltmain.sh 2011-06-15 11:31:10.000000000 -0400
***************
*** 1,9 ****
- # Generated from ltmain.m4sh.
! # ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit , 1996
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- 1,9 ----
! # libtool (GNU libtool) 2.4
# Written by Gordon Matzigkeit , 1996
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
! # 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
***************
*** 32,81 ****
#
# Provide generalized library-building support services.
#
! # --config show all configuration variables
! # --debug enable verbose shell tracing
! # -n, --dry-run display commands without modifying any files
! # --features display basic configuration information and exit
! # --mode=MODE use operation mode MODE
! # --preserve-dup-deps don't remove duplicate dependency libraries
! # --quiet, --silent don't print informational messages
! # --tag=TAG use configuration variables from tag TAG
! # -v, --verbose print informational messages (default)
! # --version print version information
! # -h, --help print short or long help message
#
# MODE must be one of the following:
#
! # clean remove files from the build directory
! # compile compile a source file into a libtool object
! # execute automatically set library path, then run a program
! # finish complete the installation of libtool libraries
! # install install libraries or executables
! # link create a library or an executable
! # uninstall remove libraries from an installed directory
#
! # MODE-ARGS vary depending on the MODE.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
! # host-triplet: $host
! # shell: $SHELL
! # compiler: $LTCC
! # compiler flags: $LTCFLAGS
! # linker: $LD (gnu? $with_gnu_ld)
! # $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
! # automake: $automake_version
! # autoconf: $autoconf_version
#
# Report bugs to .
! PROGRAM=ltmain.sh
PACKAGE=libtool
! VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
! package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--- 32,87 ----
#
# Provide generalized library-building support services.
#
! # --config show all configuration variables
! # --debug enable verbose shell tracing
! # -n, --dry-run display commands without modifying any files
! # --features display basic configuration information and exit
! # --mode=MODE use operation mode MODE
! # --preserve-dup-deps don't remove duplicate dependency libraries
! # --quiet, --silent don't print informational messages
! # --no-quiet, --no-silent
! # print informational messages (default)
! # --tag=TAG use configuration variables from tag TAG
! # -v, --verbose print more informational messages than default
! # --no-verbose don't print the extra informational messages
! # --version print version information
! # -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
! # clean remove files from the build directory
! # compile compile a source file into a libtool object
! # execute automatically set library path, then run a program
! # finish complete the installation of libtool libraries
! # install install libraries or executables
! # link create a library or an executable
! # uninstall remove libraries from an installed directory
#
! # MODE-ARGS vary depending on the MODE. When passed as first option,
! # `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
! # host-triplet: $host
! # shell: $SHELL
! # compiler: $LTCC
! # compiler flags: $LTCFLAGS
! # linker: $LD (gnu? $with_gnu_ld)
! # $progname: (GNU libtool) 2.4 Debian-2.4-2
! # automake: $automake_version
! # autoconf: $autoconf_version
#
# Report bugs to .
+ # GNU libtool home page: .
+ # General help using GNU software: .
! PROGRAM=libtool
PACKAGE=libtool
! VERSION="2.4 Debian-2.4-2"
TIMESTAMP=""
! package_revision=1.3293
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
***************
*** 91,100 ****
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# NLS nuisances: We save the old values to restore during execute mode.
- # Only set LANG and LC_ALL to C if already set.
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
--- 97,111 ----
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+ # A function that is used when there is no print builtin or printf.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+ $1
+ _LTECHO_EOF'
+ }
+
# NLS nuisances: We save the old values to restore during execute mode.
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
***************
*** 107,121 ****
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
$lt_unset CDPATH
: ${CP="cp -f"}
! : ${ECHO="echo"}
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
--- 118,141 ----
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+ LC_ALL=C
+ LANGUAGE=C
+ export LANGUAGE LC_ALL
$lt_unset CDPATH
+ # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+ # is ksh but when the shell is invoked as "sh" and the current value of
+ # the _XPG environment variable is not equal to 1 (one), the special
+ # positional parameter $0, within a function call, is the name of the
+ # function.
+ progpath="$0"
: ${CP="cp -f"}
! test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
***************
*** 144,149 ****
--- 164,190 ----
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
+ # func_dirname file append nondir_replacement
+ # Compute the dirname of FILE. If nonempty, add APPEND to the result,
+ # otherwise set result to NONDIR_REPLACEMENT.
+ func_dirname ()
+ {
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ } # func_dirname may be replaced by extended shell implementation
+
+
+ # func_basename file
+ func_basename ()
+ {
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+ } # func_basename may be replaced by extended shell implementation
+
+
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
***************
*** 158,190 ****
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
! # Extract subdirectory from the argument.
! func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
! if test "X$func_dirname_result" = "X${1}"; then
! func_dirname_result="${3}"
! else
! func_dirname_result="$func_dirname_result${2}"
! fi
! func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
}
! # Generated shell functions inserted here.
! # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
! # is ksh but when the shell is invoked as "sh" and the current value of
! # the _XPG environment variable is not equal to 1 (one), the special
! # positional parameter $0, within a function call, is the name of the
! # function.
! progpath="$0"
# The name of this program:
- # In the unlikely event $progname began with a '-', it would play havoc with
- # func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
- case $progname in
- -*) progname=./$progname ;;
- esac
# Make sure we have an absolute path for reexecution:
case $progpath in
--- 199,381 ----
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
! # Extract subdirectory from the argument.
! func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
! if test "X$func_dirname_result" = "X${1}"; then
! func_dirname_result="${3}"
! else
! func_dirname_result="$func_dirname_result${2}"
! fi
! func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
! } # func_dirname_and_basename may be replaced by extended shell implementation
!
!
! # func_stripname prefix suffix name
! # strip PREFIX and SUFFIX off of NAME.
! # PREFIX and SUFFIX must not contain globbing or regex special
! # characters, hashes, percent signs, but SUFFIX may contain a leading
! # dot (in which case that matches only a dot).
! # func_strip_suffix prefix name
! func_stripname ()
! {
! case ${2} in
! .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
! *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
! esac
! } # func_stripname may be replaced by extended shell implementation
!
!
! # These SED scripts presuppose an absolute path with a trailing slash.
! pathcar='s,^/\([^/]*\).*$,\1,'
! pathcdr='s,^/[^/]*,,'
! removedotparts=':dotsl
! s@/\./@/@g
! t dotsl
! s,/\.$,/,'
! collapseslashes='s@/\{1,\}@/@g'
! finalslash='s,/*$,/,'
!
! # func_normal_abspath PATH
! # Remove doubled-up and trailing slashes, "." path components,
! # and cancel out any ".." path components in PATH after making
! # it an absolute path.
! # value returned in "$func_normal_abspath_result"
! func_normal_abspath ()
! {
! # Start from root dir and reassemble the path.
! func_normal_abspath_result=
! func_normal_abspath_tpath=$1
! func_normal_abspath_altnamespace=
! case $func_normal_abspath_tpath in
! "")
! # Empty path, that just means $cwd.
! func_stripname '' '/' "`pwd`"
! func_normal_abspath_result=$func_stripname_result
! return
! ;;
! # The next three entries are used to spot a run of precisely
! # two leading slashes without using negated character classes;
! # we take advantage of case's first-match behaviour.
! ///*)
! # Unusual form of absolute path, do nothing.
! ;;
! //*)
! # Not necessarily an ordinary path; POSIX reserves leading '//'
! # and for example Cygwin uses it to access remote file shares
! # over CIFS/SMB, so we conserve a leading double slash if found.
! func_normal_abspath_altnamespace=/
! ;;
! /*)
! # Absolute path, do nothing.
! ;;
! *)
! # Relative path, prepend $cwd.
! func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
! ;;
! esac
! # Cancel out all the simple stuff to save iterations. We also want
! # the path to end with a slash for ease of parsing, so make sure
! # there is one (and only one) here.
! func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
! -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
! while :; do
! # Processed it all yet?
! if test "$func_normal_abspath_tpath" = / ; then
! # If we ascended to the root using ".." the result may be empty now.
! if test -z "$func_normal_abspath_result" ; then
! func_normal_abspath_result=/
! fi
! break
! fi
! func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
! -e "$pathcar"`
! func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
! -e "$pathcdr"`
! # Figure out what to do with it
! case $func_normal_abspath_tcomponent in
! "")
! # Trailing empty path component, ignore it.
! ;;
! ..)
! # Parent dir; strip last assembled component from result.
! func_dirname "$func_normal_abspath_result"
! func_normal_abspath_result=$func_dirname_result
! ;;
! *)
! # Actual path component, append it.
! func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
! ;;
! esac
! done
! # Restore leading double-slash if one was found on entry.
! func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
}
! # func_relative_path SRCDIR DSTDIR
! # generates a relative path from SRCDIR to DSTDIR, with a trailing
! # slash if non-empty, suitable for immediately appending a filename
! # without needing to append a separator.
! # value returned in "$func_relative_path_result"
! func_relative_path ()
! {
! func_relative_path_result=
! func_normal_abspath "$1"
! func_relative_path_tlibdir=$func_normal_abspath_result
! func_normal_abspath "$2"
! func_relative_path_tbindir=$func_normal_abspath_result
!
! # Ascend the tree starting from libdir
! while :; do
! # check if we have found a prefix of bindir
! case $func_relative_path_tbindir in
! $func_relative_path_tlibdir)
! # found an exact match
! func_relative_path_tcancelled=
! break
! ;;
! $func_relative_path_tlibdir*)
! # found a matching prefix
! func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
! func_relative_path_tcancelled=$func_stripname_result
! if test -z "$func_relative_path_result"; then
! func_relative_path_result=.
! fi
! break
! ;;
! *)
! func_dirname $func_relative_path_tlibdir
! func_relative_path_tlibdir=${func_dirname_result}
! if test "x$func_relative_path_tlibdir" = x ; then
! # Have to descend all the way to the root!
! func_relative_path_result=../$func_relative_path_result
! func_relative_path_tcancelled=$func_relative_path_tbindir
! break
! fi
! func_relative_path_result=../$func_relative_path_result
! ;;
! esac
! done
!
! # Now calculate path; take care to avoid doubling-up slashes.
! func_stripname '' '/' "$func_relative_path_result"
! func_relative_path_result=$func_stripname_result
! func_stripname '/' '/' "$func_relative_path_tcancelled"
! if test "x$func_stripname_result" != x ; then
! func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
! fi
! # Normalisation. If bindir is libdir, return empty string,
! # else relative path ending with a slash; either way, target
! # file name can be directly appended.
! if test ! -z "$func_relative_path_result"; then
! func_stripname './' '' "$func_relative_path_result/"
! func_relative_path_result=$func_stripname_result
! fi
! }
# The name of this program:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
# Make sure we have an absolute path for reexecution:
case $progpath in
***************
*** 215,220 ****
--- 406,420 ----
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
+ # Sed substitution that turns a string into a regex matching for the
+ # string literally.
+ sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+ # Sed substitution that converts a w32 file name or path
+ # which contains forward slashes, into one that contains
+ # (escaped) backslashes. A very naive implementation.
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
***************
*** 243,249 ****
# name if it has been set yet.
func_echo ()
{
! $ECHO "$progname${mode+: }$mode: $*"
}
# func_verbose arg...
--- 443,449 ----
# name if it has been set yet.
func_echo ()
{
! $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
}
# func_verbose arg...
***************
*** 258,275 ****
:
}
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
{
! $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
! $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
# bash bug again:
:
--- 458,482 ----
:
}
+ # func_echo_all arg...
+ # Invoke $ECHO with all args, space-separated.
+ func_echo_all ()
+ {
+ $ECHO "$*"
+ }
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
{
! $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
! $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
# bash bug again:
:
***************
*** 326,334 ****
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
! my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
done
! my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
--- 533,541 ----
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
! my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
! my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
***************
*** 378,384 ****
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
! $ECHO "X$my_tmpdir" | $Xsed
}
--- 585,591 ----
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
! $ECHO "$my_tmpdir"
}
***************
*** 392,398 ****
{
case $1 in
*[\\\`\"\$]*)
! func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
--- 599,605 ----
{
case $1 in
*[\\\`\"\$]*)
! func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
***************
*** 419,425 ****
{
case $1 in
*[\\\`\"]*)
! my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
--- 626,632 ----
{
case $1 in
*[\\\`\"]*)
! my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
***************
*** 488,502 ****
fi
}
!
!
# func_version
# Echo version message to standard output and exit.
func_version ()
{
! $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
--- 695,733 ----
fi
}
! # func_tr_sh
! # Turn $1 into a string suitable for a shell variable name.
! # Result is stored in $func_tr_sh_result. All characters
! # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
! # if $1 begins with a digit, a '_' is prepended as well.
! func_tr_sh ()
! {
! case $1 in
! [0-9]* | *[!a-zA-Z0-9_]*)
! func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
! ;;
! * )
! func_tr_sh_result=$1
! ;;
! esac
! }
# func_version
# Echo version message to standard output and exit.
func_version ()
{
! $opt_debug
!
! $SED -n '/(C)/!b go
! :more
! /\./!{
! N
! s/\n# / /
! b more
! }
! :go
! /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
***************
*** 509,530 ****
# Echo short help message to standard output and exit.
func_usage ()
{
! $SED -n '/^# Usage:/,/# -h/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
! $ECHO
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
! # func_help
! # Echo long help message to standard output and exit.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
s/^# //
s/^# *$//
s*\$progname*'$progname'*
--- 740,767 ----
# Echo short help message to standard output and exit.
func_usage ()
{
! $opt_debug
!
! $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
! echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
! # func_help [NOEXIT]
! # Echo long help message to standard output and exit,
! # unless 'noexit' is passed as argument.
func_help ()
{
+ $opt_debug
+
$SED -n '/^# Usage:/,/# Report bugs to/ {
+ :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
***************
*** 537,544 ****
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
! }' < "$progpath"
! exit $?
}
# func_missing_arg argname
--- 774,788 ----
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
! d
! }
! /^# .* home page:/b print
! /^# General help using/b print
! ' < "$progpath"
! ret=$?
! if test -z "$1"; then
! exit $ret
! fi
}
# func_missing_arg argname
***************
*** 546,608 ****
# exit_cmd.
func_missing_arg ()
{
! func_error "missing argument for $1"
exit_cmd=exit
}
- exit_cmd=:
- # Check that we have a working $ECHO.
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
- elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
- fi
- if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat </dev/null || echo $max_cmd_len`
+ } # func_len may be replaced by extended shell implementation
+
+
+ # func_lo2o object
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+ } # func_lo2o may be replaced by extended shell implementation
+
+
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+ } # func_xform may be replaced by extended shell implementation
+
+
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
***************
*** 636,651 ****
# Display the features supported by this script.
func_features ()
{
! $ECHO "host: $host"
if test "$build_libtool_libs" = yes; then
! $ECHO "enable shared libraries"
else
! $ECHO "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
! $ECHO "enable static libraries"
else
! $ECHO "disable static libraries"
fi
exit $?
--- 923,938 ----
# Display the features supported by this script.
func_features ()
{
! echo "host: $host"
if test "$build_libtool_libs" = yes; then
! echo "enable shared libraries"
else
! echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
! echo "enable static libraries"
else
! echo "disable static libraries"
fi
exit $?
***************
*** 692,808 ****
esac
}
! # Parse options once, thoroughly. This comes as soon as possible in
! # the script to make things like `libtool --version' happen quickly.
{
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
- compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
- execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
- finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
- install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
- link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
- esac
! # Parse non-mode specific arguments:
! while test "$#" -gt 0; do
opt="$1"
shift
-
case $opt in
! --config) func_config ;;
!
! --debug) preserve_args="$preserve_args $opt"
func_echo "enabling shell trace mode"
- opt_debug='set -x'
$opt_debug
;;
!
! -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
! execute_dlfiles="$execute_dlfiles $1"
! shift
;;
!
! --dry-run | -n) opt_dry_run=: ;;
! --features) func_features ;;
! --finish) mode="finish" ;;
!
! --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
! case $1 in
! # Valid mode arguments:
! clean) ;;
! compile) ;;
! execute) ;;
! finish) ;;
! install) ;;
! link) ;;
! relink) ;;
! uninstall) ;;
!
! # Catch anything else as an error
! *) func_error "invalid argument for $opt"
! exit_cmd=exit
! break
! ;;
! esac
!
! mode="$1"
shift
;;
-
--preserve-dup-deps)
! opt_duplicate_deps=: ;;
!
! --quiet|--silent) preserve_args="$preserve_args $opt"
! opt_silent=:
;;
!
! --verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
;;
!
! --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
! preserve_args="$preserve_args $opt $1"
! func_enable_tag "$1" # tagname is set here
shift
;;
# Separate optargs to long options:
! -dlopen=*|--mode=*|--tag=*)
! func_opt_split "$opt"
! set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
shift
;;
! -\?|-h) func_usage ;;
! --help) opt_help=: ;;
! --version) func_version ;;
!
! -*) func_fatal_help "unrecognized option \`$opt'" ;;
!
! *) nonopt="$opt"
! break
;;
esac
done
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
--- 979,1182 ----
esac
}
! # func_check_version_match
! # Ensure that we are using m4 macros, and libtool script from the same
! # release of libtool.
! func_check_version_match ()
{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+ $progname: definition of this LT_INIT comes from an older release.
+ $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+ $progname: and run autoconf again.
+ _LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+ $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+ $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+ $progname: and run autoconf again.
+ _LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+ $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+ $progname: but the definition of this LT_INIT comes from revision $macro_revision.
+ $progname: You should recreate aclocal.m4 with macros from revision $package_revision
+ $progname: of $PACKAGE $VERSION and run autoconf again.
+ _LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
+ fi
+ }
+
+
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
!
! # Option defaults:
! opt_debug=:
! opt_dry_run=false
! opt_config=false
! opt_preserve_dup_deps=false
! opt_features=false
! opt_finish=false
! opt_help=false
! opt_help_all=false
! opt_silent=:
! opt_verbose=:
! opt_silent=false
! opt_verbose=false
!
!
! # Parse options once, thoroughly. This comes as soon as possible in the
! # script to make things like `--version' happen as quickly as we can.
! {
! # this just eases exit handling
! while test $# -gt 0; do
opt="$1"
shift
case $opt in
! --debug|-x) opt_debug='set -x'
func_echo "enabling shell trace mode"
$opt_debug
;;
! --dry-run|--dryrun|-n)
! opt_dry_run=:
;;
! --config)
! opt_config=:
! func_config
! ;;
! --dlopen|-dlopen)
! optarg="$1"
! opt_dlopen="${opt_dlopen+$opt_dlopen
! }$optarg"
shift
;;
--preserve-dup-deps)
! opt_preserve_dup_deps=:
;;
! --features)
! opt_features=:
! func_features
! ;;
! --finish)
! opt_finish=:
! set dummy --mode finish ${1+"$@"}; shift
! ;;
! --help)
! opt_help=:
! ;;
! --help-all)
! opt_help_all=:
! opt_help=': help-all'
! ;;
! --mode)
! test $# = 0 && func_missing_arg $opt && break
! optarg="$1"
! opt_mode="$optarg"
! case $optarg in
! # Valid mode arguments:
! clean|compile|execute|finish|install|link|relink|uninstall) ;;
!
! # Catch anything else as an error
! *) func_error "invalid argument for $opt"
! exit_cmd=exit
! break
! ;;
! esac
! shift
! ;;
! --no-silent|--no-quiet)
opt_silent=false
+ func_append preserve_args " $opt"
;;
! --no-verbose)
! opt_verbose=false
! func_append preserve_args " $opt"
! ;;
! --silent|--quiet)
! opt_silent=:
! func_append preserve_args " $opt"
! opt_verbose=false
! ;;
! --verbose|-v)
! opt_verbose=:
! func_append preserve_args " $opt"
! opt_silent=false
! ;;
! --tag)
! test $# = 0 && func_missing_arg $opt && break
! optarg="$1"
! opt_tag="$optarg"
! func_append preserve_args " $opt $optarg"
! func_enable_tag "$optarg"
shift
;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+ --version) func_version ;;
+
# Separate optargs to long options:
! --*=*)
! func_split_long_opt "$opt"
! set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
shift
;;
! # Separate non-argument short options:
! -\?*|-h*|-n*|-v*)
! func_split_short_opt "$opt"
! set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
! shift
;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
esac
done
+ # Validate options:
+
+ # save first non-option argument
+ if test "$#" -gt 0; then
+ nonopt="$opt"
+ shift
+ fi
+
+ # preserve --debug
+ test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
***************
*** 810,891 ****
opt_duplicate_compiler_generated_deps=:
;;
*)
! opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
;;
esac
! # Having warned about all mis-specified options, bail out if
! # anything was wrong.
! $exit_cmd $EXIT_FAILURE
! }
! # func_check_version_match
! # Ensure that we are using m4 macros, and libtool script from the same
! # release of libtool.
! func_check_version_match ()
! {
! if test "$package_revision" != "$macro_revision"; then
! if test "$VERSION" != "$macro_version"; then
! if test -z "$macro_version"; then
! cat >&2 <<_LT_EOF
! $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
! $progname: definition of this LT_INIT comes from an older release.
! $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
! $progname: and run autoconf again.
! _LT_EOF
! else
! cat >&2 <<_LT_EOF
! $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
! $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
! $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
! $progname: and run autoconf again.
! _LT_EOF
! fi
! else
! cat >&2 <<_LT_EOF
! $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
! $progname: but the definition of this LT_INIT comes from revision $macro_revision.
! $progname: You should recreate aclocal.m4 with macros from revision $package_revision
! $progname: of $PACKAGE $VERSION and run autoconf again.
! _LT_EOF
fi
! exit $EXIT_MISMATCH
! fi
! }
!
! ## ----------- ##
! ## Main. ##
! ## ----------- ##
!
! $opt_help || {
! # Sanity checks first:
! func_check_version_match
!
! if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
! func_fatal_configuration "not configured to build any kind of library"
! fi
! test -z "$mode" && func_fatal_error "error: you must specify a MODE."
! # Darwin sucks
! eval std_shrext=\"$shrext_cmds\"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$mode' for more information."
- }
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
--- 1184,1227 ----
opt_duplicate_compiler_generated_deps=:
;;
*)
! opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
;;
esac
! $opt_help || {
! # Sanity checks first:
! func_check_version_match
! if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
! func_fatal_configuration "not configured to build any kind of library"
fi
! # Darwin sucks
! eval std_shrext=\"$shrext_cmds\"
! # Only execute mode is allowed to have -dlopen flags.
! if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
! func_error "unrecognized option \`-dlopen'"
! $ECHO "$help" 1>&2
! exit $EXIT_FAILURE
! fi
! # Change the help message to a mode-specific one.
! generic_help="$help"
! help="Try \`$progname --help --mode=$opt_mode' for more information."
! }
! # Bail if the options were screwed
! $exit_cmd $EXIT_FAILURE
! }
+ ## ----------- ##
+ ## Main. ##
+ ## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
***************
*** 950,961 ****
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
! func_ltwrapper_scriptname_result=""
! if func_ltwrapper_executable_p "$1"; then
! func_dirname_and_basename "$1" "" "."
! func_stripname '' '.exe' "$func_basename_result"
! func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
! fi
}
# func_ltwrapper_p file
--- 1286,1294 ----
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
! func_dirname_and_basename "$1" "" "."
! func_stripname '' '.exe' "$func_basename_result"
! func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
}
# func_ltwrapper_p file
***************
*** 1001,1006 ****
--- 1334,1370 ----
}
+ # func_resolve_sysroot PATH
+ # Replace a leading = in PATH with a sysroot. Store the result into
+ # func_resolve_sysroot_result
+ func_resolve_sysroot ()
+ {
+ func_resolve_sysroot_result=$1
+ case $func_resolve_sysroot_result in
+ =*)
+ func_stripname '=' '' "$func_resolve_sysroot_result"
+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+ ;;
+ esac
+ }
+
+ # func_replace_sysroot PATH
+ # If PATH begins with the sysroot, replace it with = and
+ # store the result into func_replace_sysroot_result.
+ func_replace_sysroot ()
+ {
+ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+ func_replace_sysroot_result=$1
+ ;;
+ esac
+ }
+
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
***************
*** 1013,1025 ****
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
! func_quote_for_eval "$arg"
! CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
! " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
--- 1377,1391 ----
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
! func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
! " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
! " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
***************
*** 1030,1040 ****
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
! func_quote_for_eval "$arg"
! CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
case "$@ " in
! " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
--- 1396,1408 ----
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
! func_append_quoted CC_quoted "$arg"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
! " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
! " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
***************
*** 1097,1102 ****
--- 1465,1950 ----
}
}
+
+ ##################################################
+ # FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+ ##################################################
+
+ # func_convert_core_file_wine_to_w32 ARG
+ # Helper function used by file name conversion functions when $build is *nix,
+ # and $host is mingw, cygwin, or some other w32 environment. Relies on a
+ # correctly configured wine environment available, with the winepath program
+ # in $build's $PATH.
+ #
+ # ARG is the $build file name to be converted to w32 format.
+ # Result is available in $func_convert_core_file_wine_to_w32_result, and will
+ # be empty on error (or when ARG is empty)
+ func_convert_core_file_wine_to_w32 ()
+ {
+ $opt_debug
+ func_convert_core_file_wine_to_w32_result="$1"
+ if test -n "$1"; then
+ # Unfortunately, winepath does not exit with a non-zero error code, so we
+ # are forced to check the contents of stdout. On the other hand, if the
+ # command is not found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both error code of
+ # zero AND non-empty stdout, which explains the odd construction:
+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+ fi
+ }
+ # end: func_convert_core_file_wine_to_w32
+
+
+ # func_convert_core_path_wine_to_w32 ARG
+ # Helper function used by path conversion functions when $build is *nix, and
+ # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+ # configured wine environment available, with the winepath program in $build's
+ # $PATH. Assumes ARG has no leading or trailing path separator characters.
+ #
+ # ARG is path to be converted from $build format to win32.
+ # Result is available in $func_convert_core_path_wine_to_w32_result.
+ # Unconvertible file (directory) names in ARG are skipped; if no directory names
+ # are convertible, then the result may be empty.
+ func_convert_core_path_wine_to_w32 ()
+ {
+ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+ func_convert_core_path_wine_to_w32_result=""
+ if test -n "$1"; then
+ oldIFS=$IFS
+ IFS=:
+ for func_convert_core_path_wine_to_w32_f in $1; do
+ IFS=$oldIFS
+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ else
+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+ fi
+ fi
+ done
+ IFS=$oldIFS
+ fi
+ }
+ # end: func_convert_core_path_wine_to_w32
+
+
+ # func_cygpath ARGS...
+ # Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+ # when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+ # $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+ # (2), returns the Cygwin file name or path in func_cygpath_result (input
+ # file name or path is assumed to be in w32 format, as previously converted
+ # from $build's *nix or MSYS format). In case (3), returns the w32 file name
+ # or path in func_cygpath_result (input file name or path is assumed to be in
+ # Cygwin format). Returns an empty string on error.
+ #
+ # ARGS are passed to cygpath, with the last one being the file name or path to
+ # be converted.
+ #
+ # Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+ # environment variable; do not put it in $PATH.
+ func_cygpath ()
+ {
+ $opt_debug
+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+ if test "$?" -ne 0; then
+ # on failure, ensure result is empty
+ func_cygpath_result=
+ fi
+ else
+ func_cygpath_result=
+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+ }
+ #end: func_cygpath
+
+
+ # func_convert_core_msys_to_w32 ARG
+ # Convert file name or path ARG from MSYS format to w32 format. Return
+ # result in func_convert_core_msys_to_w32_result.
+ func_convert_core_msys_to_w32 ()
+ {
+ $opt_debug
+ # awkward: cmd appends spaces to result
+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ }
+ #end: func_convert_core_msys_to_w32
+
+
+ # func_convert_file_check ARG1 ARG2
+ # Verify that ARG1 (a file name in $build format) was converted to $host
+ # format in ARG2. Otherwise, emit an error message, but continue (resetting
+ # func_to_host_file_result to ARG1).
+ func_convert_file_check ()
+ {
+ $opt_debug
+ if test -z "$2" && test -n "$1" ; then
+ func_error "Could not determine host file name corresponding to"
+ func_error " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_file_result="$1"
+ fi
+ }
+ # end func_convert_file_check
+
+
+ # func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+ # Verify that FROM_PATH (a path in $build format) was converted to $host
+ # format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+ # func_to_host_file_result to a simplistic fallback value (see below).
+ func_convert_path_check ()
+ {
+ $opt_debug
+ if test -z "$4" && test -n "$3"; then
+ func_error "Could not determine the host path corresponding to"
+ func_error " \`$3'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This is a deliberately simplistic "conversion" and
+ # should not be "improved". See libtool.info.
+ if test "x$1" != "x$2"; then
+ lt_replace_pathsep_chars="s|$1|$2|g"
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+ func_to_host_path_result="$3"
+ fi
+ fi
+ }
+ # end func_convert_path_check
+
+
+ # func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+ # Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+ # and appending REPL if ORIG matches BACKPAT.
+ func_convert_path_front_back_pathsep ()
+ {
+ $opt_debug
+ case $4 in
+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+ $2 ) func_append func_to_host_path_result "$3"
+ ;;
+ esac
+ }
+ # end func_convert_path_front_back_pathsep
+
+
+ ##################################################
+ # $build to $host FILE NAME CONVERSION FUNCTIONS #
+ ##################################################
+ # invoked via `$to_host_file_cmd ARG'
+ #
+ # In each case, ARG is the path to be converted from $build to $host format.
+ # Result will be available in $func_to_host_file_result.
+
+
+ # func_to_host_file ARG
+ # Converts the file name ARG from $build format to $host format. Return result
+ # in func_to_host_file_result.
+ func_to_host_file ()
+ {
+ $opt_debug
+ $to_host_file_cmd "$1"
+ }
+ # end func_to_host_file
+
+
+ # func_to_tool_file ARG LAZY
+ # converts the file name ARG from $build format to toolchain format. Return
+ # result in func_to_tool_file_result. If the conversion in use is listed
+ # in (the comma separated) LAZY, no conversion takes place.
+ func_to_tool_file ()
+ {
+ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+ ;;
+ *)
+ $to_tool_file_cmd "$1"
+ func_to_tool_file_result=$func_to_host_file_result
+ ;;
+ esac
+ }
+ # end func_to_tool_file
+
+
+ # func_convert_file_noop ARG
+ # Copy ARG to func_to_host_file_result.
+ func_convert_file_noop ()
+ {
+ func_to_host_file_result="$1"
+ }
+ # end func_convert_file_noop
+
+
+ # func_convert_file_msys_to_w32 ARG
+ # Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+ # conversion to w32 is not available inside the cwrapper. Returns result in
+ # func_to_host_file_result.
+ func_convert_file_msys_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+ # end func_convert_file_msys_to_w32
+
+
+ # func_convert_file_cygwin_to_w32 ARG
+ # Convert file name ARG from Cygwin to w32 format. Returns result in
+ # func_to_host_file_result.
+ func_convert_file_cygwin_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+ # LT_CYGPATH in this case.
+ func_to_host_file_result=`cygpath -m "$1"`
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+ # end func_convert_file_cygwin_to_w32
+
+
+ # func_convert_file_nix_to_w32 ARG
+ # Convert file name ARG from *nix to w32 format. Requires a wine environment
+ # and a working winepath. Returns result in func_to_host_file_result.
+ func_convert_file_nix_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_file_wine_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+ # end func_convert_file_nix_to_w32
+
+
+ # func_convert_file_msys_to_cygwin ARG
+ # Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+ # Returns result in func_to_host_file_result.
+ func_convert_file_msys_to_cygwin ()
+ {
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+ # end func_convert_file_msys_to_cygwin
+
+
+ # func_convert_file_nix_to_cygwin ARG
+ # Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
+ # in a wine environment, working winepath, and LT_CYGPATH set. Returns result
+ # in func_to_host_file_result.
+ func_convert_file_nix_to_cygwin ()
+ {
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+ func_convert_core_file_wine_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+ }
+ # end func_convert_file_nix_to_cygwin
+
+
+ #############################################
+ # $build to $host PATH CONVERSION FUNCTIONS #
+ #############################################
+ # invoked via `$to_host_path_cmd ARG'
+ #
+ # In each case, ARG is the path to be converted from $build to $host format.
+ # The result will be available in $func_to_host_path_result.
+ #
+ # Path separators are also converted from $build format to $host format. If
+ # ARG begins or ends with a path separator character, it is preserved (but
+ # converted to $host format) on output.
+ #
+ # All path conversion functions are named using the following convention:
+ # file name conversion function : func_convert_file_X_to_Y ()
+ # path conversion function : func_convert_path_X_to_Y ()
+ # where, for any given $build/$host combination the 'X_to_Y' value is the
+ # same. If conversion functions are added for new $build/$host combinations,
+ # the two new functions must follow this pattern, or func_init_to_host_path_cmd
+ # will break.
+
+
+ # func_init_to_host_path_cmd
+ # Ensures that function "pointer" variable $to_host_path_cmd is set to the
+ # appropriate value, based on the value of $to_host_file_cmd.
+ to_host_path_cmd=
+ func_init_to_host_path_cmd ()
+ {
+ $opt_debug
+ if test -z "$to_host_path_cmd"; then
+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ fi
+ }
+
+
+ # func_to_host_path ARG
+ # Converts the path ARG from $build format to $host format. Return result
+ # in func_to_host_path_result.
+ func_to_host_path ()
+ {
+ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+ }
+ # end func_to_host_path
+
+
+ # func_convert_path_noop ARG
+ # Copy ARG to func_to_host_path_result.
+ func_convert_path_noop ()
+ {
+ func_to_host_path_result="$1"
+ }
+ # end func_convert_path_noop
+
+
+ # func_convert_path_msys_to_w32 ARG
+ # Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+ # conversion to w32 is not available inside the cwrapper. Returns result in
+ # func_to_host_path_result.
+ func_convert_path_msys_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from ARG. MSYS
+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+ # and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+ }
+ # end func_convert_path_msys_to_w32
+
+
+ # func_convert_path_cygwin_to_w32 ARG
+ # Convert path ARG from Cygwin to w32 format. Returns result in
+ # func_to_host_file_result.
+ func_convert_path_cygwin_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+ }
+ # end func_convert_path_cygwin_to_w32
+
+
+ # func_convert_path_nix_to_w32 ARG
+ # Convert path ARG from *nix to w32 format. Requires a wine environment and
+ # a working winepath. Returns result in func_to_host_file_result.
+ func_convert_path_nix_to_w32 ()
+ {
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+ }
+ # end func_convert_path_nix_to_w32
+
+
+ # func_convert_path_msys_to_cygwin ARG
+ # Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+ # Returns result in func_to_host_file_result.
+ func_convert_path_msys_to_cygwin ()
+ {
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+ }
+ # end func_convert_path_msys_to_cygwin
+
+
+ # func_convert_path_nix_to_cygwin ARG
+ # Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
+ # a wine environment, working winepath, and LT_CYGPATH set. Returns result in
+ # func_to_host_file_result.
+ func_convert_path_nix_to_cygwin ()
+ {
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+ }
+ # end func_convert_path_nix_to_cygwin
+
+
# func_mode_compile arg...
func_mode_compile ()
{
***************
*** 1137,1148 ****
;;
-pie | -fpie | -fPIE)
! pie_flag="$pie_flag $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
! later="$later $arg"
continue
;;
--- 1985,1996 ----
;;
-pie | -fpie | -fPIE)
! func_append pie_flag " $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
! func_append later " $arg"
continue
;;
***************
*** 1163,1177 ****
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
! func_quote_for_eval "$arg"
! lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
! base_compile="$base_compile $lastarg"
continue
;;
--- 2011,2024 ----
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
! func_append_quoted lastarg "$arg"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
! func_append base_compile " $lastarg"
continue
;;
***************
*** 1187,1194 ****
esac # case $arg_mode
# Aesthetically quote the previous argument.
! func_quote_for_eval "$lastarg"
! base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
--- 2034,2040 ----
esac # case $arg_mode
# Aesthetically quote the previous argument.
! func_append_quoted base_compile "$lastarg"
done # for arg
case $arg_mode in
***************
*** 1213,1219 ****
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
! *.[fF][09]? | *.for | *.java | *.obj | *.sx)
func_xform "$libobj"
libobj=$func_xform_result
;;
--- 2059,2065 ----
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
! *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
***************
*** 1288,1294 ****
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
! output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
--- 2134,2140 ----
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
! output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
***************
*** 1319,1335 ****
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
! removelist="$removelist $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
! removelist="$removelist $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
! if test -n "$fix_srcfile_path"; then
! eval srcfile=\"$fix_srcfile_path\"
! fi
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
--- 2165,2180 ----
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
! func_append removelist " $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
! func_append removelist " $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
! func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
! srcfile=$func_to_tool_file_result
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
***************
*** 1349,1355 ****
if test -z "$output_obj"; then
# Place PIC objects in $objdir
! command="$command -o $lobj"
fi
func_show_eval_locale "$command" \
--- 2194,2200 ----
if test -z "$output_obj"; then
# Place PIC objects in $objdir
! func_append command " -o $lobj"
fi
func_show_eval_locale "$command" \
***************
*** 1396,1406 ****
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
! command="$command -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
! command="$command$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
--- 2241,2251 ----
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
! func_append command " -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
! func_append command "$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
***************
*** 1445,1457 ****
}
$opt_help || {
! test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
! case $mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
--- 2290,2302 ----
}
$opt_help || {
! test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
! case $opt_mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
***************
*** 1482,1491 ****
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
! -prefer-pic try to building PIC objects only
! -prefer-non-pic try to building non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
--- 2327,2337 ----
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
! -prefer-pic try to build PIC objects only
! -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
***************
*** 1538,1544 ****
The following components of INSTALL-COMMAND are treated specially:
! -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
--- 2384,2390 ----
The following components of INSTALL-COMMAND are treated specially:
! -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
***************
*** 1558,1563 ****
--- 2404,2411 ----
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
***************
*** 1586,1591 ****
--- 2434,2444 ----
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
***************
*** 1619,1636 ****
;;
*)
! func_fatal_help "invalid operation mode \`$mode'"
;;
esac
! $ECHO
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
! # Now that we've collected a possible --mode arg, show help if necessary
! $opt_help && func_mode_help
# func_mode_execute arg...
--- 2472,2515 ----
;;
*)
! func_fatal_help "invalid operation mode \`$opt_mode'"
;;
esac
! echo
$ECHO "Try \`$progname --help' for more information about other modes."
}
! # Now that we've collected a possible --mode arg, show help if necessary
! if $opt_help; then
! if test "$opt_help" = :; then
! func_mode_help
! else
! {
! func_help noexit
! for opt_mode in compile link execute install finish uninstall clean; do
! func_mode_help
! done
! } | sed -n '1p; 2,$s/^Usage:/ or: /p'
! {
! func_help noexit
! for opt_mode in compile link execute install finish uninstall clean; do
! echo
! func_mode_help
! done
! } |
! sed '1d
! /^When reporting/,/^Report/{
! H
! d
! }
! $x
! /information about other modes/d
! /more detailed .*MODE/d
! s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
! fi
! exit $?
! fi
# func_mode_execute arg...
***************
*** 1643,1655 ****
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
! for file in $execute_dlfiles; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
--- 2522,2537 ----
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
! for file in $opt_dlopen; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
***************
*** 1671,1677 ****
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
! dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
--- 2553,2559 ----
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
! func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
***************
*** 1712,1718 ****
for file
do
case $file in
! -*) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
--- 2594,2600 ----
for file
do
case $file in
! -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
***************
*** 1728,1735 ****
;;
esac
# Quote arguments (to preserve shell metacharacters).
! func_quote_for_eval "$file"
! args="$args $func_quote_for_eval_result"
done
if test "X$opt_dry_run" = Xfalse; then
--- 2610,2616 ----
;;
esac
# Quote arguments (to preserve shell metacharacters).
! func_append_quoted args "$file"
done
if test "X$opt_dry_run" = Xfalse; then
***************
*** 1754,1782 ****
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
! $ECHO "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
fi
}
! test "$mode" = execute && func_mode_execute ${1+"$@"}
! # func_mode_finish arg...
! func_mode_finish ()
! {
! $opt_debug
! libdirs="$nonopt"
! admincmds=
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
-
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
--- 2635,2700 ----
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
! echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
fi
}
! test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
!
!
! # func_mode_finish arg...
! func_mode_finish ()
! {
! $opt_debug
! libs=
! libdirs=
! admincmds=
!
! for opt in "$nonopt" ${1+"$@"}
! do
! if test -d "$opt"; then
! func_append libdirs " $opt"
!
! elif test -f "$opt"; then
! if func_lalib_unsafe_p "$opt"; then
! func_append libs " $opt"
! else
! func_warning "\`$opt' is not a valid libtool archive"
! fi
!
! else
! func_fatal_error "invalid argument \`$opt'"
! fi
! done
+ if test -n "$libs"; then
+ if test -n "$lt_sysroot"; then
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+ else
+ sysroot_cmd=
+ fi
! # Remove sysroot references
! if $opt_dry_run; then
! for lib in $libs; do
! echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
! done
! else
! tmpdir=`func_mktempdir`
! for lib in $libs; do
! sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
! > $tmpdir/tmp-la
! mv -f $tmpdir/tmp-la $lib
! done
! ${RM}r "$tmpdir"
! fi
! fi
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
***************
*** 1786,1792 ****
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
! $opt_dry_run || eval "$cmds" || admincmds="$admincmds
$cmds"
fi
done
--- 2704,2710 ----
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
! $opt_dry_run || eval "$cmds" || func_append admincmds "
$cmds"
fi
done
***************
*** 1795,1847 ****
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
! $ECHO "X----------------------------------------------------------------------" | $Xsed
! $ECHO "Libraries have been installed in:"
! for libdir in $libdirs; do
! $ECHO " $libdir"
! done
! $ECHO
! $ECHO "If you ever happen to want to link against installed libraries"
! $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
! $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
! $ECHO "flag during linking and do at least one of the following:"
! if test -n "$shlibpath_var"; then
! $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
! $ECHO " during execution"
! fi
! if test -n "$runpath_var"; then
! $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
! $ECHO " during linking"
! fi
! if test -n "$hardcode_libdir_flag_spec"; then
! libdir=LIBDIR
! eval flag=\"$hardcode_libdir_flag_spec\"
! $ECHO " - use the \`$flag' linker flag"
! fi
! if test -n "$admincmds"; then
! $ECHO " - have your system administrator run these commands:$admincmds"
! fi
! if test -f /etc/ld.so.conf; then
! $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
! fi
! $ECHO
! $ECHO "See any operating system documentation about shared libraries for"
! case $host in
! solaris2.[6789]|solaris2.1[0-9])
! $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
! $ECHO "pages."
! ;;
! *)
! $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
! ;;
! esac
! $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
! test "$mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
--- 2713,2767 ----
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
! if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
! echo "----------------------------------------------------------------------"
! echo "Libraries have been installed in:"
! for libdir in $libdirs; do
! $ECHO " $libdir"
! done
! echo
! echo "If you ever happen to want to link against installed libraries"
! echo "in a given directory, LIBDIR, you must either use libtool, and"
! echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
! echo "flag during linking and do at least one of the following:"
! if test -n "$shlibpath_var"; then
! echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
! echo " during execution"
! fi
! if test -n "$runpath_var"; then
! echo " - add LIBDIR to the \`$runpath_var' environment variable"
! echo " during linking"
! fi
! if test -n "$hardcode_libdir_flag_spec"; then
! libdir=LIBDIR
! eval flag=\"$hardcode_libdir_flag_spec\"
! $ECHO " - use the \`$flag' linker flag"
! fi
! if test -n "$admincmds"; then
! $ECHO " - have your system administrator run these commands:$admincmds"
! fi
! if test -f /etc/ld.so.conf; then
! echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
! fi
! echo
! echo "See any operating system documentation about shared libraries for"
! case $host in
! solaris2.[6789]|solaris2.1[0-9])
! echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
! echo "pages."
! ;;
! *)
! echo "more information, such as the ld(1) and ld.so(8) manual pages."
! ;;
! esac
! echo "----------------------------------------------------------------------"
! fi
exit $EXIT_SUCCESS
}
! test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
***************
*** 1852,1858 ****
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
! $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
--- 2772,2778 ----
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
! case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
***************
*** 1866,1872 ****
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
! install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
--- 2786,2797 ----
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
! func_append install_prog "$func_quote_for_eval_result"
! install_shared_prog=$install_prog
! case " $install_prog " in
! *[\\\ /]cp\ *) install_cp=: ;;
! *) install_cp=false ;;
! esac
# We need to accept at least all the BSD install flags.
dest=
***************
*** 1876,1885 ****
install_type=
isdir=no
stripme=
for arg
do
if test -n "$dest"; then
! files="$files $dest"
dest=$arg
continue
fi
--- 2801,2812 ----
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
! func_append files " $dest"
dest=$arg
continue
fi
***************
*** 1887,1896 ****
case $arg in
-d) isdir=yes ;;
-f)
! case " $install_prog " in
! *[\\\ /]cp\ *) ;;
! *) prev=$arg ;;
! esac
;;
-g | -m | -o)
prev=$arg
--- 2814,2822 ----
case $arg in
-d) isdir=yes ;;
-f)
! if $install_cp; then :; else
! prev=$arg
! fi
;;
-g | -m | -o)
prev=$arg
***************
*** 1904,1909 ****
--- 2830,2839 ----
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
***************
*** 1914,1920 ****
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
! install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
--- 2844,2854 ----
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
! func_append install_prog " $func_quote_for_eval_result"
! if test -n "$arg2"; then
! func_quote_for_eval "$arg2"
! fi
! func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
***************
*** 1923,1928 ****
--- 2857,2869 ----
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
***************
*** 1977,1986 ****
case $file in
*.$libext)
# Do the static libraries later.
! staticlibs="$staticlibs $file"
;;
*.la)
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
--- 2918,2930 ----
case $file in
*.$libext)
# Do the static libraries later.
! func_append staticlibs " $file"
;;
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
***************
*** 1994,2016 ****
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
! *) current_libdirs="$current_libdirs $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
! *) future_libdirs="$future_libdirs $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
! dir="$dir$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
! inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
--- 2938,2960 ----
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
! *) func_append current_libdirs " $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
! *) func_append future_libdirs " $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
! func_append dir "$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
! inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
***************
*** 2023,2031 ****
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
! relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
! relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
--- 2967,2975 ----
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
! relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
! relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
***************
*** 2043,2049 ****
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
! func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
--- 2987,2993 ----
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
! func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
***************
*** 2083,2089 ****
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
! test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
;;
*.lo)
--- 3027,3033 ----
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
! test -n "$old_library" && func_append staticlibs " $dir/$old_library"
;;
*.lo)
***************
*** 2183,2189 ****
if test -f "$lib"; then
func_source "$lib"
fi
! libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
--- 3127,3133 ----
if test -f "$lib"; then
func_source "$lib"
fi
! libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
***************
*** 2202,2208 ****
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
! relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
--- 3146,3152 ----
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
! relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
***************
*** 2221,2227 ****
}
else
# Install the binary that we compiled earlier.
! file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
--- 3165,3171 ----
}
else
# Install the binary that we compiled earlier.
! file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
***************
*** 2280,2286 ****
fi
}
! test "$mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
--- 3224,3230 ----
fi
}
! test "$opt_mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
***************
*** 2323,2328 ****
--- 3267,3288 ----
extern \"C\" {
#endif
+ #if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+ #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+ #endif
+
+ /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+ /* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+ # define LT_DLSYM_CONST
+ #elif defined(__osf__)
+ /* This system does not cope well with relocations in const data. */
+ # define LT_DLSYM_CONST
+ #else
+ # define LT_DLSYM_CONST const
+ #endif
+
/* External symbol declarations for the compiler. */\
"
***************
*** 2332,2341 ****
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
! progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
for progfile in $progfiles; do
! func_verbose "extracting global C symbols from \`$progfile'"
! $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
--- 3292,3302 ----
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
! progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
! func_to_tool_file "$progfile" func_convert_file_msys_to_w32
! func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
! $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
***************
*** 2371,2377 ****
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
! *cygwin | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
--- 3332,3338 ----
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
! *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
***************
*** 2384,2393 ****
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
! $opt_dry_run || {
! eval '$ECHO ": $name " >> "$nlist"'
! eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
! }
done
$opt_dry_run || {
--- 3345,3396 ----
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
! case $host in
! *cygwin* | *mingw* | *cegcc* )
! # if an import library, we need to obtain dlname
! if func_win32_import_lib_p "$dlprefile"; then
! func_tr_sh "$dlprefile"
! eval "curr_lafile=\$libfile_$func_tr_sh_result"
! dlprefile_dlbasename=""
! if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
! # Use subshell, to avoid clobbering current variable values
! dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
! if test -n "$dlprefile_dlname" ; then
! func_basename "$dlprefile_dlname"
! dlprefile_dlbasename="$func_basename_result"
! else
! # no lafile. user explicitly requested -dlpreopen .
! $sharedlib_from_linklib_cmd "$dlprefile"
! dlprefile_dlbasename=$sharedlib_from_linklib_result
! fi
! fi
! $opt_dry_run || {
! if test -n "$dlprefile_dlbasename" ; then
! eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
! else
! func_warning "Could not compute DLL name from $name"
! eval '$ECHO ": $name " >> "$nlist"'
! fi
! func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
! $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
! }
! else # not an import lib
! $opt_dry_run || {
! eval '$ECHO ": $name " >> "$nlist"'
! func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
! }
! fi
! ;;
! *)
! $opt_dry_run || {
! eval '$ECHO ": $name " >> "$nlist"'
! func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
! }
! ;;
! esac
done
$opt_dry_run || {
***************
*** 2415,2450 ****
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
! $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
! $ECHO >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
! "
! case $host in
! *cygwin* | *mingw* | *cegcc* )
! $ECHO >> "$output_objdir/$my_dlsyms" "\
! /* DATA imports from DLLs on WIN32 con't be const, because
! runtime relocations are performed -- see ld's documentation
! on pseudo-relocs. */"
! lt_dlsym_const= ;;
! *osf5*)
! echo >> "$output_objdir/$my_dlsyms" "\
! /* This system does not cope well with relocations in const data */"
! lt_dlsym_const= ;;
! *)
! lt_dlsym_const=const ;;
! esac
!
! $ECHO >> "$output_objdir/$my_dlsyms" "\
! extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
! $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
--- 3418,3436 ----
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
! echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
! echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
const char *name;
void *address;
} lt_dlsymlist;
! extern LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
! LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
***************
*** 2457,2463 ****
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
! $ECHO >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
--- 3443,3449 ----
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
! echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
***************
*** 2500,2506 ****
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
! *) symtab_cflags="$symtab_cflags $arg" ;;
esac
done
--- 3486,3492 ----
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
! *) func_append symtab_cflags " $arg" ;;
esac
done
***************
*** 2515,2530 ****
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
! compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
! finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
! compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
! finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
! compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
! finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
--- 3501,3516 ----
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
! compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
! finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
! compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
! finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
! compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
! finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
***************
*** 2538,2545 ****
# really was required.
# Nullify the symbol file.
! compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
! finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
}
--- 3524,3531 ----
# really was required.
# Nullify the symbol file.
! compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
! finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
***************
*** 2549,2554 ****
--- 3535,3541 ----
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+ # Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
***************
*** 2559,2567 ****
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
! $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
! win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
/ I /{
--- 3546,3556 ----
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
! $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
! func_to_tool_file "$1" func_convert_file_msys_to_w32
! win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
$SED -n -e '
1,100{
/ I /{
***************
*** 2590,2595 ****
--- 3579,3709 ----
$ECHO "$win32_libid_type"
}
+ # func_cygming_dll_for_implib ARG
+ #
+ # Platform-specific function to extract the
+ # name of the DLL associated with the specified
+ # import library ARG.
+ # Invoked by eval'ing the libtool variable
+ # $sharedlib_from_linklib_cmd
+ # Result is available in the variable
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib ()
+ {
+ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+ }
+
+ # func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+ #
+ # The is the core of a fallback implementation of a
+ # platform-specific function to extract the name of the
+ # DLL associated with the specified import library LIBNAME.
+ #
+ # SECTION_NAME is either .idata$6 or .idata$7, depending
+ # on the platform and compiler that created the implib.
+ #
+ # Echos the name of the DLL associated with the
+ # specified import library.
+ func_cygming_dll_for_implib_fallback_core ()
+ {
+ $opt_debug
+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+ $SED '/^Contents of section '"$match_literal"':/{
+ # Place marker at beginning of archive member dllname section
+ s/.*/====MARK====/
+ p
+ d
+ }
+ # These lines can sometimes be longer than 43 characters, but
+ # are always uninteresting
+ /:[ ]*file format pe[i]\{,1\}-/d
+ /^In archive [^:]*:/d
+ # Ensure marker is printed
+ /^====MARK====/p
+ # Remove all lines with less than 43 characters
+ /^.\{43\}/!d
+ # From remaining lines, remove first 43 characters
+ s/^.\{43\}//' |
+ $SED -n '
+ # Join marker and all lines until next marker into a single line
+ /^====MARK====/ b para
+ H
+ $ b para
+ b
+ :para
+ x
+ s/\n//g
+ # Remove the marker
+ s/^====MARK====//
+ # Remove trailing dots and whitespace
+ s/[\. \t]*$//
+ # Print
+ /./p' |
+ # we now have a list, one entry per line, of the stringified
+ # contents of the appropriate section of all members of the
+ # archive which possess that section. Heuristic: eliminate
+ # all those which have a first or second character that is
+ # a '.' (that is, objdump's representation of an unprintable
+ # character.) This should work for all archives with less than
+ # 0x302f exports -- but will fail for DLLs whose name actually
+ # begins with a literal '.' or a single character followed by
+ # a '.'.
+ #
+ # Of those that remain, print the first one.
+ $SED -e '/^\./d;/^.\./d;q'
+ }
+
+ # func_cygming_gnu_implib_p ARG
+ # This predicate returns with zero status (TRUE) if
+ # ARG is a GNU/binutils-style import library. Returns
+ # with nonzero status (FALSE) otherwise.
+ func_cygming_gnu_implib_p ()
+ {
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+ }
+
+ # func_cygming_ms_implib_p ARG
+ # This predicate returns with zero status (TRUE) if
+ # ARG is an MS-style import library. Returns
+ # with nonzero status (FALSE) otherwise.
+ func_cygming_ms_implib_p ()
+ {
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+ }
+
+ # func_cygming_dll_for_implib_fallback ARG
+ # Platform-specific function to extract the
+ # name of the DLL associated with the specified
+ # import library ARG.
+ #
+ # This fallback implementation is for use when $DLLTOOL
+ # does not support the --identify-strict option.
+ # Invoked by eval'ing the libtool variable
+ # $sharedlib_from_linklib_cmd
+ # Result is available in the variable
+ # $sharedlib_from_linklib_result
+ func_cygming_dll_for_implib_fallback ()
+ {
+ $opt_debug
+ if func_cygming_gnu_implib_p "$1" ; then
+ # binutils import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+ elif func_cygming_ms_implib_p "$1" ; then
+ # ms-generated import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+ else
+ # unknown
+ sharedlib_from_linklib_result=""
+ fi
+ }
# func_extract_an_archive dir oldlib
***************
*** 2598,2604 ****
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
! func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
--- 3712,3729 ----
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
! if test "$lock_old_archive_extraction" = yes; then
! lockfile=$f_ex_an_ar_oldlib.lock
! until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
! func_echo "Waiting for $lockfile to be removed"
! sleep 2
! done
! fi
! func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
! 'stat=$?; rm -f "$lockfile"; exit $stat'
! if test "$lock_old_archive_extraction" = yes; then
! $opt_dry_run || rm -f "$lockfile"
! fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
***************
*** 2669,2675 ****
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
! darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
--- 3794,3800 ----
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
! darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
***************
*** 2684,2708 ****
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
! my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
!
! # func_emit_wrapper_part1 [arg=no]
#
! # Emit the first part of a libtool wrapper script on stdout.
! # For more information, see the description associated with
! # func_emit_wrapper(), below.
! func_emit_wrapper_part1 ()
! {
! func_emit_wrapper_part1_arg1=no
! if test -n "$1" ; then
! func_emit_wrapper_part1_arg1=$1
! fi
$ECHO "\
#! $SHELL
--- 3809,3838 ----
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
! my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
! # func_emit_wrapper [arg=no]
#
! # Emit a libtool wrapper script on stdout.
! # Don't directly open a file because we may want to
! # incorporate the script contents within a cygwin/mingw
! # wrapper executable. Must ONLY be called from within
! # func_mode_link because it depends on a number of variables
! # set therein.
! #
! # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
! # variable will take. If 'yes', then the emitted script
! # will assume that the directory in which it is stored is
! # the $objdir directory. This is a cygwin/mingw-specific
! # behavior.
! func_emit_wrapper ()
! {
! func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
***************
*** 2718,2724 ****
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
- Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
--- 3848,3853 ----
***************
*** 2749,2779 ****
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
! ECHO=\"$qecho\"
! file=\"\$0\"
! # Make sure echo works.
! if test \"X\$1\" = X--no-reexec; then
! # Discard the --no-reexec flag, and continue.
! shift
! elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
! # Yippee, \$ECHO works!
! :
! else
! # Restart under the correct shell, and then maybe \$ECHO will work.
! exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
! fi
! fi\
"
! $ECHO "\
# Find the directory that this script lives in.
! thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
! file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
while test -n \"\$file\"; do
! destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
--- 3878,4009 ----
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
! file=\"\$0\""
!
! qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
! $ECHO "\
!
! # A function that is used when there is no print builtin or printf.
! func_fallback_echo ()
! {
! eval 'cat <<_LTECHO_EOF
! \$1
! _LTECHO_EOF'
! }
! ECHO=\"$qECHO\"
! fi
!
! # Very basic option parsing. These options are (a) specific to
! # the libtool wrapper, (b) are identical between the wrapper
! # /script/ and the wrapper /executable/ which is used only on
! # windows platforms, and (c) all begin with the string "--lt-"
! # (application programs are unlikely to have options which match
! # this pattern).
! #
! # There are only two supported options: --lt-debug and
! # --lt-dump-script. There is, deliberately, no --lt-help.
! #
! # The first argument to this parsing function should be the
! # script's $0 value, followed by "$@".
! lt_option_debug=
! func_parse_lt_options ()
! {
! lt_script_arg0=\$0
! shift
! for lt_opt
! do
! case \"\$lt_opt\" in
! --lt-debug) lt_option_debug=1 ;;
! --lt-dump-script)
! lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
! test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
! lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
! cat \"\$lt_dump_D/\$lt_dump_F\"
! exit 0
! ;;
! --lt-*)
! \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
! exit 1
! ;;
! esac
! done
!
! # Print the debug banner immediately:
! if test -n \"\$lt_option_debug\"; then
! echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
! fi
! }
!
! # Used when --lt-debug. Prints its arguments to stdout
! # (redirection is the responsibility of the caller)
! func_lt_dump_args ()
! {
! lt_dump_args_N=1;
! for lt_arg
! do
! \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
! lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
! done
! }
!
! # Core function for launching the target application
! func_exec_program_core ()
! {
"
! case $host in
! # Backslashes separate directories on plain windows
! *-*-mingw | *-*-os2* | *-cegcc*)
! $ECHO "\
! if test -n \"\$lt_option_debug\"; then
! \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
! func_lt_dump_args \${1+\"\$@\"} 1>&2
! fi
! exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
! "
! ;;
!
! *)
! $ECHO "\
! if test -n \"\$lt_option_debug\"; then
! \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
! func_lt_dump_args \${1+\"\$@\"} 1>&2
! fi
! exec \"\$progdir/\$program\" \${1+\"\$@\"}
! "
! ;;
! esac
! $ECHO "\
! \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
! exit 1
! }
!
! # A function to encapsulate launching the target application
! # Strips options in the --lt-* namespace from \$@ and
! # launches target application with the remaining arguments.
! func_exec_program ()
! {
! for lt_wr_arg
! do
! case \$lt_wr_arg in
! --lt-*) ;;
! *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
! esac
! shift
! done
! func_exec_program_core \${1+\"\$@\"}
! }
!
! # Parse options
! func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
! thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
! file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
! destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
***************
*** 2783,2812 ****
esac
fi
! file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
! file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
done
- "
- }
- # end: func_emit_wrapper_part1
-
- # func_emit_wrapper_part2 [arg=no]
- #
- # Emit the second part of a libtool wrapper script on stdout.
- # For more information, see the description associated with
- # func_emit_wrapper(), below.
- func_emit_wrapper_part2 ()
- {
- func_emit_wrapper_part2_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part2_arg1=$1
- fi
-
- $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
! WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
--- 4013,4025 ----
esac
fi
! file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
! file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
! WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
***************
*** 2814,2820 ****
fi
# remove .libs from thisdir
case \"\$thisdir\" in
! *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
--- 4027,4033 ----
fi
# remove .libs from thisdir
case \"\$thisdir\" in
! *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
***************
*** 2869,2874 ****
--- 4082,4099 ----
if test -f \"\$progdir/\$program\"; then"
+ # fixup the dll searchpath if we need to.
+ #
+ # Fix the DLL searchpath if we need to. Do this before prepending
+ # to shlibpath, because on Windows, both are PATH and uninstalled
+ # libraries must come first.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+ "
+ fi
+
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
***************
*** 2877,3129 ****
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
! $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
export $shlibpath_var
"
fi
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
- "
- fi
-
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
! "
! case $host in
! # Backslashes separate directories on plain windows
! *-*-mingw | *-*-os2* | *-cegcc*)
! $ECHO "\
! exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
! "
! ;;
!
! *)
! $ECHO "\
! exec \"\$progdir/\$program\" \${1+\"\$@\"}
! "
! ;;
! esac
! $ECHO "\
! \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
! exit 1
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
! $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
! exit 1
! fi
! fi\
! "
! }
! # end: func_emit_wrapper_part2
!
!
! # func_emit_wrapper [arg=no]
! #
! # Emit a libtool wrapper script on stdout.
! # Don't directly open a file because we may want to
! # incorporate the script contents within a cygwin/mingw
! # wrapper executable. Must ONLY be called from within
! # func_mode_link because it depends on a number of variables
! # set therein.
! #
! # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
! # variable will take. If 'yes', then the emitted script
! # will assume that the directory in which it is stored is
! # the $objdir directory. This is a cygwin/mingw-specific
! # behavior.
! func_emit_wrapper ()
! {
! func_emit_wrapper_arg1=no
! if test -n "$1" ; then
! func_emit_wrapper_arg1=$1
! fi
!
! # split this up so that func_emit_cwrapperexe_src
! # can call each part independently.
! func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
! func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
! }
!
!
! # func_to_host_path arg
! #
! # Convert paths to host format when used with build tools.
! # Intended for use with "native" mingw (where libtool itself
! # is running under the msys shell), or in the following cross-
! # build environments:
! # $build $host
! # mingw (msys) mingw [e.g. native]
! # cygwin mingw
! # *nix + wine mingw
! # where wine is equipped with the `winepath' executable.
! # In the native mingw case, the (msys) shell automatically
! # converts paths for any non-msys applications it launches,
! # but that facility isn't available from inside the cwrapper.
! # Similar accommodations are necessary for $host mingw and
! # $build cygwin. Calling this function does no harm for other
! # $host/$build combinations not listed above.
! #
! # ARG is the path (on $build) that should be converted to
! # the proper representation for $host. The result is stored
! # in $func_to_host_path_result.
! func_to_host_path ()
! {
! func_to_host_path_result="$1"
! if test -n "$1" ; then
! case $host in
! *mingw* )
! lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
! case $build in
! *mingw* ) # actually, msys
! # awkward: cmd appends spaces to result
! lt_sed_strip_trailing_spaces="s/[ ]*\$//"
! func_to_host_path_tmp1=`( cmd //c echo "$1" |\
! $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
! func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
! $SED -e "$lt_sed_naive_backslashify"`
! ;;
! *cygwin* )
! func_to_host_path_tmp1=`cygpath -w "$1"`
! func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
! $SED -e "$lt_sed_naive_backslashify"`
! ;;
! * )
! # Unfortunately, winepath does not exit with a non-zero
! # error code, so we are forced to check the contents of
! # stdout. On the other hand, if the command is not
! # found, the shell will set an exit code of 127 and print
! # *an error message* to stdout. So we must check for both
! # error code of zero AND non-empty stdout, which explains
! # the odd construction:
! func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
! if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
! func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
! $SED -e "$lt_sed_naive_backslashify"`
! else
! # Allow warning below.
! func_to_host_path_result=""
! fi
! ;;
! esac
! if test -z "$func_to_host_path_result" ; then
! func_error "Could not determine host path corresponding to"
! func_error " '$1'"
! func_error "Continuing, but uninstalled executables may not work."
! # Fallback:
! func_to_host_path_result="$1"
! fi
! ;;
! esac
! fi
! }
! # end: func_to_host_path
!
! # func_to_host_pathlist arg
! #
! # Convert pathlists to host format when used with build tools.
! # See func_to_host_path(), above. This function supports the
! # following $build/$host combinations (but does no harm for
! # combinations not listed here):
! # $build $host
! # mingw (msys) mingw [e.g. native]
! # cygwin mingw
! # *nix + wine mingw
! #
! # Path separators are also converted from $build format to
! # $host format. If ARG begins or ends with a path separator
! # character, it is preserved (but converted to $host format)
! # on output.
! #
! # ARG is a pathlist (on $build) that should be converted to
! # the proper representation on $host. The result is stored
! # in $func_to_host_pathlist_result.
! func_to_host_pathlist ()
! {
! func_to_host_pathlist_result="$1"
! if test -n "$1" ; then
! case $host in
! *mingw* )
! lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
! # Remove leading and trailing path separator characters from
! # ARG. msys behavior is inconsistent here, cygpath turns them
! # into '.;' and ';.', and winepath ignores them completely.
! func_to_host_pathlist_tmp2="$1"
! # Once set for this call, this variable should not be
! # reassigned. It is used in tha fallback case.
! func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
! $SED -e 's|^:*||' -e 's|:*$||'`
! case $build in
! *mingw* ) # Actually, msys.
! # Awkward: cmd appends spaces to result.
! lt_sed_strip_trailing_spaces="s/[ ]*\$//"
! func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
! $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
! func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
! $SED -e "$lt_sed_naive_backslashify"`
! ;;
! *cygwin* )
! func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
! func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
! $SED -e "$lt_sed_naive_backslashify"`
! ;;
! * )
! # unfortunately, winepath doesn't convert pathlists
! func_to_host_pathlist_result=""
! func_to_host_pathlist_oldIFS=$IFS
! IFS=:
! for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
! IFS=$func_to_host_pathlist_oldIFS
! if test -n "$func_to_host_pathlist_f" ; then
! func_to_host_path "$func_to_host_pathlist_f"
! if test -n "$func_to_host_path_result" ; then
! if test -z "$func_to_host_pathlist_result" ; then
! func_to_host_pathlist_result="$func_to_host_path_result"
! else
! func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
! fi
! fi
! fi
! IFS=:
! done
! IFS=$func_to_host_pathlist_oldIFS
! ;;
! esac
! if test -z "$func_to_host_pathlist_result" ; then
! func_error "Could not determine the host path(s) corresponding to"
! func_error " '$1'"
! func_error "Continuing, but uninstalled executables may not work."
! # Fallback. This may break if $1 contains DOS-style drive
! # specifications. The fix is not to complicate the expression
! # below, but for the user to provide a working wine installation
! # with winepath so that path translation in the cross-to-mingw
! # case works properly.
! lt_replace_pathsep_nix_to_dos="s|:|;|g"
! func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
! $SED -e "$lt_replace_pathsep_nix_to_dos"`
! fi
! # Now, add the leading and trailing path separators back
! case "$1" in
! :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
! ;;
! esac
! case "$1" in
! *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
! ;;
! esac
! ;;
! esac
fi
}
! # end: func_to_host_pathlist
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
--- 4102,4129 ----
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
! $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
fi
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
! func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
! \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
! exit 1
fi
+ fi\
+ "
}
!
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
***************
*** 3141,3171 ****
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
#include
#include
#ifdef _MSC_VER
# include
# include
# include
- # define setmode _setmode
#else
# include
# include
# ifdef __CYGWIN__
# include
- # define HAVE_SETENV
- # ifdef __STRICT_ANSI__
- char *realpath (const char *, char *);
- int putenv (char *);
- int setenv (const char *, const char *, int);
- # endif
# endif
#endif
#include
--- 4141,4163 ----
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
*/
EOF
cat <<"EOF"
+ #ifdef _MSC_VER
+ # define _CRT_SECURE_NO_DEPRECATE 1
+ #endif
#include
#include
#ifdef _MSC_VER
# include
# include
# include
#else
# include
# include
# ifdef __CYGWIN__
# include
# endif
#endif
#include
***************
*** 3177,3182 ****
--- 4169,4212 ----
#include
#include
+ /* declarations of non-ANSI functions */
+ #if defined(__MINGW32__)
+ # ifdef __STRICT_ANSI__
+ int _putenv (const char *);
+ # endif
+ #elif defined(__CYGWIN__)
+ # ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
+ int putenv (char *);
+ int setenv (const char *, const char *, int);
+ # endif
+ /* #elif defined (other platforms) ... */
+ #endif
+
+ /* portability defines, excluding path handling macros */
+ #if defined(_MSC_VER)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ # define S_IXUSR _S_IEXEC
+ # ifndef _INTPTR_T_DEFINED
+ # define _INTPTR_T_DEFINED
+ # define intptr_t int
+ # endif
+ #elif defined(__MINGW32__)
+ # define setmode _setmode
+ # define stat _stat
+ # define chmod _chmod
+ # define getcwd _getcwd
+ # define putenv _putenv
+ #elif defined(__CYGWIN__)
+ # define HAVE_SETENV
+ # define FOPEN_WB "wb"
+ /* #elif defined (other platforms) ... */
+ #endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
***************
*** 3192,3205 ****
# define S_IXGRP 0
#endif
! #ifdef _MSC_VER
! # define S_IXUSR _S_IEXEC
! # define stat _stat
! # ifndef _INTPTR_T_DEFINED
! # define intptr_t int
! # endif
! #endif
!
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
--- 4222,4228 ----
# define S_IXGRP 0
#endif
! /* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
***************
*** 3230,3239 ****
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
- #ifdef __CYGWIN__
- # define FOPEN_WB "wb"
- #endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
--- 4253,4258 ----
***************
*** 3246,3267 ****
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
! #undef LTWRAPPER_DEBUGPRINTF
! #if defined DEBUGWRAPPER
! # define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
! static void
! ltwrapper_debugprintf (const char *fmt, ...)
! {
! va_list args;
! va_start (args, fmt);
! (void) vfprintf (stderr, fmt, args);
! va_end (args);
! }
#else
! # define LTWRAPPER_DEBUGPRINTF(args)
#endif
! const char *program_name = NULL;
void *xmalloc (size_t num);
char *xstrdup (const char *string);
--- 4265,4277 ----
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
! #if defined(LT_DEBUGWRAPPER)
! static int lt_debug = 1;
#else
! static int lt_debug = 0;
#endif
! const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
***************
*** 3271,3311 ****
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
! void lt_fatal (const char *message, ...);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
- void lt_opt_process_env_set (const char *arg);
- void lt_opt_process_env_prepend (const char *arg);
- void lt_opt_process_env_append (const char *arg);
- int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
!
! static const char *script_text_part1 =
! EOF
!
! func_emit_wrapper_part1 yes |
! $SED -e 's/\([\\"]\)/\\\1/g' \
! -e 's/^/ "/' -e 's/$/\\n"/'
! echo ";"
! cat <")));
for (i = 0; i < newargc; i++)
{
! LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "")));
}
EOF
--- 4496,4514 ----
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
! /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
! be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
! because on Windows, both *_VARNAMEs are PATH but uninstalled
! libraries must come first. */
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
! lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
! nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
! lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
! i, nonnull (newargz[i]));
}
EOF
***************
*** 3560,3570 ****
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
! LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
return 127;
}
return rval;
--- 4517,4530 ----
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
! lt_debugprintf (__FILE__, __LINE__,
! "(main) failed to launch target \"%s\": %s\n",
! lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
***************
*** 3586,3592 ****
{
void *p = (void *) malloc (num);
if (!p)
! lt_fatal ("Memory exhausted");
return p;
}
--- 4546,4552 ----
{
void *p = (void *) malloc (num);
if (!p)
! lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
***************
*** 3620,3627 ****
{
struct stat st;
! LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
! path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
--- 4580,4587 ----
{
struct stat st;
! lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
! nonempty (path));
if ((!path) || (!*path))
return 0;
***************
*** 3638,3645 ****
int rval = 0;
struct stat st;
! LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
! path ? (*path ? path : "EMPTY!") : "NULL!"));
if ((!path) || (!*path))
return 0;
--- 4598,4605 ----
int rval = 0;
struct stat st;
! lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
! nonempty (path));
if ((!path) || (!*path))
return 0;
***************
*** 3665,3672 ****
int tmp_len;
char *concat_name;
! LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
! wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
--- 4625,4632 ----
int tmp_len;
char *concat_name;
! lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
! nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
***************
*** 3719,3725 ****
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
! lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
--- 4679,4686 ----
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
! lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
! nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
***************
*** 3744,3750 ****
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
! lt_fatal ("getcwd failed");
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
--- 4705,4712 ----
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
! lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
! nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
***************
*** 3770,3777 ****
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
! LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
! tmp_pathspec));
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
--- 4732,4740 ----
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
! lt_debugprintf (__FILE__, __LINE__,
! "checking path component for symlinks: %s\n",
! tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
***************
*** 3793,3800 ****
}
else
{
! char *errstr = strerror (errno);
! lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
}
}
XFREE (tmp_pathspec);
--- 4756,4764 ----
}
else
{
! lt_fatal (__FILE__, __LINE__,
! "error accessing file \"%s\": %s",
! tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
***************
*** 3807,3813 ****
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
! lt_fatal ("Could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
--- 4771,4778 ----
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
! lt_fatal (__FILE__, __LINE__,
! "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
***************
*** 3833,3843 ****
return str;
}
static void
! lt_error_core (int exit_status, const char *mode,
const char *message, va_list ap)
{
! fprintf (stderr, "%s: %s: ", program_name, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
--- 4798,4822 ----
return str;
}
+ void
+ lt_debugprintf (const char *file, int line, const char *fmt, ...)
+ {
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+ }
+
static void
! lt_error_core (int exit_status, const char *file,
! int line, const char *mode,
const char *message, va_list ap)
{
! fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
***************
*** 3846,3865 ****
}
void
! lt_fatal (const char *message, ...)
{
va_list ap;
va_start (ap, message);
! lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
va_end (ap);
}
void
lt_setenv (const char *name, const char *value)
{
! LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
! (name ? name : ""),
! (value ? value : "")));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
--- 4825,4856 ----
}
void
! lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
! lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+ static const char *
+ nonnull (const char *s)
+ {
+ return s ? s : "(null)";
+ }
+
+ static const char *
+ nonempty (const char *s)
+ {
+ return (s && !*s) ? "(empty)" : nonnull (s);
+ }
+
void
lt_setenv (const char *name, const char *value)
{
! lt_debugprintf (__FILE__, __LINE__,
! "(lt_setenv) setting '%s' to '%s'\n",
! nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
***************
*** 3904,3998 ****
return new_value;
}
- int
- lt_split_name_value (const char *arg, char** name, char** value)
- {
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
- }
-
- void
- lt_opt_process_env_set (const char *arg)
- {
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
- }
-
- void
- lt_opt_process_env_prepend (const char *arg)
- {
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
- }
-
- void
- lt_opt_process_env_append (const char *arg)
- {
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
- }
-
void
lt_update_exe_path (const char *name, const char *value)
{
! LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
! (name ? name : ""),
! (value ? value : "")));
if (name && *name && value && *value)
{
--- 4895,4906 ----
return new_value;
}
void
lt_update_exe_path (const char *name, const char *value)
{
! lt_debugprintf (__FILE__, __LINE__,
! "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
! nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
***************
*** 4011,4019 ****
void
lt_update_lib_path (const char *name, const char *value)
{
! LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
! (name ? name : ""),
! (value ? value : "")));
if (name && *name && value && *value)
{
--- 4919,4927 ----
void
lt_update_lib_path (const char *name, const char *value)
{
! lt_debugprintf (__FILE__, __LINE__,
! "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
! nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
***************
*** 4023,4033 ****
--- 4931,5082 ----
}
}
+ EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+ /* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+ #define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+ #define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+ char **
+ prepare_spawn (char **argv)
+ {
+ size_t argc;
+ char **new_argv;
+ size_t i;
+
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+ }
+ EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+ void lt_dump_script (FILE* f)
+ {
+ EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+ cat <<"EOF"
+ }
EOF
}
# end: func_emit_cwrapperexe_src
+ # func_win32_import_lib_p ARG
+ # True if ARG is an import lib, as indicated by $file_magic_cmd
+ func_win32_import_lib_p ()
+ {
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+ }
+
# func_mode_link arg...
func_mode_link ()
{
***************
*** 4072,4077 ****
--- 5121,5127 ----
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
***************
*** 4164,4169 ****
--- 5214,5224 ----
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
***************
*** 4195,4203 ****
;;
*)
if test "$prev" = dlfiles; then
! dlfiles="$dlfiles $arg"
else
! dlprefiles="$dlprefiles $arg"
fi
prev=
continue
--- 5250,5258 ----
;;
*)
if test "$prev" = dlfiles; then
! func_append dlfiles " $arg"
else
! func_append dlprefiles " $arg"
fi
prev=
continue
***************
*** 4221,4227 ****
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
! *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
;;
esac
;;
--- 5276,5282 ----
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
! *) func_append deplibs " $qarg.ltframework" # this is fixed later
;;
esac
;;
***************
*** 4240,4246 ****
moreargs=
for fil in `cat "$save_arg"`
do
! # moreargs="$moreargs $fil"
arg=$fil
# A libtool-controlled object.
--- 5295,5301 ----
moreargs=
for fil in `cat "$save_arg"`
do
! # func_append moreargs " $fil"
arg=$fil
# A libtool-controlled object.
***************
*** 4269,4275 ****
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
! dlfiles="$dlfiles $pic_object"
prev=
continue
else
--- 5324,5330 ----
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
! func_append dlfiles " $pic_object"
prev=
continue
else
***************
*** 4281,4287 ****
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
! dlprefiles="$dlprefiles $pic_object"
prev=
fi
--- 5336,5342 ----
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
! func_append dlprefiles " $pic_object"
prev=
fi
***************
*** 4351,4362 ****
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
! *) rpath="$rpath $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
! *) xrpath="$xrpath $arg" ;;
esac
fi
prev=
--- 5406,5417 ----
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
! *) func_append rpath " $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
! *) func_append xrpath " $arg" ;;
esac
fi
prev=
***************
*** 4368,4395 ****
continue
;;
weak)
! weak_libs="$weak_libs $arg"
prev=
continue
;;
xcclinker)
! linker_flags="$linker_flags $qarg"
! compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
! compiler_flags="$compiler_flags $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
! linker_flags="$linker_flags $qarg"
! compiler_flags="$compiler_flags $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
--- 5423,5450 ----
continue
;;
weak)
! func_append weak_libs " $arg"
prev=
continue
;;
xcclinker)
! func_append linker_flags " $qarg"
! func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
! func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
! func_append linker_flags " $qarg"
! func_append compiler_flags " $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
***************
*** 4425,4430 ****
--- 5480,5490 ----
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
***************
*** 4475,4489 ****
;;
-L*)
! func_stripname '-L' '' "$arg"
! dir=$func_stripname_result
! if test -z "$dir"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
--- 5535,5550 ----
;;
-L*)
! func_stripname "-L" '' "$arg"
! if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
***************
*** 4495,4518 ****
;;
esac
case "$deplibs " in
! *" -L$dir "*) ;;
*)
! deplibs="$deplibs -L$dir"
! lib_search_path="$lib_search_path $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
! testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
! *) dllsearchpath="$dllsearchpath:$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
! *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
--- 5556,5585 ----
;;
esac
case "$deplibs " in
! *" -L$dir "* | *" $arg "*)
! # Will only happen for absolute or sysroot arguments
! ;;
*)
! # Preserve sysroot, but never include relative directories
! case $dir in
! [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
! *) func_append deplibs " -L$dir" ;;
! esac
! func_append lib_search_path " $dir"
;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
! testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
! *) func_append dllsearchpath ":$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
! *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
***************
*** 4522,4528 ****
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
# These systems don't actually have a C or math library (as such)
continue
;;
--- 5589,5595 ----
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
***************
*** 4536,4542 ****
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
! deplibs="$deplibs System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
--- 5603,5609 ----
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
! func_append deplibs " System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
***************
*** 4556,4562 ****
;;
esac
fi
! deplibs="$deplibs $arg"
continue
;;
--- 5623,5629 ----
;;
esac
fi
! func_append deplibs " $arg"
continue
;;
***************
*** 4568,4575 ****
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
! -model|-arch|-isysroot)
! compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
--- 5635,5642 ----
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
! -model|-arch|-isysroot|--sysroot)
! func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
***************
*** 4577,4588 ****
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
! compiler_flags="$compiler_flags $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
! * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
continue
;;
--- 5644,5655 ----
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
! func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
! * ) func_append new_inherited_linker_flags " $arg" ;;
esac
continue
;;
***************
*** 4649,4661 ****
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
! *) xrpath="$xrpath $dir" ;;
esac
continue
;;
--- 5716,5732 ----
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
+ =*)
+ func_stripname '=' '' "$dir"
+ dir=$lt_sysroot$func_stripname_result
+ ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
! *) func_append xrpath " $dir" ;;
esac
continue
;;
***************
*** 4708,4715 ****
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
! arg="$arg $wl$func_quote_for_eval_result"
! compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
--- 5779,5786 ----
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
! func_append arg " $func_quote_for_eval_result"
! func_append compiler_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
***************
*** 4724,4732 ****
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
! arg="$arg $wl$func_quote_for_eval_result"
! compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
! linker_flags="$linker_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
--- 5795,5803 ----
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
! func_append arg " $wl$func_quote_for_eval_result"
! func_append compiler_flags " $wl$func_quote_for_eval_result"
! func_append linker_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
***************
*** 4754,4776 ****
arg="$func_quote_for_eval_result"
;;
! # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
! # -r[0-9][0-9]* specifies the processor on the SGI compiler
! # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
! # +DA*, +DD* enable 64-bit mode on the HP compiler
! # -q* pass through compiler args for the IBM compiler
! # -m*, -t[45]*, -txscale* pass through architecture-specific
! # compiler args for GCC
! # -F/path gives path to uninstalled frameworks, gcc on darwin
! # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
! # @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
! -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
! compiler_flags="$compiler_flags $arg"
continue
;;
--- 5825,5851 ----
arg="$func_quote_for_eval_result"
;;
! # Flags to be passed through unchanged, with rationale:
! # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
! # -r[0-9][0-9]* specify processor for the SGI compiler
! # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
! # +DA*, +DD* enable 64-bit mode for the HP compiler
! # -q* compiler args for the IBM compiler
! # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
! # -F/path path to uninstalled frameworks, gcc on darwin
! # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
! # @file GCC response files
! # -tp=* Portland pgcc target processor selection
! # --sysroot=* for sysroot support
! # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
! -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
! -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
! func_append compiler_flags " $arg"
continue
;;
***************
*** 4782,4788 ****
*.$objext)
# A standard object.
! objs="$objs $arg"
;;
*.lo)
--- 5857,5863 ----
*.$objext)
# A standard object.
! func_append objs " $arg"
;;
*.lo)
***************
*** 4813,4819 ****
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
! dlfiles="$dlfiles $pic_object"
prev=
continue
else
--- 5888,5894 ----
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
! func_append dlfiles " $pic_object"
prev=
continue
else
***************
*** 4825,4831 ****
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
! dlprefiles="$dlprefiles $pic_object"
prev=
fi
--- 5900,5906 ----
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
! func_append dlprefiles " $pic_object"
prev=
fi
***************
*** 4870,4893 ****
*.$libext)
# An archive.
! deplibs="$deplibs $arg"
! old_deplibs="$old_deplibs $arg"
continue
;;
*.la)
# A libtool-controlled library.
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
! dlfiles="$dlfiles $arg"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
! dlprefiles="$dlprefiles $arg"
prev=
else
! deplibs="$deplibs $arg"
fi
continue
;;
--- 5945,5969 ----
*.$libext)
# An archive.
! func_append deplibs " $arg"
! func_append old_deplibs " $arg"
continue
;;
*.la)
# A libtool-controlled library.
+ func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
! func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
! func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
! func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
***************
*** 4925,4931 ****
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
! eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
shlib_search_path=
fi
--- 6001,6007 ----
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
! eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
***************
*** 4934,4939 ****
--- 6010,6017 ----
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
***************
*** 4954,4965 ****
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
! if $opt_duplicate_deps ; then
case "$libs " in
! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
! libs="$libs $deplib"
done
if test "$linkmode" = lib; then
--- 6032,6043 ----
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
! if $opt_preserve_dup_deps ; then
case "$libs " in
! *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
! func_append libs " $deplib"
done
if test "$linkmode" = lib; then
***************
*** 4972,4980 ****
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
! *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
! pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
--- 6050,6058 ----
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
! *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
esac
! func_append pre_post_deps " $pre_post_dep"
done
fi
pre_post_deps=
***************
*** 5044,5060 ****
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
case $lib in
! *.la) func_source "$lib" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
! deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
case " $weak_libs " in
*" $deplib_base "*) ;;
! *) deplibs="$deplibs $deplib" ;;
esac
done
done
--- 6122,6140 ----
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
+ func_resolve_sysroot "$lib"
case $lib in
! *.la) func_source "$func_resolve_sysroot_result" ;;
esac
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
! func_basename "$deplib"
! deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
! *) func_append deplibs " $deplib" ;;
esac
done
done
***************
*** 5075,5085 ****
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
! compiler_flags="$compiler_flags $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
! * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
--- 6155,6165 ----
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
! func_append compiler_flags " $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
! * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
***************
*** 5164,5170 ****
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
! * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
esac
fi
fi
--- 6244,6250 ----
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
! * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
***************
*** 5177,5183 ****
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
! newlib_search_path="$newlib_search_path $func_stripname_result"
;;
prog)
if test "$pass" = conv; then
--- 6257,6264 ----
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
! func_resolve_sysroot "$func_stripname_result"
! func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
if test "$pass" = conv; then
***************
*** 5191,5197 ****
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
! newlib_search_path="$newlib_search_path $func_stripname_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
--- 6272,6279 ----
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
! func_resolve_sysroot "$func_stripname_result"
! func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
***************
*** 5202,5218 ****
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
! dir=$func_stripname_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
! *) xrpath="$xrpath $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
! *.la) lib="$deplib" ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
--- 6284,6304 ----
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
! func_resolve_sysroot "$func_stripname_result"
! dir=$func_resolve_sysroot_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
! *) func_append xrpath " $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
! *.la)
! func_resolve_sysroot "$deplib"
! lib=$func_resolve_sysroot_result
! ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
***************
*** 5230,5236 ****
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
! if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
--- 6316,6322 ----
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
! if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
***************
*** 5240,5254 ****
;;
esac
if test "$valid_a_lib" != yes; then
! $ECHO
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which you do not appear to have"
! $ECHO "*** because the file extensions .$libext of this argument makes me believe"
! $ECHO "*** that it is just a static archive that I should not use here."
else
! $ECHO
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
--- 6326,6340 ----
;;
esac
if test "$valid_a_lib" != yes; then
! echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which you do not appear to have"
! echo "*** because the file extensions .$libext of this argument makes me believe"
! echo "*** that it is just a static archive that I should not use here."
else
! echo
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
***************
*** 5275,5285 ****
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
! newdlprefiles="$newdlprefiles $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
! newdlfiles="$newdlfiles $deplib"
fi
fi
continue
--- 6361,6371 ----
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
! func_append newdlprefiles " $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
! func_append newdlfiles " $deplib"
fi
fi
continue
***************
*** 5321,5340 ****
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
! tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
! *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
esac
done
fi
! dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
! test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
! test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
if test "$pass" = conv; then
--- 6407,6426 ----
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
! tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
! *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
esac
done
fi
! dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
! test -n "$dlopen" && func_append dlfiles " $dlopen"
! test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
if test "$pass" = conv; then
***************
*** 5345,5361 ****
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
! convenience="$convenience $ladir/$objdir/$old_library"
! old_convenience="$old_convenience $ladir/$objdir/$old_library"
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
! if $opt_duplicate_deps ; then
case "$tmp_libs " in
! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
! tmp_libs="$tmp_libs $deplib"
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
--- 6431,6447 ----
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
! func_append convenience " $ladir/$objdir/$old_library"
! func_append old_convenience " $ladir/$objdir/$old_library"
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
! if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
! *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
! func_append tmp_libs " $deplib"
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
***************
*** 5366,5374 ****
# Get the name of the library we link against.
linklib=
! for l in $old_library $library_names; do
! linklib="$l"
! done
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
--- 6452,6466 ----
# Get the name of the library we link against.
linklib=
! if test -n "$old_library" &&
! { test "$prefer_static_libs" = yes ||
! test "$prefer_static_libs,$installed" = "built,no"; }; then
! linklib=$old_library
! else
! for l in $old_library $library_names; do
! linklib="$l"
! done
! fi
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
***************
*** 5385,5393 ****
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
! dlprefiles="$dlprefiles $lib $dependency_libs"
else
! newdlfiles="$newdlfiles $lib"
fi
continue
fi # $pass = dlopen
--- 6477,6485 ----
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
! func_append dlprefiles " $lib $dependency_libs"
else
! func_append newdlfiles " $lib"
fi
continue
fi # $pass = dlopen
***************
*** 5409,5422 ****
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
! if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
! dir="$libdir"
! absdir="$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
--- 6501,6514 ----
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
! if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
! dir="$lt_sysroot$libdir"
! absdir="$lt_sysroot$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
***************
*** 5424,5435 ****
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
! notinst_path="$notinst_path $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
! notinst_path="$notinst_path $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
--- 6516,6527 ----
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
! func_append notinst_path " $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
! func_append notinst_path " $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
***************
*** 5440,5459 ****
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
! # Prefer using a static library (so that no silly _DYNAMIC symbols
! # are required to link).
! if test -n "$old_library"; then
! newdlprefiles="$newdlprefiles $dir/$old_library"
! # Keep a list of preopened convenience libraries to check
! # that they are being used correctly in the link pass.
! test -z "$libdir" && \
! dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
! # Otherwise, use the dlname, so that lt_dlopen finds it.
! elif test -n "$dlname"; then
! newdlprefiles="$newdlprefiles $dir/$dlname"
! else
! newdlprefiles="$newdlprefiles $dir/$linklib"
! fi
fi # $pass = dlpreopen
if test -z "$libdir"; then
--- 6532,6577 ----
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
! case "$host" in
! # special handling for platforms with PE-DLLs.
! *cygwin* | *mingw* | *cegcc* )
! # Linker will automatically link against shared library if both
! # static and shared are present. Therefore, ensure we extract
! # symbols from the import library if a shared library is present
! # (otherwise, the dlopen module name will be incorrect). We do
! # this by putting the import library name into $newdlprefiles.
! # We recover the dlopen module name by 'saving' the la file
! # name in a special purpose variable, and (later) extracting the
! # dlname from the la file.
! if test -n "$dlname"; then
! func_tr_sh "$dir/$linklib"
! eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
! func_append newdlprefiles " $dir/$linklib"
! else
! func_append newdlprefiles " $dir/$old_library"
! # Keep a list of preopened convenience libraries to check
! # that they are being used correctly in the link pass.
! test -z "$libdir" && \
! func_append dlpreconveniencelibs " $dir/$old_library"
! fi
! ;;
! * )
! # Prefer using a static library (so that no silly _DYNAMIC symbols
! # are required to link).
! if test -n "$old_library"; then
! func_append newdlprefiles " $dir/$old_library"
! # Keep a list of preopened convenience libraries to check
! # that they are being used correctly in the link pass.
! test -z "$libdir" && \
! func_append dlpreconveniencelibs " $dir/$old_library"
! # Otherwise, use the dlname, so that lt_dlopen finds it.
! elif test -n "$dlname"; then
! func_append newdlprefiles " $dir/$dlname"
! else
! func_append newdlprefiles " $dir/$linklib"
! fi
! ;;
! esac
fi # $pass = dlpreopen
if test -z "$libdir"; then
***************
*** 5471,5477 ****
if test "$linkmode" = prog && test "$pass" != link; then
! newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
--- 6589,6595 ----
if test "$linkmode" = prog && test "$pass" != link; then
! func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
***************
*** 5484,5490 ****
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
! newlib_search_path="$newlib_search_path $func_stripname_result"
;;
esac
# Need to link against all dependency_libs?
--- 6602,6609 ----
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
! func_resolve_sysroot "$func_stripname_result"
! func_append newlib_search_path " $func_resolve_sysroot_result"
;;
esac
# Need to link against all dependency_libs?
***************
*** 5495,5506 ****
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
! if $opt_duplicate_deps ; then
case "$tmp_libs " in
! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
! tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
fi # $linkmode = prog...
--- 6614,6625 ----
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
! if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
! *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
! func_append tmp_libs " $deplib"
done # for deplib
continue
fi # $linkmode = prog...
***************
*** 5515,5521 ****
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
! *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
--- 6634,6640 ----
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
! *) func_append temp_rpath "$absdir:" ;;
esac
fi
***************
*** 5527,5533 ****
*)
case "$compile_rpath " in
*" $absdir "*) ;;
! *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
--- 6646,6652 ----
*)
case "$compile_rpath " in
*" $absdir "*) ;;
! *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
***************
*** 5536,5542 ****
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
--- 6655,6661 ----
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
***************
*** 5561,5572 ****
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
! notinst_deplibs="$notinst_deplibs $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
! notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
fi
;;
--- 6680,6691 ----
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
! func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
! func_append notinst_deplibs " $lib"
need_relink=yes
fi
;;
***************
*** 5583,5589 ****
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
! $ECHO
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
--- 6702,6708 ----
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
! echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
***************
*** 5601,5607 ****
*)
case "$compile_rpath " in
*" $absdir "*) ;;
! *) compile_rpath="$compile_rpath $absdir"
esac
;;
esac
--- 6720,6726 ----
*)
case "$compile_rpath " in
*" $absdir "*) ;;
! *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
***************
*** 5610,5616 ****
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) finalize_rpath="$finalize_rpath $libdir"
esac
;;
esac
--- 6729,6735 ----
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
***************
*** 5664,5670 ****
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
! if test "$linkmode" = prog || test "$mode" != relink; then
add_shlibpath=
add_dir=
add=
--- 6783,6789 ----
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
! if test "$linkmode" = prog || test "$opt_mode" != relink; then
add_shlibpath=
add_dir=
add=
***************
*** 5686,5694 ****
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
! $ECHO
! $ECHO "*** And there doesn't seem to be a static archive available"
! $ECHO "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
--- 6805,6813 ----
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
! echo
! echo "*** And there doesn't seem to be a static archive available"
! echo "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
***************
*** 5720,5726 ****
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
! add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
--- 6839,6845 ----
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
! func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
***************
*** 5742,5748 ****
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
! *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
--- 6861,6867 ----
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
! *) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
***************
*** 5756,5768 ****
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
! *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
fi
fi
fi
! if test "$linkmode" = prog || test "$mode" = relink; then
add_shlibpath=
add_dir=
add=
--- 6875,6887 ----
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
! *) func_append finalize_shlibpath "$libdir:" ;;
esac
fi
fi
fi
! if test "$linkmode" = prog || test "$opt_mode" = relink; then
add_shlibpath=
add_dir=
add=
***************
*** 5776,5782 ****
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
! *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
--- 6895,6901 ----
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
! *) func_append finalize_shlibpath "$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
***************
*** 5793,5799 ****
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
! add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
--- 6912,6918 ----
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
! func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
***************
*** 5828,5848 ****
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
! $ECHO
$ECHO "*** Warning: This system can not link to static lib archive $lib."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
! $ECHO "*** But as you try to build a module library, libtool will still create "
! $ECHO "*** a static module, that should work as long as the dlopening application"
! $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
! $ECHO
! $ECHO "*** However, this would only work if libtool was able to extract symbol"
! $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
! $ECHO "*** not find such a program. So, this module is probably useless."
! $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
--- 6947,6967 ----
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
! echo
$ECHO "*** Warning: This system can not link to static lib archive $lib."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
! echo "*** But as you try to build a module library, libtool will still create "
! echo "*** a static module, that should work as long as the dlopening application"
! echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
! echo
! echo "*** However, this would only work if libtool was able to extract symbol"
! echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
! echo "*** not find such a program. So, this module is probably useless."
! echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
***************
*** 5870,5896 ****
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
! *) xrpath="$xrpath $temp_xrpath";;
esac;;
! *) temp_deplibs="$temp_deplibs $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
! newlib_search_path="$newlib_search_path $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
! if $opt_duplicate_deps ; then
case "$tmp_libs " in
! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
fi
! tmp_libs="$tmp_libs $deplib"
done
if test "$link_all_deplibs" != no; then
--- 6989,7021 ----
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
! *) func_append xrpath " $temp_xrpath";;
esac;;
! *) func_append temp_deplibs " $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
! func_append newlib_search_path " $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
! case $deplib in
! -L*) func_stripname '-L' '' "$deplib"
! func_resolve_sysroot "$func_stripname_result";;
! *) func_resolve_sysroot "$deplib" ;;
! esac
! if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
! *" $func_resolve_sysroot_result "*)
! func_append specialdeplibs " $func_resolve_sysroot_result" ;;
esac
fi
! func_append tmp_libs " $func_resolve_sysroot_result"
done
if test "$link_all_deplibs" != no; then
***************
*** 5900,5907 ****
case $deplib in
-L*) path="$deplib" ;;
*.la)
func_dirname "$deplib" "" "."
! dir="$func_dirname_result"
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
--- 7025,7034 ----
case $deplib in
-L*) path="$deplib" ;;
*.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
! dir=$func_dirname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
***************
*** 5928,5935 ****
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
! compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
! linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
--- 7055,7062 ----
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
! func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
! func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
***************
*** 5962,5968 ****
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
! compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
--- 7089,7095 ----
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
! compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
***************
*** 5979,5985 ****
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
! *) lib_search_path="$lib_search_path $dir" ;;
esac
done
newlib_search_path=
--- 7106,7112 ----
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
! *) func_append lib_search_path " $dir" ;;
esac
done
newlib_search_path=
***************
*** 6037,6046 ****
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
! *) tmp_libs="$tmp_libs $deplib" ;;
esac
;;
! *) tmp_libs="$tmp_libs $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
--- 7164,7173 ----
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
! *) func_append tmp_libs " $deplib" ;;
esac
;;
! *) func_append tmp_libs " $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
***************
*** 6056,6062 ****
;;
esac
if test -n "$i" ; then
! tmp_libs="$tmp_libs $i"
fi
done
dependency_libs=$tmp_libs
--- 7183,7189 ----
;;
esac
if test -n "$i" ; then
! func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
***************
*** 6097,6103 ****
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
! objs="$objs$old_deplibs"
;;
lib)
--- 7224,7230 ----
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
! func_append objs "$old_deplibs"
;;
lib)
***************
*** 6130,6139 ****
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
! $ECHO
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
! libobjs="$libobjs $objs"
fi
fi
--- 7257,7266 ----
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
! echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
! func_append libobjs " $objs"
fi
fi
***************
*** 6198,6204 ****
age="$number_minor"
revision="$number_revision"
;;
! freebsd-aout|freebsd-elf|sunos)
current="$number_major"
revision="$number_minor"
age="0"
--- 7325,7331 ----
age="$number_minor"
revision="$number_revision"
;;
! freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
***************
*** 6334,6340 ****
done
# Make executables depend on our current version.
! verstring="$verstring:${current}.0"
;;
qnx)
--- 7461,7467 ----
done
# Make executables depend on our current version.
! func_append verstring ":${current}.0"
;;
qnx)
***************
*** 6402,6411 ****
fi
func_generate_dlsyms "$libname" "$libname" "yes"
! libobjs="$libobjs $symfileobj"
test "X$libobjs" = "X " && libobjs=
! if test "$mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
--- 7529,7538 ----
fi
func_generate_dlsyms "$libname" "$libname" "yes"
! func_append libobjs " $symfileobj"
test "X$libobjs" = "X " && libobjs=
! if test "$opt_mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
***************
*** 6421,6427 ****
continue
fi
fi
! removelist="$removelist $p"
;;
*) ;;
esac
--- 7548,7554 ----
continue
fi
fi
! func_append removelist " $p"
;;
*) ;;
esac
***************
*** 6432,6458 ****
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
! oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
! oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
! # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
! # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
! # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
! temp_xrpath="$temp_xrpath -R$libdir"
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
--- 7559,7586 ----
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
! func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
! oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
! # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
! # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
! # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
! func_replace_sysroot "$libdir"
! func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) func_append finalize_rpath " $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
***************
*** 6466,6472 ****
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
! *) dlfiles="$dlfiles $lib" ;;
esac
done
--- 7594,7600 ----
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
! *) func_append dlfiles " $lib" ;;
esac
done
***************
*** 6476,6494 ****
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
! *) dlprefiles="$dlprefiles $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
! deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
--- 7604,7622 ----
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
! *) func_append dlprefiles " $lib" ;;
esac
done
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
! func_append deplibs " System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
***************
*** 6505,6511 ****
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
! deplibs="$deplibs -lc"
fi
;;
esac
--- 7633,7639 ----
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
! func_append deplibs " -lc"
fi
;;
esac
***************
*** 6554,6560 ****
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
! newdeplibs="$newdeplibs $i"
i=""
;;
esac
--- 7682,7688 ----
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
! func_append newdeplibs " $i"
i=""
;;
esac
***************
*** 6565,6585 ****
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
! newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
! $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which I believe you do not have"
! $ECHO "*** because a test_compile did reveal that the linker did not use it for"
! $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
! newdeplibs="$newdeplibs $i"
;;
esac
done
--- 7693,7713 ----
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
! func_append newdeplibs " $i"
else
droppeddeps=yes
! echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which I believe you do not have"
! echo "*** because a test_compile did reveal that the linker did not use it for"
! echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
*)
! func_append newdeplibs " $i"
;;
esac
done
***************
*** 6597,6603 ****
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
! newdeplibs="$newdeplibs $i"
i=""
;;
esac
--- 7725,7731 ----
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
! func_append newdeplibs " $i"
i=""
;;
esac
***************
*** 6608,6636 ****
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
! newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
! $ECHO
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which you do not appear to have"
! $ECHO "*** because a test_compile did reveal that the linker did not use this one"
! $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
! $ECHO
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
! $ECHO "*** make it link in! You will probably need to install it or some"
! $ECHO "*** library that it depends on before this library will be fully"
! $ECHO "*** functional. Installing it before continuing would be even better."
fi
;;
*)
! newdeplibs="$newdeplibs $i"
;;
esac
done
--- 7736,7764 ----
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
! func_append newdeplibs " $i"
else
droppeddeps=yes
! echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which you do not appear to have"
! echo "*** because a test_compile did reveal that the linker did not use this one"
! echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
! echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
! echo "*** make it link in! You will probably need to install it or some"
! echo "*** library that it depends on before this library will be fully"
! echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
! func_append newdeplibs " $i"
;;
esac
done
***************
*** 6647,6661 ****
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
! newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
! potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
--- 7775,7801 ----
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
! func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
+ if test -n "$file_magic_glob"; then
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+ else
+ libnameglob=$libname
+ fi
+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
! if test "$want_nocaseglob" = yes; then
! shopt -s nocaseglob
! potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
! $nocaseglob
! else
! potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
! fi
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
***************
*** 6672,6684 ****
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
! *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
! newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
--- 7812,7824 ----
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
! *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
! func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
***************
*** 6687,6698 ****
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
! $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which you do not appear to have"
! $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
--- 7827,7838 ----
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
! echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which you do not appear to have"
! echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
***************
*** 6703,6709 ****
;;
*)
# Add a -L argument.
! newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
--- 7843,7849 ----
;;
*)
# Add a -L argument.
! func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
***************
*** 6719,6725 ****
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
! newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
;;
esac
--- 7859,7865 ----
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
! func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
***************
*** 6730,6738 ****
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
! if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
! newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
--- 7870,7878 ----
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
! if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
! func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
***************
*** 6741,6752 ****
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
! $ECHO
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
! $ECHO "*** I have the capability to make that library automatically link in when"
! $ECHO "*** you link to this library. But I can only do this if you have a"
! $ECHO "*** shared version of the library, which you do not appear to have"
! $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
--- 7881,7892 ----
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
! echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
! echo "*** I have the capability to make that library automatically link in when"
! echo "*** you link to this library. But I can only do this if you have a"
! echo "*** shared version of the library, which you do not appear to have"
! echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
***************
*** 6757,6788 ****
;;
*)
# Add a -L argument.
! newdeplibs="$newdeplibs $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
! tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
! -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
! tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
! if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
! $GREP . >/dev/null; then
! $ECHO
if test "X$deplibs_check_method" = "Xnone"; then
! $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
else
! $ECHO "*** Warning: inter-library dependencies are not known to be supported."
fi
! $ECHO "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
! fi
;;
esac
versuffix=$versuffix_save
--- 7897,7928 ----
;;
*)
# Add a -L argument.
! func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
! tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
! tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
! case $tmp_deplibs in
! *[!\ \ ]*)
! echo
if test "X$deplibs_check_method" = "Xnone"; then
! echo "*** Warning: inter-library dependencies are not supported in this platform."
else
! echo "*** Warning: inter-library dependencies are not known to be supported."
fi
! echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
! ;;
! esac
;;
esac
versuffix=$versuffix_save
***************
*** 6794,6816 ****
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
! newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
! $ECHO
! $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
! $ECHO "*** a static module, that should work as long as the dlopening"
! $ECHO "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
! $ECHO
! $ECHO "*** However, this would only work if libtool was able to extract symbol"
! $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
! $ECHO "*** not find such a program. So, this module is probably useless."
! $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
--- 7934,7956 ----
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
! newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
! echo
! echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
! echo "*** a static module, that should work as long as the dlopening"
! echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
! echo
! echo "*** However, this would only work if libtool was able to extract symbol"
! echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
! echo "*** not find such a program. So, this module is probably useless."
! echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
***************
*** 6820,6835 ****
build_libtool_libs=no
fi
else
! $ECHO "*** The inter-library dependencies that have been dropped here will be"
! $ECHO "*** automatically added whenever a program is linked with this library"
! $ECHO "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
! $ECHO
! $ECHO "*** Since this library must not contain undefined symbols,"
! $ECHO "*** because either the platform does not support them or"
! $ECHO "*** it was explicitly requested with -no-undefined,"
! $ECHO "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
--- 7960,7975 ----
build_libtool_libs=no
fi
else
! echo "*** The inter-library dependencies that have been dropped here will be"
! echo "*** automatically added whenever a program is linked with this library"
! echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
! echo
! echo "*** Since this library must not contain undefined symbols,"
! echo "*** because either the platform does not support them or"
! echo "*** it was explicitly requested with -no-undefined,"
! echo "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
***************
*** 6846,6854 ****
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
! newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
! new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
! deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
--- 7986,7994 ----
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
! newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
! new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
! deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
***************
*** 6861,6867 ****
*)
case " $deplibs " in
*" -L$path/$objdir "*)
! new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
--- 8001,8007 ----
*)
case " $deplibs " in
*" -L$path/$objdir "*)
! func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
***************
*** 6871,6880 ****
-L*)
case " $new_libs " in
*" $deplib "*) ;;
! *) new_libs="$new_libs $deplib" ;;
esac
;;
! *) new_libs="$new_libs $deplib" ;;
esac
done
deplibs="$new_libs"
--- 8011,8020 ----
-L*)
case " $new_libs " in
*" $deplib "*) ;;
! *) func_append new_libs " $deplib" ;;
esac
;;
! *) func_append new_libs " $deplib" ;;
esac
done
deplibs="$new_libs"
***************
*** 6891,6900 ****
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
! test "$mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
--- 8031,8042 ----
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
! test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
+ func_replace_sysroot "$libdir"
+ libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
***************
*** 6903,6920 ****
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! dep_rpath="$dep_rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
! *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
done
--- 8045,8062 ----
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! func_append dep_rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
! *) func_apped perm_rpath " $libdir" ;;
esac
fi
done
***************
*** 6932,6938 ****
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
! rpath="$rpath$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
--- 8074,8080 ----
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
! func_append rpath "$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
***************
*** 6940,6946 ****
fi
shlibpath="$finalize_shlibpath"
! test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
--- 8082,8088 ----
fi
shlibpath="$finalize_shlibpath"
! test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
***************
*** 6966,6983 ****
linknames=
for link
do
! linknames="$linknames $link"
done
# Use standard objects if they are pic
! test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
! delfiles="$delfiles $export_symbols"
fi
orig_export_symbols=
--- 8108,8125 ----
linknames=
for link
do
! func_append linknames " $link"
done
# Use standard objects if they are pic
! test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
! func_append delfiles " $export_symbols"
fi
orig_export_symbols=
***************
*** 7008,7020 ****
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
! for cmd in $cmds; do
IFS="$save_ifs"
! eval cmd=\"$cmd\"
! func_len " $cmd"
! len=$func_len_result
! if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
func_show_eval "$cmd" 'exit $?'
skipped_export=false
else
# The command line is too long to execute in one step.
--- 8150,8194 ----
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
! for cmd1 in $cmds; do
IFS="$save_ifs"
! # Take the normal branch if the nm_file_list_spec branch
! # doesn't work or if tool conversion is not needed.
! case $nm_file_list_spec~$to_tool_file_cmd in
! *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
! try_normal_branch=yes
! eval cmd=\"$cmd1\"
! func_len " $cmd"
! len=$func_len_result
! ;;
! *)
! try_normal_branch=no
! ;;
! esac
! if test "$try_normal_branch" = yes \
! && { test "$len" -lt "$max_cmd_len" \
! || test "$max_cmd_len" -le -1; }
! then
! func_show_eval "$cmd" 'exit $?'
! skipped_export=false
! elif test -n "$nm_file_list_spec"; then
! func_basename "$output"
! output_la=$func_basename_result
! save_libobjs=$libobjs
! save_output=$output
! output=${output_objdir}/${output_la}.nm
! func_to_tool_file "$output"
! libobjs=$nm_file_list_spec$func_to_tool_file_result
! func_append delfiles " $output"
! func_verbose "creating $NM input file list: $output"
! for obj in $save_libobjs; do
! func_to_tool_file "$obj"
! $ECHO "$func_to_tool_file_result"
! done > "$output"
! eval cmd=\"$cmd1\"
func_show_eval "$cmd" 'exit $?'
+ output=$save_output
+ libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
***************
*** 7036,7042 ****
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
! $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
--- 8210,8216 ----
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
! $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
***************
*** 7048,7054 ****
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
! delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
--- 8222,8228 ----
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
! func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
***************
*** 7058,7064 ****
case " $convenience " in
*" $test_deplib "*) ;;
*)
! tmp_deplibs="$tmp_deplibs $test_deplib"
;;
esac
done
--- 8232,8238 ----
case " $convenience " in
*" $test_deplib "*) ;;
*)
! func_append tmp_deplibs " $test_deplib"
;;
esac
done
***************
*** 7078,7098 ****
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
! generated="$generated $gentop"
func_extract_archives $gentop $convenience
! libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
! linker_flags="$linker_flags $flag"
fi
# Make a backup of the uninstalled library when relinking
! if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
--- 8252,8272 ----
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
! func_append generated " $gentop"
func_extract_archives $gentop $convenience
! func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
! func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
! if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
***************
*** 7137,7143 ****
save_libobjs=$libobjs
fi
save_output=$output
! output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
--- 8311,8318 ----
save_libobjs=$libobjs
fi
save_output=$output
! func_basename "$output"
! output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
***************
*** 7150,7162 ****
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
! $ECHO 'INPUT (' > $output
for obj in $save_libobjs
do
! $ECHO "$obj" >> $output
done
! $ECHO ')' >> $output
! delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
--- 8325,8340 ----
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
! echo 'INPUT (' > $output
for obj in $save_libobjs
do
! func_to_tool_file "$obj"
! $ECHO "$func_to_tool_file_result" >> $output
done
! echo ')' >> $output
! func_append delfiles " $output"
! func_to_tool_file "$output"
! output=$func_to_tool_file_result
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
***************
*** 7170,7179 ****
fi
for obj
do
! $ECHO "$obj" >> $output
done
! delfiles="$delfiles $output"
! output=$firstobj\"$file_list_spec$output\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
--- 8348,8359 ----
fi
for obj
do
! func_to_tool_file "$obj"
! $ECHO "$func_to_tool_file_result" >> $output
done
! func_append delfiles " $output"
! func_to_tool_file "$output"
! output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
***************
*** 7197,7213 ****
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
! eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
else
# All subsequent reloadable object files will link in
# the last one created.
! eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
! objlist=$obj
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
--- 8377,8395 ----
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
! reload_objs=$objlist
! eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
! reload_objs="$objlist $last_robj"
! eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
! objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
***************
*** 7217,7227 ****
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
! eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
! delfiles="$delfiles $output"
else
output=
--- 8399,8410 ----
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
! reload_objs="$objlist $last_robj"
! eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
! func_append delfiles " $output"
else
output=
***************
*** 7255,7261 ****
lt_exit=$?
# Restore the uninstalled library and exit
! if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
--- 8438,8444 ----
lt_exit=$?
# Restore the uninstalled library and exit
! if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
***************
*** 7276,7282 ****
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
! $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
--- 8459,8465 ----
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
! $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
***************
*** 7288,7294 ****
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
! delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
--- 8471,8477 ----
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
! func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
***************
*** 7329,7338 ****
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
! generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
! libobjs="$libobjs $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
--- 8512,8521 ----
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
! func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
! func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
***************
*** 7348,7354 ****
lt_exit=$?
# Restore the uninstalled library and exit
! if test "$mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
--- 8531,8537 ----
lt_exit=$?
# Restore the uninstalled library and exit
! if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
***************
*** 7360,7366 ****
IFS="$save_ifs"
# Restore the uninstalled library and exit
! if test "$mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
--- 8543,8549 ----
IFS="$save_ifs"
# Restore the uninstalled library and exit
! if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
***************
*** 7441,7458 ****
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
! reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
! generated="$generated $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
# Create the old-style object.
! 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
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
--- 8624,8644 ----
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
! reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
! func_append generated " $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
+ # If we're not building shared, we need to use non_pic_objs
+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
# Create the old-style object.
! reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
***************
*** 7512,7519 ****
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
! finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
--- 8698,8705 ----
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
! compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
! finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
***************
*** 7524,7537 ****
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
! compile_command="$compile_command ${wl}-bind_at_load"
! finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
! compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
! finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
--- 8710,8723 ----
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
! func_append compile_command " ${wl}-bind_at_load"
! func_append finalize_command " ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
! compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
! finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
***************
*** 7545,7551 ****
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
! new_libs="$new_libs -L$path/$objdir" ;;
esac
;;
esac
--- 8731,8737 ----
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
! func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
***************
*** 7555,7571 ****
-L*)
case " $new_libs " in
*" $deplib "*) ;;
! *) new_libs="$new_libs $deplib" ;;
esac
;;
! *) new_libs="$new_libs $deplib" ;;
esac
done
compile_deplibs="$new_libs"
! compile_command="$compile_command $compile_deplibs"
! finalize_command="$finalize_command $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
--- 8741,8757 ----
-L*)
case " $new_libs " in
*" $deplib "*) ;;
! *) func_append new_libs " $deplib" ;;
esac
;;
! *) func_append new_libs " $deplib" ;;
esac
done
compile_deplibs="$new_libs"
! func_append compile_command " $compile_deplibs"
! func_append finalize_command " $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
***************
*** 7573,7579 ****
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
fi
--- 8759,8765 ----
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
! *) func_append finalize_rpath " $libdir" ;;
esac
done
fi
***************
*** 7592,7609 ****
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
! *) perm_rpath="$perm_rpath $libdir" ;;
esac
fi
case $host in
--- 8778,8795 ----
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
! *) func_append perm_rpath " $libdir" ;;
esac
fi
case $host in
***************
*** 7612,7623 ****
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
! *) dllsearchpath="$dllsearchpath:$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
! *) dllsearchpath="$dllsearchpath:$testbindir";;
esac
;;
esac
--- 8798,8809 ----
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
! *) func_append dllsearchpath ":$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
! *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
***************
*** 7643,7660 ****
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! rpath="$rpath $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
! *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
esac
fi
done
--- 8829,8846 ----
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
! func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
! func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
! *) func_append finalize_perm_rpath " $libdir" ;;
esac
fi
done
***************
*** 7668,7675 ****
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
! compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
! finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
--- 8854,8861 ----
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
! compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
! finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
***************
*** 7681,7695 ****
wrappers_required=yes
case $host in
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
--- 8867,8881 ----
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
***************
*** 7698,7710 ****
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
! compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
--- 8884,8902 ----
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
! compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
***************
*** 7727,7733 ****
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
! rpath="$rpath$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
--- 8919,8925 ----
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
! func_append rpath "$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
***************
*** 7735,7741 ****
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
! rpath="$rpath$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
--- 8927,8933 ----
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
! func_append rpath "$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
***************
*** 7745,7755 ****
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
! link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
exit $EXIT_SUCCESS
fi
--- 8937,8954 ----
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
! link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
+
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
exit $EXIT_SUCCESS
fi
***************
*** 7764,7770 ****
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
! relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
--- 8963,8969 ----
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
! relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
***************
*** 7776,7788 ****
fi
# Replace the output file specification.
! link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
# Now create the wrapper script.
func_verbose "creating $output"
--- 8975,8993 ----
fi
# Replace the output file specification.
! link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
func_show_eval "$link_command" 'exit $?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output_objdir/$outputname"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Now create the wrapper script.
func_verbose "creating $output"
***************
*** 7800,7817 ****
fi
done
relink_command="(cd `pwd`; $relink_command)"
! relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
! fi
!
! # Quote $ECHO for shipping.
! if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
! case $progpath in
! [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
! *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
! esac
! qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
! else
! qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
--- 9005,9011 ----
fi
done
relink_command="(cd `pwd`; $relink_command)"
! relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
***************
*** 7891,7897 ****
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
! oldobjs="$oldobjs $symfileobj"
fi
fi
addlibs="$old_convenience"
--- 9085,9091 ----
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
! func_append oldobjs " $symfileobj"
fi
fi
addlibs="$old_convenience"
***************
*** 7899,7908 ****
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
! generated="$generated $gentop"
func_extract_archives $gentop $addlibs
! oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
--- 9093,9102 ----
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
! func_append generated " $gentop"
func_extract_archives $gentop $addlibs
! func_append oldobjs " $func_extract_archives_result"
fi
# Do each command in the archive commands.
***************
*** 7913,7922 ****
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
! generated="$generated $gentop"
func_extract_archives $gentop $dlprefiles
! oldobjs="$oldobjs $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
--- 9107,9116 ----
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
! func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
! func_append oldobjs " $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
***************
*** 7932,7940 ****
done | sort | sort -uc >/dev/null 2>&1); then
:
else
! $ECHO "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
! generated="$generated $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
--- 9126,9134 ----
done | sort | sort -uc >/dev/null 2>&1); then
:
else
! echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
! func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
***************
*** 7958,7966 ****
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
! oldobjs="$oldobjs $gentop/$newobj"
;;
! *) oldobjs="$oldobjs $obj" ;;
esac
done
fi
--- 9152,9160 ----
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
! func_append oldobjs " $gentop/$newobj"
;;
! *) func_append oldobjs " $obj" ;;
esac
done
fi
***************
*** 7970,7975 ****
--- 9164,9179 ----
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
+ elif test -n "$archiver_list_spec"; then
+ func_verbose "using command file archive linking..."
+ for obj in $oldobjs
+ do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > $output_objdir/$libname.libcmd
+ func_to_tool_file "$output_objdir/$libname.libcmd"
+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+ cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
***************
*** 8043,8049 ****
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
! relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
--- 9247,9253 ----
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
! relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
***************
*** 8066,8074 ****
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
! newdependency_libs="$newdependency_libs $libdir/$name"
;;
! *) newdependency_libs="$newdependency_libs $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
--- 9270,9288 ----
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
! func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
! ;;
! -L*)
! func_stripname -L '' "$deplib"
! func_replace_sysroot "$func_stripname_result"
! func_append newdependency_libs " -L$func_replace_sysroot_result"
;;
! -R*)
! func_stripname -R '' "$deplib"
! func_replace_sysroot "$func_stripname_result"
! func_append newdependency_libs " -R$func_replace_sysroot_result"
! ;;
! *) func_append newdependency_libs " $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
***************
*** 8082,8090 ****
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
! newdlfiles="$newdlfiles $libdir/$name"
;;
! *) newdlfiles="$newdlfiles $lib" ;;
esac
done
dlfiles="$newdlfiles"
--- 9296,9304 ----
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
! func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
! *) func_append newdlfiles " $lib" ;;
esac
done
dlfiles="$newdlfiles"
***************
*** 8101,8107 ****
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
! newdlprefiles="$newdlprefiles $libdir/$name"
;;
esac
done
--- 9315,9321 ----
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
! func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
***************
*** 8113,8119 ****
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
! newdlfiles="$newdlfiles $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
--- 9327,9333 ----
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
! func_append newdlfiles " $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
***************
*** 8122,8136 ****
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
! newdlprefiles="$newdlprefiles $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
! *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
--- 9336,9368 ----
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
! func_append newdlprefiles " $abs"
done
dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
! *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
! # If a -bindir argument was supplied, place the dll there.
! if test "x$bindir" != x ;
! then
! func_relative_path "$install_libdir" "$bindir"
! tdlname=$func_relative_path_result$dlname
! else
! # Otherwise fall back on heuristic.
! tdlname=../bin/$dlname
! fi
! ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
***************
*** 8189,8195 ****
exit $EXIT_SUCCESS
}
! { test "$mode" = link || test "$mode" = relink; } &&
func_mode_link ${1+"$@"}
--- 9421,9427 ----
exit $EXIT_SUCCESS
}
! { test "$opt_mode" = link || test "$opt_mode" = relink; } &&
func_mode_link ${1+"$@"}
***************
*** 8209,8217 ****
for arg
do
case $arg in
! -f) RM="$RM $arg"; rmforce=yes ;;
! -*) RM="$RM $arg" ;;
! *) files="$files $arg" ;;
esac
done
--- 9441,9449 ----
for arg
do
case $arg in
! -f) func_append RM " $arg"; rmforce=yes ;;
! -*) func_append RM " $arg" ;;
! *) func_append files " $arg" ;;
esac
done
***************
*** 8220,8243 ****
rmdirs=
- origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
! objdir="$origobjdir"
else
! objdir="$dir/$origobjdir"
fi
func_basename "$file"
name="$func_basename_result"
! test "$mode" = uninstall && objdir="$dir"
! # Remember objdir for removal later, being careful to avoid duplicates
! if test "$mode" = clean; then
case " $rmdirs " in
! *" $objdir "*) ;;
! *) rmdirs="$rmdirs $objdir" ;;
esac
fi
--- 9452,9474 ----
rmdirs=
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
! odir="$objdir"
else
! odir="$dir/$objdir"
fi
func_basename "$file"
name="$func_basename_result"
! test "$opt_mode" = uninstall && odir="$dir"
! # Remember odir for removal later, being careful to avoid duplicates
! if test "$opt_mode" = clean; then
case " $rmdirs " in
! *" $odir "*) ;;
! *) func_append rmdirs " $odir" ;;
esac
fi
***************
*** 8263,8280 ****
# Delete the libtool libraries and symlinks.
for n in $library_names; do
! rmfiles="$rmfiles $objdir/$n"
done
! test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
! case "$mode" in
clean)
! case " $library_names " in
! # " " in the beginning catches empty $dlname
*" $dlname "*) ;;
! *) rmfiles="$rmfiles $objdir/$dlname" ;;
esac
! test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
--- 9494,9510 ----
# Delete the libtool libraries and symlinks.
for n in $library_names; do
! func_append rmfiles " $odir/$n"
done
! test -n "$old_library" && func_append rmfiles " $odir/$old_library"
! case "$opt_mode" in
clean)
! case " $library_names " in
*" $dlname "*) ;;
! *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
esac
! test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
***************
*** 8302,8320 ****
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
! rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
! rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
;;
*)
! if test "$mode" = clean ; then
noexename=$name
case $file in
*.exe)
--- 9532,9550 ----
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
! func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
! func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
! if test "$opt_mode" = clean ; then
noexename=$name
case $file in
*.exe)
***************
*** 8324,8330 ****
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
! rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
--- 9554,9560 ----
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
! func_append rmfiles " $file"
;;
esac
# Do a test to see if this is a libtool program.
***************
*** 8333,8339 ****
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
! rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
--- 9563,9569 ----
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
! func_append rmfiles " $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
***************
*** 8341,8352 ****
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
! rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
! rmfiles="$rmfiles $objdir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
! rmfiles="$rmfiles $objdir/lt-${noexename}.c"
fi
fi
fi
--- 9571,9582 ----
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
! func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
! func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
! func_append rmfiles " $odir/lt-${noexename}.c"
fi
fi
fi
***************
*** 8354,8360 ****
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
--- 9584,9589 ----
***************
*** 8366,8381 ****
exit $exit_status
}
! { test "$mode" = uninstall || test "$mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
! test -z "$mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
! func_fatal_help "invalid operation mode \`$mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
--- 9595,9610 ----
exit $exit_status
}
! { test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
! test -z "$opt_mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
! func_fatal_help "invalid operation mode \`$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
diff -cNr octave-3.4.0/build-aux/mkinstalldirs octave-3.4.1/build-aux/mkinstalldirs
*** octave-3.4.0/build-aux/mkinstalldirs 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/mkinstalldirs 2011-06-15 11:31:30.000000000 -0400
***************
*** 0 ****
--- 1,162 ----
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+ scriptversion=2009-04-28.21; # UTC
+
+ # Original author: Noah Friedman
+ # Created: 1993-05-16
+ # Public domain.
+ #
+ # This file is maintained in Automake, please report
+ # bugs to or send patches to
+ # .
+
+ nl='
+ '
+ IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+ Create each directory DIR (with mode MODE, if specified), including all
+ leading file name components.
+
+ Report bugs to ."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage"
+ exit $?
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+ done
+
+ for file
+ do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+ done
+
+ case $# in
+ 0) exit 0 ;;
+ esac
+
+ # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+ # mkdir -p a/c at the same time, both will detect that a is missing,
+ # one will create a, then the other will try to create a and die with
+ # a "File exists" error. This is a problem when calling mkinstalldirs
+ # from a parallel make. We use --version in the probe to restrict
+ # ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+ '')
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
+ fi
+ ;;
+ esac
+
+ for file
+ do
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
+ shift
+ IFS=$oIFS
+
+ for d
+ do
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp=$pathcomp/
+ done
+ done
+
+ exit $errstatus
+
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+ # time-stamp-time-zone: "UTC"
+ # time-stamp-end: "; # UTC"
+ # End:
diff -cNr octave-3.4.0/build-aux/mk-opts.pl octave-3.4.1/build-aux/mk-opts.pl
*** octave-3.4.0/build-aux/mk-opts.pl 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/mk-opts.pl 2011-06-15 11:11:27.000000000 -0400
***************
*** 0 ****
--- 1,1076 ----
+ #! /usr/bin/perl -w
+ #
+ # Copyright (C) 2002-2011 John W. Eaton
+ #
+ # This file is part of Octave.
+ #
+ # Octave is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by the
+ # Free Software Foundation; either version 3 of the License, or (at
+ # your option) any later version.
+ #
+ # Octave is distributed in the hope that it will be useful, but WITHOUT
+ # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ # for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with Octave; see the file COPYING. If not, see
+ # .
+
+ # Generate option handling code from a simpler input files for
+ # Octave's functions like lsode, dassl, etc.
+
+ # FIXME:
+ #
+ # * Improve default documentation and/or individual documentation
+ # in data files.
+ #
+ # * Fix print/show code to display/return something more informative
+ # for special values (for example, -1 ==> infinite in some cases).
+ # Probably need more information in the data files for this.
+
+ # Input file format:
+ #
+ # CLASS = string
+ # FCN_NAME = string
+ # INCLUDE = file
+ # DOC_STRING doc END_DOC_STRING
+ # OPTION
+ # NAME = string
+ # DOC_ITEM doc END_DOC_ITEM
+ # TYPE = string
+ # SET_ARG_TYPE = string (optional, defaults to TYPE)
+ # INIT_VALUE = string | INIT_BODY code END_INIT_BODY
+ # SET_EXPR = string | SET_BODY code END_SET_BODY | SET_CODE code END_SET_CODE
+ # END_OPTION
+ #
+ # END_* must appear at beginning of line (whitespace ignored).
+
+ ################################################################################
+ # Load packages to
+ # 1) process command line options
+ ################################################################################
+ use Getopt::Long;
+
+ ################################################################################
+ # Extract command line arguments
+ &parse_options;
+
+ $DEFN_FILE = shift @ARGV;
+ open (DEFN_FILE) or die "unable to open input definition file $DEFN_FILE";
+
+ ################################################################################
+ # Initialize variables
+ $BLANK_LINE = qr/^\s*$/;
+ $COMMENT = qr/^\s*#/;
+
+ ################################################################################
+ # Process file
+ $OPT_NUM = 0;
+
+ &parse_input;
+
+ &process_data;
+
+ # Produce desired style of output
+ &emit_opt_class_header if $opt_class_header;
+ &emit_opt_handler_fcns if $opt_handler_fcns;
+ &emit_options_debug if $opt_debug;
+
+ # End of main code
+
+ ################################################################################
+ # Subroutines
+ ################################################################################
+
+ sub parse_input
+ {
+ LINE: while ()
+ {
+ next LINE if /$BLANK_LINE/;
+ next LINE if /$COMMENT/;
+
+ if (/^\s*OPTION\s*$/)
+ {
+ &parse_option_block;
+ }
+ elsif (/^\s*CLASS\s*=\s*"(\w+)"\s*$/)
+ {
+ die "duplicate CLASS" if defined $CLASS;
+ $CLASS = $1;
+ $CLASS_NAME = "${CLASS}_options";
+ $STRUCT_NAME = "${CLASS_NAME}_struct";
+ $STATIC_TABLE_NAME = "${CLASS_NAME}_table";
+ }
+ elsif (/^\s*FCN_NAME\s*=\s*"(\w+)"\s*$/)
+ {
+ die "duplicate FCN_NAME" if defined $FCN_NAME;
+ $FCN_NAME = $1;
+ }
+ elsif (/^\s*INCLUDE\s*=\s*"(\S+)"\s*$/)
+ {
+ $INCLUDE .= "#include <$1>\n";
+ }
+ elsif (/^\s*DOC_STRING\s*$/)
+ {
+ die "duplicate DOC_STRING" if defined $DOC_STRING;
+ while (defined ($_ = ) and not /^\s*END_DOC_STRING\s*$/)
+ {
+ $DOC_STRING .= $_;
+ }
+ $DOC_STRING =~ s/\n/\\n\\\n/g;
+ }
+ else
+ {
+ die "mk-opts.pl: unknown command: $_\n"
+ }
+ }
+ $INCLUDE = "" if not defined $INCLUDE; # Initialize value if required
+ }
+
+ sub parse_option_block
+ {
+ while ()
+ {
+ next if /$BLANK_LINE/;
+
+ die "missing END_OPTION" if /^\s*OPTION\s*$/;
+
+ last if /^\s*END_OPTION\s*$/;
+
+ if (/^\s*NAME\s*=\s*"(.*)"\s*$/)
+ {
+ die "duplicate NAME" if defined $NAME[$OPT_NUM];
+ $NAME[$OPT_NUM] = $1;
+ ($OPT[$OPT_NUM] = $NAME[$OPT_NUM]) =~ s/\s+/_/g;
+ $OPTVAR[$OPT_NUM] = 'x_' . $OPT[$OPT_NUM];
+ $KW_TOK[$OPT_NUM] = [ split (' ', $NAME[$OPT_NUM]) ];
+ $N_TOKS[$OPT_NUM] = @{$KW_TOK[$OPT_NUM]};
+ }
+ elsif (/^\s*DOC_ITEM\s*$/)
+ {
+ die "duplicate DOC_ITEM" if defined $DOC_ITEM[$OPT_NUM];
+ while (defined ($_ = ) and not /^\s*END_DOC_ITEM\s*$/)
+ {
+ $DOC_ITEM[$OPT_NUM] .= $_;
+ }
+ $DOC_ITEM[$OPT_NUM] =~ s/\n/\\n\\\n/g;
+ }
+ elsif (/^\s*TYPE\s*=\s*"(.*)"\s*$/)
+ {
+ die "duplicate TYPE" if defined $TYPE[$OPT_NUM];
+ $TYPE[$OPT_NUM] = $1;
+ }
+ elsif (/^\s*SET_ARG_TYPE\s*=\s*"(.*)"\s*$/)
+ {
+ die "duplicate SET_ARG_TYPE" if defined $SET_ARG_TYPE[$OPT_NUM];
+ $SET_ARG_TYPE[$OPT_NUM] = $1;
+ }
+ elsif (/^\s*INIT_VALUE\s*=\s*"(.*)"\s*$/)
+ {
+ die "duplicate INIT_VALUE" if defined $INIT_VALUE[$OPT_NUM];
+ $INIT_VALUE[$OPT_NUM] = $1;
+ }
+ elsif (/^\s*SET_EXPR\s*=\s*"(.*)"\s*$/)
+ {
+ die "duplicate SET_EXPR" if defined $SET_EXPR[$OPT_NUM];
+ $SET_EXPR[$OPT_NUM] = $1;
+ }
+ elsif (/^\s*INIT_BODY\s*$/)
+ {
+ die "duplicate INIT_BODY" if defined $INIT_BODY[$OPT_NUM];
+ while (defined ($_ = ) and not /^\s*END_INIT_BODY\s*$/)
+ {
+ $INIT_BODY[$OPT_NUM] .= $_;
+ }
+ }
+ elsif (/^\s*SET_BODY\s*$/)
+ {
+ die "duplicate SET_BODY" if defined $INIT_BODY[$OPT_NUM];
+ while (defined ($_ = ) and not /^\s*END_SET_BODY\s*$/)
+ {
+ $SET_BODY[$OPT_NUM] .= $_;
+ }
+ }
+ elsif (/^\s*SET_CODE\s*$/)
+ {
+ die "duplicate SET_CODE" if defined $SET_CODE[$OPT_NUM];
+ while (defined ($_ = ) and not /^\s*END_SET_CODE\s*$/)
+ {
+ $SET_CODE[$OPT_NUM] .= $_;
+ }
+ }
+ }
+
+ if (not defined $SET_ARG_TYPE[$OPT_NUM])
+ {
+ $SET_ARG_TYPE[$OPT_NUM] = $TYPE[$OPT_NUM];
+ }
+ else
+ {
+ $SET_ARG_TYPE[$OPT_NUM]
+ = substopt ($SET_ARG_TYPE[$OPT_NUM], $OPTVAR[$OPT_NUM],
+ $OPT[$OPT_NUM], $TYPE[$OPT_NUM]);
+ }
+
+ $OPT_NUM++;
+ }
+
+ sub process_data
+ {
+ $MAX_TOKENS = max (@N_TOKS);
+
+ &get_min_match_len_info;
+
+ $FCN_NAME = lc ($CLASS) if not defined $FCN_NAME;
+
+ $OPT_FCN_NAME = "${FCN_NAME}_options" if not defined $OPT_FCN_NAME;
+
+ $STATIC_OBJECT_NAME = "${FCN_NAME}_opts";
+
+ if (not defined $DOC_STRING)
+ {
+ $DOC_STRING = "Query or set options for the function \@code{$FCN_NAME}.\\n\\
+ When called with no arguments, the names of all available options and\\n\\
+ their current values are displayed.\\n\\
+ Given one argument, return the value of the corresponding option.\\n\\
+ When called with two arguments, \@code{$OPT_FCN_NAME} set the option\\n\\
+ \@var{opt} to value \@var{val}.";
+ }
+ }
+
+ #FIXME: What does this routine do? And can it be simpler to understand?
+ sub get_min_match_len_info
+ {
+ my ($i, $j, $k);
+
+ for ($i = 0; $i < $OPT_NUM; $i++)
+ {
+ for ($j = 0; $j < $MAX_TOKENS; $j++)
+ {
+ $MIN_TOK_LEN_TO_MATCH[$i][$j] = 0;
+ }
+
+ $MIN_TOKS_TO_MATCH[$i] = 1;
+
+ L1: for ($k = 0; $k < $OPT_NUM; $k++)
+ {
+ my $duplicate = 1;
+
+ if ($i != $k)
+ {
+ L2: for ($j = 0; $j < $MAX_TOKENS; $j++)
+ {
+ if ($j < $N_TOKS[$i])
+ {
+ if ($KW_TOK[$i][$j] eq $KW_TOK[$k][$j])
+ {
+ if ($MIN_TOK_LEN_TO_MATCH[$i][$j] == 0)
+ {
+ $MIN_TOK_LEN_TO_MATCH[$i][$j] = 1;
+ }
+
+ $MIN_TOKS_TO_MATCH[$i]++;
+ }
+ else
+ {
+ $duplicate = 0;
+
+ if ($MIN_TOK_LEN_TO_MATCH[$i][$j] == 0)
+ {
+ $MIN_TOK_LEN_TO_MATCH[$i][$j] = 1;
+ }
+
+ my @s = split (//, $KW_TOK[$i][$j]);
+ my @t = split (//, $KW_TOK[$k][$j]);
+
+ my ($n, $ii);
+ $n = scalar (@s);
+ $n = scalar (@t) if (@t < $n);
+
+ for ($ii = 0; $ii < $n; $ii++)
+ {
+ if ("$s[$ii]" eq "$t[$ii]")
+ {
+ if ($ii + 2 > $MIN_TOK_LEN_TO_MATCH[$i][$j])
+ {
+ $MIN_TOK_LEN_TO_MATCH[$i][$j]++;
+ }
+ }
+ else
+ {
+ last L2;
+ }
+ }
+
+ last L1;
+ }
+ }
+ else
+ {
+ die qq|ambiguous options "$NAME[$i]" and "$NAME[$k]"| if $duplicate;
+ }
+ }
+ }
+ }
+ }
+ } # end of get_min_match_len_info
+
+
+ sub emit_copy_body
+ {
+ my ($pfx, $var) = @_;
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ print "${pfx}$OPTVAR[$i] = ${var}.$OPTVAR[$i];\n";
+ }
+
+ print "${pfx}reset = ${var}.reset;\n";
+ }
+
+ ## To silence GCC warnings, we create an initialization list even
+ ## though the init function actually does the work of initialization.
+
+ sub emit_default_init_list
+ {
+ my ($prefix) = @_;
+
+ print "$OPTVAR[0] (),\n" unless ($OPT_NUM == 0);
+
+ for (my $i = 1; $i < $OPT_NUM; $i++)
+ {
+ print "${prefix}$OPTVAR[$i] (),\n";
+ }
+
+ print "${prefix}reset ()\n";
+ }
+
+ sub emit_copy_ctor_init_list
+ {
+ my ($prefix, $var) = @_;
+
+ print "$OPTVAR[0] ($var.$OPTVAR[0]),\n" unless ($OPT_NUM == 0);
+
+ for (my $i = 1; $i < $OPT_NUM; $i++)
+ {
+ print "${prefix}$OPTVAR[$i] ($var.$OPTVAR[$i]),\n";
+ }
+
+ print "${prefix}reset ($var.reset)\n";
+ }
+
+ sub emit_opt_class_header
+ {
+ my ($i, $s);
+
+ print <<"_END_EMIT_OPT_CLASS_HEADER_";
+ // DO NOT EDIT!
+ // Generated automatically from $DEFN_FILE.
+
+ #if !defined (octave_${CLASS_NAME}_h)
+ #define octave_${CLASS_NAME}_h 1
+
+ #include
+ #include
+
+ $INCLUDE
+
+ class
+ $CLASS_NAME
+ {
+ public:
+
+ $CLASS_NAME (void)
+ _END_EMIT_OPT_CLASS_HEADER_
+
+ print ' : ';
+ emit_default_init_list (" ");
+
+ print " {
+ init ();
+ }
+
+ $CLASS_NAME (const ${CLASS_NAME}& opt)
+ : ";
+
+ emit_copy_ctor_init_list (" ", "opt");
+
+ print " { }
+
+ ${CLASS_NAME}& operator = (const ${CLASS_NAME}& opt)
+ {
+ if (this != &opt)
+ {\n";
+
+ emit_copy_body (' ', 'opt');
+
+ print " }
+
+ return *this;
+ }
+
+ ~$CLASS_NAME (void) { }\n";
+
+ print "\n void init (void)\n {\n";
+
+ for ($i = 0; $i < $OPT_NUM; $i++)
+ {
+ if ($INIT_VALUE[$i])
+ {
+ print " $OPTVAR[$i] = $INIT_VALUE[$i];\n";
+ }
+ elsif ($INIT_BODY[$i])
+ {
+ $s = substopt ($INIT_BODY[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]);
+ chomp ($s);
+ $s =~ s/^\s*/ /g;
+ $s =~ s/\n\s*/\n /g;
+ print $s,"\n";
+ }
+ }
+
+ print " reset = true;\n",
+ " }\n";
+
+ ## For backward compatibility and because set_options is probably
+ ## a better name in some contexts:
+
+ print "\n void set_options (const ${CLASS_NAME}& opt)\n",
+ " {\n";
+
+ emit_copy_body (' ', 'opt');
+
+ print " }\n\n void set_default_options (void) { init (); }\n";
+
+ for ($i = 0; $i < $OPT_NUM; $i++)
+ {
+ if ($SET_EXPR[$i])
+ {
+ emit_set_decl ($i);
+
+ print "\n { $OPTVAR[$i] = $SET_EXPR[$i]; reset = true; }\n";
+ }
+ elsif ($SET_BODY[$i])
+ {
+ emit_set_decl ($i);
+
+ $s = substopt ($SET_BODY[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]);
+ chomp ($s);
+ $s = ' ' . $s;
+ $s =~ s/\n/\n /g;
+ print "\n {\n$s\n reset = true;\n }\n";
+ }
+ elsif ($SET_CODE[$i])
+ {
+ $s = substopt ($SET_CODE[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]);
+ chomp ($s);
+ $s =~ s/^ //g;
+ $s =~ s/\n /\n/g;
+ print "\n",$s,"\n";
+ }
+ }
+
+ for ($i = 0; $i < $OPT_NUM; $i++)
+ {
+ print " $TYPE[$i] $OPT[$i] (void) const\n { return $OPTVAR[$i]; }\n\n";
+ }
+
+ print "private:\n\n";
+
+ for ($i = 0; $i < $OPT_NUM; $i++)
+ {
+ print " $TYPE[$i] $OPTVAR[$i];\n";
+ }
+
+ print "\nprotected:\n\n bool reset;\n};\n\n#endif\n";
+ }
+
+ sub emit_set_decl
+ {
+ my ($i) = @_;
+
+ print "\n void set_$OPT[$i] ($SET_ARG_TYPE[$i] val)";
+ }
+
+ sub emit_opt_handler_fcns
+ {
+ my $header = $DEFN_FILE;
+ $header =~ s/[.]\w*$/.h/; # replace .in with .h
+ $header =~ s|^.*/([^/]*)$|$1|; # strip directory part
+
+ print <<"_END_EMIT_OPT_HANDLER_FCNS_";
+ // DO NOT EDIT!
+ // Generated automatically from $DEFN_FILE.
+
+ #ifdef HAVE_CONFIG_H
+ #include
+ #endif
+
+ #include
+ #include
+
+ #include "$header"
+
+ #include "defun-dld.h"
+ #include "pr-output.h"
+
+ #include "oct-obj.h"
+ #include "utils.h"
+ #include "pager.h"
+
+ static $CLASS_NAME $STATIC_OBJECT_NAME;
+
+ _END_EMIT_OPT_HANDLER_FCNS_
+
+ &emit_struct_decl;
+
+ &emit_struct_def;
+
+ &emit_print_function;
+
+ &emit_set_functions;
+
+ &emit_show_function;
+
+ &emit_options_function;
+ }
+
+ sub emit_struct_decl
+ {
+ print <<"_END_PRINT_STRUCT_DECL_";
+ #define MAX_TOKENS $MAX_TOKENS
+
+ struct $STRUCT_NAME
+ {
+ const char *keyword;
+ const char *kw_tok[MAX_TOKENS + 1];
+ int min_len[MAX_TOKENS + 1];
+ int min_toks_to_match;
+ };
+
+ _END_PRINT_STRUCT_DECL_
+ }
+
+ sub emit_struct_def
+ {
+ my $i;
+
+ print "#define NUM_OPTIONS $OPT_NUM\n\n";
+
+ print "static $STRUCT_NAME $STATIC_TABLE_NAME [] =\n{\n";
+
+ for ($i = 0; $i < ($OPT_NUM - 1); $i++)
+ {
+ emit_option_table_entry ($i, 0);
+ print "\n";
+ }
+ emit_option_table_entry ($i, 0);
+
+ print "};\n\n";
+ }
+
+ sub emit_option_table_entry
+ {
+ my ($i, $empty) = @_;
+
+ my $k;
+
+ if ($empty)
+ {
+ print " { 0,\n";
+ }
+ else
+ {
+ print " { \"$NAME[$i]\",\n";
+ }
+
+ my $n = scalar $#{$KW_TOK[$i]};
+ print " {";
+ for $k (0 .. $MAX_TOKENS)
+ {
+ if ($empty or $k > $n)
+ {
+ print " 0,";
+ }
+ else
+ {
+ print " \"$KW_TOK[$i][$k]\",";
+ }
+ }
+ print " },\n";
+
+ print " {";
+ for $k (0 .. $MAX_TOKENS)
+ {
+ if ($empty or $k > $n)
+ {
+ print " 0,";
+ }
+ else
+ {
+ print " $MIN_TOK_LEN_TO_MATCH[$i][$k],";
+ }
+ }
+ print " }, $MIN_TOKS_TO_MATCH[$i], ";
+
+ print "},\n";
+ }
+
+ sub emit_print_function
+ {
+ ## FIXME -- determine the width of the table automatically.
+
+ print qq|static void
+ print_$CLASS_NAME (std::ostream& os)
+ {
+ std::ostringstream buf;
+
+ os << "\\n"
+ << "Options for $CLASS include:\\n\\n"
+ << " keyword value\\n"
+ << " ------- -----\\n";
+
+ $STRUCT_NAME *list = $STATIC_TABLE_NAME;\n\n|;
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ print qq| {\n os << " "
+ << std::setiosflags (std::ios::left) << std::setw (50)
+ << list[$i].keyword
+ << std::resetiosflags (std::ios::left)
+ << " ";\n\n|;
+
+ if ($TYPE[$i] eq "double")
+ {
+ print qq| double val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| os << val << "\\n";\n|;
+ }
+ elsif ($TYPE[$i] eq "float")
+ {
+ print qq| float val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| os << val << "\\n";\n|;
+ }
+ elsif ($TYPE[$i] eq "int" or $TYPE[$i] eq "octave_idx_type")
+ {
+ print qq| int val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| os << val << "\\n";\n|;
+ }
+ elsif ($TYPE[$i] eq "std::string")
+ {
+ print qq| os << $STATIC_OBJECT_NAME.$OPT[$i] () << "\\n";\n|;
+ }
+ elsif ($TYPE[$i] eq "Array" or $TYPE[$i] eq "Array")
+ {
+ my $elt_type;
+ if ($TYPE[$i] eq "Array")
+ {
+ $elt_type = "int";
+ }
+ else
+ {
+ $elt_type = "octave_idx_type";
+ }
+ print qq| Array<$elt_type> val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| if (val.length () == 1)
+ {
+ os << val(0) << "\\n";
+ }
+ else
+ {
+ os << "\\n\\n";
+ octave_idx_type len = val.length ();
+ Matrix tmp (len, 1);
+ for (octave_idx_type i = 0; i < len; i++)
+ tmp(i,0) = val(i);
+ octave_print_internal (os, tmp, false, 2);
+ os << "\\n\\n";
+ }\n|;
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print qq| Array val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| if (val.length () == 1)
+ {
+ os << val(0) << "\\n";
+ }
+ else
+ {
+ os << "\\n\\n";
+ Matrix tmp = Matrix (ColumnVector (val));
+ octave_print_internal (os, tmp, false, 2);
+ os << "\\n\\n";
+ }\n|;
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print qq| Array val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n|;
+ print qq| if (val.length () == 1)
+ {
+ os << val(0) << "\\n";
+ }
+ else
+ {
+ os << "\\n\\n";
+ FloatMatrix tmp = FloatMatrix (FloatColumnVector (val));
+ octave_print_internal (os, tmp, false, 2);
+ os << "\\n\\n";
+ }\n|;
+ }
+ else
+ {
+ die ("unknown type $TYPE[$i]");
+ }
+
+ print " }\n\n";
+ }
+
+ print qq| os << "\\n";\n}\n\n|;
+ }
+
+ sub emit_set_functions
+ {
+ print "static void
+ set_$CLASS_NAME (const std::string& keyword, const octave_value& val)
+ {
+ $STRUCT_NAME *list = $STATIC_TABLE_NAME;\n\n";
+
+ my $iftok = "if";
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ $iftok = "else if" if ($i > 0);
+
+ print " $iftok (keyword_almost_match (list[$i].kw_tok, list[$i].min_len,
+ keyword, list[$i].min_toks_to_match, MAX_TOKENS))
+ {\n";
+
+ if ($TYPE[$i] eq "double")
+ {
+ print " double tmp = val.double_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "float")
+ {
+ print " float tmp = val.float_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "int" or $TYPE[$i] eq "octave_idx_type")
+ {
+ print " int tmp = val.int_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "std::string")
+ {
+ print " std::string tmp = val.string_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "Array" or $TYPE[$i] eq "Array")
+ {
+ print " Array tmp = val.int_vector_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print " Array tmp = val.vector_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print " Array tmp = val.float_vector_value ();\n\n";
+ print " if (! error_state)
+ $STATIC_OBJECT_NAME.set_$OPT[$i] (tmp);\n";
+ }
+ else
+ {
+ die ("unknown type $TYPE[$i]");
+ }
+
+ print " }\n";
+ }
+
+ print qq| else
+ {
+ warning ("$OPT_FCN_NAME: no match for `%s'", keyword.c_str ());
+ }
+ }\n\n|;
+ }
+
+ sub emit_show_function
+ {
+ print "static octave_value_list
+ show_$CLASS_NAME (const std::string& keyword)
+ {
+ octave_value retval;
+
+ $STRUCT_NAME *list = $STATIC_TABLE_NAME;\n\n";
+
+ my $iftok = "if";
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ $iftok = "else if" if ($i > 0);
+
+ print " $iftok (keyword_almost_match (list[$i].kw_tok, list[$i].min_len,
+ keyword, list[$i].min_toks_to_match, MAX_TOKENS))
+ {\n";
+
+ if ($TYPE[$i] eq "double")
+ {
+ print " double val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " retval = val;\n";
+ }
+ elsif ($TYPE[$i] eq "float")
+ {
+ print " float val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " retval = val;\n";
+ }
+ elsif ($TYPE[$i] eq "int" or $TYPE[$i] eq "octave_idx_type")
+ {
+ print " int val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " retval = static_cast (val);\n";
+ }
+ elsif ($TYPE[$i] eq "std::string")
+ {
+ print " retval = $STATIC_OBJECT_NAME.$OPT[$i] ();\n";
+ }
+ elsif ($TYPE[$i] eq "Array" or $TYPE[$i] eq "Array")
+ {
+ my $elt_type;
+ if ($TYPE[$i] eq "Array")
+ {
+ $elt_type = "int";
+ }
+ else
+ {
+ $elt_type = "octave_idx_type";
+ }
+ print " Array<$elt_type> val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " if (val.length () == 1)
+ {
+ retval = static_cast (val(0));
+ }
+ else
+ {
+ octave_idx_type len = val.length ();
+ ColumnVector tmp (len);
+ for (octave_idx_type i = 0; i < len; i++)
+ tmp(i) = val(i);
+ retval = tmp;
+ }\n";
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print " Array val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " if (val.length () == 1)
+ {
+ retval = val(0);
+ }
+ else
+ {
+ retval = ColumnVector (val);
+ }\n";
+ }
+ elsif ($TYPE[$i] eq "Array")
+ {
+ print " Array val = $STATIC_OBJECT_NAME.$OPT[$i] ();\n\n";
+ print " if (val.length () == 1)
+ {
+ retval = val(0);
+ }
+ else
+ {
+ retval = FloatColumnVector (val);
+ }\n";
+ }
+ else
+ {
+ die ("unknown type $TYPE[$i]");
+ }
+
+ print " }\n";
+ }
+
+ print qq| else
+ {
+ warning ("$OPT_FCN_NAME: no match for `%s'", keyword.c_str ());
+ }
+
+ return retval;\n}\n\n|;
+ }
+
+ sub emit_options_function
+ {
+ print <<"_END_EMIT_OPTIONS_FUNCTION_HDR_";
+ DEFUN_DLD ($OPT_FCN_NAME, args, ,
+ "-*- texinfo -*-\\n\\
+ \@deftypefn {Loadable Function} {} $OPT_FCN_NAME ()\\n\\
+ \@deftypefnx {Loadable Function} {val =} $OPT_FCN_NAME (\@var{opt})\\n\\
+ \@deftypefnx {Loadable Function} {} $OPT_FCN_NAME (\@var{opt}, \@var{val})\\n\\
+ $DOC_STRING\\n\\
+ \\n\\
+ Options include\\n\\
+ \\n\\
+ \@table \@code\\n\\
+ _END_EMIT_OPTIONS_FUNCTION_HDR_
+ # FIXME: Add extra newline above
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ print '@item \"', $NAME[$i], '\"\n\\', "\n";
+ print $DOC_ITEM[$i] if $DOC_ITEM[$i];
+ }
+
+ print <<"_END_EMIT_OPTIONS_FUNCTION_BODY_";
+ \@end table\\n\\
+ \@end deftypefn")
+ {
+ octave_value_list retval;
+
+ int nargin = args.length ();
+
+ if (nargin == 0)
+ {
+ print_$CLASS_NAME (octave_stdout);
+ }
+ else if (nargin == 1 || nargin == 2)
+ {
+ std::string keyword = args(0).string_value ();
+
+ if (! error_state)
+ {
+ if (nargin == 1)
+ retval = show_$CLASS_NAME (keyword);
+ else
+ set_$CLASS_NAME (keyword, args(1));
+ }
+ else
+ error ("$OPT_FCN_NAME: expecting keyword as first argument");
+ }
+ else
+ print_usage ();
+
+ return retval;
+ }
+ _END_EMIT_OPTIONS_FUNCTION_BODY_
+
+ }
+
+ sub emit_options_debug
+ {
+ print qq|CLASS = "$CLASS"\n|;
+
+ for (my $i = 0; $i < $OPT_NUM; $i++)
+ {
+ print "\nOPTION\n";
+ print qq| NAME = "$NAME[$i]"\n|;
+ print qq| TYPE = "$TYPE[$i]"\n|;
+ if ($SET_ARG_TYPE[$i])
+ {
+ print eval ("\" SET_ARG_TYPE = \\\"$SET_ARG_TYPE[$i]\\\"\"") . "\n";
+ }
+ if ($INIT_VALUE[$i])
+ {
+ print qq| INIT_VALUE = "$INIT_VALUE[$i]"\n|;
+ }
+ if ($INIT_BODY[$i])
+ {
+ print " INIT_BODY\n";
+ print &substopt ($INIT_BODY[$i]);
+ print " END_INIT_BODY\n";
+ }
+ if ($SET_EXPR[$i])
+ {
+ print qq| SET_EXPR = "$SET_EXPR[$i]"\n|;
+ }
+ if ($SET_BODY[$i])
+ {
+ print " SET_BODY\n";
+ print &substopt ($SET_BODY[$i]);
+ print " END_SET_BODY\n";
+ }
+ if ($SET_CODE[$i])
+ {
+ print " SET_CODE\n";
+ print &substopt ($SET_CODE[$i]);
+ print " END_SET_CODE\n";
+ }
+ print "END_OPTION\n";
+ }
+ }
+
+ sub substopt
+ {
+ my ($string, $optvar, $opt, $type) = @_;
+
+ $string =~ s/\$OPTVAR/$optvar/g;
+ $string =~ s/\$OPT/$opt/g;
+ $string =~ s/\$TYPE/$type/g;
+
+ return $string;
+ }
+
+ sub max
+ {
+ my $max = shift;
+
+ foreach (@_)
+ {
+ $max = $_ if $max < $_;
+ }
+
+ return $max;
+ }
+
+ ################################################################################
+ # Subroutine processes any command line arguments
+ ################################################################################
+ sub parse_options
+ {
+ my $result;
+
+ $opt_help = 0;
+ $opt_class_header = 0;
+ $opt_handler_fcns = 0;
+ $opt_debug = 0;
+
+ $result = GetOptions ("opt-class-header" => \$opt_class_header,
+ "opt-handler-fcns" => \$opt_handler_fcns,
+ "debug" => \$opt_debug,
+ "help" => \$opt_help);
+
+ # give user info if options incorrect or -h(elp) given
+ &usage_info if (!$result or (@ARGV != 1) or $opt_help);
+ if ($opt_class_header and $opt_handler_fcns)
+ {
+ die "Only one of [-opt-class-header | -opt-handler-fcns ] may be specified";
+ }
+
+ }
+
+ ################################################################################
+ # Subroutine displays usage information
+ ################################################################################
+ sub usage_info
+ {
+ warn <<_END_OF_USAGE_;
+ //////////////////////////////////////////////////////////////////////////////
+ USAGE : mk-opts.pl -opt-class-header|-opt-handler-fcns [-debug] [-help] DEFN_FILE
+ //////////////////////////////////////////////////////////////////////////////
+
+ Automatically generate C++ code for option handling code (DASSL, DASRT, etc.)
+ from definition file.
+
+ See the head of mk-opts.pl for a description of the format that is parsed.
+ _END_OF_USAGE_
+
+ exit(1); # exit with error code
+ }
+
diff -cNr octave-3.4.0/build-aux/move-if-change octave-3.4.1/build-aux/move-if-change
*** octave-3.4.0/build-aux/move-if-change 1969-12-31 19:00:00.000000000 -0500
--- octave-3.4.1/build-aux/move-if-change 2011-06-15 11:11:27.000000000 -0400
***************
*** 0 ****
--- 1,15 ----
+ #!/bin/sh
+ #
+ # Like mv $1 $2, but if the files are the same, just delete $1.
+ # Status is 0 if $2 is changed, 1 otherwise.
+
+ if test -r $2; then
+ if cmp $1 $2 > /dev/null; then
+ echo $2 is unchanged
+ rm -f $1
+ else
+ mv -f $1 $2
+ fi
+ else
+ mv -f $1 $2
+ fi
diff -cNr octave-3.4.0/build-aux/warn-on-use.h octave-3.4.1/build-aux/warn-on-use.h
*** octave-3.4.0/build-aux/warn-on-use.h 2011-02-08 05:03:17.000000000 -0500
--- octave-3.4.1/build-aux/warn-on-use.h 2011-06-15 11:31:05.000000000 -0400
***************
*** 11,17 ****
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! Lesser General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
--- 11,17 ----
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
diff -cNr octave-3.4.0/ChangeLog octave-3.4.1/ChangeLog
*** octave-3.4.0/ChangeLog 2011-02-08 05:01:12.000000000 -0500
--- octave-3.4.1/ChangeLog 2011-06-15 11:41:22.000000000 -0400
***************
*** 1,6933 ****
! 2011-01-31 John W. Eaton
! Version 3.4.0 released.
! * configure.ac (AC_INIT): Version is now 3.4.0.
! (OCTAVE_API_VERSION_NUMBER): Now 47.
! (OCTAVE_RELEASE_DATE): Now 2011-02-08.
!
! 2011-01-31 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.92.
! (OCTAVE_API_VERSION_NUMBER): Now 46.
! (OCTAVE_RELEASE_DATE): Now 2011-02-06.
!
! 2011-01-31 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.91+.
!
! 2011-01-31 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.91.
(OCTAVE_API_VERSION_NUMBER): Now 45.
! (OCTAVE_RELEASE_DATE): Now 2011-01-31.
!
! 2011-02-08 John W. Eaton
!
! * NEWS: Add note about subfunctions.
!
! 2011-02-06 John W. Eaton
!
! * PROJECTS, README.devel: Use maintainers@octave.org instead of
! octave-maintainers@octave.org.
!
! 2010-02-05 Rik
!
! * PROJECTS: Point to maintained list on Octave Wiki.
!
! 2010-02-05 Rik
!
! * mkoctfile.in, octave-config.in: Update usage strings.
!
! 2010-02-04 Rik
!
! * configure.ac: Add new doc/icons/Makefile to list of Makefiles to build
! * examples/Makefile.am: Move building of .desktop files and distribution
! of icons to doc/icons directory.
!
! 2010-01-30 Rik
!
! * NEWS: Deprecate glpkmex function.
!
! 2011-01-30 John W. Eaton
!
! * acinclude.m4 (OCTAVE_PROG_GHOSTSCRIPT): Update warning message.
!
! 2011-01-30 John W. Eaton
!
! * configure.ac: Remove code to print warning for missing ARPACK.
! * README.MacOS: Remove arpack from list of prerequisite software.
!
! 2010-01-29 Rik
!
! * NEWS: Deprecate saveimage function.
!
! 2011-01-28 Ben Abbott
!
! * README.MacOS: Spelling corrections.
! * README.MacOS: Additional modifications for building Octave manually.
! * README.MacOS: Modify instructions for building Octave manually.
!
! 2011-01-28 John W. Eaton
!
! * configure.ac: Don't check for ARPACK.
! * common.mk (ARPACK_CPPFLAGS, ARPACK_LDFLAGS, ARPACK_LIBS):
! Delete variables.
! (do_subst_config_vals): Don't substitute them.
!
! 2011-01-27 Ben Abbott
!
! * README.MacOS: Modify instructions for MacPorts to "deactivate"
! rather than "uninstall" octave.
!
! 2011-01-26 John W. Eaton
!
! * mk-opts.pl, mkoctfile.cc.in, mkoctfile.in: Untabify.
!
! * mkf77def.in, mk-opts.pl, mkoctfile.cc.in, structdemo.cc,
! unwinddemo.cc, fortdemo.cc, paramdemo.cc,
! celldemo.cc,stringdemo.cc, hello.cc, embedded.cc, helloworld.cc:
! Strip trailing whitespace.
!
! 2011-01-26 Ben Abbott
!
! * README.MacOS: Modify organization, and update for MacPorts.
!
! 2011-01-26 John W. Eaton
!
! * bootstrap: Update from gnulib sources.
!
! 2011-01-26 John W. Eaton
!
! * configure.ac (INSTALL_SCRIPT): Update commend about UGLY_DEFS.
!
! 2011-01-26 John W. Eaton
!
! * acinclude.m4 (OPENGL_LIBS): Don't add -L/usr/X11R6/LIB to
! LDFLAGS in test. Bug #32160.
!
! 2010-01-25 Rik
!
! * Makefile.am: Directly run makefile rules in doc/interpreter directory
! for AUTHORS, BUGS, INSTALL.OCTAVE files.
!
! 2011-01-25 John W. Eaton
!
! * autogen.sh (AUTOMAKE): Add --foreign to the automake command.
! Check for required GNU files here instead of having automake do it.
! Export AUTOMAKE so our options are actually used.
!
! 2011-01-25 John W. Eaton
!
! * Makefile.am (EXTRA_DIST): Remove ROADMAP from the list.
!
! 2010-01-24 Rik
!
! * AUTHORS: Remove. File now auto-generated from contributors.texi.
! * Makefile.am: Add rule for AUTHORS file.
!
! 2011-01-24 John W. Eaton
!
! * NEWS: Note change in audio/mu2lin.
!
! 2010-01-22 Tatsuro MATSUOKA
!
! * README.MinGW: Small corrections to documentation.
!
! 2010-01-22 Rik
!
! * README.devel: Update for 3.4 release.
!
! 2010-01-22 Rik
!
! * HACKING: Revise and incorporate all of file ROADMAP.
! * ROADMAP: Deleted.
!
! 2010-01-22 Rik
!
! * README.Windows: Reference README.MinGW
! * README.MinGW: Replace placeholder with actual instructions
!
! 2011-01-22 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.90+.
!
! 2011-01-22 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.90.
! (OCTAVE_API_VERSION_NUMBER): Now 44.
! (OCTAVE_RELEASE_DATE): Now 2011-01-22.
! (OCTAVE_COPYRIGHT): Update year to 2011.
!
! 2010-01-20 Rik
!
! * README.Cygwin, README.MacOS, README.Windows, README.ftp: Update
! documentation files for 3.4 release.
!
! * README.MinGW: Create placeholder for new README file.
!
! 2011-01-20 John W. Eaton
!
! * bootstrap: Update from gnulib sources.
!
! 2011-01-20 John W. Eaton
!
! * configure.ac, NEWS: Update for backend -> graphics_toolkit change.
!
! 2010-01-17 Rik
!
! * NEWS: Add quadcc to list of new functions added.
!
! 2011-01-17 John W. Eaton
!
! * mkoctfile.cc.in (main): Add + missing from previous change.
!
! 2011-01-15 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.54.
! (OCTAVE_API_VERSION_NUMBER): Now 42.
! (OCTAVE_RELEASE_DATE): Now 2010-11-19.
!
! 2011-01-15 John W. Eaton
!
! * NEWS: Add krylovb to deprecated function list.
!
! 2010-01-14 Rik
!
! * NEWS: Add replot to deprecated function list.
!
! 2011-01-14 John W. Eaton
!
! * bootstrap.conf (gnulib_modules): Include filemode in the list.
!
! 2011-01-14 John W. Eaton
!
! * Update copyright notices for 2011.
!
! 2011-01-14 John W. Eaton
!
! * bootstrap (gnulib_path): Set default gnulib path with ${x:=y},
! not ${x=y}.
!
! 2011-01-14 John W. Eaton
!
! * bootstrap, bootstrap.conf: Update from gnulib sources.
!
! 2011-01-13 John W. Eaton
!
! * bootstrap.conf (gnulib_modules): Include mkstemp in the list.
!
! 2011-01-13 John W. Eaton
!
! * configure.ac (AC_ARG_ENABLE(extra-warning-flags)):
! Eliminate some code duplication.
!
! 2011-01-13 John W. Eaton
!
! * configure.ac (AC_ARG_ENABLE(extra-warning-flags)): Check for
! -Wcast-qual and -Wcast-align and add them to WARN_CFLAGS and
! WARN_CXXFLAGS.
!
! 2011-01-13 John W. Eaton
!
! * configure.ac (AC_ARG_ENABLE(extra-warning-flags)): Check for
! -Wpointer-arith, -Wmissing-prototypes, -Wstrict-prototypes, and
! -Wwrite-strings and add them to WARN_CFLAGS. Check for
! -Wpointer-arith and add them to WARN_CXXFLAGS.
!
! 2011-01-12 John W. Eaton
!
! * mk-opts.pl: Generate initialization lists and in-line code for
! copying.
!
! 2010-01-11 Rik
!
! * ROADMAP: Update guide to Octave directory structure.
!
! 2010-01-11 Rik
!
! * README.mirrors: Update ftp links.
!
! 2010-01-06 Rik
!
! * README: Update links and disk space requirements.
!
! 2011-01-06 Jordi Gutiérrez Hermoso
!
! * run-octave.in: Add a -gud option so that gdb can be called from
! Emacs's GUD mode and similar.
!
! 2011-01-06 John W. Eaton
!
! * mkoctfile.in, mkoctfile.cc.in: Substitute and use LAPACK_LIBS.
! Bug #32009.
!
! 2010-01-04 Rik
!
! * README.MacOS: Update CFLAGS recommendation to use -O2.
!
! 2010-01-04 Rik
!
! * README.gnuplot: Update recommendation to version 4.4.
!
! 2010-01-04 Marco Atzeri
!
! * README.Cygmin: Update build instructions before 3.4 release.
!
! 2010-12-31 Kai Habel
!
! * NEWS: Add curl and divergence to new functions list.
!
! 2010-12-20 Ben Abbott
!
! * README.MacOS, Makefile.am: Update build insructions for MacOS and
! distribute file in tarball.
!
! 2010-12-20 Rik
!
! * README.Cray, SENDING-PATCHES, Makefile.am: Remove obsolete files.
!
! 2010-12-18 Rik
!
! * NEWS: Deprecate sphcat and spvcat functions.
!
! 2010-12-17 Rik
!
! * README.MacOS: New file documenting build instructions for Mac OSX.
!
! 2010-12-09 Kai Habel
!
! * NEWS: Add pie3 to new functions list.
!
! 2010-12-09 Marco Atzeri
!
! * configure.ac: Don't add -lwsock32 to LIBS on cygwin systems.
!
! 2010-11-21 Kai Habel
!
! * NEWS: Add uigetdir, uigetfile, uiputfile.
!
! 2010-11-19 John W. Eaton
!
! * Makefile.am (bin_SCRIPTS): Remove run-octave from the list.
!
! 2010-10-19 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.54+.
!
! 2010-10-19 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.54.
! (OCTAVE_API_VERSION_NUMBER): Now 42.
! (OCTAVE_RELEASE_DATE): Now 2010-11-19.
!
! 2010-11-15 Kai Habel
!
! * NEWS: Add saveas. Fix uimenu.
!
! 2010-11-14 Michael Goffioul
!
! * mkoctfile.cc.in: replace %OCTAVE_CONF_F77_INTEGER8_FLAG% with
! %OCTAVE_CONF_F77_INTEGER_8_FLAG%.
!
! 2010-11-10 John W. Eaton
!
! * configure.ac: Don't check for nan.h.
!
! 2010-11-10 John W. Eaton
!
! * configure.ac (AH_BOTTOM): Eliminate special case for __DECCXX:
!
! 2010-11-10 John W. Eaton
!
! * configure.ac: Eliminate special cases for nextstep.
!
! 2010-11-10 John W. Eaton
!
! * configure.ac: Eliminate special checks for SCO systems.
!
! 2010-11-10 John W. Eaton
!
! * NEWS: Update deprecated function list with dispatch.
!
! 2010-11-09 Rik
!
! * configure.ac: Fix typo where variable name was missing '$'
!
! 2010-11-09 Rik
!
! * configure.ac: Properly m4 quote AS_HELP_STRING.
!
! 2010-11-09 Rik
!
! * configure.ac: Remove redundant warning message when '--without-opengl'
! option used.
!
! 2010-11-09 John W. Eaton
!
! * configure.ac: Don't check for trunc, copysign, or _copysign.
!
! 2010-11-08 John W. Eaton
!
! * configure.ac (--without-opengl): New configure option.
!
! 2010-11-03 John W. Eaton
!
! * bootstrap.conf (gnulib_modules): Include copysign in the list.
!
! 2010-10-28 Rik
!
! * NEWS: Update deprecated function list with autocov and autocor.
!
! 2010-10-25 Kai Habel
!
! * NEWS: Add uimenu.
!
! 2010-10-24 Rik
!
! * NEWS: Update deprecated function list for version 3.4.
!
! 2010-10-22 John W. Eaton
!
! * Makefile.am (EXTRA_DIST): Include bootstrap and bootstrap.conf
! in the list.
!
! 2010-10-19 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.53+.
!
! 2010-10-19 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.53.
! (OCTAVE_API_VERSION_NUMBER): Now 41.
! (OCTAVE_RELEASE_DATE): Now 2010-10-19.
!
! 2010-09-29 John W. Eaton
!
! * examples/make_int.cc (Fmake_int): Don't pass arg to mlock.
!
! 2010-09-29 John W. Eaton
!
! * examples/structdemo.cc (Fstructdemo): Use octave_scalar_map
! instead of Octave_map.
!
! 2010-09-29 John W. Eaton
!
! * configure.ac: Style fixes.
!
! 2010-09-29 John P. Swensen
!
! * configure.ac: Allow selection of GraphicsMagick or ImageMagick
! at configure time using "--with-magick=" option.
!
! 2010-09-24 Jaroslav Hajek
!
! * m4/ax_blas.m4: Update.
!
! 2010-09-23 John W. Eaton
!
! * octave-bug.in, octave-bug.cc.in: Delete
! * Makefile.am (EXTRA_DIST): Remove them from the list.
! (bin_PROGRAMS): Remove octave-bug from the list.
! (octave_bug_SOURCES, nodist_octave_bug_SOURCES): Delete variables.
! (BUILT_SOURCES): Remove octave-bug.cc from the list.
! (bin_SCRIPTS): Remove octave-bug from the list.
! (octave-bug.cc, octave-bug): Delete rules.
!
! 2010-09-20 John W. Eaton
!
! * bootstrap.conf (gnulib_modules): Include mktime in the list.
!
! 2010-09-18 John W. Eaton
!
! * Makefile.am (BUILT_SOURCES): Include run-octave in the list.
!
! 2010-09-16 John W. Eaton
!
! * configure.ac (SCRIPTS_EXE_SUFFIX) Delete variable and all uses.
! (BUILD_COMPILED_AUX_PROGRAMS): New variable.
! (AMCOND_BUILD_COMPILED_AUX_PROGRAMS): New Automake conditional.
! * Makefile.am (SCRIPTS_EXE_SUFFIX, BUILT_SHELL_FILES): Delete
! variables and all uses.
! (bin_SCRIPTS, bin_PROGRAMS, mkoctfile_SOURCES,
! nodist_mkoctfile_SOURCES, octave_config_SOURCES,
! nodist_octave_config_SOURCES, octave_bug_SOURCES,
! nodist_octave_bug_SOURCES, BUILT_SOURCES): Define conditionally
! based on AMCOND_BUILD_COMPILED_AUX_PROGRAMS.
! (noinst_SCRIPTS): New variable.
! (CLEANFILES): Include $(bin_PROGRAMS) $(bin_SCRIPTS)
! $(BUILT_SOURCES) in the list.
! (all-local): Also depend on $(bin_PROGRAMS) and $(noinst_SCRIPTS).
! (octave-bug.cc, octave-config.cc, mkoctfile.cc, octave-bug)
! (octave-config, mkoctfile): Make rules conditional on
! AMCOND_BUILD_COMPILED_AUX_PROGRAMS.
! (make-version-links, remove-version-links): Define different
! rules conditional on AMCOND_BUILD_COMPILED_AUX_PROGRAMS.
!
! 2010-09-13 Jaroslav Hajek
!
! * NEWS: Update.
!
! 2010-09-10 Jaroslav Hajek
!
! * m4/ax_blas_f77_func.m4: Update.
!
! 2010-09-07 Ben Abbott
!
! * acinclude.m4, configure.ac, m4/module.mk: Update acx_*.m4
! macros to the newer ax_*.m4 versions.
! * ax_blas.m4, ax_lapack.m4, ax_blas_f77_func.m4,
! ax_pthread.m4: Add files.
! * acx_blas.m4, acx_lapack.m4, acx_blas_f77_func.m4,
! acx_pthread.m4: Remove files.
!
! 2010-09-01 Jaroslav Hajek
!
! * NEWS: Update.
!
! 2010-08-21 Rik
!
! * NEWS: Add randi to list of new functions
!
! 2010-08-09 John Swensen
!
! * mkoctfile.in: Add ability to pass -pthread through to linker.
!
! 2010-08-13 Jaroslav Hajek
!
! * NEWS: Update.
!
! 2010-08-09 Rik
!
! * examples/Makefile.am: Don't echo 'echo' command when building
! octave.desktop.
!
! 2010-08-09 Jaroslav Hajek
!
! * NEWS: Update.
!
! 2010-08-05 Rik
!
! * configure.ac: Change warning messages about freetype and fontconfig
! to reflect their requirement for native graphics. Bug #30594.
!
! 2010-08-05 Rik
!
! * Makefile.am: Remove distribution of emacs directory
!
! * emacs/info-emacs-info, emacs/info-emacs-octave-help, emacs/module.mk,
! emacs/NEWS, emacs/octave-hlp.el, emacs/octave-inf.el,
! emacs/octave-mod.el, emacs/octave-tags, emacs/octave-tags.1,
! emacs/README, emacs/TODO: Remove from further hg checkouts.
!
! 2010-08-05 Rik
!
! * ChangeLog: Correct date in version upgrade 3.3.52+ comment.
!
! 2010-08-01 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.52+.
!
! 2010-08-01 John W. Eaton
!
! * configure.ac (AC_INIT): Version is now 3.3.52.
! (OCTAVE_API_VERSION_NUMBER): Now 40.
! (OCTAVE_RELEASE_DATE): Now 2010-08-01.
!
! 2010-07-30 Rik