Hello community, here is the log from the commit of package libquvi for openSUSE:Factory checked in at 2013-01-01 12:01:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libquvi (Old) and /work/SRC/openSUSE:Factory/.libquvi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libquvi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libquvi/libquvi.changes 2012-01-24 12:19:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libquvi.new/libquvi.changes 2013-01-01 12:01:04.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Dec 29 18:01:49 UTC 2012 - [email protected] + +- Update to 0.4.1 version: + * Add examples/parse.c [a26f5f6] + * Add examples/supported.c [179d997] + * DOC: Replace buzzhumor with gaskrank [3d2e015] + * FIX: Lua 5.2: Use luaL_newstate instead (#89) [6de7322] + * FIX: Make verify c/b check against correct option [0c4ff3b] + * FIX: Use dirname(3) properly [b2f1621] +- Remove conditionnal BuildRequires macros; now work fine with lua 5.2 + +------------------------------------------------------------------- Old: ---- libquvi-0.4.0.tar.bz2 New: ---- libquvi-0.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libquvi.spec ++++++ --- /var/tmp/diff_new_pack.pKkPyW/_old 2013-01-01 12:01:06.000000000 +0100 +++ /var/tmp/diff_new_pack.pKkPyW/_new 2013-01-01 12:01:06.000000000 +0100 @@ -19,19 +19,14 @@ %define soname 7 Name: libquvi -Version: 0.4.0 +Version: 0.4.1 Release: 0 Summary: Library to parse flash media stream URLs License: LGPL-2.1+ Group: System/Libraries Url: http://quvi.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 -%if 0%{?suse_version} > 1210 -# Not yet compatible with lua 5.2, see http://sourceforge.net/apps/trac/quvi/ticket/89 -BuildRequires: lua51-devel -%else BuildRequires: lua-devel >= 5.1 -%endif # For pkgconfig() Provides BuildRequires: pkg-config BuildRequires: pkgconfig(libcurl) >= 7.18.2 ++++++ libquvi-0.4.0.tar.bz2 -> libquvi-0.4.1.tar.bz2 ++++++ ++++ 4880 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/ChangeLog new/libquvi-0.4.1/ChangeLog --- old/libquvi-0.4.0/ChangeLog 2011-10-05 16:20:04.000000000 +0200 +++ new/libquvi-0.4.1/ChangeLog 2012-03-23 16:20:07.000000000 +0100 @@ -1,3 +1,107 @@ +commit dd471b6 +Author: Toni Gundogdu <[email protected]> +Date: 2012-03-23 + + Update NEWS for v0.4.1 + +NEWS + +commit 0d0e8ee +Author: Toni Gundogdu <[email protected]> +Date: 2012-03-23 + + Bump version to 0.4.1 + + * Bump interface C:R+1:A + +m4/version.m4 + +commit 6de7322 +Author: Toni Gundogdu <[email protected]> +Date: 2012-03-18 + + FIX: Lua 5.2: Use luaL_newstate instead (#89) + + "lua_open was removed in 5.1, and apparently really removed in 5.2 + luaL_newstate replaces it, and as libquvi already depends on Lua 5.1 + just unconditionally replacing the call should work." -- marienz + + * http://sourceforge.net/apps/trac/quvi/ticket/89 + +src/libquvi/lua_wrap.c + +commit b2f1621 +Author: Toni Gundogdu <[email protected]> +Date: 2011-11-30 + + FIX: Use dirname(3) properly + + dirname(3) returned pointers to null-terminated strings must + not be passed to free(3). dirname(3) may modify the contents. + Preserve the pathname by using a temporary copy with dirname(3). + +src/libquvi/lua_wrap.c +src/libquvi/util.c +src/libquvi/util.h + +commit 0c4ff3b +Author: Toni Gundogdu <[email protected]> +Date: 2012-03-18 + + FIX: Make verify c/b check against correct option + + Check that the verify callback was set, not the resolve callback. + +src/libquvi/net_wrap.c + +commit 179d997 +Author: Toni Gundogdu <[email protected]> +Date: 2011-11-30 + + Add examples/supported.c + +examples/Makefile.am +examples/supported.c + +commit a26f5f6 +Author: Toni Gundogdu <[email protected]> +Date: 2011-11-30 + + Add examples/parse.c + +examples/Makefile.am +examples/parse.c + +commit 41ead47 +Author: Toni Gundogdu <[email protected]> +Date: 2012-02-29 + + Add gen-new.sh (repo only) + +gen-news.sh + +commit be85ead +Author: Toni Gundogdu <[email protected]> +Date: 2012-02-29 + + Add license to misc. scripts + + * autogen.sh + * gen-ver.sh + +autogen.sh +gen-ver.sh + +commit 3d2e015 +Author: Toni Gundogdu <[email protected]> +Date: 2012-02-29 + + DOC: Replace buzzhumor with gaskrank + + * buzzhumor.lua was removed in libquvi-scripts 0.4.3 + +doc/nd/Webscripts/Tutorial.txt + commit 965afaf Author: Toni Gundogdu <[email protected]> Date: 2011-10-05 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/NEWS new/libquvi-0.4.1/NEWS --- old/libquvi-0.4.0/NEWS 2011-10-05 16:16:54.000000000 +0200 +++ new/libquvi-0.4.1/NEWS 2012-03-23 16:18:36.000000000 +0100 @@ -1,3 +1,14 @@ +v0.4.1 (2012-03-23) / Toni Gundogdu + +Toni Gundogdu: + - Add examples/parse.c [a26f5f6] + - Add examples/supported.c [179d997] + - DOC: Replace buzzhumor with gaskrank [3d2e015] + - FIX: Lua 5.2: Use luaL_newstate instead (#89) [6de7322] + - Thanks to Marien Zwart for the fix + - FIX: Make verify c/b check against correct option [0c4ff3b] + - FIX: Use dirname(3) properly [b2f1621] + 0.4.0 Wed Oct 05 2011 Toni Gundogdu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/VERSION new/libquvi-0.4.1/VERSION --- old/libquvi-0.4.0/VERSION 2011-10-05 16:20:05.000000000 +0200 +++ new/libquvi-0.4.1/VERSION 2012-03-23 16:20:07.000000000 +0100 @@ -1 +1 @@ -v0.4.0 +v0.4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/config.aux/missing new/libquvi-0.4.1/config.aux/missing --- old/libquvi-0.4.0/config.aux/missing 2011-10-05 16:19:39.000000000 +0200 +++ new/libquvi-0.4.1/config.aux/missing 2012-03-23 16:19:49.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/doc/man3/libquvi.3 new/libquvi-0.4.1/doc/man3/libquvi.3 --- old/libquvi-0.4.0/doc/man3/libquvi.3 2011-10-05 16:19:42.000000000 +0200 +++ new/libquvi-0.4.1/doc/man3/libquvi.3 2012-03-23 16:19:51.000000000 +0100 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "libquvi 3" -.TH libquvi 3 "2011-09-23" "v0.4.0" "libquvi manual" +.TH libquvi 3 "2011-09-23" "v0.4.1" "libquvi manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/doc/nd/Webscripts/Tutorial.txt new/libquvi-0.4.1/doc/nd/Webscripts/Tutorial.txt --- old/libquvi-0.4.0/doc/nd/Webscripts/Tutorial.txt 2011-09-14 10:38:42.000000000 +0200 +++ new/libquvi-0.4.1/doc/nd/Webscripts/Tutorial.txt 2012-03-23 16:00:43.000000000 +0100 @@ -72,7 +72,7 @@ cp -r $prefix/share/lua/util/ lua/ ;# any utility scripts that libquvi uses cp -r $prefix/share/lua/website/quvi/ lua/website/ ;# importable scripts -cp $prefix/share/lua/website/buzzhumor.lua lua/website/foo.lua +cp $prefix/share/lua/website/gaskrank.lua lua/website/foo.lua # foo/ dir should now look like: find . @@ -83,7 +83,7 @@ ./lua/website/quvi ./lua/website/quvi/const.lua ./lua/website/quvi/url.lua -./lua/website/quvi/html.lua ;# added in 0.4.0 +./lua/website/quvi/html.lua ;# (libquvi-scripts 0.4.0+) ./lua/website/quvi/util.lua ./lua/website/quvi/bit.lua ./lua/util @@ -92,10 +92,10 @@ ./lua/util/trim.lua (end) -And open "foo.lua" in an editor. +And open "foo.lua". -About: Tailoring foo.lua +About: Editing foo.lua libquvi scripts use extensively the lua patterns. If you are new to lua or the patterns, you can read more about them from in @@ -120,7 +120,7 @@ Update the domain pattern. (start code) -- r.domain = 'buzzhumor%.com" +- r.domain = 'gaskrank%.tv" + r.domain = 'foo%.bar' (end) @@ -172,11 +172,11 @@ `parse' function: To keep this tutorial simple, let's go ahead and presume that the 'foo.bar' -website is identical to that of 'buzzhumor.com'. Start by setting the +website is identical to that of 'gaskrank.tv'. Start by setting the host ID. (start code) -- self.host_id = 'buzzhumor' +- self.host_id = 'gaskrank' + self.host_id = 'foo' (end) @@ -252,9 +252,9 @@ Does the website support >1 formats: If yes, see if you can add support for them all. youtube.lua, -cbsnews.lua, dailymotion.lua scripts are good examples. Don' -worry about it though. Support the additional formats can be -added later, too. +cbsnews.lua, dailymotion.lua scripts are good examples. Don't +worry about it, though. Support for the additional formats can +be added later, too. Does the parsed title contain extra characters: * We want the _media title only_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/examples/Makefile.am new/libquvi-0.4.1/examples/Makefile.am --- old/libquvi-0.4.0/examples/Makefile.am 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/examples/Makefile.am 2012-03-23 16:00:43.000000000 +0100 @@ -1,5 +1,5 @@ if WITH_EXAMPLES -noinst_PROGRAMS= simple version +noinst_PROGRAMS= simple version parse supported simple_SOURCES= simple.c common.c common.h simple_CPPFLAGS= -I$(top_srcdir)/src/libquvi $(AM_CPPFLAGS) @@ -11,6 +11,16 @@ version_CFLAGS= $(AM_CFLAGS) version_LDFLAGS= $(top_builddir)/src/libquvi/libquvi.la $(AM_LDFLAGS) +parse_SOURCES= parse.c +parse_CPPFLAGS= -I$(top_srcdir)/src/libquvi $(AM_CPPFLAGS) +parse_CFLAGS= $(AM_CFLAGS) +parse_LDFLAGS= $(top_builddir)/src/libquvi/libquvi.la $(AM_LDFLAGS) + +supported_SOURCES= supported.c +supported_CPPFLAGS= -I$(top_srcdir)/src/libquvi $(AM_CPPFLAGS) +supported_CFLAGS= $(AM_CFLAGS) +supported_LDFLAGS= $(top_builddir)/src/libquvi/libquvi.la $(AM_LDFLAGS) + if WITH_SOUP noinst_PROGRAMS+= callback_libsoup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/examples/parse.c new/libquvi-0.4.1/examples/parse.c --- old/libquvi-0.4.0/examples/parse.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libquvi-0.4.1/examples/parse.c 2012-03-23 16:00:43.000000000 +0100 @@ -0,0 +1,54 @@ +/* libquvi + * Copyright (C) 2011 Toni Gundogdu <[email protected]> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include <quvi/quvi.h> +#include <stdio.h> + +int main(int argc, char **argv) +{ + quvi_media_t m; + QUVIcode rc; + quvi_t q; + + rc = quvi_init(&q); + if (rc != QUVI_OK) + { + puts(quvi_strerror(q, rc)); + quvi_close(&q); /* Must be closed. */ + return (rc); + } + + quvi_setopt(q, QUVIOPT_NORESOLVE, 1L); /*!*/ + + rc = quvi_parse(q, "http://dai.ly/cityofscars";, &m); + if (rc != QUVI_OK) + puts(quvi_strerror(q, rc)); + else + { + char *s; + quvi_getprop(m, QUVIPROP_PAGETITLE, &s); + puts(s); + } + quvi_parse_close(&m); + quvi_close(&q); + + return (0); +} + +/* vim: set ts=2 sw=2 tw=72 expandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/examples/supported.c new/libquvi-0.4.1/examples/supported.c --- old/libquvi-0.4.0/examples/supported.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libquvi-0.4.1/examples/supported.c 2012-03-23 16:00:43.000000000 +0100 @@ -0,0 +1,57 @@ +/* libquvi + * Copyright (C) 2011 Toni Gundogdu <[email protected]> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include <stdio.h> +#include <quvi/quvi.h> + +static void print_supported(quvi_t q) +{ + char *d,*f; + while (quvi_next_supported_website(q, &d, &f) == QUVI_OK) + { + puts(d); + /* Ignore returned "formats" string as it has no longer use in + * libquvi 0.4. */ + quvi_free(d); + quvi_free(f); + } +} + +int main(int argc, char **argv) +{ + QUVIcode rc; + quvi_t q; + + rc = quvi_init(&q); + if (rc != QUVI_OK) + { + puts(quvi_strerror(q, rc)); + return (rc); + } + +#ifdef _1 + quvi_setopt(q, QUVIOPT_CATEGORY, QUVIPROTO_HTTP); /* Include HTTP only */ +#endif + print_supported(q); + quvi_close(&q); + + return (0); +} + +/* vim: set ts=2 sw=2 tw=72 expandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/gen-ver.sh new/libquvi-0.4.1/gen-ver.sh --- old/libquvi-0.4.0/gen-ver.sh 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/gen-ver.sh 2012-03-23 16:00:43.000000000 +0100 @@ -1,5 +1,24 @@ #!/bin/sh -# gen-ver.sh for libquvi. +# +# gen-ver.sh for libquvi +# Copyright (C) 2011 Toni Gundogdu +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library 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 Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA +# +set -e from_file() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/m4/libtool.m4 new/libquvi-0.4.1/m4/libtool.m4 --- old/libquvi-0.4.0/m4/libtool.m4 2011-10-05 16:19:23.000000000 +0200 +++ new/libquvi-0.4.1/m4/libtool.m4 2012-03-23 16:19:34.000000000 +0100 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2644,7 +2703,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2713,7 +2772,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2738,7 +2797,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2762,7 +2821,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2793,7 +2852,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2803,7 +2862,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3225,7 +3284,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3645,6 +3704,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4229,7 +4289,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4321,18 +4383,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4492,7 +4569,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4517,7 +4596,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4768,8 +4846,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5064,6 +5141,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5110,10 +5188,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5126,7 +5200,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5165,7 +5239,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5607,9 +5680,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5767,7 +5837,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6137,7 +6206,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6898,12 +6967,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7100,7 +7175,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7233,7 +7307,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7420,6 +7493,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7489,6 +7633,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/m4/ltoptions.m4 new/libquvi-0.4.1/m4/ltoptions.m4 --- old/libquvi-0.4.0/m4/ltoptions.m4 2011-10-05 16:19:23.000000000 +0200 +++ new/libquvi-0.4.1/m4/ltoptions.m4 2012-03-23 16:19:34.000000000 +0100 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/m4/ltversion.m4 new/libquvi-0.4.1/m4/ltversion.m4 --- old/libquvi-0.4.0/m4/ltversion.m4 2011-10-05 16:19:23.000000000 +0200 +++ new/libquvi-0.4.1/m4/ltversion.m4 2012-03-23 16:19:34.000000000 +0100 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/m4/version.m4 new/libquvi-0.4.1/m4/version.m4 --- old/libquvi-0.4.0/m4/version.m4 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/m4/version.m4 2012-03-23 16:10:07.000000000 +0100 @@ -1,4 +1,4 @@ -m4_define([_LIBQUVI_VERSION], [0.4.0]) +m4_define([_LIBQUVI_VERSION], [0.4.1]) m4_define([_LIBQUVI_CURRENT], [7]) -m4_define([_LIBQUVI_REVISION], [0]) +m4_define([_LIBQUVI_REVISION], [1]) m4_define([_LIBQUVI_AGE], [0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/src/libquvi/lua_wrap.c new/libquvi-0.4.1/src/libquvi/lua_wrap.c --- old/libquvi-0.4.0/src/libquvi/lua_wrap.c 2011-09-14 10:39:33.000000000 +0200 +++ new/libquvi-0.4.1/src/libquvi/lua_wrap.c 2012-03-23 16:00:43.000000000 +0100 @@ -29,6 +29,7 @@ #include <unistd.h> #endif #include <assert.h> +#include <libgen.h> #include <lualib.h> #include <lauxlib.h> @@ -414,7 +415,7 @@ { QUVIcode rc; - quvi->lua = (lua_State *) lua_open(); + quvi->lua = luaL_newstate(); if (!quvi->lua) return (QUVI_LUAINIT); @@ -638,6 +639,12 @@ return (QUVI_OK); } +static char *_dirname(const char *s, char **b) +{ + *b = strdup(s); + return (dirname(*b)); +} + /* Website scripts. */ /* Executes the host script's "ident" function. */ @@ -646,7 +653,6 @@ { static const char *f = "ident"; _quvi_lua_script_t s; - char *script_dir; _quvi_t quvi; lua_State *l; QUVIcode rc; @@ -683,13 +689,14 @@ return (QUVI_LUA); } - script_dir = dirname_from(s->path); - lua_newtable(l); setfield_s(l, "page_url", ident->url); - setfield_s(l, "script_dir", script_dir); - - _free(script_dir); + { + char *b = NULL; + char *d = _dirname(s->path, &b); + setfield_s(l, "script_dir", d); + _free(b); + } if (lua_pcall(l, 1, 1, 0)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/src/libquvi/net_wrap.c new/libquvi-0.4.1/src/libquvi/net_wrap.c --- old/libquvi-0.4.0/src/libquvi/net_wrap.c 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/src/libquvi/net_wrap.c 2012-03-23 16:00:43.000000000 +0100 @@ -283,7 +283,7 @@ freprintf(&n->url, "%s", m->url); - if (q->resolve_func) + if (q->verify_func) rc = q->verify_func(n); else rc = curl_verify(q, n); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/src/libquvi/util.c new/libquvi-0.4.1/src/libquvi/util.c --- old/libquvi-0.4.0/src/libquvi/util.c 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/src/libquvi/util.c 2012-03-23 16:00:43.000000000 +0100 @@ -22,7 +22,6 @@ #include <string.h> #include <errno.h> #include <stdarg.h> -#include <libgen.h> #include <assert.h> #ifdef HAVE_ICONV @@ -219,12 +218,4 @@ return (quvi_llst_append((quvi_llst_node_t*)lst, qvl)); } -char *dirname_from(const char *s) -{ - char *t = strdup(s); - char *p = strdup(dirname(t)); - _free(t); - return (p); -} - /* vim: set ts=2 sw=2 tw=72 expandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libquvi-0.4.0/src/libquvi/util.h new/libquvi-0.4.1/src/libquvi/util.h --- old/libquvi-0.4.0/src/libquvi/util.h 2011-09-13 20:03:00.000000000 +0200 +++ new/libquvi-0.4.1/src/libquvi/util.h 2012-03-23 16:00:43.000000000 +0100 @@ -29,7 +29,6 @@ int add_media_url(_quvi_llst_node_t * lst, const char *fmt, ...); char *unescape(_quvi_t quvi, char *s); char *from_html_entities(char *src); -char *dirname_from(const char *s); #endif /* vim: set ts=2 sw=2 tw=72 expandtab: */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
