diff -Nru gobject-introspection-0.9.1~git20100708.01772763/aclocal.m4 gobject-introspection-0.9.2/aclocal.m4 --- gobject-introspection-0.9.1~git20100708.01772763/aclocal.m4 2010-07-09 11:38:16.000000000 +0100 +++ gobject-introspection-0.9.2/aclocal.m4 2010-07-12 18:21:07.000000000 +0100 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, +[m4_warning([this file was generated for autoconf 2.66. 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'.])]) @@ -156,7 +156,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl +_PKG_TEXT]) ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -167,7 +167,7 @@ _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .]) ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff -Nru gobject-introspection-0.9.1~git20100708.01772763/config.guess gobject-introspection-0.9.2/config.guess --- gobject-introspection-0.9.1~git20100708.01772763/config.guess 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/config.guess 2010-07-12 18:00:20.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2009-11-20' # 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 @@ -56,9 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -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. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 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." diff -Nru gobject-introspection-0.9.1~git20100708.01772763/config.h.in gobject-introspection-0.9.2/config.h.in --- gobject-introspection-0.9.1~git20100708.01772763/config.h.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/config.h.in 2010-07-12 18:21:46.000000000 +0100 @@ -100,8 +100,17 @@ /* Define to the platform's shared library suffix */ #undef SHLIB_SUFFIX -/* The size of `time_t', as computed by sizeof. */ -#undef SIZEOF_TIME_T +/* The size of `char', as computed by sizeof. */ +#undef SIZEOF_CHAR + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of `short', as computed by sizeof. */ +#undef SIZEOF_SHORT /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru gobject-introspection-0.9.1~git20100708.01772763/config.sub gobject-introspection-0.9.2/config.sub --- gobject-introspection-0.9.1~git20100708.01772763/config.sub 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/config.sub 2010-07-12 18:00:20.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,9 +75,8 @@ version="\ 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. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 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." @@ -381,8 +380,7 @@ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ @@ -1087,11 +1085,6 @@ basic_machine=tic6x-unknown os=-coff ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1442,8 +1435,6 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; -none) ;; *) diff -Nru gobject-introspection-0.9.1~git20100708.01772763/configure gobject-introspection-0.9.2/configure --- gobject-introspection-0.9.1~git20100708.01772763/configure 2010-07-09 11:38:16.000000000 +0100 +++ gobject-introspection-0.9.2/configure 2010-07-12 18:21:20.000000000 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for gobject-introspection 0.9.1. +# Generated by GNU Autoconf 2.66 for gobject-introspection 0.9.2. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -173,6 +173,14 @@ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes @@ -320,7 +328,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -360,19 +368,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -529,161 +537,14 @@ # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-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. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -702,8 +563,8 @@ # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='0.9.1' -PACKAGE_STRING='gobject-introspection 0.9.1' +PACKAGE_VERSION='0.9.2' +PACKAGE_STRING='gobject-introspection 0.9.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection' PACKAGE_URL='' @@ -817,7 +678,6 @@ LIPO NMEDIT DSYMUTIL -lt_ECHO RANLIB AR OBJDUMP @@ -1075,7 +935,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1101,7 +961,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1305,7 +1165,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1321,7 +1181,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1351,8 +1211,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1360,7 +1220,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1378,13 +1238,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1407,7 +1267,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1421,8 +1281,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1437,9 +1297,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1478,11 +1338,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1508,7 +1368,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gobject-introspection 0.9.1 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 0.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1522,7 +1382,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1579,7 +1439,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 0.9.1:";; + short | recursive ) echo "Configuration of gobject-introspection 0.9.2:";; esac cat <<\_ACEOF @@ -1716,10 +1576,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 0.9.1 -generated by GNU Autoconf 2.65 +gobject-introspection configure 0.9.2 +generated by GNU Autoconf 2.66 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1823,7 +1683,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1932,7 +1792,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2177,10 +2037,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2239,17 +2099,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ------------------------------------------------------------------------------------------- ## +( $as_echo "## ------------------------------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection ## -## ------------------------------------------------------------------------------------------- ## -_ASBOX +## ------------------------------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2265,8 +2123,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gobject-introspection $as_me 0.9.1, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by gobject-introspection $as_me 0.9.2, which was +generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2376,11 +2234,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2414,11 +2270,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2431,11 +2285,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2449,11 +2301,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2508,7 +2358,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2523,7 +2378,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2599,7 +2458,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2616,16 +2475,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2741,11 +2606,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2767,7 +2632,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2777,7 +2642,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -3015,7 +2880,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3023,7 +2888,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -3057,7 +2922,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3073,7 +2938,7 @@ # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='0.9.1' + VERSION='0.9.2' cat >>confdefs.h <<_ACEOF @@ -3158,7 +3023,7 @@ # Check for Win32 # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -3169,16 +3034,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3203,7 +3068,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3211,7 +3076,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3549,8 +3414,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3664,9 +3529,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3708,8 +3572,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3766,9 +3630,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3819,8 +3683,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4238,7 +4102,7 @@ fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4363,8 +4227,8 @@ -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.2.10' +macro_revision='1.3175' @@ -4380,6 +4244,75 @@ ltmain="$ac_aux_dir/ltmain.sh" +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if test "${ac_cv_path_SED+set}" = set; then : @@ -4437,7 +4370,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -4513,7 +4446,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4579,7 +4512,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4646,7 +4579,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4762,7 +4695,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -4845,8 +4778,11 @@ NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4890,7 +4826,7 @@ fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4945,6 +4881,15 @@ fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -4964,13 +4909,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4967: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4970: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4973: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5027,6 +4972,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5091,8 +5041,8 @@ # 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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5363,16 +5313,18 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5402,6 +5354,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5410,11 +5366,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5440,7 +5396,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5852,6 +5808,18 @@ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -6021,8 +5989,8 @@ test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then @@ -6176,7 +6144,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6179 "configure"' > conftest.$ac_ext + echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6888,6 +6856,38 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if test "${lt_cv_ld_force_load+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $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 + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -6915,7 +6915,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7050,8 +7050,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -7180,8 +7180,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7206,6 +7205,8 @@ + + # Set options @@ -7358,6 +7359,7 @@ + test -z "$LN_S" && LN_S="ln -s" @@ -7407,19 +7409,6 @@ - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -7432,23 +7421,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -7477,7 +7449,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -7686,7 +7658,12 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } @@ -7706,15 +7683,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7709: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7713: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -7792,6 +7769,12 @@ lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -7834,6 +7817,13 @@ lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + lt_prog_compiler_pic='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -7896,7 +7886,7 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -7908,25 +7898,25 @@ # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_wl='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' + lt_prog_compiler_wl='-Wl,' ;; esac ;; @@ -7958,7 +7948,7 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -8045,15 +8035,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8052: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -8101,7 +8091,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -8150,16 +8140,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8153: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8157: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -8205,16 +8195,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8208: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8212: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -8324,13 +8314,36 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - link_all_deplibs=no - ;; esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -8364,11 +8377,12 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -8404,6 +8418,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -8425,6 +8440,11 @@ fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -8454,11 +8474,12 @@ tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -8469,13 +8490,17 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -8491,17 +8516,17 @@ fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -8510,7 +8535,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -8622,8 +8647,10 @@ else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -8685,7 +8712,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -8742,7 +8768,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -8786,8 +8812,13 @@ # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -8826,7 +8857,7 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -8842,7 +8873,11 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -8850,7 +8885,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -8916,7 +8951,7 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -8935,7 +8970,7 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -8956,7 +8991,46 @@ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if test "${lt_cv_prog_compiler__b+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -8984,7 +9058,7 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -8995,15 +9069,15 @@ int foo(void) {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9012,7 +9086,7 @@ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9065,17 +9139,17 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9085,13 +9159,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9294,44 +9368,50 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -9502,16 +9582,23 @@ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -9524,7 +9611,7 @@ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -9544,7 +9631,13 @@ if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -9632,7 +9725,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -9685,23 +9778,12 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -9801,6 +9883,19 @@ hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + 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=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -9843,8 +9938,10 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -9911,12 +10008,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9929,23 +10031,31 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes + lt_cv_shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9957,18 +10067,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -10259,6 +10357,11 @@ + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= @@ -10589,7 +10692,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10592 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10630,7 +10733,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10639,7 +10748,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -10685,7 +10798,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10688 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10726,7 +10839,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10735,7 +10854,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -11117,7 +11240,7 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 @@ -11190,7 +11313,7 @@ fi if test "$LEX" = :; then - as_fn_error "flex not found but required" "$LINENO" 5 + as_fn_error $? "flex not found but required" "$LINENO" 5 fi for ac_prog in 'bison -y' @@ -11237,7 +11360,7 @@ test -n "$YACC" || YACC=":" if test "$YACC" = :; then - as_fn_error "bison not found but required" "$LINENO" 5 + as_fn_error $? "bison not found but required" "$LINENO" 5 fi @@ -11324,7 +11447,7 @@ $as_echo ".$SHLIB_SUFFIX" >&6; } # any reason it may fail? if test "x$SHLIB_SUFFIX" = x; then - as_fn_error "Cannot determine shared library suffix from libtool" "$LINENO" 5 + as_fn_error $? "Cannot determine shared library suffix from libtool" "$LINENO" 5 fi cat >>confdefs.h <<_ACEOF @@ -11588,7 +11711,7 @@ # Put the nasty error message in config.log where it belongs echo "$GOBJECT_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gobject-2.0 gio-2.0) were not met: + as_fn_error $? "Package requirements (gobject-2.0 gio-2.0) were not met: $GOBJECT_PKG_ERRORS @@ -11598,12 +11721,13 @@ Alternatively, you may set the environment variables GOBJECT_CFLAGS and GOBJECT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11612,7 +11736,8 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS @@ -11677,7 +11802,7 @@ # Put the nasty error message in config.log where it belongs echo "$GTHREAD_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gthread-2.0) were not met: + as_fn_error $? "Package requirements (gthread-2.0) were not met: $GTHREAD_PKG_ERRORS @@ -11687,12 +11812,13 @@ Alternatively, you may set the environment variables GTHREAD_CFLAGS and GTHREAD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11701,7 +11827,8 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS @@ -11866,7 +11993,7 @@ have_cairo=yes fi if test x$have_cairo != xyes; then - as_fn_error "Tests enabled but cairo not found; pass --disable-tests or install cairo" "$LINENO" 5 + as_fn_error $? "Tests enabled but cairo not found; pass --disable-tests or install cairo" "$LINENO" 5 fi fi if test x$enable_tests != xno; then @@ -11943,7 +12070,7 @@ # Put the nasty error message in config.log where it belongs echo "$SCANNER_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gobject-2.0 gthread-2.0 gio-2.0) were not met: + as_fn_error $? "Package requirements (gobject-2.0 gthread-2.0 gio-2.0) were not met: $SCANNER_PKG_ERRORS @@ -11953,12 +12080,13 @@ Alternatively, you may set the environment variables SCANNER_CFLAGS and SCANNER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11967,7 +12095,8 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else SCANNER_CFLAGS=$pkg_cv_SCANNER_CFLAGS SCANNER_LIBS=$pkg_cv_SCANNER_LIBS @@ -12128,7 +12257,7 @@ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - as_fn_error "libffi not found" "$LINENO" 5 + as_fn_error $? "libffi not found" "$LINENO" 5 fi if test x"$ac_cv_search_ffi_call" = x"none required" ; then @@ -12140,7 +12269,7 @@ LIBS=$save_LIBS fi if test x"$have_ffi_h" != x"yes" ; then - as_fn_error "ffi.h not found" "$LINENO" 5 + as_fn_error $? "ffi.h not found" "$LINENO" 5 fi FFI_PC_LIBS=$FFI_LIBS @@ -12159,34 +12288,131 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 -$as_echo_n "checking size of time_t... " >&6; } -if test "${ac_cv_sizeof_time_t+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 +$as_echo_n "checking size of char... " >&6; } +if test "${ac_cv_sizeof_char+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_char" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (char) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_char=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 +$as_echo "$ac_cv_sizeof_char" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_CHAR $ac_cv_sizeof_char +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +$as_echo_n "checking size of short... " >&6; } +if test "${ac_cv_sizeof_short+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_short=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 +$as_echo "$ac_cv_sizeof_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SHORT $ac_cv_sizeof_short +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if test "${ac_cv_sizeof_int+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INT $ac_cv_sizeof_int +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then : $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "#include -"; then : + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : else - if test "$ac_cv_type_time_t" = yes; then + if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (time_t) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else - ac_cv_sizeof_time_t=0 + ac_cv_sizeof_long=0 fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 -$as_echo "$ac_cv_sizeof_time_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_TIME_T $ac_cv_sizeof_time_t +#define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF @@ -12248,7 +12474,7 @@ # Put the nasty error message in config.log where it belongs echo "$GIREPO_PKG_ERRORS" >&5 - as_fn_error "Package requirements (glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0) were not met: $GIREPO_PKG_ERRORS @@ -12258,12 +12484,13 @@ Alternatively, you may set the environment variables GIREPO_CFLAGS and GIREPO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -12272,7 +12499,8 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GIREPO_CFLAGS=$pkg_cv_GIREPO_CFLAGS GIREPO_LIBS=$pkg_cv_GIREPO_LIBS @@ -12446,7 +12674,7 @@ test $ac_status = 0; }; then : else - as_fn_error "You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" "$LINENO" 5 + as_fn_error $? "You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" "$LINENO" 5 fi fi @@ -12634,8 +12862,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -12845,8 +13072,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -12858,8 +13084,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -12898,7 +13123,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error "too old" "$LINENO" 5 + as_fn_error $? "too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -12982,7 +13207,7 @@ if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else @@ -13129,7 +13354,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } -as_fn_error "Python headers not found" "$LINENO" 5 +as_fn_error $? "Python headers not found" "$LINENO" 5 fi rm -f conftest.err conftest.$ac_ext CPPFLAGS="$save_CPPFLAGS" @@ -13220,6 +13445,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -13243,51 +13469,51 @@ fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then - as_fn_error "conditional \"OS_WIN32\" was never defined. + as_fn_error $? "conditional \"OS_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GIO_UNIX_TRUE}" && test -z "${HAVE_GIO_UNIX_FALSE}"; then - as_fn_error "conditional \"HAVE_GIO_UNIX\" was never defined. + as_fn_error $? "conditional \"HAVE_GIO_UNIX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_TESTS_TRUE}" && test -z "${BUILD_TESTS_FALSE}"; then - as_fn_error "conditional \"BUILD_TESTS\" was never defined. + as_fn_error $? "conditional \"BUILD_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then - as_fn_error "conditional \"HAVE_CAIRO\" was never defined. + as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then - as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then - as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined. + as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13437,19 +13663,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -13645,7 +13871,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -13698,8 +13924,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gobject-introspection $as_me 0.9.1, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by gobject-introspection $as_me 0.9.2, which was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13764,11 +13990,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gobject-introspection config.status 0.9.1 -configured by $0, generated by GNU Autoconf 2.65, +gobject-introspection config.status 0.9.2 +configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13824,7 +14050,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13833,7 +14059,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -13887,131 +14113,143 @@ sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +SED \ GREP \ EGREP \ FGREP \ @@ -14035,8 +14273,6 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_wl \ lt_prog_compiler_pic \ @@ -14066,12 +14302,13 @@ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -14098,9 +14335,9 @@ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -14108,12 +14345,6 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -14163,7 +14394,7 @@ "gobject-introspection-1.0.pc") CONFIG_FILES="$CONFIG_FILES gobject-introspection-1.0.pc" ;; "gobject-introspection-no-export-1.0.pc") CONFIG_FILES="$CONFIG_FILES gobject-introspection-no-export-1.0.pc" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -14201,7 +14432,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -14218,7 +14449,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -14232,18 +14463,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14332,20 +14563,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -14373,7 +14612,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14458,7 +14697,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -14471,7 +14710,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14499,7 +14738,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -14526,7 +14765,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14663,22 +14902,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -14689,19 +14928,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -14862,7 +15101,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -14910,6 +15150,12 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + # The host system. host_alias=$host_alias host=$host @@ -14959,10 +15205,6 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -14984,6 +15226,9 @@ old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -15005,12 +15250,6 @@ # The name of the directory that contains temporary libtool files. objdir=$objdir -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO - # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -15073,6 +15312,9 @@ # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -15112,6 +15354,10 @@ # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -15371,7 +15617,7 @@ func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -15382,7 +15628,7 @@ # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } @@ -15395,10 +15641,8 @@ func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -15409,20 +15653,20 @@ # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` } # func_arith arithmetic-term... @@ -15486,7 +15730,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -15507,7 +15751,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru gobject-introspection-0.9.1~git20100708.01772763/configure.ac gobject-introspection-0.9.2/configure.ac --- gobject-introspection-0.9.1~git20100708.01772763/configure.ac 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/configure.ac 2010-07-12 18:20:44.000000000 +0100 @@ -4,12 +4,12 @@ dnl the gi version number m4_define(gi_major_version, 0) m4_define(gi_minor_version, 9) -m4_define(gi_micro_version, 1) +m4_define(gi_micro_version, 2) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ(2.59) AC_INIT(gobject-introspection, gi_version, - http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection) + [http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection]) AM_INIT_AUTOMAKE([1.7 -Wno-portability]) AM_MAINTAINER_MODE @@ -180,11 +180,14 @@ AC_SUBST(FFI_PC_LIBS) AC_SUBST(FFI_PC_PACKAGES) -AC_CHECK_SIZEOF(time_t, [], [#include ]) +AC_CHECK_SIZEOF(char) +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0]) -# if we ever remove manual check for ffi and require .pc file, then +# if we ever remove manual check for ffi and require .pc file, then # just put libffi in the PKG_CHECK_MODULES(GIREPO) deps GIREPO_LIBS="$GIREPO_LIBS $GCOV_LIBS $FFI_LIBS" GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS" diff -Nru gobject-introspection-0.9.1~git20100708.01772763/debian/changelog gobject-introspection-0.9.2/debian/changelog --- gobject-introspection-0.9.1~git20100708.01772763/debian/changelog 2010-07-09 11:41:55.000000000 +0100 +++ gobject-introspection-0.9.2/debian/changelog 2010-07-12 19:10:24.000000000 +0100 @@ -1,8 +1,8 @@ -gobject-introspection (0.9.1~git20100708.01772763-0ubuntu1~10.04~ricotz1) lucid; urgency=low +gobject-introspection (0.9.2-0ubuntu1~10.04~ricotz1) lucid; urgency=low * New git release - -- Rico Tzschichholz Fri, 09 Jul 2010 12:41:55 +0200 + -- Rico Tzschichholz Mon, 12 Jul 2010 20:10:24 +0200 gobject-introspection (0.6.14-1ubuntu1) maverick; urgency=low diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/Makefile.am gobject-introspection-0.9.2/docs/Makefile.am --- gobject-introspection-0.9.1~git20100708.01772763/docs/Makefile.am 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/docs/Makefile.am 2010-07-12 16:09:40.000000000 +0100 @@ -1,4 +1 @@ -SUBDIRS = -if ENABLE_GTK_DOC -SUBDIRS += reference -endif +SUBDIRS = reference diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/Makefile.in gobject-introspection-0.9.2/docs/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/docs/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/docs/Makefile.in 2010-07-12 18:21:12.000000000 +0100 @@ -33,7 +33,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_GTK_DOC_TRUE@am__append_1 = reference subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -70,7 +69,7 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = reference +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -238,7 +237,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -258,7 +256,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = $(am__append_1) +SUBDIRS = reference all: all-recursive .SUFFIXES: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/gi-sections.txt gobject-introspection-0.9.2/docs/reference/gi-sections.txt --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/gi-sections.txt 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/gi-sections.txt 2010-07-12 18:21:51.000000000 +0100 @@ -144,9 +144,14 @@ giobjectinfo GI_IS_OBJECT_INFO GIObjectInfo +GIObjectInfoGetValueFunction +GIObjectInfoRefFunction +GIObjectInfoSetValueFunction +GIObjectInfoUnrefFunction g_object_info_get_type_name g_object_info_get_type_init g_object_info_get_abstract +g_object_info_get_fundamental g_object_info_get_parent g_object_info_get_n_interfaces g_object_info_get_interface @@ -165,6 +170,14 @@ g_object_info_get_constant g_object_info_get_class_struct g_object_info_find_vfunc +g_object_info_get_unref_function +g_object_info_get_unref_function_pointer +g_object_info_get_ref_function +g_object_info_get_ref_function_pointer +g_object_info_get_set_value_function +g_object_info_get_set_value_function_pointer +g_object_info_get_get_value_function +g_object_info_get_get_value_function_pointer
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi.devhelp gobject-introspection-0.9.2/docs/reference/html/gi.devhelp --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi.devhelp 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi.devhelp 2010-07-12 18:21:50.000000000 +0100 @@ -212,9 +212,14 @@ + + + + + @@ -233,6 +238,14 @@ + + + + + + + + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi.devhelp2 gobject-introspection-0.9.2/docs/reference/html/gi.devhelp2 --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi.devhelp2 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi.devhelp2 2010-07-12 18:21:50.000000000 +0100 @@ -212,9 +212,14 @@ + + + + + @@ -233,6 +238,14 @@ + + + + + + + + @@ -355,17 +368,8 @@ - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIArgInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIArgInfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIArgInfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-GIArgInfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -43,14 +43,14 @@ enum GIScopeType; enum GITransfer; GIDirection g_arg_info_get_direction (GIArgInfo *info); -gboolean g_arg_info_is_caller_allocates (GIArgInfo *info); -gboolean g_arg_info_is_return_value (GIArgInfo *info); -gboolean g_arg_info_is_optional (GIArgInfo *info); -gboolean g_arg_info_may_be_null (GIArgInfo *info); +gboolean g_arg_info_is_caller_allocates (GIArgInfo *info); +gboolean g_arg_info_is_return_value (GIArgInfo *info); +gboolean g_arg_info_is_optional (GIArgInfo *info); +gboolean g_arg_info_may_be_null (GIArgInfo *info); GITransfer g_arg_info_get_ownership_transfer (GIArgInfo *info); GIScopeType g_arg_info_get_scope (GIArgInfo *info); -gint g_arg_info_get_closure (GIArgInfo *info); -gint g_arg_info_get_destroy (GIArgInfo *info); +gint g_arg_info_get_closure (GIArgInfo *info); +gint g_arg_info_get_destroy (GIArgInfo *info); GITypeInfo * g_arg_info_get_type (GIArgInfo *info); void g_arg_info_load_type (GIArgInfo *info, GITypeInfo *type); @@ -214,7 +214,7 @@ transfer the container (list, array, hash table) from the callee to the caller. The callee retains the ownership of the individual items in the container and the caller has to free up the container resources -(g_list_free()/g_hash_table_destroy() etc) of this transfer. +(g_list_free()/g_hash_table_destroy() etc) of this transfer. @@ -255,12 +255,12 @@

g_arg_info_is_caller_allocates ()

-
gboolean            g_arg_info_is_caller_allocates      (GIArgInfo *info);
+
gboolean            g_arg_info_is_caller_allocates      (GIArgInfo *info);

Obtain if the argument is a pointer to a struct or object that will receive an output of a function. The default assumption for GI_DIRECTION_OUT arguments which have allocation is that the -callee allocates; if this is TRUE, then the caller must allocate. +callee allocates; if this is TRUE, then the caller must allocate.

@@ -272,7 +272,7 @@ - @@ -281,7 +281,7 @@

g_arg_info_is_return_value ()

-
gboolean            g_arg_info_is_return_value          (GIArgInfo *info);
+
gboolean            g_arg_info_is_return_value          (GIArgInfo *info);

Obtain if the argument is a return value. It can either be a parameter or a return value. @@ -296,7 +296,7 @@

- @@ -305,7 +305,7 @@

g_arg_info_is_optional ()

-
gboolean            g_arg_info_is_optional              (GIArgInfo *info);
+
gboolean            g_arg_info_is_optional              (GIArgInfo *info);

Obtain if the argument is optional.

@@ -319,7 +319,7 @@
- @@ -328,9 +328,9 @@

g_arg_info_may_be_null ()

-
gboolean            g_arg_info_may_be_null              (GIArgInfo *info);
+
gboolean            g_arg_info_may_be_null              (GIArgInfo *info);

-Obtain if the argument accepts NULL. +Obtain if the argument accepts NULL.

Returns :

 TRUE if caller is required to have allocated the argument + TRUE if caller is required to have allocated the argument

Returns :

 TRUE if it is a return value + TRUE if it is a return value

Returns :

 TRUE if it is an optional argument + TRUE if it is an optional argument
@@ -342,7 +342,7 @@ - @@ -401,7 +401,7 @@

g_arg_info_get_closure ()

-
gint                g_arg_info_get_closure              (GIArgInfo *info);
+
gint                g_arg_info_get_closure              (GIArgInfo *info);

Obtain the index of the user data argument. This is only valid for arguments which are callbacks. @@ -425,9 +425,9 @@

g_arg_info_get_destroy ()

-
gint                g_arg_info_get_destroy              (GIArgInfo *info);
+
gint                g_arg_info_get_destroy              (GIArgInfo *info);

-Obtains the index of the GDestroyNotify argument. This is only valid +Obtains the index of the GDestroyNotify argument. This is only valid for arguments which are callbacks.

Returns :

 TRUE if it accepts NULL + TRUE if it accepts NULL
@@ -440,7 +440,7 @@ - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIBaseInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIBaseInfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIBaseInfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-GIBaseInfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -43,18 +43,18 @@ GIBaseInfo * g_base_info_ref (GIBaseInfo *info); voidg_base_info_unref (GIBaseInfo *info); GIInfoTypeg_base_info_get_type (GIBaseInfo *info); -const gchar * g_base_info_get_name (GIBaseInfo *info); -const gchar * g_base_info_get_namespace (GIBaseInfo *info); -gbooleang_base_info_is_deprecated (GIBaseInfo *info); -const gchar * g_base_info_get_attribute (GIBaseInfo *info, - const gchar *name); -gbooleang_base_info_iterate_attributes (GIBaseInfo *info, +const gchar * g_base_info_get_name (GIBaseInfo *info); +const gchar * g_base_info_get_namespace (GIBaseInfo *info); +gbooleang_base_info_is_deprecated (GIBaseInfo *info); +const gchar * g_base_info_get_attribute (GIBaseInfo *info, + const gchar *name); +gbooleang_base_info_iterate_attributes (GIBaseInfo *info, GIAttributeIter *iterator, char **name, char **value); GIBaseInfo * g_base_info_get_container (GIBaseInfo *info); GTypelib * g_base_info_get_typelib (GIBaseInfo *info); -gbooleang_base_info_equal (GIBaseInfo *info1, +gbooleang_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2); @@ -66,11 +66,20 @@ All other structs can be casted to a GIBaseInfo, for instance:

-

Example 1. Casting a GIFunctionInfo to GIBaseInfo

-
-   GIFunctionInfo *function_info = ...;
-   GIBaseInfo *info = (GIBaseInfo*)function_info;
-
+

Example 1. Casting a GIFunctionInfo to GIBaseInfo

+
+

Returns :

 index of the GDestroyNotify argument or -1 if there is none + index of the GDestroyNotify argument or -1 if there is none
+ + + + + + + 
1
+2
GIFunctionInfo *function_info = ...;
+GIBaseInfo *info = (GIBaseInfo*)function_info;
+
+


Most GIRepository APIs returning a GIBaseInfo is actually creating a new struct, in other @@ -81,12 +90,22 @@

-

Example 2. Getting the Button of the Gtk typelib

-
-   GIBaseInfo *button_info = g_irepository_find_by_name(NULL, "Gtk", "Button");
-   ... use button_info ...
-   g_base_info_unref(button_info);
-
+

Example 2. Getting the Button of the Gtk typelib

+
+ + + + + + + + 
1
+2
+3
GIBaseInfo *button_info = g_irepository_find_by_name(NULL, "Gtk", "Button");
+... use button_info ...
+g_base_info_unref(button_info);
+
+


@@ -195,7 +214,7 @@

GI_INFO_TYPE_ERROR_DOMAIN

-error domain for a GError, see GIErrorDomainInfo +error domain for a GError, see GIErrorDomainInfo @@ -332,7 +351,7 @@

g_base_info_get_name ()

-
const gchar *       g_base_info_get_name                (GIBaseInfo *info);
+
const gchar *       g_base_info_get_name                (GIBaseInfo *info);

Obtain the name of the info. What the name represents depends on the GIInfoType of the info. For instance for GIFunctionInfo it is @@ -348,7 +367,7 @@

Returns :

- the name of info or NULL if it lacks a name. + the name of info or NULL if it lacks a name. @@ -357,7 +376,7 @@

g_base_info_get_namespace ()

-
const gchar *       g_base_info_get_namespace           (GIBaseInfo *info);
+
const gchar *       g_base_info_get_namespace           (GIBaseInfo *info);

Obtain the namespace of info.

@@ -380,7 +399,7 @@

g_base_info_is_deprecated ()

-
gboolean            g_base_info_is_deprecated           (GIBaseInfo *info);
+
gboolean            g_base_info_is_deprecated           (GIBaseInfo *info);

Obtain whether the info is represents a metadata which is deprecated or not. @@ -395,7 +414,7 @@

Returns :

- TRUE if deprecated + TRUE if deprecated @@ -404,8 +423,8 @@

g_base_info_get_attribute ()

-
const gchar *       g_base_info_get_attribute           (GIBaseInfo *info,
-                                                         const gchar *name);
+
const gchar *       g_base_info_get_attribute           (GIBaseInfo *info,
+                                                         const gchar *name);

Retrieve an arbitrary attribute associated with this node.

@@ -424,7 +443,7 @@

Returns :

- The value of the attribute, or NULL if no such attribute exists + The value of the attribute, or NULL if no such attribute exists @@ -433,14 +452,14 @@

g_base_info_iterate_attributes ()

-
gboolean            g_base_info_iterate_attributes      (GIBaseInfo *info,
+
gboolean            g_base_info_iterate_attributes      (GIBaseInfo *info,
                                                          GIAttributeIter *iterator,
                                                          char **name,
                                                          char **value);

 

 Iterate over all attributes associated with this node.  The iterator
 structure is typically stack allocated, and must have its first
-member initialized to NULL.
+member initialized to NULL.
 

 

 Both the name and value should be treated as constants
@@ -449,20 +468,38 @@
 

 

 

-
Example 3. Iterating over attributes

-
-void
-print_attributes (GIBaseInfo *info)
-{
-  GIAttributeIter iter = { 0, };
-  char *name;
-  char *value;
-  while (g_base_info_iterate_attributes (info, &iter, &name, &value))
-    {
-      g_print ("attribute name: %s value: %s", name, value);
-    }
-}
-

+
Example 3. Iterating over attributes

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
void
+print_attributes (GIBaseInfo *info)
+{
+  GIAttributeIter iter = { 0, };
+  char *name;
+  char *value;
+  while (g_base_info_iterate_attributes (info, &iter, &name, &value))
+    {
+      g_print ("attribute name: %s value: %s", name, value);
+    }
+}

+

+
 

 


 

@@ -491,7 +528,7 @@
 
 
 
Returns :

- TRUE if there are more attributes
+ TRUE if there are more attributes
 
 
 
@@ -548,7 +585,7 @@
 

 

 
g_base_info_equal ()

-
gboolean            g_base_info_equal                   (GIBaseInfo *info1,
+
gboolean            g_base_info_equal                   (GIBaseInfo *info1,
                                                          GIBaseInfo *info2);

 

 Compare two GIBaseInfo.
@@ -573,7 +610,7 @@
 
 
 
Returns :

- TRUE if and only if info1 equals info2.
+ TRUE if and only if info1 equals info2.
 
 
 
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GICallableInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GICallableInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GICallableInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GICallableInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -41,20 +41,20 @@
 typedef             GICallableInfo;
 GITypeInfo *        g_callable_info_get_return_type     (GICallableInfo *info);
 GITransfer          g_callable_info_get_caller_owns     (GICallableInfo *info);
-gboolean            g_callable_info_may_return_null     (GICallableInfo *info);
-const gchar *       g_callable_info_get_return_attribute
+gboolean            g_callable_info_may_return_null     (GICallableInfo *info);
+const gchar *       g_callable_info_get_return_attribute
                                                         (GICallableInfo *info,
-                                                         const gchar *name);
-gboolean            g_callable_info_iterate_return_attributes
+                                                         const gchar *name);
+gboolean            g_callable_info_iterate_return_attributes
                                                         (GICallableInfo *info,
                                                          GIAttributeIter *iterator,
                                                          char **name,
                                                          char **value);
-gint                g_callable_info_get_n_args          (GICallableInfo *info);
+gint                g_callable_info_get_n_args          (GICallableInfo *info);
 GIArgInfo *         g_callable_info_get_arg             (GICallableInfo *info,
-                                                         gint n);
+                                                         gint n);
 void                g_callable_info_load_arg            (GICallableInfo *info,
-                                                         gint n,
+                                                         gint n,
                                                          GIArgInfo *arg);
 void                g_callable_info_load_return_type    (GICallableInfo *info,
                                                          GITypeInfo *type);
@@ -154,7 +154,7 @@
 
 
 
Returns :

- TRUE if the caller owns the return value, FALSE otherwise.
+ TRUE if the caller owns the return value, FALSE otherwise.
 
 
 
@@ -163,9 +163,9 @@
 

 

 
g_callable_info_may_return_null ()

-
gboolean            g_callable_info_may_return_null     (GICallableInfo *info);

+
gboolean            g_callable_info_may_return_null     (GICallableInfo *info);

 

-See if a callable could return NULL.
+See if a callable could return NULL.
 

 
@@ -177,7 +177,7 @@
 
-
@@ -186,9 +186,9 @@
 

 
g_callable_info_get_return_attribute ()

-
const gchar *       g_callable_info_get_return_attribute
+
const gchar *       g_callable_info_get_return_attribute
                                                         (GICallableInfo *info,
-                                                         const gchar *name);

+                                                         const gchar *name);

 

 Retrieve an arbitrary attribute associated with the return value.
 

@@ -207,7 +207,7 @@
 
 

-
@@ -216,7 +216,7 @@
 

 
g_callable_info_iterate_return_attributes ()

-
gboolean            g_callable_info_iterate_return_attributes
+
gboolean            g_callable_info_iterate_return_attributes
                                                         (GICallableInfo *info,
                                                          GIAttributeIter *iterator,
                                                          char **name,
@@ -224,7 +224,7 @@
 

 Iterate over all attributes associated with the return value.  The
 iterator structure is typically stack allocated, and must have its
-first member initialized to NULL.
+first member initialized to NULL.
 

 

 Both the name and value should be treated as constants
@@ -259,7 +259,7 @@
 
 

-
@@ -268,7 +268,7 @@
 

 
g_callable_info_get_n_args ()

-
gint                g_callable_info_get_n_args          (GICallableInfo *info);

+
gint                g_callable_info_get_n_args          (GICallableInfo *info);

 

 Obtain the number of arguments (both IN and OUT) for this callable.
 

@@ -292,7 +292,7 @@
 

 
g_callable_info_get_arg ()

 
GIArgInfo *         g_callable_info_get_arg             (GICallableInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain information about a particular argument of this callable.
 

@@ -322,7 +322,7 @@
 

 
g_callable_info_load_arg ()

 
void                g_callable_info_load_arg            (GICallableInfo *info,
-                                                         gint n,
+                                                         gint n,
                                                          GIArgInfo *arg);

 

 Obtain information about a particular argument of this callable; this
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIConstantInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIConstantInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIConstantInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIConstantInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -40,7 +40,7 @@
 
#define             GI_IS_CONSTANT_INFO                 (info)
 typedef             GIConstantInfo;
 GITypeInfo *        g_constant_info_get_type            (GIConstantInfo *info);
-gint                g_constant_info_get_value           (GIConstantInfo *info,
+gint                g_constant_info_get_value           (GIConstantInfo *info,
                                                          GArgument *value);
 

 

@@ -115,7 +115,7 @@
 

 

 
g_constant_info_get_value ()

-
gint                g_constant_info_get_value           (GIConstantInfo *info,
+
gint                g_constant_info_get_value           (GIConstantInfo *info,
                                                          GArgument *value);

 

 Obtain the value associated with the GIConstantInfo and store it in the
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIEnumInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIEnumInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIEnumInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIEnumInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -41,11 +41,11 @@
 #define             GI_IS_VALUE_INFO                    (info)
 typedef             GIEnumInfo;
 typedef             GIValueInfo;
-gint                g_enum_info_get_n_values            (GIEnumInfo *info);
+gint                g_enum_info_get_n_values            (GIEnumInfo *info);
 GIValueInfo *       g_enum_info_get_value               (GIEnumInfo *info,
-                                                         gint n);
+                                                         gint n);
 GITypeTag           g_enum_info_get_storage_type        (GIEnumInfo *info);
-glong               g_value_info_get_value              (GIValueInfo *info);
+glong               g_value_info_get_value              (GIValueInfo *info);
 

 

 

@@ -120,7 +120,7 @@
 

 

 
g_enum_info_get_n_values ()

-
gint                g_enum_info_get_n_values            (GIEnumInfo *info);

+
gint                g_enum_info_get_n_values            (GIEnumInfo *info);

 

 Obtain the number of values this enumeration contains.
 

@@ -144,7 +144,7 @@
 

 
g_enum_info_get_value ()

 
GIValueInfo *       g_enum_info_get_value               (GIEnumInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain a value for this enumeration.
 

@@ -163,7 +163,7 @@
 
 

-
@@ -202,7 +202,7 @@
 

 
g_value_info_get_value ()

-
glong               g_value_info_get_value              (GIValueInfo *info);

+
glong               g_value_info_get_value              (GIValueInfo *info);

 

 Obtain the enumeration value of the GIValueInfo.
 

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIErrorDomainInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIErrorDomainInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIErrorDomainInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIErrorDomainInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -39,15 +39,15 @@
 
Synopsis

 
#define             GI_IS_ERROR_DOMAIN_INFO             (info)
 typedef             GIErrorDomainInfo;
-const gchar *       g_error_domain_info_get_quark       (GIErrorDomainInfo *info);
+const gchar *       g_error_domain_info_get_quark       (GIErrorDomainInfo *info);
 GIInterfaceInfo *   g_error_domain_info_get_codes       (GIErrorDomainInfo *info);
 

 

 
Description

 

-A GIErrorDomainInfo struct represents a domain of a GError.
-An error domain is associated with a GQuark and contains a pointer
+A GIErrorDomainInfo struct represents a domain of a GError.
+An error domain is associated with a GQuark and contains a pointer
 to an enum with all the error codes.
 

 

@@ -84,16 +84,16 @@
 
typedef GIBaseInfo GIErrorDomainInfo;
 

 

-Represents a GError error domain.
+Represents a GError error domain.
 

 

 
g_error_domain_info_get_quark ()

-
const gchar *       g_error_domain_info_get_quark       (GIErrorDomainInfo *info);

+
const gchar *       g_error_domain_info_get_quark       (GIErrorDomainInfo *info);

 

 Obtain a string representing the quark for this error domain.
-NULL will be returned if the type tag is wrong or if a quark is
+NULL will be returned if the type tag is wrong or if a quark is
 missing in the typelib.
 

 

 

 

 
Returns :
 TRUE if callable could return NULL
+ TRUE if callable could return NULL
 
 

 
 

 
Returns :
 The value of the attribute, or NULL if no such attribute exists
+ The value of the attribute, or NULL if no such attribute exists
 
 

 
 

 
Returns :
 TRUE if there are more attributes
+ TRUE if there are more attributes
 
 

 
 

 
Returns :
 the enumeration value or NULL if type tag is wrong,
+ the enumeration value or NULL if type tag is wrong,
 free the struct with g_base_info_unref() when done. [transfer full]
 
 

 
 
 
 

@@ -106,7 +106,7 @@
 
-
@@ -130,7 +130,7 @@
 
-
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIFieldInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIFieldInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIFieldInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIFieldInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -41,14 +41,14 @@
 typedef             GIFieldInfo;
 enum                GIFieldInfoFlags;
 GIFieldInfoFlagsg_field_info_get_flags              (GIFieldInfo *info);
-gintg_field_info_get_size               (GIFieldInfo *info);
-gintg_field_info_get_offset             (GIFieldInfo *info);
+gintg_field_info_get_size               (GIFieldInfo *info);
+gintg_field_info_get_offset             (GIFieldInfo *info);
 GITypeInfo *        g_field_info_get_type               (GIFieldInfo *info);
-gbooleang_field_info_get_field              (GIFieldInfo *field_info,
-                                                         gpointer mem,
+gbooleang_field_info_get_field              (GIFieldInfo *field_info,
+                                                         gpointer mem,
                                                          GArgument *value);
-gbooleang_field_info_set_field              (GIFieldInfo *field_info,
-                                                         gpointer mem,
+gbooleang_field_info_set_field              (GIFieldInfo *field_info,
+                                                         gpointer mem,
                                                          const GArgument *value);
 
@@ -154,7 +154,7 @@
 

 
g_field_info_get_size ()

-
gint                g_field_info_get_size               (GIFieldInfo *info);

+
gint                g_field_info_get_size               (GIFieldInfo *info);

 

 Obtain the size in bits of the field member, this is how
 much space you need to allocate to store the field.
@@ -178,7 +178,7 @@
 

 

 
g_field_info_get_offset ()

-
gint                g_field_info_get_offset             (GIFieldInfo *info);

+
gint                g_field_info_get_offset             (GIFieldInfo *info);

 

 Obtain the offset in bits of the field member, this is relative
 to the beginning of the struct or union.
@@ -226,8 +226,8 @@
 

 

 
g_field_info_get_field ()

-
gboolean            g_field_info_get_field              (GIFieldInfo *field_info,
-                                                         gpointer mem,
+
gboolean            g_field_info_get_field              (GIFieldInfo *field_info,
+                                                         gpointer mem,
                                                          GArgument *value);

 

 Reads a field identified by a GFieldInfo from a C structure or
@@ -255,7 +255,7 @@
 
 

-
@@ -264,8 +264,8 @@
 

 
g_field_info_set_field ()

-
gboolean            g_field_info_set_field              (GIFieldInfo *field_info,
-                                                         gpointer mem,
+
gboolean            g_field_info_set_field              (GIFieldInfo *field_info,
+                                                         gpointer mem,
                                                          const GArgument *value);

 

 Writes a field identified by a GFieldInfo to a C structure or
@@ -295,7 +295,7 @@
 
 

-
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIFunctionInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIFunctionInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIFunctionInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIFunctionInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -42,17 +42,17 @@
 enum                GInvokeError;
 enum                GIFunctionInfoFlags;
 #define             G_INVOKE_ERROR
-const gchar *       g_function_info_get_symbol          (GIFunctionInfo *info);
+const gchar *       g_function_info_get_symbol          (GIFunctionInfo *info);
 GIFunctionInfoFlagsg_function_info_get_flags          (GIFunctionInfo *info);
 GIPropertyInfo *    g_function_info_get_property        (GIFunctionInfo *info);
 GIVFuncInfo *       g_function_info_get_vfunc           (GIFunctionInfo *info);
-gbooleang_function_info_invoke              (GIFunctionInfo *info,
+gbooleang_function_info_invoke              (GIFunctionInfo *info,
                                                          const GArgument *in_args,
                                                          int n_in_args,
                                                          const GArgument *out_args,
                                                          int n_out_args,
                                                          GArgument *return_value,
-                                                         GError **error);
+                                                         GError **error);
 

@@ -206,11 +206,11 @@
 

 

 
g_function_info_get_symbol ()

-
const gchar *       g_function_info_get_symbol          (GIFunctionInfo *info);

+
const gchar *       g_function_info_get_symbol          (GIFunctionInfo *info);

 

 Obtain the symbol of the function. The symbol is the name of the
 exported function, suitable to be used as an argument to
-g_module_symbol().
+g_module_symbol().
 

 

 

 
Returns :
 the quark represented as a string or NULL
+ the quark represented as a string or NULL
 
 

 
 

 
Returns :
 the error domain or NULL if type tag is wrong,
+ the error domain or NULL if type tag is wrong,
 free the struct with g_base_info_unref() when done. [transfer full]
 
 
                                                                                                                    
 
 

 
Returns :
 TRUE if reading the field succeeded, otherwise FALSE
+ TRUE if reading the field succeeded, otherwise FALSE
 
 

 
 

 
Returns :
 TRUE if writing the field succeeded, otherwise FALSE
+ TRUE if writing the field succeeded, otherwise FALSE
 
 

                           
 
 
@@ -259,7 +259,7 @@
 Obtain the property associated with this GIFunctionInfo.
 Only GIFunctionInfo with the flag GI_FUNCTION_IS_GETTER or
 GI_FUNCTION_IS_SETTER have a property set. For other cases,
-NULL will be returned.
+NULL will be returned.
 

 

 
@@ -271,7 +271,7 @@
 
-
@@ -285,7 +285,7 @@
 

 Obtain the virtual function associated with this GIFunctionInfo.
 Only GIFunctionInfo with the flag GI_FUNCTION_WRAPS_VFUNC has
-a virtual function set. For other cases, NULL will be returned.
+a virtual function set. For other cases, NULL will be returned.
 

 

 

 
Returns :
 the property or NULL if not set. Free it with
+ the property or NULL if not set. Free it with
 g_base_info_unref() when done. [transfer full]
 
 

 
@@ -297,7 +297,7 @@
 
-
@@ -307,20 +307,20 @@
 

 
g_function_info_invoke ()

-
gboolean            g_function_info_invoke              (GIFunctionInfo *info,
+
gboolean            g_function_info_invoke              (GIFunctionInfo *info,
                                                          const GArgument *in_args,
                                                          int n_in_args,
                                                          const GArgument *out_args,
                                                          int n_out_args,
                                                          GArgument *return_value,
-                                                         GError **error);

+                                                         GError **error);

 

 Invokes the function described in info with the given
 arguments. Note that inout parameters must appear in both
 argument lists. This function uses dlsym() to obtain a pointer
 to the function, so the library or shared object containing the
 described function must either be linked to the caller, or must
-have been g_module_symbol()ed before calling this function.
+have been g_module_symbol()ed before calling this function.
 

 

 

 

 
Returns :
 the virtual function or NULL if not set.
+ the virtual function or NULL if not set.
 Free it by calling g_base_info_unref() when done. [transfer full]
 
 

 
@@ -334,7 +334,7 @@
 
@@ -346,7 +346,7 @@
 
@@ -358,17 +358,17 @@
 
-
-
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIInterfaceInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIInterfaceInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIInterfaceInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIInterfaceInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -39,30 +39,30 @@
 
Synopsis
#define             GI_IS_INTERFACE_INFO                (info)
 typedef             GIInterfaceInfo;
-gint                g_interface_info_get_n_prerequisites
+gint                g_interface_info_get_n_prerequisites
                                                         (GIInterfaceInfo *info);
 GIBaseInfo *        g_interface_info_get_prerequisite   (GIInterfaceInfo *info,
-                                                         gint n);
-gint                g_interface_info_get_n_properties   (GIInterfaceInfo *info);
+                                                         gint n);
+gint                g_interface_info_get_n_properties   (GIInterfaceInfo *info);
 GIPropertyInfo *    g_interface_info_get_property       (GIInterfaceInfo *info,
-                                                         gint n);
-gint                g_interface_info_get_n_methods      (GIInterfaceInfo *info);
+                                                         gint n);
+gint                g_interface_info_get_n_methods      (GIInterfaceInfo *info);
 GIFunctionInfo *    g_interface_info_get_method         (GIInterfaceInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIFunctionInfo *    g_interface_info_find_method        (GIInterfaceInfo *info,
-                                                         const gchar *name);
-gint                g_interface_info_get_n_signals      (GIInterfaceInfo *info);
+                                                         const gchar *name);
+gint                g_interface_info_get_n_signals      (GIInterfaceInfo *info);
 GISignalInfo *      g_interface_info_get_signal         (GIInterfaceInfo *info,
-                                                         gint n);
-gint                g_interface_info_get_n_vfuncs       (GIInterfaceInfo *info);
+                                                         gint n);
+gint                g_interface_info_get_n_vfuncs       (GIInterfaceInfo *info);
 GIVFuncInfo *       g_interface_info_get_vfunc          (GIInterfaceInfo *info,
-                                                         gint n);
-gint                g_interface_info_get_n_constants    (GIInterfaceInfo *info);
+                                                         gint n);
+gint                g_interface_info_get_n_constants    (GIInterfaceInfo *info);
 GIConstantInfo *    g_interface_info_get_constant       (GIInterfaceInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIStructInfo *      g_interface_info_get_iface_struct   (GIInterfaceInfo *info);
 GIVFuncInfo *       g_interface_info_find_vfunc         (GIInterfaceInfo *info,
-                                                         const gchar *name);
+                                                         const gchar *name);
 

@@ -115,7 +115,7 @@
 

 

 
g_interface_info_get_n_prerequisites ()

-
gint                g_interface_info_get_n_prerequisites
+
gint                g_interface_info_get_n_prerequisites
                                                         (GIInterfaceInfo *info);

 

 Obtain the number of prerequisites for this interface type.
@@ -142,7 +142,7 @@
 

 
g_interface_info_get_prerequisite ()

 
GIBaseInfo *        g_interface_info_get_prerequisite   (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);

 

 Obtain an interface type prerequisites index n.
 

@@ -171,7 +171,7 @@
 

 

 
g_interface_info_get_n_properties ()

-
gint                g_interface_info_get_n_properties   (GIInterfaceInfo *info);

+
gint                g_interface_info_get_n_properties   (GIInterfaceInfo *info);

 

 Obtain the number of properties that this interface type has.
 

@@ -195,7 +195,7 @@
 

 
g_interface_info_get_property ()

 
GIPropertyInfo *    g_interface_info_get_property       (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an interface type property at index n.
 

@@ -224,7 +224,7 @@
 

 

 
g_interface_info_get_n_methods ()

-
gint                g_interface_info_get_n_methods      (GIInterfaceInfo *info);

+
gint                g_interface_info_get_n_methods      (GIInterfaceInfo *info);

 

 Obtain the number of methods that this interface type has.
 

@@ -248,7 +248,7 @@
 

 
g_interface_info_get_method ()

 
GIFunctionInfo *    g_interface_info_get_method         (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an interface type method at index n.
 

@@ -278,9 +278,9 @@
 

 
g_interface_info_find_method ()

 
GIFunctionInfo *    g_interface_info_find_method        (GIInterfaceInfo *info,
-                                                         const gchar *name);

+                                                         const gchar *name);
 

-Obtain a method of the interface type given a name. NULL will be
+Obtain a method of the interface type given a name. NULL will be
 returned if there's no method available with that name.
 

 

 

in_args :

 an array of GArguments, one for each in
    parameter of info. If there are no in parameter, in_args
-   can be NULL
+   can be NULL
 
 

 
out_args :

 an array of GArguments, one for each out
    parameter of info. If there are no out parameters, out_args
-   may be NULL
+   may be NULL
 
 

 
return_value :

 return location for the return value of the
    function. If the function returns void, return_value may be
-   NULL
+   NULL
 
 

 

 
error :
return location for detailed error information, or NULL
+return location for detailed error information, or NULL
 
 

 

 
Returns :
 TRUE if the function has been invoked, FALSE if an
+ TRUE if the function has been invoked, FALSE if an
   error occurred.
 
 

 
 
 

@@ -298,7 +298,7 @@
 
-
@@ -308,7 +308,7 @@
 

 
g_interface_info_get_n_signals ()

-
gint                g_interface_info_get_n_signals      (GIInterfaceInfo *info);

+
gint                g_interface_info_get_n_signals      (GIInterfaceInfo *info);

 

 Obtain the number of signals that this interface type has.
 

@@ -332,7 +332,7 @@
 

 
g_interface_info_get_signal ()

 
GISignalInfo *      g_interface_info_get_signal         (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an interface type signal at index n.
 

@@ -361,7 +361,7 @@
 

 

 
g_interface_info_get_n_vfuncs ()

-
gint                g_interface_info_get_n_vfuncs       (GIInterfaceInfo *info);

+
gint                g_interface_info_get_n_vfuncs       (GIInterfaceInfo *info);

 

 Obtain the number of virtual functions that this interface type has.
 

@@ -385,7 +385,7 @@
 

 
g_interface_info_get_vfunc ()

 
GIVFuncInfo *       g_interface_info_get_vfunc          (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an interface type virtual function at index n.
 

@@ -414,7 +414,7 @@
 

 

 
g_interface_info_get_n_constants ()

-
gint                g_interface_info_get_n_constants    (GIInterfaceInfo *info);

+
gint                g_interface_info_get_n_constants    (GIInterfaceInfo *info);

 

 Obtain the number of constants that this interface type has.
 

@@ -438,7 +438,7 @@
 

 
g_interface_info_get_constant ()

 
GIConstantInfo *    g_interface_info_get_constant       (GIInterfaceInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an interface type constant at index n.
 

@@ -481,7 +481,7 @@
 
 

-
@@ -492,7 +492,7 @@
 

 
g_interface_info_find_vfunc ()

 
GIVFuncInfo *       g_interface_info_find_vfunc         (GIInterfaceInfo *info,
-                                                         const gchar *name);

+                                                         const gchar *name);
 

 Locate a virtual function slot with name name. See the documentation
 for g_object_info_find_vfunc() for more information on virtuals.
@@ -512,7 +512,7 @@
 
 

-
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIObjectInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIObjectInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIObjectInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIObjectInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -39,42 +39,62 @@
 
Synopsis
#define             GI_IS_OBJECT_INFO                   (info)
 typedef             GIObjectInfo;
-const gchar *       g_object_info_get_type_name         (GIObjectInfo *info);
-const gchar *       g_object_info_get_type_init         (GIObjectInfo *info);
-gboolean            g_object_info_get_abstract          (GIObjectInfo *info);
+void *              (*GIObjectInfoGetValueFunction)     (const GValue *value);
+void *              (*GIObjectInfoRefFunction)          (void *object);
+void                (*GIObjectInfoSetValueFunction)     (GValue *value,
+                                                         void *object);
+void                (*GIObjectInfoUnrefFunction)        (void *object);
+const gchar *       g_object_info_get_type_name         (GIObjectInfo *info);
+const gchar *       g_object_info_get_type_init         (GIObjectInfo *info);
+gboolean            g_object_info_get_abstract          (GIObjectInfo *info);
+gboolean            g_object_info_get_fundamental       (GIObjectInfo *info);
 GIObjectInfo *      g_object_info_get_parent            (GIObjectInfo *info);
-gint                g_object_info_get_n_interfaces      (GIObjectInfo *info);
+gint                g_object_info_get_n_interfaces      (GIObjectInfo *info);
 GIInterfaceInfo *   g_object_info_get_interface         (GIObjectInfo *info,
-                                                         gint n);
-gint                g_object_info_get_n_fields          (GIObjectInfo *info);
+                                                         gint n);
+gint                g_object_info_get_n_fields          (GIObjectInfo *info);
 GIFieldInfo *       g_object_info_get_field             (GIObjectInfo *info,
-                                                         gint n);
-gint                g_object_info_get_n_properties      (GIObjectInfo *info);
+                                                         gint n);
+gint                g_object_info_get_n_properties      (GIObjectInfo *info);
 GIPropertyInfo *    g_object_info_get_property          (GIObjectInfo *info,
-                                                         gint n);
-gint                g_object_info_get_n_methods         (GIObjectInfo *info);
+                                                         gint n);
+gint                g_object_info_get_n_methods         (GIObjectInfo *info);
 GIFunctionInfo *    g_object_info_get_method            (GIObjectInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIFunctionInfo *    g_object_info_find_method           (GIObjectInfo *info,
-                                                         const gchar *name);
-gint                g_object_info_get_n_signals         (GIObjectInfo *info);
+                                                         const gchar *name);
+gint                g_object_info_get_n_signals         (GIObjectInfo *info);
 GISignalInfo *      g_object_info_get_signal            (GIObjectInfo *info,
-                                                         gint n);
-gint                g_object_info_get_n_vfuncs          (GIObjectInfo *info);
+                                                         gint n);
+gint                g_object_info_get_n_vfuncs          (GIObjectInfo *info);
 GIVFuncInfo *       g_object_info_get_vfunc             (GIObjectInfo *info,
-                                                         gint n);
-gint                g_object_info_get_n_constants       (GIObjectInfo *info);
+                                                         gint n);
+gint                g_object_info_get_n_constants       (GIObjectInfo *info);
 GIConstantInfo *    g_object_info_get_constant          (GIObjectInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIStructInfo *      g_object_info_get_class_struct      (GIObjectInfo *info);
 GIVFuncInfo *       g_object_info_find_vfunc            (GIObjectInfo *info,
-                                                         const gchar *name);
+                                                         const gchar *name);
+const char *        g_object_info_get_unref_function    (GIObjectInfo *info);
+GIObjectInfoUnrefFunction  g_object_info_get_unref_function_pointer
+                                                        (GIObjectInfo *info);
+const char *        g_object_info_get_ref_function      (GIObjectInfo *info);
+GIObjectInfoRefFunction  g_object_info_get_ref_function_pointer
+                                                        (GIObjectInfo *info);
+const char *        g_object_info_get_set_value_function
+                                                        (GIObjectInfo *info);
+GIObjectInfoSetValueFunction  g_object_info_get_set_value_function_pointer
+                                                        (GIObjectInfo *info);
+const char *        g_object_info_get_get_value_function
+                                                        (GIObjectInfo *info);
+GIObjectInfoGetValueFunction  g_object_info_get_get_value_function_pointer
+                                                        (GIObjectInfo *info);
 

 
Description

 

-GIObjectInfo represents a GObject. This doesn't represent a specific
+GIObjectInfo represents a GObject. This doesn't represent a specific
 instance of a GObject, instead this represent the object type (eg class).
 

 

@@ -120,9 +140,95 @@
 

 

+

+
GIObjectInfoGetValueFunction ()

+
void *              (*GIObjectInfoGetValueFunction)     (const GValue *value);

+

+Extract an object instance out of value
+

+

 

 
Returns :
 the GIFunctionInfo or NULL if none found.
+ the GIFunctionInfo or NULL if none found.
 Free the struct by calling g_base_info_unref() when done. [transfer full]
 
 

 

 
Returns :
 the GIStructInfo or NULL. Free it with
+ the GIStructInfo or NULL. Free it with
 g_base_info_unref() when done. [transfer full]
 
 

 
Returns :
 the GIVFuncInfo, or NULL. Free it with
+ the GIVFuncInfo, or NULL. Free it with
 g_base_info_unref() when done. [transfer full]
 
 

 
 
 
 

++
+
+
+
+
+
+
+
+
+
+


value :
a GValue
+
Returns :
 the object instance
+

+

+

+

+
GIObjectInfoRefFunction ()

+
void *              (*GIObjectInfoRefFunction)          (void *object);

+

+Increases the reference count of an object instance.
+

+

++
+
+
+
+
+
+
+
+
+
+


object :
object instance pointer
+
Returns :
 the object instance
+

+

+

+

+
GIObjectInfoSetValueFunction ()

+
void                (*GIObjectInfoSetValueFunction)     (GValue *value,
+                                                         void *object);

+

+Update value and attach the object instance pointer object to it.
+

+

++
+
+
+
+
+
+
+
+
+
+


value :
a GValue
+
object :
object instance pointer
+

+

+

+

+
GIObjectInfoUnrefFunction ()

+
void                (*GIObjectInfoUnrefFunction)        (void *object);

+

+Decreases the reference count of an object instance.
+

+

++
+
+
+
+


object :
object instance pointer
+

+

+

 

 
g_object_info_get_type_name ()

-
const gchar *       g_object_info_get_type_name         (GIObjectInfo *info);

+
const gchar *       g_object_info_get_type_name         (GIObjectInfo *info);

 

 Obtain the name of the objects class/type.
 

@@ -145,7 +251,7 @@
 

 

 
g_object_info_get_type_init ()

-
const gchar *       g_object_info_get_type_init         (GIObjectInfo *info);

+
const gchar *       g_object_info_get_type_init         (GIObjectInfo *info);

 

 Obtain the function which when called will return the GType
 function for which this object type is registered.
@@ -169,7 +275,7 @@
 

 

 
g_object_info_get_abstract ()

-
gboolean            g_object_info_get_abstract          (GIObjectInfo *info);

+
gboolean            g_object_info_get_abstract          (GIObjectInfo *info);

 

 Obtain if the object type is an abstract type, eg if it cannot be
 instantiated
@@ -184,7 +290,31 @@
 
 
 
Returns :

- TRUE if the object type is abstract
+ TRUE if the object type is abstract
+
+
+
+

+

+

+

+
g_object_info_get_fundamental ()

+
gboolean            g_object_info_get_fundamental       (GIObjectInfo *info);

+

+Obtain if the object type is of a fundamental type which is not
+G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.
+

+

++
+
+
+
+
+
+
+
@@ -217,7 +347,7 @@
 

 
g_object_info_get_n_interfaces ()

-
gint                g_object_info_get_n_interfaces      (GIObjectInfo *info);

+
gint                g_object_info_get_n_interfaces      (GIObjectInfo *info);

 

 Obtain the number of interfaces that this object type has.
 

@@ -241,7 +371,7 @@
 

 
g_object_info_get_interface ()

 
GIInterfaceInfo *   g_object_info_get_interface         (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type interface at index n.
 

@@ -270,7 +400,7 @@
 

 

 
g_object_info_get_n_fields ()

-
gint                g_object_info_get_n_fields          (GIObjectInfo *info);

+
gint                g_object_info_get_n_fields          (GIObjectInfo *info);

 

 Obtain the number of fields that this object type has.
 

@@ -294,7 +424,7 @@
 

 
g_object_info_get_field ()

 
GIFieldInfo *       g_object_info_get_field             (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type field at index n.
 

@@ -323,7 +453,7 @@
 

 

 
g_object_info_get_n_properties ()

-
gint                g_object_info_get_n_properties      (GIObjectInfo *info);

+
gint                g_object_info_get_n_properties      (GIObjectInfo *info);

 

 Obtain the number of properties that this object type has.
 

@@ -347,7 +477,7 @@
 

 
g_object_info_get_property ()

 
GIPropertyInfo *    g_object_info_get_property          (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type property at index n.
 

@@ -376,7 +506,7 @@
 

 

 
g_object_info_get_n_methods ()

-
gint                g_object_info_get_n_methods         (GIObjectInfo *info);

+
gint                g_object_info_get_n_methods         (GIObjectInfo *info);

 

 Obtain the number of methods that this object type has.
 

@@ -400,7 +530,7 @@
 

 
g_object_info_get_method ()

 
GIFunctionInfo *    g_object_info_get_method            (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type method at index n.
 

@@ -430,9 +560,9 @@
 

 
g_object_info_find_method ()

 
GIFunctionInfo *    g_object_info_find_method           (GIObjectInfo *info,
-                                                         const gchar *name);

+                                                         const gchar *name);
 

-Obtain a method of the object type given a name. NULL will be
+Obtain a method of the object type given a name. NULL will be
 returned if there's no method available with that name.
 

 


info :
a GIObjectInfo
+
Returns :
 TRUE if the object type is a fundamental type
 
 

 
 

@@ -460,7 +590,7 @@
 

 
g_object_info_get_n_signals ()

-
gint                g_object_info_get_n_signals         (GIObjectInfo *info);

+
gint                g_object_info_get_n_signals         (GIObjectInfo *info);

 

 Obtain the number of signals that this object type has.
 

@@ -484,7 +614,7 @@
 

 
g_object_info_get_signal ()

 
GISignalInfo *      g_object_info_get_signal            (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type signal at index n.
 

@@ -513,7 +643,7 @@
 

 

 
g_object_info_get_n_vfuncs ()

-
gint                g_object_info_get_n_vfuncs          (GIObjectInfo *info);

+
gint                g_object_info_get_n_vfuncs          (GIObjectInfo *info);

 

 Obtain the number of virtual functions that this object type has.
 

@@ -537,7 +667,7 @@
 

 
g_object_info_get_vfunc ()

 
GIVFuncInfo *       g_object_info_get_vfunc             (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type virtual function at index n.
 

@@ -566,7 +696,7 @@
 

 

 
g_object_info_get_n_constants ()

-
gint                g_object_info_get_n_constants       (GIObjectInfo *info);

+
gint                g_object_info_get_n_constants       (GIObjectInfo *info);

 

 Obtain the number of constants that this object type has.
 

@@ -590,7 +720,7 @@
 

 
g_object_info_get_constant ()

 
GIConstantInfo *    g_object_info_get_constant          (GIObjectInfo *info,
-                                                         gint n);

+                                                         gint n);
 

 Obtain an object type constant at index n.
 

@@ -621,7 +751,7 @@
 
g_object_info_get_class_struct ()

 
GIStructInfo *      g_object_info_get_class_struct      (GIObjectInfo *info);

 

-Every GObject has two structures; an instance structure and a class
+Every GObject has two structures; an instance structure and a class
 structure.  This function returns the metadata for the class structure.
 

 

 

@@ -634,7 +764,7 @@
 
-
@@ -645,12 +775,12 @@
 

 
g_object_info_find_vfunc ()

 
GIVFuncInfo *       g_object_info_find_vfunc            (GIObjectInfo *info,
-                                                         const gchar *name);

+                                                         const gchar *name);
 

 Locate a virtual function slot with name name. Note that the namespace
 for virtuals is distinct from that of methods; there may or may not be
 a concrete method associated for a virtual. If there is one, it may
-be retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be
+be retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be
 returned.
 See the documentation for g_vfunc_info_get_invoker() for more
 information on invoking virtuals.
@@ -670,13 +800,229 @@
 
 

-

 

 
Returns :
 the GIStructInfo or NULL. Free with
+ the GIStructInfo or NULL. Free with
 g_base_info_unref() when done. [transfer full]
 
 

 
Returns :
 the GIVFuncInfo, or NULL. Free it with
+ the GIVFuncInfo, or NULL. Free it with
 g_base_info_unref() when done. [transfer full]
 
 

 
 

 

+

+

+
g_object_info_get_unref_function ()

+
const char *        g_object_info_get_unref_function    (GIObjectInfo *info);

+

+Obtain the symbol name of the function that should be called to unref this
+object type. It's mainly used fundamental types. The type signature for
+the symbol is GIObjectInfoUnrefFunction, to fetch the function pointer
+see g_object_info_get_unref_function().
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the symbol or NULL
+

+

+

+

+
g_object_info_get_unref_function_pointer ()

+
GIObjectInfoUnrefFunction  g_object_info_get_unref_function_pointer
+                                                        (GIObjectInfo *info);

+

+Obtain a pointer to a function which can be used to
+decrease the reference count an instance of this object type.
+This takes derivation into account and will reversely traverse
+the base classes of this type, starting at the top type.
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the function pointer or NULL
+

+

+

+

+
g_object_info_get_ref_function ()

+
const char *        g_object_info_get_ref_function      (GIObjectInfo *info);

+

+Obtain the symbol name of the function that should be called to ref this
+object type. It's mainly used fundamental types. The type signature for
+the symbol is GIObjectInfoRefFunction, to fetch the function pointer
+see g_object_info_get_ref_function().
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the symbol or NULL
+

+

+

+

+
g_object_info_get_ref_function_pointer ()

+
GIObjectInfoRefFunction  g_object_info_get_ref_function_pointer
+                                                        (GIObjectInfo *info);

+

+Obtain a pointer to a function which can be used to
+increase the reference count an instance of this object type.
+This takes derivation into account and will reversely traverse
+the base classes of this type, starting at the top type.
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the function pointer or NULL
+

+

+

+

+
g_object_info_get_set_value_function ()

+
const char *        g_object_info_get_set_value_function
+                                                        (GIObjectInfo *info);

+

+Obtain the symbol name of the function that should be called to convert
+set a GValue giving an object instance pointer of this object type.
+I's mainly used fundamental types. The type signature for the symbol
+is GIObjectInfoSetValueFunction, to fetch the function pointer
+see g_object_info_get_set_value_function().
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the symbol or NULL
+

+

+

+

+
g_object_info_get_set_value_function_pointer ()

+
GIObjectInfoSetValueFunction  g_object_info_get_set_value_function_pointer
+                                                        (GIObjectInfo *info);

+

+Obtain a pointer to a function which can be used to
+set a GValue given an instance of this object type.
+This takes derivation into account and will reversely traverse
+the base classes of this type, starting at the top type.
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the function pointer or NULL
+

+

+

+

+
g_object_info_get_get_value_function ()

+
const char *        g_object_info_get_get_value_function
+                                                        (GIObjectInfo *info);

+

+Obtain the symbol name of the function that should be called to convert
+an object instance pointer of this object type to a GValue.
+I's mainly used fundamental types. The type signature for the symbol
+is GIObjectInfoGetValueFunction, to fetch the function pointer
+see g_object_info_get_get_value_function().
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the symbol or NULL
+

+

+

+

+
g_object_info_get_get_value_function_pointer ()

+
GIObjectInfoGetValueFunction  g_object_info_get_get_value_function_pointer
+                                                        (GIObjectInfo *info);

+

+Obtain a pointer to a function which can be used to
+extract an instance of this object type out of a GValue.
+This takes derivation into account and will reversely traverse
+the base classes of this type, starting at the top type.
+

+

++
+
+
+
+
+
+
+
+
+
+


info :
a GIObjectInfo
+
Returns :
 the function pointer or NULL
+

+

 

 

 

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIPropertyInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIPropertyInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIPropertyInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIPropertyInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -39,7 +39,7 @@
 
Synopsis

 
#define             GI_IS_PROPERTY_INFO                 (info)
 typedef             GIPropertyInfo;
-GParamFlags         g_property_info_get_flags           (GIPropertyInfo *info);
+GParamFlags         g_property_info_get_flags           (GIPropertyInfo *info);
 GITypeInfo *        g_property_info_get_type            (GIPropertyInfo *info);
 GITransfer          g_property_info_get_ownership_transfer
                                                         (GIPropertyInfo *info);
@@ -91,7 +91,7 @@
 

 

 
g_property_info_get_flags ()

-
GParamFlags         g_property_info_get_flags           (GIPropertyInfo *info);

+
GParamFlags         g_property_info_get_flags           (GIPropertyInfo *info);

 

 Obtain the flags for this property info. See GParamFags for
 more information about possible flag values.
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIRegisteredTypeInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIRegisteredTypeInfo.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIRegisteredTypeInfo.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-GIRegisteredTypeInfo.html	2010-07-12 18:21:51.000000000 +0100
@@ -39,11 +39,11 @@
 
Synopsis

 
#define             GI_IS_REGISTERED_TYPE_INFO          (info)
 typedef             GIRegisteredTypeInfo;
-const gchar *       g_registered_type_info_get_type_name
+const gchar *       g_registered_type_info_get_type_name
                                                         (GIRegisteredTypeInfo *info);
-const gchar *       g_registered_type_info_get_type_init
+const gchar *       g_registered_type_info_get_type_init
                                                         (GIRegisteredTypeInfo *info);
-GType               g_registered_type_info_get_g_type   (GIRegisteredTypeInfo *info);
+GType               g_registered_type_info_get_g_type   (GIRegisteredTypeInfo *info);
 

 

 

@@ -104,11 +104,11 @@
 

 

 
g_registered_type_info_get_type_name ()

-
const gchar *       g_registered_type_info_get_type_name
+
const gchar *       g_registered_type_info_get_type_name
                                                         (GIRegisteredTypeInfo *info);

 

 Obtain the type name of the struct within the GObject type system.
-This type can be passed to g_type_name() to get a GType.
+This type can be passed to g_type_name() to get a GType.
 

 
@@ -129,7 +129,7 @@
 

 
g_registered_type_info_get_type_init ()

-
const gchar *       g_registered_type_info_get_type_init
+
const gchar *       g_registered_type_info_get_type_init
                                                         (GIRegisteredTypeInfo *info);

 

 Obtain the type init function for info. The type init function is the
@@ -148,7 +148,7 @@
 

@@ -157,9 +157,9 @@
 

 
g_registered_type_info_get_g_type ()

-
GType               g_registered_type_info_get_g_type   (GIRegisteredTypeInfo *info);

+
GType               g_registered_type_info_get_g_type   (GIRegisteredTypeInfo *info);

 

-Obtain the GType for this registered type.
+Obtain the GType for this registered type.
 

 

 

 

 
Returns :

  the symbol name of the type init function, suitable for
-passing into g_module_symbol().
+passing into g_module_symbol().
 
 

 
 
@@ -171,7 +171,7 @@
 
-
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-girepository.html gobject-introspection-0.9.2/docs/reference/html/gi-girepository.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-girepository.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-girepository.html	2010-07-12 18:21:51.000000000 +0100
@@ -46,60 +46,60 @@
                     GTypelib;
 GIRepository *      g_irepository_get_default           (void);
 voidg_irepository_prepend_search_path   (const char *directory);
-GSList *            g_irepository_get_search_path       (void);
+GSList *            g_irepository_get_search_path       (void);
 const char *        g_irepository_load_typelib          (GIRepository *repository,
                                                          GTypelib *typelib,
                                                          GIRepositoryLoadFlags flags,
-                                                         GError **error);
-gbooleang_irepository_is_registered         (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *version);
+                                                         GError **error);
+gbooleang_irepository_is_registered         (GIRepository *repository,
+                                                         const gchar *namespace_,
+                                                         const gchar *version);
 GIBaseInfo *        g_irepository_find_by_name          (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *name);
+                                                         const gchar *namespace_,
+                                                         const gchar *name);
 GTypelib *          g_irepository_require               (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *version,
+                                                         const gchar *namespace_,
+                                                         const gchar *version,
                                                          GIRepositoryLoadFlags flags,
-                                                         GError **error);
-gchar **            g_irepository_get_dependencies      (GIRepository *repository,
-                                                         const gchar *namespace_);
-gchar **            g_irepository_get_loaded_namespaces (GIRepository *repository);
+                                                         GError **error);
+gchar **            g_irepository_get_dependencies      (GIRepository *repository,
+                                                         const gchar *namespace_);
+gchar **            g_irepository_get_loaded_namespaces (GIRepository *repository);
 GIBaseInfo *        g_irepository_find_by_gtype         (GIRepository *repository,
-                                                         GType gtype);
-gintg_irepository_get_n_infos           (GIRepository *repository,
-                                                         const gchar *namespace_);
+                                                         GType gtype);
+gintg_irepository_get_n_infos           (GIRepository *repository,
+                                                         const gchar *namespace_);
 GIBaseInfo *        g_irepository_get_info              (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         gint index);
-const gchar *       g_irepository_get_typelib_path      (GIRepository *repository,
-                                                         const gchar *namespace_);
-const gchar *       g_irepository_get_shared_library    (GIRepository *repository,
-                                                         const gchar *namespace_);
-const gchar *       g_irepository_get_version           (GIRepository *repository,
-                                                         const gchar *namespace_);
-GOptionGroup *      g_irepository_get_option_group      (void);
-const gchar *       g_irepository_get_c_prefix          (GIRepository *repository,
-                                                         const gchar *namespace_);
-gbooleang_irepository_dump                  (const char *arg,
-                                                         GError **error);
+                                                         const gchar *namespace_,
+                                                         gint index);
+const gchar *       g_irepository_get_typelib_path      (GIRepository *repository,
+                                                         const gchar *namespace_);
+const gchar *       g_irepository_get_shared_library    (GIRepository *repository,
+                                                         const gchar *namespace_);
+const gchar *       g_irepository_get_version           (GIRepository *repository,
+                                                         const gchar *namespace_);
+GOptionGroup *      g_irepository_get_option_group      (void);
+const gchar *       g_irepository_get_c_prefix          (GIRepository *repository,
+                                                         const gchar *namespace_);
+gbooleang_irepository_dump                  (const char *arg,
+                                                         GError **error);
 #define             G_IREPOSITORY_ERROR
-GTypelib *          g_typelib_new_from_memory           (guchar *memory,
-                                                         gsize len);
-GTypelib *          g_typelib_new_from_const_memory     (const guchar *memory,
-                                                         gsize len);
-GTypelib *          g_typelib_new_from_mapped_file      (GMappedFile *mfile);
+GTypelib *          g_typelib_new_from_memory           (guchar *memory,
+                                                         gsize len);
+GTypelib *          g_typelib_new_from_const_memory     (const guchar *memory,
+                                                         gsize len);
+GTypelib *          g_typelib_new_from_mapped_file      (GMappedFile *mfile);
 voidg_typelib_free                      (GTypelib *typelib);
-gbooleang_typelib_symbol                    (GTypelib *typelib,
-                                                         const gchar *symbol_name,
-                                                         gpointer *symbol);
-const gchar *       g_typelib_get_namespace             (GTypelib *typelib);
+gbooleang_typelib_symbol                    (GTypelib *typelib,
+                                                         const gchar *symbol_name,
+                                                         gpointer *symbol);
+const gchar *       g_typelib_get_namespace             (GTypelib *typelib);
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GIRepository
 

 

@@ -206,7 +206,7 @@
 call conventions.
 

-All methods on GIRepository also accept NULL as an instance
+All methods on GIRepository also accept NULL as an instance
 parameter to mean this default repository, which is usually more
 convenient for C.
 

@@ -237,7 +237,7 @@
 

 
g_irepository_get_search_path ()

-
GSList *            g_irepository_get_search_path       (void);

+
GSList *            g_irepository_get_search_path       (void);

 

 Returns the search path the GIRepository will use when looking for typelibs.
 The string is internal to GIRespository and should not be freed, nor should
@@ -258,7 +258,7 @@
 
const char *        g_irepository_load_typelib          (GIRepository *repository,
                                                          GTypelib *typelib,
                                                          GIRepositoryLoadFlags flags,
-                                                         GError **error);

+                                                         GError **error);
 

 

 

 

 

 
Returns :
 the GType.
+ the GType.
 
 

                                                                                                                                         
 
 
 
 

@@ -295,9 +295,9 @@
 

 
g_irepository_is_registered ()

-
gboolean            g_irepository_is_registered         (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *version);

+
gboolean            g_irepository_is_registered         (GIRepository *repository,
+                                                         const gchar *namespace_,
+                                                         const gchar *version);

 

 Check whether a particular namespace (and optionally, a specific
 version thereof) is currently loaded.  This function is likely to
@@ -311,7 +311,7 @@
 

-
@@ -321,12 +321,12 @@
 
-
-
@@ -336,8 +336,8 @@
 

 
g_irepository_find_by_name ()

 
GIBaseInfo *        g_irepository_find_by_name          (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *name);

+                                                         const gchar *namespace_,
+                                                         const gchar *name);
 

 Searches for a particular entry in a namespace.  Before calling
 this function for a particular namespace, you must call
@@ -349,7 +349,7 @@
 

-
@@ -364,7 +364,7 @@
 
-
@@ -374,10 +374,10 @@
 

 
g_irepository_require ()

 
GTypelib *          g_irepository_require               (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         const gchar *version,
+                                                         const gchar *namespace_,
+                                                         const gchar *version,
                                                          GIRepositoryLoadFlags flags,
-                                                         GError **error);

+                                                         GError **error);
 

 Force the namespace namespace_ to be loaded if it isn't already.
 If namespace_ is not loaded, this function will search for a
@@ -390,7 +390,7 @@
 

-
@@ -400,7 +400,7 @@
 
-
@@ -410,12 +410,12 @@
 
-
-
@@ -424,8 +424,8 @@
 

 
g_irepository_get_dependencies ()

-
gchar **            g_irepository_get_dependencies      (GIRepository *repository,
-                                                         const gchar *namespace_);

+
gchar **            g_irepository_get_dependencies      (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 Return an array of all (transitive) dependencies for namespace
 namespace_, including version.  The returned strings are of the
@@ -440,7 +440,7 @@
 

-
@@ -459,7 +459,7 @@
 

 
g_irepository_get_loaded_namespaces ()

-
gchar **            g_irepository_get_loaded_namespaces (GIRepository *repository);

+
gchar **            g_irepository_get_loaded_namespaces (GIRepository *repository);

 

 

 

 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
version :
 Required version, may be NULL for latest. [allow-none]
+ Required version, may be NULL for latest. [allow-none]
 
 

 

 
Returns :
 TRUE if namespace-version is loaded, FALSE otherwise
+ TRUE if namespace-version is loaded, FALSE otherwise
 
 

 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
Returns :
 GIBaseInfo representing metadata about name, or NULL
+ GIBaseInfo representing metadata about name, or NULL
 
 

 
 

 
repository :
 Repository, may be NULL for the default. [allow-none]
+ Repository, may be NULL for the default. [allow-none]
 
 

 

 

 
version :
 Version of namespace, may be NULL for latest. [allow-none]
+ Version of namespace, may be NULL for latest. [allow-none]
 
 

 

 

 
error :
a GError.
+a GError.
 
 

 

 
Returns :
 a pointer to the GTypelib if successful, NULL otherwise
+ a pointer to the GTypelib if successful, NULL otherwise
 
 

 
 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

@@ -482,9 +482,9 @@
 

 
g_irepository_find_by_gtype ()

 
GIBaseInfo *        g_irepository_find_by_gtype         (GIRepository *repository,
-                                                         GType gtype);

+                                                         GType gtype);
 

-Searches all loaded namespaces for a particular GType.  Note that
+Searches all loaded namespaces for a particular GType.  Note that
 in order to locate the metadata, the namespace corresponding to
 the type must first have been loaded.  There is currently no
 mechanism for determining the namespace which corresponds to an
@@ -496,7 +496,7 @@
 

-
@@ -506,7 +506,7 @@
 
-
@@ -515,8 +515,8 @@
 

 
g_irepository_get_n_infos ()

-
gint                g_irepository_get_n_infos           (GIRepository *repository,
-                                                         const gchar *namespace_);

+
gint                g_irepository_get_n_infos           (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 This function returns the number of metadata entries in
 given namespace namespace_.  The namespace must have
@@ -527,7 +527,7 @@
 

-
@@ -547,8 +547,8 @@
 

 
g_irepository_get_info ()

 
GIBaseInfo *        g_irepository_get_info              (GIRepository *repository,
-                                                         const gchar *namespace_,
-                                                         gint index);

+                                                         const gchar *namespace_,
+                                                         gint index);
 

 This function returns a particular metadata entry in the
 given namespace namespace_.  The namespace must have
@@ -559,7 +559,7 @@
 

-
@@ -583,8 +583,8 @@
 

 
g_irepository_get_typelib_path ()

-
const gchar *       g_irepository_get_typelib_path      (GIRepository *repository,
-                                                         const gchar *namespace_);

+
const gchar *       g_irepository_get_typelib_path      (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 If namespace namespace_ is loaded, return the full path to the
 .typelib file it was loaded from.  If the typelib for
@@ -596,7 +596,7 @@
 

-
@@ -606,7 +606,7 @@
 
-
@@ -615,13 +615,13 @@
 

 
g_irepository_get_shared_library ()

-
const gchar *       g_irepository_get_shared_library    (GIRepository *repository,
-                                                         const gchar *namespace_);

+
const gchar *       g_irepository_get_shared_library    (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 This function returns the full path to the shared C library
 associated with the given namespace namespace_. There may be no
 shared library path associated, in which case this function will
-return NULL.
+return NULL.
 

 

 Note: The namespace must have already been loaded using a function
@@ -632,7 +632,7 @@
 

-
@@ -642,7 +642,7 @@
 
-
@@ -651,8 +651,8 @@
 

 
g_irepository_get_version ()

-
const gchar *       g_irepository_get_version           (GIRepository *repository,
-                                                         const gchar *namespace_);

+
const gchar *       g_irepository_get_version           (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 This function returns the loaded version associated with the given
 namespace namespace_.
@@ -666,7 +666,7 @@
 

-
@@ -685,7 +685,7 @@
 

 
g_irepository_get_option_group ()

-
GOptionGroup *      g_irepository_get_option_group      (void);

+
GOptionGroup *      g_irepository_get_option_group      (void);

 

 

 

 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
Returns :
 GIBaseInfo representing metadata about type, or NULL
+ GIBaseInfo representing metadata about type, or NULL
 
 

 
 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 

 
repository :
Repository, may be NULL for the default
+Repository, may be NULL for the default
 
 

 

 

 
Returns :
 Filesystem path (or $lt;builtin$gt;) if successful, NULL if namespace is not loaded
+ Filesystem path (or $lt;builtin$gt;) if successful, NULL if namespace is not loaded
 
 

 
 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
Returns :
 Full path to shared library, or NULL if none associated
+ Full path to shared library, or NULL if none associated
 
 

 
 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

@@ -700,12 +700,12 @@
 

 
g_irepository_get_c_prefix ()

-
const gchar *       g_irepository_get_c_prefix          (GIRepository *repository,
-                                                         const gchar *namespace_);

+
const gchar *       g_irepository_get_c_prefix          (GIRepository *repository,
+                                                         const gchar *namespace_);

 

 This function returns the "C prefix", or the C level namespace
 associated with the given introspection namespace.  Each C symbol
-starts with this prefix, as well each GType in the library.
+starts with this prefix, as well each GType in the library.
 

 

 Note: The namespace must have already been loaded using a function
@@ -716,7 +716,7 @@
 

-
@@ -726,7 +726,7 @@
 
-
@@ -735,8 +735,8 @@
 

 
g_irepository_dump ()

-
gboolean            g_irepository_dump                  (const char *arg,
-                                                         GError **error);

+
gboolean            g_irepository_dump                  (const char *arg,
+                                                         GError **error);

 

 Argument specified is a comma-separated pair of filenames; i.e. of
 the form "input.txt,output.xml".  The input file should be a
@@ -757,12 +757,12 @@
 
 

-
-
@@ -779,11 +779,11 @@
 

 
g_typelib_new_from_memory ()

-
GTypelib *          g_typelib_new_from_memory           (guchar *memory,
-                                                         gsize len);

+
GTypelib *          g_typelib_new_from_memory           (guchar *memory,
+                                                         gsize len);

 

 Creates a new GTypelib from a memory location.  The memory block
-pointed to by typelib will be automatically g_free()d when the
+pointed to by typelib will be automatically g_free()d when the
 repository is destroyed.
 

 

 
 

 
repository :
A GIRepository, may be NULL for the default
+A GIRepository, may be NULL for the default
 
 

 

 

 
Returns :
 C namespace prefix, or NULL if none associated
+ C namespace prefix, or NULL if none associated
 
 

 
 

 
error :
a GError
+a GError
 
 

 

 
Returns :
 TRUE on success, FALSE on error
+ TRUE on success, FALSE on error
 
 

 
 

@@ -810,8 +810,8 @@
 

 
g_typelib_new_from_const_memory ()

-
GTypelib *          g_typelib_new_from_const_memory     (const guchar *memory,
-                                                         gsize len);

+
GTypelib *          g_typelib_new_from_const_memory     (const guchar *memory,
+                                                         gsize len);

 

 Creates a new GTypelib from a memory location.
 

@@ -839,16 +839,16 @@
 

 

 
g_typelib_new_from_mapped_file ()

-
GTypelib *          g_typelib_new_from_mapped_file      (GMappedFile *mfile);

+
GTypelib *          g_typelib_new_from_mapped_file      (GMappedFile *mfile);

 

-Creates a new GTypelib from a GMappedFile.
+Creates a new GTypelib from a GMappedFile.
 

 

 

-
@@ -878,9 +878,9 @@
 

 
g_typelib_symbol ()

-
gboolean            g_typelib_symbol                    (GTypelib *typelib,
-                                                         const gchar *symbol_name,
-                                                         gpointer *symbol);

+
gboolean            g_typelib_symbol                    (GTypelib *typelib,
+                                                         const gchar *symbol_name,
+                                                         gpointer *symbol);

 

 Loads a symbol from GTypelib.
 

@@ -904,7 +904,7 @@
 

-
@@ -913,7 +913,7 @@
 

 
g_typelib_get_namespace ()

-
const gchar *       g_typelib_get_namespace             (GTypelib *typelib);

+
const gchar *       g_typelib_get_namespace             (GTypelib *typelib);

 

 

 

 
 
 

 
mfile :
a GMappedFile, that will be free'd when the repository is destroyed
+a GMappedFile, that will be free'd when the repository is destroyed
 
 

 

 

 

 
Returns :
 TRUE on success
+ TRUE on success
 
 

 
 

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-girffi.html gobject-introspection-0.9.2/docs/reference/html/gi-girffi.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-girffi.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-girffi.html	2010-07-12 18:21:51.000000000 +0100
@@ -42,21 +42,21 @@
                                                          void **Param3,
                                                          void *Param4);
                     GIFunctionInvoker;
-voidgi_cclosure_marshal_generic         (GClosure *closure,
-                                                         GValue *return_gvalue,
-                                                         guint n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer invocation_hint,
-                                                         gpointer marshal_data);
+voidgi_cclosure_marshal_generic         (GClosure *closure,
+                                                         GValue *return_gvalue,
+                                                         guint n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer invocation_hint,
+                                                         gpointer marshal_data);
 ffi_type *          g_type_info_get_ffi_type            (GITypeInfo *info);
-gbooleang_function_info_prep_invoker        (GIFunctionInfo *info,
+gbooleang_function_info_prep_invoker        (GIFunctionInfo *info,
                                                          GIFunctionInvoker *invoker,
-                                                         GError **error);
+                                                         GError **error);
 voidg_function_invoker_destroy          (GIFunctionInvoker *invoker);
 ffi_closure *       g_callable_info_prepare_closure     (GICallableInfo *callable_info,
                                                          ffi_cif *cif,
                                                          GIFFIClosureCallback callback,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 voidg_callable_info_free_closure        (GICallableInfo *callable_info,
                                                          ffi_closure *closure);
 
@@ -119,7 +119,7 @@
 
-
+
@@ -129,12 +129,12 @@
 

 
gi_cclosure_marshal_generic ()

-
void                gi_cclosure_marshal_generic         (GClosure *closure,
-                                                         GValue *return_gvalue,
-                                                         guint n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer invocation_hint,
-                                                         gpointer marshal_data);

+
void                gi_cclosure_marshal_generic         (GClosure *closure,
+                                                         GValue *return_gvalue,
+                                                         guint n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer invocation_hint,
+                                                         gpointer marshal_data);

 

 

 
                                                                                        
 
 
gpointer native_address;
gpointer native_address;

 the native adress
 
 

 

@@ -196,9 +196,9 @@
 

 
g_function_info_prep_invoker ()

-
gboolean            g_function_info_prep_invoker        (GIFunctionInfo *info,
+
gboolean            g_function_info_prep_invoker        (GIFunctionInfo *info,
                                                          GIFunctionInvoker *invoker,
-                                                         GError **error);

+                                                         GError **error);

 

 Initialize the caller-allocated invoker structure with a cache
 of information needed to invoke the C function corresponding to
@@ -224,12 +224,12 @@
 
 

-
-
@@ -256,7 +256,7 @@
 
ffi_closure *       g_callable_info_prepare_closure     (GICallableInfo *callable_info,
                                                          ffi_cif *cif,
                                                          GIFFIClosureCallback callback,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

 Prepares a callback for ffi invocation.
 

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gir-reference.html gobject-introspection-0.9.2/docs/reference/html/gi-gir-reference.html
--- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gir-reference.html	2010-07-09 11:39:12.000000000 +0100
+++ gobject-introspection-0.9.2/docs/reference/html/gi-gir-reference.html	2010-07-12 18:21:51.000000000 +0100
@@ -34,11 +34,22 @@
      Possible children: namespace.
 
      

-
Example 4. A GIR fragment showing an api node

-
-     <api version="1.0">
-       <namespace/>
-     </api>

+
Example 4. A GIR fragment showing an api node

+

+  

 

 
error :
A GError
+A GError
 
 

 

 
Returns :
 TRUE on success, FALSE otherwise with error set.
+ TRUE on success, FALSE otherwise with error set.
 
 

 
 

+    
+      
+        
+        
+      
+    
+  
1
+2
+3
<api version="1.0">
+  <namespace/>
+</api>

+

+
 

 

 

@@ -54,14 +65,28 @@
      interface.
 
      

-
Example 5. A GIR fragment showing an namespace node

-
-     <api version="1.0">
-       <namespace="Gtk">
-          <class/>
-          <function/>
-       </namespace>
-     </api>

+
Example 5. A GIR fragment showing an namespace node

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
<api version="1.0">
+  <namespace="Gtk">
+     <class/>
+     <function/>
+  </namespace>
+</api>

+

+
 

 

 

@@ -76,18 +101,36 @@
      method,
      property.
      

-
Example 6. A GIR fragment showing an class node

-
-     <api version="1.0">
-       <namespace="Gtk">
-         <class name="Widget">
-            <constructor/>
-            <field/>
-            <method/>
-            <property/>
-         <class>
-       </namespace>
-     </api>

+
Example 6. A GIR fragment showing an class node

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
<api version="1.0">
+  <namespace="Gtk">
+    <class name="Widget">
+       <constructor/>
+       <field/>
+       <method/>
+       <property/>
+    <class>
+  </namespace>
+</api>

+

+
@@ -101,17 +144,34 @@ method, property.
-

Example 7. A GIR fragment showing an interface node

-
-     <api version="1.0">
-       <namespace="Gtk">
-         <interface name="Buildable">
-            <field/>
-            <method/>
-            <property/>
-         <interface>
-       </namespace>
-     </api>
+

Example 7. A GIR fragment showing an interface node

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
<api version="1.0">
+  <namespace="Gtk">
+    <interface name="Buildable">
+       <field/>
+       <method/>
+       <property/>
+    <interface>
+  </namespace>
+</api>
+
+

@@ -122,14 +182,28 @@ Parent node: namespace.
-

Example 8. A GIR fragment showing an function node

-
-     <api version="1.0">
-       <namespace="Gtk">
-         <function name="init">
-         </function>
-       </namespace>
-     </api>
+

Example 8. A GIR fragment showing an function node

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
<api version="1.0">
+  <namespace="Gtk">
+    <function name="init">
+    </function>
+  </namespace>
+</api>
+
+

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GISignalInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GISignalInfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GISignalInfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-GISignalInfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -39,9 +39,9 @@

Synopsis

#define             GI_IS_SIGNAL_INFO                   (info)
 typedef             GISignalInfo;
-GSignalFlags        g_signal_info_get_flags             (GISignalInfo *info);
+GSignalFlags        g_signal_info_get_flags             (GISignalInfo *info);
 GIVFuncInfo *       g_signal_info_get_class_closure     (GISignalInfo *info);
-gboolean            g_signal_info_true_stops_emit       (GISignalInfo *info);
+gboolean            g_signal_info_true_stops_emit       (GISignalInfo *info);
@@ -97,9 +97,9 @@

g_signal_info_get_flags ()

-
GSignalFlags        g_signal_info_get_flags             (GISignalInfo *info);
+
GSignalFlags        g_signal_info_get_flags             (GISignalInfo *info);

-Obtain the flags for this signal info. See GSignalFlags for +Obtain the flags for this signal info. See GSignalFlags for more information about possible flag values.

@@ -125,7 +125,7 @@

Obtain the class closure for this signal if one is set. The class closure is a virtual function on the type that the signal belongs to. -If the signal lacks a closure NULL will be returned. +If the signal lacks a closure NULL will be returned.

@@ -137,7 +137,7 @@ - @@ -146,7 +146,7 @@

g_signal_info_true_stops_emit ()

-
gboolean            g_signal_info_true_stops_emit       (GISignalInfo *info);
+
gboolean            g_signal_info_true_stops_emit       (GISignalInfo *info);

Obtain if the returning true in the signal handler will stop the emission of the signal. @@ -161,7 +161,7 @@

- diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gistructinfo.html gobject-introspection-0.9.2/docs/reference/html/gi-gistructinfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gistructinfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-gistructinfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -39,18 +39,18 @@

Synopsis

#define             GI_IS_STRUCT_INFO                   (info)
 typedef             GIStructInfo;
-gint                g_struct_info_get_n_fields          (GIStructInfo *info);
+gint                g_struct_info_get_n_fields          (GIStructInfo *info);
 GIFieldInfo *       g_struct_info_get_field             (GIStructInfo *info,
-                                                         gint n);
-gint                g_struct_info_get_n_methods         (GIStructInfo *info);
+                                                         gint n);
+gint                g_struct_info_get_n_methods         (GIStructInfo *info);
 GIFunctionInfo *    g_struct_info_get_method            (GIStructInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIFunctionInfo *    g_struct_info_find_method           (GIStructInfo *info,
-                                                         const gchar *name);
-gsize               g_struct_info_get_size              (GIStructInfo *info);
-gsize               g_struct_info_get_alignment         (GIStructInfo *info);
-gboolean            g_struct_info_is_gtype_struct       (GIStructInfo *info);
-gboolean            g_struct_info_is_foreign            (GIStructInfo *info);
+                                                         const gchar *name);
+gsize               g_struct_info_get_size              (GIStructInfo *info);
+gsize               g_struct_info_get_alignment         (GIStructInfo *info);
+gboolean            g_struct_info_is_gtype_struct       (GIStructInfo *info);
+gboolean            g_struct_info_is_foreign            (GIStructInfo *info);
@@ -86,7 +86,7 @@

g_struct_info_get_n_fields ()

-
gint                g_struct_info_get_n_fields          (GIStructInfo *info);
+
gint                g_struct_info_get_n_fields          (GIStructInfo *info);

Returns :

 the class closure or NULL + the class closure or NULL

Returns :

 TRUE if returning true stops the signal emission + TRUE if returning true stops the signal emission
@@ -109,7 +109,7 @@

g_struct_info_get_field ()

GIFieldInfo *       g_struct_info_get_field             (GIStructInfo *info,
-                                                         gint n);
+ gint n);

@@ -136,7 +136,7 @@

g_struct_info_get_n_methods ()

-
gint                g_struct_info_get_n_methods         (GIStructInfo *info);
+
gint                g_struct_info_get_n_methods         (GIStructInfo *info);

@@ -159,7 +159,7 @@

g_struct_info_get_method ()

GIFunctionInfo *    g_struct_info_get_method            (GIStructInfo *info,
-                                                         gint n);
+ gint n);

@@ -187,7 +187,7 @@

g_struct_info_find_method ()

GIFunctionInfo *    g_struct_info_find_method           (GIStructInfo *info,
-                                                         const gchar *name);
+ const gchar *name);

@@ -214,7 +214,7 @@

g_struct_info_get_size ()

-
gsize               g_struct_info_get_size              (GIStructInfo *info);
+
gsize               g_struct_info_get_size              (GIStructInfo *info);

@@ -236,7 +236,7 @@

g_struct_info_get_alignment ()

-
gsize               g_struct_info_get_alignment         (GIStructInfo *info);
+
gsize               g_struct_info_get_alignment         (GIStructInfo *info);

@@ -258,10 +258,10 @@

g_struct_info_is_gtype_struct ()

-
gboolean            g_struct_info_is_gtype_struct       (GIStructInfo *info);
+
gboolean            g_struct_info_is_gtype_struct       (GIStructInfo *info);

Return true if this structure represents the "class structure" for some -GObject or GInterface. This function is mainly useful to hide this kind of structure +GObject or GInterface. This function is mainly useful to hide this kind of structure from generated public APIs.

@@ -274,7 +274,7 @@ - @@ -283,7 +283,7 @@

g_struct_info_is_foreign ()

-
gboolean            g_struct_info_is_foreign            (GIStructInfo *info);
+
gboolean            g_struct_info_is_foreign            (GIStructInfo *info);

Returns :

 TRUE if this is a class struct, FALSE otherwise + TRUE if this is a class struct, FALSE otherwise
diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GITypeInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GITypeInfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GITypeInfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-GITypeInfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -42,18 +42,18 @@ typedef GITypeInfo; enum GITypeTag; #define G_TYPE_TAG_IS_BASIC (tag) -const gchar* g_type_tag_to_string (GITypeTag type); -gbooleang_type_info_is_pointer (GITypeInfo *info); +const gchar* g_type_tag_to_string (GITypeTag type); +gbooleang_type_info_is_pointer (GITypeInfo *info); GITypeTagg_type_info_get_tag (GITypeInfo *info); GITypeInfo * g_type_info_get_param_type (GITypeInfo *info, - gint n); + gint n); GIBaseInfo * g_type_info_get_interface (GITypeInfo *info); -gintg_type_info_get_array_length (GITypeInfo *info); -gintg_type_info_get_array_fixed_size (GITypeInfo *info); -gbooleang_type_info_is_zero_terminated (GITypeInfo *info); -gintg_type_info_get_n_error_domains (GITypeInfo *info); +gintg_type_info_get_array_length (GITypeInfo *info); +gintg_type_info_get_array_fixed_size (GITypeInfo *info); +gbooleang_type_info_is_zero_terminated (GITypeInfo *info); +gintg_type_info_get_n_error_domains (GITypeInfo *info); GIErrorDomainInfo * g_type_info_get_error_domain (GITypeInfo *info, - gint n); + gint n); GIArrayTypeg_type_info_get_array_type (GITypeInfo *info); @@ -127,12 +127,12 @@ - - @@ -162,27 +162,18 @@ GI_TYPE_TAG_UINT32 = 7, GI_TYPE_TAG_INT64 = 8, GI_TYPE_TAG_UINT64 = 9, - GI_TYPE_TAG_SHORT = 10, - GI_TYPE_TAG_USHORT = 11, - GI_TYPE_TAG_INT = 12, - GI_TYPE_TAG_UINT = 13, - GI_TYPE_TAG_LONG = 14, - GI_TYPE_TAG_ULONG = 15, - GI_TYPE_TAG_SSIZE = 16, - GI_TYPE_TAG_SIZE = 17, - GI_TYPE_TAG_FLOAT = 18, - GI_TYPE_TAG_DOUBLE = 19, - GI_TYPE_TAG_TIME_T = 20, - GI_TYPE_TAG_GTYPE = 21, - GI_TYPE_TAG_UTF8 = 22, - GI_TYPE_TAG_FILENAME = 23, + GI_TYPE_TAG_FLOAT = 10, + GI_TYPE_TAG_DOUBLE = 11, + GI_TYPE_TAG_GTYPE = 12, + GI_TYPE_TAG_UTF8 = 13, + GI_TYPE_TAG_FILENAME = 14, /* Non-basic types */ - GI_TYPE_TAG_ARRAY = 24, - GI_TYPE_TAG_INTERFACE = 25, - GI_TYPE_TAG_GLIST = 26, - GI_TYPE_TAG_GSLIST = 27, - GI_TYPE_TAG_GHASH = 28, - GI_TYPE_TAG_ERROR = 29 + GI_TYPE_TAG_ARRAY = 15, + GI_TYPE_TAG_INTERFACE = 16, + GI_TYPE_TAG_GLIST = 17, + GI_TYPE_TAG_GSLIST = 18, + GI_TYPE_TAG_GHASH = 19, + GI_TYPE_TAG_ERROR = 20 /* Note - there is only room currently for 32 tags. * See docs/typelib-format.txt SimpleTypeBlob definition */ } GITypeTag; @@ -244,46 +235,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -294,13 +245,8 @@ - - - - - @@ -326,22 +272,22 @@ - - - - @@ -366,7 +312,7 @@

g_type_tag_to_string ()

-
const gchar*        g_type_tag_to_string                (GITypeTag type);
+
const gchar*        g_type_tag_to_string                (GITypeTag type);

GI_ARRAY_TYPE_PTR_ARRAY

a GPtrArray array +a GPtrArray array

GI_ARRAY_TYPE_BYTE_ARRAY

a GByteArray array +a GByteArray array

GI_TYPE_TAG_SHORT

signed short -

GI_TYPE_TAG_USHORT

unsigned hosrt -

GI_TYPE_TAG_INT

signed integer -

GI_TYPE_TAG_UINT

unsigned integer -

GI_TYPE_TAG_LONG

signed long -

GI_TYPE_TAG_ULONG

unsigned long -

GI_TYPE_TAG_SSIZE

ssize_t -

GI_TYPE_TAG_SIZE

size_t -

GI_TYPE_TAG_FLOAT

 float

GI_TYPE_TAG_TIME_T

time_t -

GI_TYPE_TAG_GTYPE

a GType +a GType

GI_TYPE_TAG_GLIST

a GList +a GList

GI_TYPE_TAG_GSLIST

a GSList +a GSList

GI_TYPE_TAG_GHASH

a GHashTable +a GHashTable

GI_TYPE_TAG_ERROR

a GError +a GError
@@ -388,7 +334,7 @@

g_type_info_is_pointer ()

-
gboolean            g_type_info_is_pointer              (GITypeInfo *info);
+
gboolean            g_type_info_is_pointer              (GITypeInfo *info);

Obtain if the type is passed as a reference.

@@ -402,7 +348,7 @@
- @@ -436,7 +382,7 @@

g_type_info_get_param_type ()

GITypeInfo *        g_type_info_get_param_type          (GITypeInfo *info,
-                                                         gint n);
+ gint n);

Obtain the parameter type n.

@@ -481,7 +427,7 @@
- @@ -491,7 +437,7 @@

g_type_info_get_array_length ()

-
gint                g_type_info_get_array_length        (GITypeInfo *info);
+
gint                g_type_info_get_array_length        (GITypeInfo *info);

Obtain the array length of the type. The type tag must be a GI_TYPE_TAG_ARRAY or -1 will returned. @@ -515,7 +461,7 @@

g_type_info_get_array_fixed_size ()

-
gint                g_type_info_get_array_fixed_size    (GITypeInfo *info);
+
gint                g_type_info_get_array_fixed_size    (GITypeInfo *info);

Obtain the fixed array size of the type. The type tag must be a GI_TYPE_TAG_ARRAY or -1 will returned. @@ -539,10 +485,10 @@

g_type_info_is_zero_terminated ()

-
gboolean            g_type_info_is_zero_terminated      (GITypeInfo *info);
+
gboolean            g_type_info_is_zero_terminated      (GITypeInfo *info);

-Obtain if the last element of the array is NULL. The type tag must be a -GI_TYPE_TAG_ARRAY or FALSE will returned. +Obtain if the last element of the array is NULL. The type tag must be a +GI_TYPE_TAG_ARRAY or FALSE will returned.

Returns :

 TRUE if it is a pointer + TRUE if it is a pointer

Returns :

 the GIBaseInfo, or NULL. Free it with + the GIBaseInfo, or NULL. Free it with g_base_info_unref() when done. [transfer full]
@@ -554,7 +500,7 @@ - @@ -563,7 +509,7 @@

g_type_info_get_n_error_domains ()

-
gint                g_type_info_get_n_error_domains     (GITypeInfo *info);
+
gint                g_type_info_get_n_error_domains     (GITypeInfo *info);

Obtain the number of error domains for this type. The type tag must be a GI_TYPE_TAG_ERROR or -1 will be returned. @@ -588,7 +534,7 @@

g_type_info_get_error_domain ()

GIErrorDomainInfo * g_type_info_get_error_domain        (GITypeInfo *info,
-                                                         gint n);
+ gint n);

Obtain the error domains at index n for this type. The type tag must be a GI_TYPE_TAG_ERROR or -1 will be returned. @@ -608,7 +554,7 @@

- diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-giunioninfo.html gobject-introspection-0.9.2/docs/reference/html/gi-giunioninfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-giunioninfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-giunioninfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -39,22 +39,22 @@

Synopsis

#define             GI_IS_UNION_INFO                    (info)
 typedef             GIUnionInfo;
-gint                g_union_info_get_n_fields           (GIUnionInfo *info);
+gint                g_union_info_get_n_fields           (GIUnionInfo *info);
 GIFieldInfo *       g_union_info_get_field              (GIUnionInfo *info,
-                                                         gint n);
-gint                g_union_info_get_n_methods          (GIUnionInfo *info);
+                                                         gint n);
+gint                g_union_info_get_n_methods          (GIUnionInfo *info);
 GIFunctionInfo *    g_union_info_get_method             (GIUnionInfo *info,
-                                                         gint n);
-gboolean            g_union_info_is_discriminated       (GIUnionInfo *info);
-gint                g_union_info_get_discriminator_offset
+                                                         gint n);
+gboolean            g_union_info_is_discriminated       (GIUnionInfo *info);
+gint                g_union_info_get_discriminator_offset
                                                         (GIUnionInfo *info);
 GITypeInfo *        g_union_info_get_discriminator_type (GIUnionInfo *info);
 GIConstantInfo *    g_union_info_get_discriminator      (GIUnionInfo *info,
-                                                         gint n);
+                                                         gint n);
 GIFunctionInfo *    g_union_info_find_method            (GIUnionInfo *info,
-                                                         const gchar *name);
-gsize               g_union_info_get_size               (GIUnionInfo *info);
-gsize               g_union_info_get_alignment          (GIUnionInfo *info);
+                                                         const gchar *name);
+gsize               g_union_info_get_size               (GIUnionInfo *info);
+gsize               g_union_info_get_alignment          (GIUnionInfo *info);
@@ -90,7 +90,7 @@

g_union_info_get_n_fields ()

-
gint                g_union_info_get_n_fields           (GIUnionInfo *info);
+
gint                g_union_info_get_n_fields           (GIUnionInfo *info);

Returns :

 TRUE if zero terminated + TRUE if zero terminated

Returns :

 the error domain or NULL if type tag is wrong, + the error domain or NULL if type tag is wrong, free the struct with g_base_info_unref() when done. [transfer full]
@@ -113,7 +113,7 @@

g_union_info_get_field ()

GIFieldInfo *       g_union_info_get_field              (GIUnionInfo *info,
-                                                         gint n);
+ gint n);

@@ -140,7 +140,7 @@

g_union_info_get_n_methods ()

-
gint                g_union_info_get_n_methods          (GIUnionInfo *info);
+
gint                g_union_info_get_n_methods          (GIUnionInfo *info);

@@ -163,7 +163,7 @@

g_union_info_get_method ()

GIFunctionInfo *    g_union_info_get_method             (GIUnionInfo *info,
-                                                         gint n);
+ gint n);

@@ -190,7 +190,7 @@

g_union_info_is_discriminated ()

-
gboolean            g_union_info_is_discriminated       (GIUnionInfo *info);
+
gboolean            g_union_info_is_discriminated       (GIUnionInfo *info);

@@ -212,7 +212,7 @@

g_union_info_get_discriminator_offset ()

-
gint                g_union_info_get_discriminator_offset
+
gint                g_union_info_get_discriminator_offset
                                                         (GIUnionInfo *info);

 

 

@@ -258,7 +258,7 @@
 

 
g_union_info_get_discriminator ()

 
GIConstantInfo *    g_union_info_get_discriminator      (GIUnionInfo *info,
-                                                         gint n);

+                                                         gint n);

@@ -286,7 +286,7 @@

g_union_info_find_method ()

GIFunctionInfo *    g_union_info_find_method            (GIUnionInfo *info,
-                                                         const gchar *name);
+ const gchar *name);

@@ -313,7 +313,7 @@

g_union_info_get_size ()

-
gsize               g_union_info_get_size               (GIUnionInfo *info);
+
gsize               g_union_info_get_size               (GIUnionInfo *info);

@@ -335,7 +335,7 @@

g_union_info_get_alignment ()

-
gsize               g_union_info_get_alignment          (GIUnionInfo *info);
+
gsize               g_union_info_get_alignment          (GIUnionInfo *info);

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIVFuncInfo.html gobject-introspection-0.9.2/docs/reference/html/gi-GIVFuncInfo.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-GIVFuncInfo.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-GIVFuncInfo.html 2010-07-12 18:21:51.000000000 +0100 @@ -41,7 +41,7 @@ typedef GIVFuncInfo; enum GIVFuncInfoFlags; GIVFuncInfoFlagsg_vfunc_info_get_flags (GIVFuncInfo *info); -gintg_vfunc_info_get_offset (GIVFuncInfo *info); +gintg_vfunc_info_get_offset (GIVFuncInfo *info); GISignalInfo * g_vfunc_info_get_signal (GIVFuncInfo *info); GIFunctionInfo * g_vfunc_info_get_invoker (GIVFuncInfo *info); @@ -153,7 +153,7 @@

g_vfunc_info_get_offset ()

-
gint                g_vfunc_info_get_offset             (GIVFuncInfo *info);
+
gint                g_vfunc_info_get_offset             (GIVFuncInfo *info);

Obtain the offset of the function pointer in the class struct. The value 0xFFFF indicates that the struct offset is unknown. @@ -193,7 +193,7 @@

- @@ -220,7 +220,7 @@ - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gtypelib.html gobject-introspection-0.9.2/docs/reference/html/gi-gtypelib.html --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/gi-gtypelib.html 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/gi-gtypelib.html 2010-07-12 18:21:51.000000000 +0100 @@ -69,14 +69,14 @@ AttributeBlob; dimensions; DirEntry * g_typelib_get_dir_entry (GTypelib *typelib, - guint16 index); + guint16 index); voidg_typelib_check_sanity (void); #define g_typelib_get_string (typelib, offset) enum GTypelibError; #define G_TYPELIB_ERROR -gbooleang_typelib_validate (GTypelib *typelib, - GError **error); +gbooleang_typelib_validate (GTypelib *typelib, + GError **error); #define BLOB_IS_REGISTERED_TYPE (blob) @@ -276,50 +276,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -474,22 +474,22 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -643,31 +643,31 @@ - + - + - + - + - + @@ -698,17 +698,17 @@ - + - + - + @@ -745,83 +745,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -843,22 +843,22 @@ - + - + - + - + @@ -882,17 +882,17 @@ - + - + - + @@ -917,27 +917,27 @@ - + - + - + - + - + @@ -967,32 +967,32 @@ - + - + - + - + - + - + @@ -1019,39 +1019,39 @@ - + - + - + - + - + - + - + @@ -1074,17 +1074,17 @@ - + - + - + @@ -1114,43 +1114,43 @@ - + - + - + - + - + - + - + - + @@ -1180,37 +1180,37 @@ - + - + - + - + - + - + - + @@ -1254,78 +1254,78 @@ - + - + - + - + - + - + - + - + - - + - - + - + - + - + - + - + @@ -1380,77 +1380,77 @@ - + - + - + - + - + - + - + - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - + @@ -1590,53 +1590,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -1677,72 +1677,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1775,66 +1775,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1849,7 +1849,8 @@ guint16 blob_type; /* 7 */ guint16 deprecated : 1; guint16 abstract : 1; - guint16 reserved :14; + guint16 fundamental : 1; + guint16 reserved :13; guint32 name; guint32 gtype_name; @@ -1867,6 +1868,11 @@ guint16 n_constants; guint16 reserved2; + guint32 ref_func; + guint32 unref_func; + guint32 set_value_func; + guint32 get_value_func; + guint32 reserved3; guint32 reserved4; @@ -1887,99 +1893,129 @@ - + - + - + - + + + + + - + - - + - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + - + - + @@ -2056,84 +2092,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2186,22 +2222,22 @@ - + - + - + - + @@ -2212,17 +2248,17 @@ - + - + - + @@ -2242,19 +2278,19 @@ - + - + - + @@ -2287,7 +2323,7 @@

g_typelib_get_dir_entry ()

DirEntry *          g_typelib_get_dir_entry             (GTypelib *typelib,
-                                                         guint16 index);
+ guint16 index);

Returns :

 the signal or NULL if none set + the signal or NULL if none set

Returns :

 the GIVFuncInfo or NULL. Free it with + the GIVFuncInfo or NULL. Free it with g_base_info_unref() when done. [transfer full]

gchar magic[16];

gchar magic[16];

 See G_IR_MAGIC.

guint8 major_version;

guint8 major_version;

 The version of the typelib format. Minor version changes indicate compatible changes and should still allow the typelib to be parsed by a parser designed for the same major_version.

guint8 minor_version;

guint8 minor_version;

 See major_version.

guint16 n_entries;

guint16 n_entries;

 The number of entries in the directory.

guint16 n_local_entries;

guint16 n_local_entries;

 The number of entries referring to blobs in this typelib. The local entries must occur before the unresolved entries.

guint32 directory;

guint32 directory;

 Offset of the directory in the typelib.

guint32 n_attributes;

guint32 n_attributes;

 Number of attribute blocks

guint32 attributes;

guint32 attributes;

 Offset of the list of attributes in the typelib.

guint32 dependencies;

guint32 dependencies;

 Offset of a single string, which is the list of dependencies, separated by the '|' character. The dependencies are required in order to avoid having programs @@ -328,115 +328,115 @@

guint32 size;

guint32 size;

 The size in bytes of the typelib.

guint32 namespace;

guint32 namespace;

 Offset of the namespace string in the typelib.

guint32 nsversion;

guint32 nsversion;

 Offset of the namespace version string in the typelib.

guint32 shared_library;

guint32 shared_library;

 This field is the set of shared libraries associated with the typelib. The entries are separated by the '|' (pipe) character.

guint32 c_prefix;

guint32 c_prefix;

 The prefix for the function names of the library

guint16 entry_blob_size;

guint16 entry_blob_size;

 The sizes of fixed-size blobs. Recording this information here allows to write parser which continue to work if the format is extended by adding new fields to the end of the fixed-size blobs.

guint16 function_blob_size;

guint16 function_blob_size;

 See above.

guint16 callback_blob_size;

guint16 callback_blob_size;

 See above.

guint16 signal_blob_size;

guint16 signal_blob_size;

 See above.

guint16 vfunc_blob_size;

guint16 vfunc_blob_size;

 See above.

guint16 arg_blob_size;

guint16 arg_blob_size;

 See above.

guint16 property_blob_size;

guint16 property_blob_size;

 See above.

guint16 field_blob_size;

guint16 field_blob_size;

 See above.

guint16 value_blob_size;

guint16 value_blob_size;

 See above.

guint16 attribute_blob_size;

guint16 attribute_blob_size;

 See above.

guint16 constant_blob_size;

guint16 constant_blob_size;

 See above.

guint16 error_domain_blob_size;

guint16 error_domain_blob_size;

 See above.

guint16 signature_blob_size;

guint16 signature_blob_size;

 See above.

guint16 enum_blob_size;

guint16 enum_blob_size;

 See above.

guint16 struct_blob_size;

guint16 struct_blob_size;

 See above.

guint16 object_blob_size;

guint16 object_blob_size;

 See above.

guint16 interface_blob_size;

guint16 interface_blob_size;

 For variable-size blobs, the size of the struct up to the first flexible array member. Recording this information here allows to write parser which continue to work if the format is extended by @@ -445,7 +445,7 @@

guint16 union_blob_size;

guint16 union_blob_size;

 See above.

guint16 blob_type;

guint16 blob_type;

 A GTypelibBlobType

guint16 local : 1;

guint16 local : 1;

 Whether this entry refers to a blob in this typelib.

guint32 name;

guint32 name;

 The name of the entry.

guint32 offset;

guint32 offset;

 If is_local is set, this is the offset of the blob in the typelib. Otherwise, it is the offset of the namespace in which the blob has to be looked up by name. @@ -528,17 +528,17 @@

guint32 name;

guint32 name;

 A suggested name for the parameter.

guint in : 1;

guint in : 1;

 The parameter is an input to the function

guint out : 1;

guint out : 1;

 The parameter is used to return an output of the function. Parameters can be both in and out. Out parameters implicitly add another level of indirection to the parameter type. Ie if @@ -547,13 +547,13 @@

guint caller_allocates : 1;

guint caller_allocates : 1;

 The parameter is a pointer to a struct or object that will receive an output of the function.

guint allow_none : 1;

guint allow_none : 1;

 Only meaningful for types which are passed as pointers. For an in parameter, indicates if it is ok to pass NULL in, for an out parameter, whether it may return NULL. Note that NULL is a @@ -562,13 +562,13 @@

guint optional : 1;

guint optional : 1;

 For an out parameter, indicates that NULL may be passed in if the value is not needed.

guint transfer_ownership : 1;

guint transfer_ownership : 1;

 For an in parameter, indicates that the function takes over ownership of the parameter value. For an out parameter, it indicates that the caller is responsible for freeing the return @@ -576,14 +576,14 @@

guint transfer_container_ownership : 1;

guint transfer_container_ownership : 1;

 For container types, indicates that the ownership of the container, but not of its contents is transferred. This is typically the case for out parameters returning lists of statically allocated things.

guint return_value : 1;

guint return_value : 1;

 The parameter should be considered the return value of the function. Only out parameters can be marked as return value, and there can be at most one per function call. If an out parameter is marked as @@ -592,20 +592,20 @@

guint scope : 3;

guint scope : 3;

 A GIScopeType. If the parameter is of a callback type, this denotes the scope of the user_data and the callback function pointer itself (for languages that emit code at run-time).

gint8 closure;

gint8 closure;

 Index of the closure (user_data) parameter associated with the callback, or -1.

gint8 destroy;

gint8 destroy;

 Index of the destroy notfication callback parameter associated with the callback, or -1.

guint16 may_return_null : 1;

guint16 may_return_null : 1;

 Only relevant for pointer types. Indicates whether the caller must expect NULL as a return value.

guint16 caller_owns_return_value : 1;

guint16 caller_owns_return_value : 1;

 If set, the caller is responsible for freeing the return value if it is no longer needed.

guint16 caller_owns_return_container : 1;

guint16 caller_owns_return_container : 1;

 This flag is only relevant if the return type is a container type. If the flag is set, the caller is resonsible for freeing the container, but not its contents.

guint16 reserved :13;

guint16 reserved :13;

guint16 n_arguments;

guint16 n_arguments;

 The number of arguments that this function expects, also the length of the array of ArgBlobs.

guint16 blob_type;

guint16 blob_type;

 A GTypelibBlobType

guint16 deprecated : 1;

guint16 deprecated : 1;

 Whether the blob is deprecated.

guint32 name;

guint32 name;

 The name of the blob.

guint16 blob_type;

guint16 blob_type;

 BLOB_TYPE_FUNCTION

guint16 deprecated : 1;

guint16 deprecated : 1;

 The function is deprecated.

guint16 setter : 1;

guint16 setter : 1;

 The function is a setter for a property. Language bindings may prefer to not bind individual setters and rely on the generic -g_object_set(). +g_object_set().

guint16 getter : 1;

guint16 getter : 1;

 The function is a getter for a property. Language bindings may prefer to not bind individual getters and rely on the generic -g_object_get(). +g_object_get().

guint16 constructor : 1;

guint16 constructor : 1;

 The function acts as a constructor for the object it is contained in.

guint16 wraps_vfunc : 1;

guint16 wraps_vfunc : 1;

 The function is a simple wrapper for a virtual function.

guint16 throws : 1;

guint16 throws : 1;

guint16 index :10;

guint16 index :10;

 Index of the property that this function is a setter or getter of in the array of properties of the containing interface, or index of the virtual function that this function wraps.

guint32 name;

guint32 name;

guint32 symbol;

guint32 symbol;

 The symbol which can be used to obtain the function pointer with dlsym().

guint32 signature;

guint32 signature;

 Offset of the SignatureBlob describing the parameter types and the return value type.

guint16 is_static : 1;

guint16 is_static : 1;

 The function is a "static method"; in other words it's a pure function whose name is conceptually scoped to the object.

guint16 reserved : 15;

guint16 reserved : 15;

guint16 reserved2 : 16;

guint16 reserved2 : 16;

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint32 name;

guint32 name;

guint32 signature;

guint32 signature;

 Offset of the SignatureBlob describing the parameter types and the return value type.

guint8 pointer :1;

guint8 pointer :1;

 Whether this type represents an indirection

guint8 tag :5;

guint8 tag :5;

 A GITypeTag

guint16 interface;

guint16 interface;

 Index of the directory entry for the interface.

guint8 pointer :1;

guint8 pointer :1;

guint8 reserved :2;

guint8 reserved :2;

guint8 tag :5;

guint8 tag :5;

guint8 reserved2;

guint8 reserved2;

guint16 n_types;

guint16 n_types;

 The number of parameter types to follow.

guint8 pointer :1;

guint8 pointer :1;

guint8 reserved :2;

guint8 reserved :2;

guint8 tag :5;

guint8 tag :5;

guint8 reserved2;

guint8 reserved2;

guint16 n_domains;

guint16 n_domains;

 The number of domains to follow

guint16 domains[];

guint16 domains[];

 Indices of the directory entries for the error domains

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 reserved :15;

guint16 reserved :15;

guint32 name;

guint32 name;

guint32 get_quark;

guint32 get_quark;

 The symbol name of the function which must be called to obtain the GQuark for the error domain.

guint16 error_codes;

guint16 error_codes;

 Index of the InterfaceBlob describing the enumeration which lists the possible error codes.

guint16 reserved2;

guint16 reserved2;

guint32 deprecated : 1;

guint32 deprecated : 1;

 Whether this value is deprecated

guint32 name;

guint32 name;

 Name of blob

gint32 value;

gint32 value;

 The numerical value

guint32 name;

guint32 name;

 The name of the field.

guint8 readable :1;

guint8 readable :1;

guint8 writable :1;

guint8 writable :1;

 How the field may be accessed.

guint8 has_embedded_type :1;

guint8 has_embedded_type :1;

 An anonymous type follows the FieldBlob.

guint8 reserved :5;

guint8 reserved :5;

guint8 bits;

guint8 bits;

 If this field is part of a bitfield, the number of bits which it uses, otherwise 0.

guint16 struct_offset;

guint16 struct_offset;

 The offset of the field in the struct. The value 0xFFFF indicates that the struct offset is unknown.

guint32 reserved2;

guint32 reserved2;

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 unregistered : 1;

guint16 unregistered : 1;

guint16 reserved :14;

guint16 reserved :14;

guint32 name;

guint32 name;

guint32 gtype_name;

guint32 gtype_name;

 The name under which the type is registered with GType.

guint32 gtype_init;

guint32 gtype_init;

 The symbol name of the get_type() function which registers the type.

guint16 blob_type;

guint16 blob_type;

 BLOB_TYPE_STRUCT

guint16 deprecated : 1;

guint16 deprecated : 1;

 Whether this structure is deprecated

guint16 unregistered : 1;

guint16 unregistered : 1;

 If this is set, the type is not registered with GType.

guint16 is_gtype_struct : 1;

guint16 is_gtype_struct : 1;

 Whether this structure is the class or interface layout for a GObject

guint16 alignment : 6;

guint16 alignment : 6;

 The byte boundary that the struct is aligned to in memory

guint16 foreign : 1;

guint16 foreign : 1;

 If the type is foreign, eg if it's expected to be overridden by a native language binding instead of relying of introspected bindings.

guint16 reserved : 6;

guint16 reserved : 6;

guint32 name;

guint32 name;

guint32 gtype_name;

String name of the associated GType +

guint32 gtype_name;

String name of the associated GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType +

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 size;

guint32 size;

 The size of the struct in bytes.

guint16 n_fields;

guint16 n_fields;

guint16 n_methods;

guint16 n_methods;

guint32 reserved2;

guint32 reserved2;

guint32 reserved3;

guint32 reserved3;

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 unregistered : 1;

guint16 unregistered : 1;

 If this is set, the type is not registered with GType.

guint16 discriminated : 1;

guint16 discriminated : 1;

 Is set if the union is discriminated

guint16 alignment : 6;

guint16 alignment : 6;

 The byte boundary that the union is aligned to in memory

guint16 reserved : 7;

guint16 reserved : 7;

guint32 name;

guint32 name;

guint32 gtype_name;

String name of the associated GType +

guint32 gtype_name;

String name of the associated GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType +

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 size;

guint32 size;

 The size of the union in bytes.

guint16 n_fields;

guint16 n_fields;

 Length of the arrays

guint16 n_functions;

guint16 n_functions;

guint32 reserved2;

guint32 reserved2;

guint32 reserved3;

guint32 reserved3;

gint32 discriminator_offset;

gint32 discriminator_offset;

 Offset from the beginning of the union where the discriminator of a discriminated union is located. The value 0xFFFF indicates that the discriminator offset @@ -1503,58 +1503,58 @@

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 unregistered : 1;

guint16 unregistered : 1;

 If this is set, the type is not registered with GType.

guint16 storage_type : 5;

guint16 storage_type : 5;

 The tag of the type used for the enum in the C ABI (will be a signed or unsigned integral type)

guint16 reserved : 9;

guint16 reserved : 9;

guint32 name;

guint32 name;

guint32 gtype_name;

String name of the associated GType +

guint32 gtype_name;

String name of the associated GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType +

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint16 n_values;

guint16 n_values;

 The lengths of the values arrays.

guint16 reserved2;

guint16 reserved2;

guint32 reserved3;

guint32 reserved3;

guint32 name;

guint32 name;

 The name of the property.

guint32 deprecated : 1;

guint32 deprecated : 1;

guint32 readable : 1;

guint32 readable : 1;

guint32 writable : 1;

guint32 writable : 1;

guint32 construct : 1;

guint32 construct : 1;

guint32 construct_only : 1;

guint32 construct_only : 1;

 The ParamFlags used when registering the property.

guint32 transfer_ownership : 1;

guint32 transfer_ownership : 1;

 When writing, the type containing the property takes ownership of the value. When reading, the returned value needs to be released by the caller.

guint32 transfer_container_ownership : 1;

guint32 transfer_container_ownership : 1;

 For container types indicates that the ownership of the container, but not of its contents, is transferred. This is typically the case when reading lists of statically allocated things.

guint32 reserved :25;

guint32 reserved :25;

guint32 reserved2;

guint32 reserved2;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 run_first : 1;

guint16 run_first : 1;

guint16 run_last : 1;

guint16 run_last : 1;

guint16 run_cleanup : 1;

guint16 run_cleanup : 1;

guint16 no_recurse : 1;

guint16 no_recurse : 1;

guint16 detailed : 1;

guint16 detailed : 1;

guint16 action : 1;

guint16 action : 1;

guint16 no_hooks : 1;

guint16 no_hooks : 1;

 The flags used when registering the signal.

guint16 has_class_closure : 1;

guint16 has_class_closure : 1;

 Set if the signal has a class closure.

guint16 true_stops_emit : 1;

guint16 true_stops_emit : 1;

 Whether the signal has true-stops-emit semantics

guint16 reserved : 6;

guint16 reserved : 6;

guint16 class_closure;

guint16 class_closure;

 The index of the class closure in the list of virtual functions of the object or interface on which the signal is defined.

guint32 name;

guint32 name;

 The name of the signal.

guint32 reserved2;

guint32 reserved2;

guint32 signature;

guint32 signature;

 Offset of the SignatureBlob describing the parameter types and the return value type.

guint32 name;

guint32 name;

 The name of the virtual function.

guint16 must_chain_up : 1;

guint16 must_chain_up : 1;

 If set, every implementation of this virtual function must chain up to the implementation of the parent class.

guint16 must_be_implemented : 1;

guint16 must_be_implemented : 1;

 If set, every derived class must override this virtual function.

guint16 must_not_be_implemented : 1;

guint16 must_not_be_implemented : 1;

 If set, derived class must not override this virtual function.

guint16 class_closure : 1;

guint16 class_closure : 1;

 Set if this virtual function is the class closure of a signal.

guint16 reserved :12;

guint16 reserved :12;

guint16 signal;

guint16 signal;

 The index of the signal in the list of signals of the object or interface to which this virtual function belongs.

guint16 struct_offset;

guint16 struct_offset;

 The offset of the function pointer in the class struct. The value 0xFFFF indicates that the struct offset is unknown.

guint16 invoker : 10;

guint16 invoker : 10;

 If a method invoker for this virtual exists, this is the offset in the class structure of the method. If no method is known, this value will be 0x3ff.

guint16 reserved2 : 6;

guint16 reserved2 : 6;

guint32 reserved3;

guint32 reserved3;

guint32 signature;

guint32 signature;

 Offset of the SignatureBlob describing the parameter types and the return value type.

guint16 blob_type;

guint16 blob_type;

 BLOB_TYPE_OBJECT

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 abstract : 1;

guint16 abstract : 1;

guint16 reserved :14;

guint16 fundamental : 1;

this object is not a GObject derived type, instead it's +an additional fundamental type. +

guint16 reserved :13;

guint32 name;

guint32 name;

guint32 gtype_name;

String name of the associated GType +

guint32 gtype_name;

String name of the associated GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType +

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint16 parent;

guint16 parent;

 The directory index of the parent type. This is only set for objects. If an object does not have a parent, it is zero.

guint16 gtype_struct;

guint16 gtype_struct;

guint16 n_interfaces;

guint16 n_interfaces;

guint16 n_fields;

guint16 n_fields;

guint16 n_properties;

guint16 n_properties;

guint16 n_methods;

guint16 n_methods;

guint16 n_signals;

guint16 n_signals;

guint16 n_vfuncs;

guint16 n_vfuncs;

guint16 n_constants;

guint16 n_constants;

 The lengths of the arrays.Up to 16bits of padding may be inserted between the arrays to ensure that they start on a 32bit boundary.

guint16 reserved2;

guint16 reserved2;

guint32 reserved3;

guint32 ref_func;

String pointing to a function which can be called to increase +the reference count for an instance of this object type. +

guint32 unref_func;

String pointing to a function which can be called to decrease +the reference count for an instance of this object type. +

guint32 set_value_func;

String pointing to a function which can be called to +convert a pointer of this object to a GValue +

guint32 get_value_func;

String pointing to a function which can be called to +convert extract a pointer to this object from a GValue +

guint32 reserved3;

guint32 reserved4;

guint32 reserved4;

guint16 interfaces[];

guint16 interfaces[];

 An array of indices of directory entries for the implemented interfaces.

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 reserved :15;

guint16 reserved :15;

guint32 name;

guint32 name;

guint32 gtype_name;

guint32 gtype_name;

guint32 gtype_init;

guint32 gtype_init;

guint16 gtype_struct;

guint16 gtype_struct;

 Name of the interface "class" C structure

guint16 n_prerequisites;

guint16 n_prerequisites;

 Number of prerequisites

guint16 n_properties;

guint16 n_properties;

 Number of properties

guint16 n_methods;

guint16 n_methods;

 Number of methods

guint16 n_signals;

guint16 n_signals;

 Number of signals

guint16 n_vfuncs;

guint16 n_vfuncs;

 Number of virtual functions

guint16 n_constants;

guint16 n_constants;

 The lengths of the arrays. Up to 16bits of padding may be inserted between the arrays to ensure that they start on a 32bit boundary.

guint32 reserved2;

guint32 reserved2;

guint32 reserved3;

guint32 reserved3;

guint16 prerequisites[];

guint16 prerequisites[];

 An array of indices of directory entries for required interfaces.

guint16 blob_type;

guint16 blob_type;

guint16 deprecated : 1;

guint16 deprecated : 1;

guint16 reserved :15;

guint16 reserved :15;

guint32 name;

guint32 name;

guint32 size;

guint32 size;

 The size of the value in bytes.

guint32 offset;

guint32 offset;

 The offset of the value in the typelib.

guint32 reserved2;

guint32 reserved2;

guint32 offset;

guint32 offset;

 The offset of the typelib entry to which this attribute refers. Attributes are kept sorted by offset, so that the attributes of an entry can be found by a binary search.

guint32 name;

guint32 name;

 The name of the attribute, a string.

guint32 value;

guint32 value;

 The value of the attribute (also a string)
@@ -2397,8 +2433,8 @@

g_typelib_validate ()

-
gboolean            g_typelib_validate                  (GTypelib *typelib,
-                                                         GError **error);
+
gboolean            g_typelib_validate                  (GTypelib *typelib,
+                                                         GError **error);

diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/index.sgml gobject-introspection-0.9.2/docs/reference/html/index.sgml --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/html/index.sgml 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/html/index.sgml 2010-07-12 18:21:51.000000000 +0100 @@ -187,17 +187,8 @@ - - - - - - - - - @@ -332,9 +323,14 @@ + + + + + @@ -353,6 +349,14 @@ + + + + + + + + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/Makefile.am gobject-introspection-0.9.2/docs/reference/Makefile.am --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/Makefile.am 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/Makefile.am 2010-07-12 18:20:39.000000000 +0100 @@ -44,7 +44,6 @@ FIXXREF_OPTIONS= # include common portion ... -if ENABLE_GTK_DOC include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += version.xml.in @@ -53,7 +52,6 @@ rm -fr html tmpl xml clean-local: gtk-docs-clean -endif ######################################################################## diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/Makefile.in gobject-introspection-0.9.2/docs/reference/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/Makefile.in 2010-07-12 18:21:12.000000000 +0100 @@ -204,7 +204,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -268,46 +267,44 @@ # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to # whether a source that is a target of one rule is then # searched for in VPATH/GPATH. # -@ENABLE_GTK_DOC_TRUE@GPATH = $(srcdir) -@ENABLE_GTK_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) # include common portion ... # Other files to distribute -@ENABLE_GTK_DOC_TRUE@EXTRA_DIST = $(content_files) $(HTML_IMAGES) \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-overrides.txt \ -@ENABLE_GTK_DOC_TRUE@ version.xml.in -@ENABLE_GTK_DOC_TRUE@DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ -@ENABLE_GTK_DOC_TRUE@ pdf-build.stamp \ -@ENABLE_GTK_DOC_TRUE@ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ -@ENABLE_GTK_DOC_TRUE@ $(srcdir)/pdf.stamp - -@ENABLE_GTK_DOC_TRUE@SCANOBJ_FILES = \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).args \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).hierarchy \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).interfaces \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).prerequisites \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE).signals - -@ENABLE_GTK_DOC_TRUE@REPORT_FILES = \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-undocumented.txt \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-undeclared.txt \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-unused.txt +EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ + version.xml.in +DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + pdf-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ + $(srcdir)/pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt -@ENABLE_GTK_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @@ -357,7 +354,6 @@ ctags: CTAGS CTAGS: -@ENABLE_GTK_DOC_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -394,7 +390,6 @@ dist-hook check-am: all-am check: check-am -@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -423,11 +418,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_GTK_DOC_FALSE@uninstall-local: -@ENABLE_GTK_DOC_FALSE@distclean-local: -@ENABLE_GTK_DOC_FALSE@install-data-local: -@ENABLE_GTK_DOC_FALSE@maintainer-clean-local: -@ENABLE_GTK_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -513,172 +503,172 @@ @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -#all-local: +@ENABLE_GTK_DOC_FALSE@all-local: -@ENABLE_GTK_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp +$(REPORT_FILES): sgml-build.stamp #### scan #### -@ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Scanning header files' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_GTK_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_GTK_DOC_TRUE@ done ; \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@ENABLE_GTK_DOC_TRUE@ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -@ENABLE_GTK_DOC_TRUE@ else \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ -@ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@ENABLE_GTK_DOC_TRUE@ test -f $$i || touch $$i ; \ -@ENABLE_GTK_DOC_TRUE@ done \ -@ENABLE_GTK_DOC_TRUE@ fi -@ENABLE_GTK_DOC_TRUE@ @touch scan-build.stamp +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + @touch scan-build.stamp -@ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true #### templates #### -@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Rebuilding template files' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ @touch tmpl-build.stamp +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @touch tmpl-build.stamp -@ENABLE_GTK_DOC_TRUE@tmpl.stamp: tmpl-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +tmpl.stamp: tmpl-build.stamp + @true -@ENABLE_GTK_DOC_TRUE@$(srcdir)/tmpl/*.sgml: -@ENABLE_GTK_DOC_TRUE@ @true +$(srcdir)/tmpl/*.sgml: + @true #### xml #### -@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building XML' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_GTK_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_GTK_DOC_TRUE@ done ; \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ @touch sgml-build.stamp +sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + @touch sgml-build.stamp -@ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp -@ENABLE_GTK_DOC_TRUE@ @true +sgml.stamp: sgml-build.stamp + @true #### html #### -@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building HTML' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ @rm -rf $(srcdir)/html -@ENABLE_GTK_DOC_TRUE@ @mkdir $(srcdir)/html -@ENABLE_GTK_DOC_TRUE@ @mkhtml_options=""; \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_GTK_DOC_TRUE@ mkhtml_options=--path="$(srcdir)"; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@ENABLE_GTK_DOC_TRUE@ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Fixing cross-references' -@ENABLE_GTK_DOC_TRUE@ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ @touch html-build.stamp +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + @rm -rf $(srcdir)/html + @mkdir $(srcdir)/html + @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(srcdir)"; \ + fi; \ + cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @touch html-build.stamp #### pdf #### -@ENABLE_GTK_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_TRUE@ @echo 'gtk-doc: Building PDF' -@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_TRUE@ @rm -rf $(srcdir)/$(DOC_MODULE).pdf -@ENABLE_GTK_DOC_TRUE@ @mkpdf_imgdirs=""; \ -@ENABLE_GTK_DOC_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ -@ENABLE_GTK_DOC_TRUE@ for img in $(HTML_IMAGES); do \ -@ENABLE_GTK_DOC_TRUE@ part=`dirname $$img`; \ -@ENABLE_GTK_DOC_TRUE@ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ -@ENABLE_GTK_DOC_TRUE@ if test $$? != 0; then \ -@ENABLE_GTK_DOC_TRUE@ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ done; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@ENABLE_GTK_DOC_TRUE@ @touch pdf-build.stamp +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building PDF' + @-chmod -R u+w $(srcdir) + @rm -rf $(srcdir)/$(DOC_MODULE).pdf + @mkpdf_imgdirs=""; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + @touch pdf-build.stamp ############## -@ENABLE_GTK_DOC_TRUE@clean-local: -@ENABLE_GTK_DOC_TRUE@ rm -f *~ *.bak -@ENABLE_GTK_DOC_TRUE@ rm -rf .libs - -@ENABLE_GTK_DOC_TRUE@distclean-local: -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ -@ENABLE_GTK_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -@ENABLE_GTK_DOC_TRUE@maintainer-clean-local: clean -@ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && rm -rf xml html - -@ENABLE_GTK_DOC_TRUE@install-data-local: -@ENABLE_GTK_DOC_TRUE@ @installfiles=`echo $(srcdir)/html/*`; \ -@ENABLE_GTK_DOC_TRUE@ if test "$$installfiles" = '$(srcdir)/html/*'; \ -@ENABLE_GTK_DOC_TRUE@ then echo '-- Nothing to install' ; \ -@ENABLE_GTK_DOC_TRUE@ else \ -@ENABLE_GTK_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_GTK_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_GTK_DOC_TRUE@ else \ -@ENABLE_GTK_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ $(mkinstalldirs) $${installdir} ; \ -@ENABLE_GTK_DOC_TRUE@ for i in $$installfiles; do \ -@ENABLE_GTK_DOC_TRUE@ echo '-- Installing '$$i ; \ -@ENABLE_GTK_DOC_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ -@ENABLE_GTK_DOC_TRUE@ done; \ -@ENABLE_GTK_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_GTK_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -@ENABLE_GTK_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@ENABLE_GTK_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ -@ENABLE_GTK_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -@ENABLE_GTK_DOC_TRUE@ fi - -@ENABLE_GTK_DOC_TRUE@uninstall-local: -@ENABLE_GTK_DOC_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_GTK_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_GTK_DOC_TRUE@ else \ -@ENABLE_GTK_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_GTK_DOC_TRUE@ fi; \ -@ENABLE_GTK_DOC_TRUE@ rm -rf $${installdir} +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + @installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + mv -f $${installdir}/$(DOC_MODULE).devhelp \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} # # Require gtk-doc when making dist # @ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -#dist-check-gtkdoc: -# @echo "*** gtk-doc must be installed and enabled in order to make dist" -# @false - -@ENABLE_GTK_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@ENABLE_GTK_DOC_TRUE@ mkdir $(distdir)/tmpl -@ENABLE_GTK_DOC_TRUE@ mkdir $(distdir)/html -@ENABLE_GTK_DOC_TRUE@ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -@ENABLE_GTK_DOC_TRUE@ cp $(srcdir)/html/* $(distdir)/html -@ENABLE_GTK_DOC_TRUE@ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ -@ENABLE_GTK_DOC_TRUE@ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ -@ENABLE_GTK_DOC_TRUE@ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ -@ENABLE_GTK_DOC_TRUE@ cd $(distdir) && rm -f $(DISTCLEANFILES) -@ENABLE_GTK_DOC_TRUE@ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html +@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html -@ENABLE_GTK_DOC_TRUE@.PHONY : dist-hook-local docs +.PHONY : dist-hook-local docs -@ENABLE_GTK_DOC_TRUE@gtk-docs-clean: -@ENABLE_GTK_DOC_TRUE@ rm -fr html tmpl xml +gtk-docs-clean: + rm -fr html tmpl xml -@ENABLE_GTK_DOC_TRUE@clean-local: gtk-docs-clean +clean-local: gtk-docs-clean ######################################################################## diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/giobjectinfo.sgml gobject-introspection-0.9.2/docs/reference/tmpl/giobjectinfo.sgml --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/giobjectinfo.sgml 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/tmpl/giobjectinfo.sgml 2010-07-12 18:21:50.000000000 +0100 @@ -36,6 +36,41 @@ + + + + + +@value: +@Returns: + + + + + + + +@object: +@Returns: + + + + + + + +@value: +@object: + + + + + + + +@object: + + @@ -63,6 +98,15 @@ @Returns: + + + + + +@info: +@Returns: + + @@ -234,3 +278,75 @@ @Returns: + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + + + + + + +@info: +@Returns: + + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/gitypeinfo.sgml gobject-introspection-0.9.2/docs/reference/tmpl/gitypeinfo.sgml --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/gitypeinfo.sgml 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/tmpl/gitypeinfo.sgml 2010-07-12 18:21:50.000000000 +0100 @@ -61,17 +61,8 @@ @GI_TYPE_TAG_UINT32: @GI_TYPE_TAG_INT64: @GI_TYPE_TAG_UINT64: -@GI_TYPE_TAG_SHORT: -@GI_TYPE_TAG_USHORT: -@GI_TYPE_TAG_INT: -@GI_TYPE_TAG_UINT: -@GI_TYPE_TAG_LONG: -@GI_TYPE_TAG_ULONG: -@GI_TYPE_TAG_SSIZE: -@GI_TYPE_TAG_SIZE: @GI_TYPE_TAG_FLOAT: @GI_TYPE_TAG_DOUBLE: -@GI_TYPE_TAG_TIME_T: @GI_TYPE_TAG_GTYPE: @GI_TYPE_TAG_UTF8: @GI_TYPE_TAG_FILENAME: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/gtypelib.sgml gobject-introspection-0.9.2/docs/reference/tmpl/gtypelib.sgml --- gobject-introspection-0.9.1~git20100708.01772763/docs/reference/tmpl/gtypelib.sgml 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/docs/reference/tmpl/gtypelib.sgml 2010-07-12 18:21:50.000000000 +0100 @@ -378,6 +378,7 @@ @blob_type: @deprecated: @abstract: +@fundamental: @reserved: @name: @gtype_name: @@ -392,6 +393,10 @@ @n_vfuncs: @n_constants: @reserved2: +@ref_func: +@unref_func: +@set_value_func: +@get_value_func: @reserved3: @reserved4: @interfaces: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/examples/Makefile.in gobject-introspection-0.9.2/examples/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/examples/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/examples/Makefile.in 2010-07-12 18:21:13.000000000 +0100 @@ -234,7 +234,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gir/Everything-1.0-expected.gir gobject-introspection-0.9.2/gir/Everything-1.0-expected.gir --- gobject-introspection-0.9.1~git20100708.01772763/gir/Everything-1.0-expected.gir 2010-07-09 11:38:09.000000000 +0100 +++ gobject-introspection-0.9.2/gir/Everything-1.0-expected.gir 2010-07-12 14:35:03.000000000 +0100 @@ -161,6 +161,107 @@ c:type="GInitiallyUnownedClass"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -1876,11 +1977,11 @@ - + - + @@ -2196,6 +2297,18 @@ + + + + + + + + + + the int wrapped in a GValue. @@ -2208,5 +2321,20 @@ + + + + + + + + + + + + + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gir/everything.c gobject-introspection-0.9.2/gir/everything.c --- gobject-introspection-0.9.1~git20100708.01772763/gir/everything.c 2010-07-09 11:38:09.000000000 +0100 +++ gobject-introspection-0.9.2/gir/everything.c 2010-07-12 14:35:03.000000000 +0100 @@ -1,5 +1,8 @@ #include #include +#include +#include + #include "everything.h" static gboolean abort_on_error = TRUE; @@ -1896,6 +1899,296 @@ test_obj_set_bare(TEST_OBJECT(obj), NULL); } +/* TestFundamental */ + +TestFundamentalObject * +test_fundamental_object_ref (TestFundamentalObject * fundamental_object) +{ + g_return_val_if_fail (fundamental_object != NULL, NULL); + g_atomic_int_inc (&fundamental_object->refcount); + + return fundamental_object; +} + +static void +test_fundamental_object_free (TestFundamentalObject * fundamental_object) +{ + TestFundamentalObjectClass *mo_class; + test_fundamental_object_ref (fundamental_object); + + mo_class = TEST_FUNDAMENTAL_OBJECT_GET_CLASS (fundamental_object); + mo_class->finalize (fundamental_object); + + if (G_LIKELY (g_atomic_int_dec_and_test (&fundamental_object->refcount))) { + g_type_free_instance ((GTypeInstance *) fundamental_object); + } +} + +void +test_fundamental_object_unref (TestFundamentalObject * fundamental_object) +{ + g_return_if_fail (fundamental_object != NULL); + g_return_if_fail (fundamental_object->refcount > 0); + + if (G_UNLIKELY (g_atomic_int_dec_and_test (&fundamental_object->refcount))) { + test_fundamental_object_free (fundamental_object); + } +} + +static void +test_fundamental_object_replace (TestFundamentalObject ** olddata, TestFundamentalObject * newdata) +{ + TestFundamentalObject *olddata_val; + + g_return_if_fail (olddata != NULL); + + olddata_val = g_atomic_pointer_get ((gpointer *) olddata); + + if (olddata_val == newdata) + return; + + if (newdata) + test_fundamental_object_ref (newdata); + + while (!g_atomic_pointer_compare_and_exchange ((gpointer *) olddata, + olddata_val, newdata)) { + olddata_val = g_atomic_pointer_get ((gpointer *) olddata); + } + + if (olddata_val) + test_fundamental_object_unref (olddata_val); +} + +static void +test_value_fundamental_object_init (GValue * value) +{ + value->data[0].v_pointer = NULL; +} + +static void +test_value_fundamental_object_free (GValue * value) +{ + if (value->data[0].v_pointer) { + test_fundamental_object_unref (TEST_FUNDAMENTAL_OBJECT_CAST (value->data[0].v_pointer)); + } +} + +static void +test_value_fundamental_object_copy (const GValue * src_value, GValue * dest_value) +{ + if (src_value->data[0].v_pointer) { + dest_value->data[0].v_pointer = + test_fundamental_object_ref (TEST_FUNDAMENTAL_OBJECT_CAST (src_value->data[0]. + v_pointer)); + } else { + dest_value->data[0].v_pointer = NULL; + } +} + +static gpointer +test_value_fundamental_object_peek_pointer (const GValue * value) +{ + return value->data[0].v_pointer; +} + +static gchar * +test_value_fundamental_object_collect (GValue * value, + guint n_collect_values, + GTypeCValue * collect_values, + guint collect_flags) +{ + if (collect_values[0].v_pointer) { + value->data[0].v_pointer = + test_fundamental_object_ref (collect_values[0].v_pointer); + } else { + value->data[0].v_pointer = NULL; + } + + return NULL; +} + +static gchar * +test_value_fundamental_object_lcopy (const GValue * value, + guint n_collect_values, + GTypeCValue * collect_values, + guint collect_flags) +{ + gpointer *fundamental_object_p = collect_values[0].v_pointer; + + if (!fundamental_object_p) { + return g_strdup_printf ("value location for '%s' passed as NULL", + G_VALUE_TYPE_NAME (value)); + } + + if (!value->data[0].v_pointer) + *fundamental_object_p = NULL; + else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) + *fundamental_object_p = value->data[0].v_pointer; + else + *fundamental_object_p = test_fundamental_object_ref (value->data[0].v_pointer); + + return NULL; +} + +static void +test_fundamental_object_finalize (TestFundamentalObject * obj) +{ + +} + +static TestFundamentalObject * +test_fundamental_object_copy_default (const TestFundamentalObject * obj) +{ + g_warning ("TestFundamentalObject classes must implement TestFundamentalObject::copy"); + return NULL; +} + +static void +test_fundamental_object_class_init (gpointer g_class, gpointer class_data) +{ + TestFundamentalObjectClass *mo_class = TEST_FUNDAMENTAL_OBJECT_CLASS (g_class); + + mo_class->copy = test_fundamental_object_copy_default; + mo_class->finalize = test_fundamental_object_finalize; +} + +static void +test_fundamental_object_init (GTypeInstance * instance, gpointer klass) +{ + TestFundamentalObject *fundamental_object = TEST_FUNDAMENTAL_OBJECT_CAST (instance); + + fundamental_object->refcount = 1; +} + +/** + * TestFundamentalObject: + * + * Ref Func: test_fundamental_object_ref + * Unref Func: test_fundamental_object_unref + * Set Value Func: test_value_set_fundamental_object + * Get Value Func: test_value_get_fundamental_object + */ + +GType +test_fundamental_object_get_type (void) +{ + static GType _test_fundamental_object_type = 0; + + if (G_UNLIKELY (_test_fundamental_object_type == 0)) { + static const GTypeValueTable value_table = { + test_value_fundamental_object_init, + test_value_fundamental_object_free, + test_value_fundamental_object_copy, + test_value_fundamental_object_peek_pointer, + (char *) "p", + test_value_fundamental_object_collect, + (char *) "p", + test_value_fundamental_object_lcopy + }; + static const GTypeInfo fundamental_object_info = { + sizeof (TestFundamentalObjectClass), + NULL, NULL, + test_fundamental_object_class_init, + NULL, + NULL, + sizeof (TestFundamentalObject), + 0, + (GInstanceInitFunc) test_fundamental_object_init, + &value_table + }; + static const GTypeFundamentalInfo fundamental_object_fundamental_info = { + (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | + G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) + }; + + _test_fundamental_object_type = g_type_fundamental_next (); + g_type_register_fundamental (_test_fundamental_object_type, "TestFundamentalObject", + &fundamental_object_info, &fundamental_object_fundamental_info, G_TYPE_FLAG_ABSTRACT); + + } + + return _test_fundamental_object_type; +} + +/** + * test_value_set_fundamental_object: (skip) + * @value: + * @fundamental_object: + */ +void +test_value_set_fundamental_object (GValue * value, TestFundamentalObject * fundamental_object) +{ + gpointer *pointer_p; + + g_return_if_fail (TEST_VALUE_HOLDS_FUNDAMENTAL_OBJECT (value)); + g_return_if_fail (fundamental_object == NULL || TEST_IS_FUNDAMENTAL_OBJECT (fundamental_object)); + + pointer_p = &value->data[0].v_pointer; + + test_fundamental_object_replace ((TestFundamentalObject **) pointer_p, fundamental_object); +} + +/** + * test_value_get_fundamental_object: (skip) + * @value: + */ +TestFundamentalObject * +test_value_get_fundamental_object (const GValue * value) +{ + g_return_val_if_fail (TEST_VALUE_HOLDS_FUNDAMENTAL_OBJECT (value), NULL); + + return value->data[0].v_pointer; +} + +static TestFundamentalObjectClass *parent_class = NULL; + +G_DEFINE_TYPE (TestFundamentalSubObject, test_fundamental_sub_object, TEST_TYPE_FUNDAMENTAL_OBJECT); + +static TestFundamentalSubObject * +_test_fundamental_sub_object_copy (TestFundamentalSubObject * fundamental_sub_object) +{ + TestFundamentalSubObject *copy; + + copy = test_fundamental_sub_object_new(NULL); + copy->data = g_strdup(fundamental_sub_object->data); + return copy; +} + +static void +test_fundamental_sub_object_finalize (TestFundamentalSubObject * fundamental_sub_object) +{ + g_return_if_fail (fundamental_sub_object != NULL); + + g_free(fundamental_sub_object->data); + test_fundamental_object_unref (TEST_FUNDAMENTAL_OBJECT (fundamental_sub_object)); +} + +static void +test_fundamental_sub_object_class_init (TestFundamentalSubObjectClass * klass) +{ + parent_class = g_type_class_peek_parent (klass); + + klass->fundamental_object_class.copy = (TestFundamentalObjectCopyFunction) _test_fundamental_sub_object_copy; + klass->fundamental_object_class.finalize = + (TestFundamentalObjectFinalizeFunction) test_fundamental_sub_object_finalize; +} + +static void +test_fundamental_sub_object_init(TestFundamentalSubObject *object) +{ + +} + +TestFundamentalSubObject * +test_fundamental_sub_object_new (const char * data) +{ + TestFundamentalSubObject *object; + + object = (TestFundamentalSubObject *) g_type_create_instance (test_fundamental_sub_object_get_type()); + object->data = g_strdup(data); + return object; +} + /** * test_callback: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gir/everything.h gobject-introspection-0.9.2/gir/everything.h --- gobject-introspection-0.9.1~git20100708.01772763/gir/everything.h 2010-07-09 11:38:09.000000000 +0100 +++ gobject-introspection-0.9.2/gir/everything.h 2010-07-12 14:35:03.000000000 +0100 @@ -334,6 +334,61 @@ void test_sub_obj_unset_bare (TestSubObj *obj); int test_sub_obj_instance_method (TestSubObj *obj); +/* fundamental object */ +#define TEST_TYPE_FUNDAMENTAL_OBJECT (test_fundamental_object_get_type()) +#define TEST_IS_FUNDAMENTAL_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_FUNDAMENTAL_OBJECT)) +#define TEST_IS_FUNDAMENTAL_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_TYPE_FUNDAMENTAL_OBJECT)) +#define TEST_FUNDAMENTAL_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_TYPE_FUNDAMENTAL_OBJECT, TestFundamentalObjectClass)) +#define TEST_FUNDAMENTAL_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_FUNDAMENTAL_OBJECT, TestFundamentalObject)) +#define TEST_FUNDAMENTAL_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_TYPE_FUNDAMENTAL_OBJECT, TestFundamentalObjectClass)) +#define TEST_FUNDAMENTAL_OBJECT_CAST(obj) ((TestFundamentalObject*)(obj)) + +typedef struct _TestFundamentalObject TestFundamentalObject; +typedef struct _TestFundamentalObjectClass TestFundamentalObjectClass; +typedef TestFundamentalObject * (*TestFundamentalObjectCopyFunction) (const TestFundamentalObject *obj); +typedef void (*TestFundamentalObjectFinalizeFunction) (TestFundamentalObject *obj); + + +struct _TestFundamentalObject { + GTypeInstance instance; + gint refcount; + guint flags; +}; + +struct _TestFundamentalObjectClass { + GTypeClass type_class; + + TestFundamentalObjectCopyFunction copy; + TestFundamentalObjectFinalizeFunction finalize; +}; + +GType test_fundamental_object_get_type (void); +TestFundamentalObject* test_fundamental_object_ref (TestFundamentalObject *fundamental_object); +void test_fundamental_object_unref (TestFundamentalObject *fundamental_object); + +#define TEST_VALUE_HOLDS_FUNDAMENTAL_OBJECT(value) (G_VALUE_HOLDS(value, TEST_TYPE_FUNDAMENTAL_OBJECT)) + +void test_value_set_fundamental_object (GValue *value, TestFundamentalObject *fundamental_object); +TestFundamentalObject* test_value_get_fundamental_object (const GValue *value); + +typedef struct _TestFundamentalSubObject TestFundamentalSubObject; +typedef struct _TestFundamentalSubObjectClass TestFundamentalSubObjectClass; + +struct _TestFundamentalSubObject +{ + TestFundamentalObject fundamental_object; + char *data; +}; + +struct _TestFundamentalSubObjectClass { + TestFundamentalObjectClass fundamental_object_class; +}; + +GType test_fundamental_sub_object_get_type(void); + +TestFundamentalSubObject * +test_fundamental_sub_object_new (const char *data); + /* callback */ typedef void (*TestSimpleCallback) (void); typedef int (*TestCallback) (void); diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gir/GIMarshallingTests-1.0-expected.gir gobject-introspection-0.9.2/gir/GIMarshallingTests-1.0-expected.gir --- gobject-introspection-0.9.1~git20100708.01772763/gir/GIMarshallingTests-1.0-expected.gir 2010-07-09 11:38:09.000000000 +0100 +++ gobject-introspection-0.9.2/gir/GIMarshallingTests-1.0-expected.gir 2010-07-12 14:35:03.000000000 +0100 @@ -2940,7 +2940,7 @@ - + @@ -2954,7 +2954,7 @@ direction="inout" caller-allocates="0" transfer-ownership="full"> - + @@ -2967,14 +2967,14 @@ direction="out" caller-allocates="0" transfer-ownership="full"> - + - + - + @@ -2995,7 +2995,7 @@ - + @@ -3009,7 +3009,7 @@ direction="inout" caller-allocates="0" transfer-ownership="full"> - + @@ -3023,7 +3023,7 @@ direction="inout" caller-allocates="0" transfer-ownership="full"> - + @@ -3037,7 +3037,7 @@ direction="out" caller-allocates="0" transfer-ownership="full"> - + @@ -3051,20 +3051,20 @@ direction="out" caller-allocates="0" transfer-ownership="full"> - + - + - + - + @@ -3101,7 +3101,7 @@ direction="inout" caller-allocates="0" transfer-ownership="full"> - + @@ -3115,14 +3115,14 @@ direction="out" caller-allocates="0" transfer-ownership="full"> - + - + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gir/Makefile.in gobject-introspection-0.9.2/gir/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/gir/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/gir/Makefile.in 2010-07-12 18:21:13.000000000 +0100 @@ -334,7 +334,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/gdump.c gobject-introspection-0.9.2/girepository/gdump.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/gdump.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/gdump.c 2010-07-12 14:35:03.000000000 +0100 @@ -271,6 +271,56 @@ } static void +dump_fundamental_type (GType type, const char *symbol, GOutputStream *out) +{ + guint n_interfaces; + guint i; + GType *interfaces; + GString *parent_str; + GType parent; + gboolean first = TRUE; + + + escaped_printf (out, " len > 0) + escaped_printf (out, " parents=\"%s\"", parent_str->str); + g_string_free (parent_str, TRUE); + + goutput_write (out, ">\n"); + + interfaces = g_type_interfaces (type, &n_interfaces); + for (i = 0; i < n_interfaces; i++) + { + GType itype = interfaces[i]; + escaped_printf (out, " \n", + g_type_name (itype)); + } + goutput_write (out, " \n"); +} + +static void dump_type (GType type, const char *symbol, GOutputStream *out) { switch (g_type_fundamental (type)) @@ -294,10 +344,7 @@ /* GValue, etc. Just skip them. */ break; default: - /* Other fundamental types such as the once GStreamer and Clutter registers - * are not yet interesting from an introspection perspective and should be - * ignored - */ + dump_fundamental_type (type, symbol, out); break; } } diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/giconstantinfo.c gobject-introspection-0.9.2/girepository/giconstantinfo.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/giconstantinfo.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/giconstantinfo.c 2010-07-12 14:35:03.000000000 +0100 @@ -129,27 +129,6 @@ case GI_TYPE_TAG_DOUBLE: value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset]; break; - case GI_TYPE_TAG_TIME_T: - value->v_long = *(long*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_SHORT: - value->v_short = *(gshort*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_USHORT: - value->v_ushort = *(gushort*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_INT: - value->v_int = *(gint*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_UINT: - value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_LONG: - value->v_long = *(glong*)&rinfo->typelib->data[blob->offset]; - break; - case GI_TYPE_TAG_ULONG: - value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset]; - break; } } } diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/gifieldinfo.c gobject-introspection-0.9.2/girepository/gifieldinfo.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/gifieldinfo.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/gifieldinfo.c 2010-07-12 14:35:03.000000000 +0100 @@ -215,15 +215,11 @@ break; case GI_TYPE_TAG_INT16: case GI_TYPE_TAG_UINT16: - case GI_TYPE_TAG_SHORT: - case GI_TYPE_TAG_USHORT: value->v_uint16 = G_STRUCT_MEMBER (guint16, mem, offset); result = TRUE; break; case GI_TYPE_TAG_INT32: case GI_TYPE_TAG_UINT32: - case GI_TYPE_TAG_INT: - case GI_TYPE_TAG_UINT: value->v_uint32 = G_STRUCT_MEMBER (guint32, mem, offset); result = TRUE; break; @@ -232,13 +228,6 @@ value->v_uint64 = G_STRUCT_MEMBER (guint64, mem, offset); result = TRUE; break; - case GI_TYPE_TAG_LONG: - case GI_TYPE_TAG_ULONG: - value->v_ulong = G_STRUCT_MEMBER (gulong, mem, offset); - result = TRUE; - break; - case GI_TYPE_TAG_SSIZE: - case GI_TYPE_TAG_SIZE: case GI_TYPE_TAG_GTYPE: value->v_size = G_STRUCT_MEMBER (gsize, mem, offset); result = TRUE; @@ -251,16 +240,6 @@ value->v_double = G_STRUCT_MEMBER (gdouble, mem, offset); result = TRUE; break; - case GI_TYPE_TAG_TIME_T: -#if SIZEOF_TIME_T == 4 - value->v_int32 = G_STRUCT_MEMBER (time_t, mem, offset); -#elif SIZEOF_TIME_T == 8 - value->v_int64 = G_STRUCT_MEMBER (time_t, mem, offset); -#else -# error "Unexpected size for time_t: not 4 or 8" -#endif - result = TRUE; - break; case GI_TYPE_TAG_UTF8: case GI_TYPE_TAG_FILENAME: case GI_TYPE_TAG_ARRAY: @@ -306,15 +285,11 @@ break; case GI_TYPE_TAG_INT16: case GI_TYPE_TAG_UINT16: - case GI_TYPE_TAG_SHORT: - case GI_TYPE_TAG_USHORT: value->v_int = (gint)G_STRUCT_MEMBER (guint16, mem, offset); result = TRUE; break; case GI_TYPE_TAG_INT32: case GI_TYPE_TAG_UINT32: - case GI_TYPE_TAG_INT: - case GI_TYPE_TAG_UINT: value->v_int = (gint)G_STRUCT_MEMBER (guint32, mem, offset); result = TRUE; break; @@ -323,11 +298,6 @@ value->v_int = (gint)G_STRUCT_MEMBER (guint64, mem, offset); result = TRUE; break; - case GI_TYPE_TAG_LONG: - case GI_TYPE_TAG_ULONG: - value->v_int = (gint)G_STRUCT_MEMBER (gulong, mem, offset); - result = TRUE; - break; default: g_warning("Field %s: Unexpected enum storage type %s", g_base_info_get_name ((GIBaseInfo *)field_info), @@ -424,15 +394,11 @@ break; case GI_TYPE_TAG_INT16: case GI_TYPE_TAG_UINT16: - case GI_TYPE_TAG_SHORT: - case GI_TYPE_TAG_USHORT: G_STRUCT_MEMBER (guint16, mem, offset) = value->v_uint16; result = TRUE; break; case GI_TYPE_TAG_INT32: case GI_TYPE_TAG_UINT32: - case GI_TYPE_TAG_INT: - case GI_TYPE_TAG_UINT: G_STRUCT_MEMBER (guint32, mem, offset) = value->v_uint32; result = TRUE; break; @@ -441,13 +407,6 @@ G_STRUCT_MEMBER (guint64, mem, offset) = value->v_uint64; result = TRUE; break; - case GI_TYPE_TAG_LONG: - case GI_TYPE_TAG_ULONG: - G_STRUCT_MEMBER (gulong, mem, offset)= value->v_ulong; - result = TRUE; - break; - case GI_TYPE_TAG_SSIZE: - case GI_TYPE_TAG_SIZE: case GI_TYPE_TAG_GTYPE: G_STRUCT_MEMBER (gsize, mem, offset) = value->v_size; result = TRUE; @@ -460,16 +419,6 @@ G_STRUCT_MEMBER (gdouble, mem, offset)= value->v_double; result = TRUE; break; - case GI_TYPE_TAG_TIME_T: -#if SIZEOF_TIME_T == 4 - G_STRUCT_MEMBER (time_t, mem, offset) = value->v_int32; -#elif SIZEOF_TIME_T == 8 - G_STRUCT_MEMBER (time_t, mem, offset) = value->v_int64; -#else -# error "Unexpected size for time_t: not 4 or 8" -#endif - result = TRUE; - break; case GI_TYPE_TAG_UTF8: case GI_TYPE_TAG_FILENAME: case GI_TYPE_TAG_ARRAY: @@ -510,15 +459,11 @@ break; case GI_TYPE_TAG_INT16: case GI_TYPE_TAG_UINT16: - case GI_TYPE_TAG_SHORT: - case GI_TYPE_TAG_USHORT: G_STRUCT_MEMBER (guint16, mem, offset) = (guint16)value->v_int; result = TRUE; break; case GI_TYPE_TAG_INT32: case GI_TYPE_TAG_UINT32: - case GI_TYPE_TAG_INT: - case GI_TYPE_TAG_UINT: G_STRUCT_MEMBER (guint32, mem, offset) = (guint32)value->v_int; result = TRUE; break; @@ -527,11 +472,6 @@ G_STRUCT_MEMBER (guint64, mem, offset) = (guint64)value->v_int; result = TRUE; break; - case GI_TYPE_TAG_LONG: - case GI_TYPE_TAG_ULONG: - G_STRUCT_MEMBER (gulong, mem, offset) = (gulong)value->v_int; - result = TRUE; - break; default: g_warning("Field %s: Unexpected enum storage type %s", g_base_info_get_name ((GIBaseInfo *)field_info), diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/giobjectinfo.c gobject-introspection-0.9.2/girepository/giobjectinfo.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/giobjectinfo.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/giobjectinfo.c 2010-07-12 14:35:03.000000000 +0100 @@ -97,6 +97,29 @@ } /** + * g_object_info_get_fundamental: + * @info: a #GIObjectInfo + * + * Obtain if the object type is of a fundamental type which is not + * G_TYPE_OBJECT. This is mostly for supporting GstMiniObject. + * + * Returns: %TRUE if the object type is a fundamental type + */ +gboolean +g_object_info_get_fundamental (GIObjectInfo *info) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + ObjectBlob *blob; + + g_return_val_if_fail (info != NULL, FALSE); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), FALSE); + + blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + return blob->fundamental != 0; +} + +/** * g_object_info_get_type_name: * @info: a #GIObjectInfo * @@ -636,3 +659,229 @@ return NULL; } +typedef const char* (*SymbolGetter) (GIObjectInfo *info); + +static void * +_get_func(GIObjectInfo *info, + SymbolGetter getter) +{ + const char* symbol; + GSList *parents = NULL, *l; + GIObjectInfo *parent_info; + + parent_info = info; + while (parent_info != NULL) { + parents = g_slist_prepend(parents, parent_info); + parent_info = g_object_info_get_parent(parent_info); + } + + for (l = parents; l; l = l->next) { + GIObjectInfoRefFunction func; + parent_info = l->data; + symbol = getter(parent_info); + if (symbol == NULL) + continue; + if (g_typelib_symbol (((GIRealInfo *)parent_info)->typelib, symbol, (void**) &func)) { + g_slist_free(parents); + return func; + } + } + + g_slist_free(parents); + return NULL; + +} + +/** + * g_object_info_get_ref_function: + * @info: a #GIObjectInfo + * + * Obtain the symbol name of the function that should be called to ref this + * object type. It's mainly used fundamental types. The type signature for + * the symbol is %GIObjectInfoRefFunction, to fetch the function pointer + * see g_object_info_get_ref_function(). + * + * Returns: the symbol or %NULL + */ +const char * +g_object_info_get_ref_function (GIObjectInfo *info) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + ObjectBlob *blob; + + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->ref_func) + return g_typelib_get_string (rinfo->typelib, blob->ref_func); + + return NULL; +} + +/** + * g_object_info_get_ref_function_pointer: + * @info: a #GIObjectInfo + * + * Obtain a pointer to a function which can be used to + * increase the reference count an instance of this object type. + * This takes derivation into account and will reversely traverse + * the base classes of this type, starting at the top type. + * + * Returns: the function pointer or %NULL + */ +GIObjectInfoRefFunction +g_object_info_get_ref_function_pointer (GIObjectInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + return (GIObjectInfoRefFunction)_get_func(info, (SymbolGetter)g_object_info_get_ref_function); +} + +/** + * g_object_info_get_unref_function: + * @info: a #GIObjectInfo + * + * Obtain the symbol name of the function that should be called to unref this + * object type. It's mainly used fundamental types. The type signature for + * the symbol is %GIObjectInfoUnrefFunction, to fetch the function pointer + * see g_object_info_get_unref_function(). + * + * Returns: the symbol or %NULL + */ +const char * +g_object_info_get_unref_function (GIObjectInfo *info) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + ObjectBlob *blob; + + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->unref_func) + return g_typelib_get_string (rinfo->typelib, blob->unref_func); + + return NULL; +} + +/** + * g_object_info_get_unref_function_pointer: + * @info: a #GIObjectInfo + * + * Obtain a pointer to a function which can be used to + * decrease the reference count an instance of this object type. + * This takes derivation into account and will reversely traverse + * the base classes of this type, starting at the top type. + * + * Returns: the function pointer or %NULL + */ +GIObjectInfoUnrefFunction +g_object_info_get_unref_function_pointer (GIObjectInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + return (GIObjectInfoUnrefFunction)_get_func(info, (SymbolGetter)g_object_info_get_unref_function); +} + +/** + * g_object_info_get_set_value_function: + * @info: a #GIObjectInfo + * + * Obtain the symbol name of the function that should be called to convert + * set a GValue giving an object instance pointer of this object type. + * I's mainly used fundamental types. The type signature for the symbol + * is %GIObjectInfoSetValueFunction, to fetch the function pointer + * see g_object_info_get_set_value_function(). + * + * Returns: the symbol or %NULL + */ +const char * +g_object_info_get_set_value_function (GIObjectInfo *info) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + ObjectBlob *blob; + + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->set_value_func) + return g_typelib_get_string (rinfo->typelib, blob->set_value_func); + + return NULL; +} + +/** + * g_object_info_get_set_value_function_pointer: + * @info: a #GIObjectInfo + * + * Obtain a pointer to a function which can be used to + * set a GValue given an instance of this object type. + * This takes derivation into account and will reversely traverse + * the base classes of this type, starting at the top type. + * + * Returns: the function pointer or %NULL + */ +GIObjectInfoSetValueFunction +g_object_info_get_set_value_function_pointer (GIObjectInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + return (GIObjectInfoSetValueFunction)_get_func(info, (SymbolGetter)g_object_info_get_set_value_function); +} + +/** + * g_object_info_get_get_value_function: + * @info: a #GIObjectInfo + * + * Obtain the symbol name of the function that should be called to convert + * an object instance pointer of this object type to a GValue. + * I's mainly used fundamental types. The type signature for the symbol + * is %GIObjectInfoGetValueFunction, to fetch the function pointer + * see g_object_info_get_get_value_function(). + * + * Returns: the symbol or %NULL + */ +const char * +g_object_info_get_get_value_function (GIObjectInfo *info) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + ObjectBlob *blob; + + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + + if (blob->get_value_func) + return g_typelib_get_string (rinfo->typelib, blob->get_value_func); + + return NULL; +} + +/** + * g_object_info_get_get_value_function_pointer: + * @info: a #GIObjectInfo + * + * Obtain a pointer to a function which can be used to + * extract an instance of this object type out of a GValue. + * This takes derivation into account and will reversely traverse + * the base classes of this type, starting at the top type. + * + * Returns: the function pointer or %NULL + */ +GIObjectInfoGetValueFunction +g_object_info_get_get_value_function_pointer (GIObjectInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); + + return (GIObjectInfoGetValueFunction)_get_func(info, (SymbolGetter)g_object_info_get_get_value_function); +} diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/giobjectinfo.h gobject-introspection-0.9.2/girepository/giobjectinfo.h --- gobject-introspection-0.9.1~git20100708.01772763/girepository/giobjectinfo.h 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/giobjectinfo.h 2010-07-12 14:35:03.000000000 +0100 @@ -30,12 +30,52 @@ G_BEGIN_DECLS +/** + * GIObjectInfoRefFunction: + * @object: object instance pointer + * + * Increases the reference count of an object instance. + * + * Returns: the object instance + */ +typedef void * (*GIObjectInfoRefFunction) (void *object); + +/** + * GIObjectInfoUnrefFunction: + * @object: object instance pointer + * + * Decreases the reference count of an object instance. + * + */ +typedef void (*GIObjectInfoUnrefFunction) (void *object); + +/** + * GIObjectInfoSetValueFunction: + * @value: a #GValue + * @object: object instance pointer + * + * Update @value and attach the object instance pointer @object to it. + * + */ +typedef void (*GIObjectInfoSetValueFunction) (GValue *value, void *object); + +/** + * GIObjectInfoGetValueFunction: + * @value: a #GValue + * + * Extract an object instance out of @value + * + * Returns: the object instance + */ +typedef void * (*GIObjectInfoGetValueFunction) (const GValue *value); + #define GI_IS_OBJECT_INFO(info) \ (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_OBJECT) const gchar * g_object_info_get_type_name (GIObjectInfo *info); const gchar * g_object_info_get_type_init (GIObjectInfo *info); gboolean g_object_info_get_abstract (GIObjectInfo *info); +gboolean g_object_info_get_fundamental (GIObjectInfo *info); GIObjectInfo * g_object_info_get_parent (GIObjectInfo *info); gint g_object_info_get_n_interfaces (GIObjectInfo *info); GIInterfaceInfo * g_object_info_get_interface (GIObjectInfo *info, @@ -64,6 +104,18 @@ gint n); GIStructInfo * g_object_info_get_class_struct (GIObjectInfo *info); +const char * g_object_info_get_ref_function (GIObjectInfo *info); +GIObjectInfoRefFunction g_object_info_get_ref_function_pointer (GIObjectInfo *info); + +const char * g_object_info_get_unref_function (GIObjectInfo *info); +GIObjectInfoUnrefFunction g_object_info_get_unref_function_pointer (GIObjectInfo *info); + +const char * g_object_info_get_set_value_function (GIObjectInfo *info); +GIObjectInfoSetValueFunction g_object_info_get_set_value_function_pointer (GIObjectInfo *info); + +const char * g_object_info_get_get_value_function (GIObjectInfo *info); +GIObjectInfoGetValueFunction g_object_info_get_get_value_function_pointer (GIObjectInfo *info); + G_END_DECLS diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/giregisteredtypeinfo.h gobject-introspection-0.9.2/girepository/giregisteredtypeinfo.h --- gobject-introspection-0.9.1~git20100708.01772763/girepository/giregisteredtypeinfo.h 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/giregisteredtypeinfo.h 2010-07-12 14:35:03.000000000 +0100 @@ -38,7 +38,8 @@ (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_INTERFACE) || \ (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_OBJECT) || \ (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_STRUCT) || \ - (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_UNION)) + (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_UNION) || \ + (g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_BOXED)) const gchar * g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info); const gchar * g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info); diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girepository.c gobject-introspection-0.9.2/girepository/girepository.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girepository.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girepository.c 2010-07-12 14:35:04.000000000 +0100 @@ -1319,28 +1319,10 @@ return "int64"; case GI_TYPE_TAG_UINT64: return "uint64"; - case GI_TYPE_TAG_SHORT: - return "short"; - case GI_TYPE_TAG_USHORT: - return "ushort"; - case GI_TYPE_TAG_INT: - return "int"; - case GI_TYPE_TAG_UINT: - return "uint"; - case GI_TYPE_TAG_LONG: - return "long"; - case GI_TYPE_TAG_ULONG: - return "ulong"; - case GI_TYPE_TAG_SSIZE: - return "ssize"; - case GI_TYPE_TAG_SIZE: - return "size"; case GI_TYPE_TAG_FLOAT: return "float"; case GI_TYPE_TAG_DOUBLE: return "double"; - case GI_TYPE_TAG_TIME_T: - return "time_t"; case GI_TYPE_TAG_GTYPE: return "GType"; case GI_TYPE_TAG_UTF8: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girffi.c gobject-introspection-0.9.2/girepository/girffi.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girffi.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girffi.c 2010-07-12 14:35:04.000000000 +0100 @@ -54,25 +54,6 @@ return &ffi_type_sint64; case GI_TYPE_TAG_UINT64: return &ffi_type_uint64; - case GI_TYPE_TAG_SHORT: - return &ffi_type_sshort; - case GI_TYPE_TAG_USHORT: - return &ffi_type_ushort; - case GI_TYPE_TAG_INT: - return &ffi_type_sint; - case GI_TYPE_TAG_UINT: - return &ffi_type_uint; - case GI_TYPE_TAG_SSIZE: -#if GLIB_SIZEOF_SIZE_T == 4 - return &ffi_type_sint32; -#elif GLIB_SIZEOF_SIZE_T == 8 - return &ffi_type_sint64; -#else -# error "Unexpected size for size_t: not 4 or 8" -#endif - case GI_TYPE_TAG_LONG: - return &ffi_type_slong; - case GI_TYPE_TAG_SIZE: case GI_TYPE_TAG_GTYPE: #if GLIB_SIZEOF_SIZE_T == 4 return &ffi_type_uint32; @@ -81,16 +62,6 @@ #else # error "Unexpected size for size_t: not 4 or 8" #endif - case GI_TYPE_TAG_TIME_T: -#if SIZEOF_TIME_T == 4 - return &ffi_type_sint32; -#elif SIZEOF_TIME_T == 8 - return &ffi_type_sint64; -#else -# error "Unexpected size for time_t: not 4 or 8" -#endif - case GI_TYPE_TAG_ULONG: - return &ffi_type_ulong; case GI_TYPE_TAG_FLOAT: return &ffi_type_float; case GI_TYPE_TAG_DOUBLE: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girmodule.c gobject-introspection-0.9.2/girepository/girmodule.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girmodule.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girmodule.c 2010-07-12 14:35:04.000000000 +0100 @@ -290,7 +290,7 @@ /* fill in header */ header = (Header *)data; memcpy (header, G_IR_MAGIC, 16); - header->major_version = 2; + header->major_version = 3; header->minor_version = 0; header->reserved = 0; header->n_entries = n_entries; diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girnode.c gobject-introspection-0.9.2/girepository/girnode.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girnode.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girnode.c 2010-07-12 14:35:04.000000000 +0100 @@ -298,6 +298,10 @@ g_free (node->name); g_free (iface->gtype_name); g_free (iface->gtype_init); + g_free (iface->ref_func); + g_free (iface->unref_func); + g_free (iface->set_value_func); + g_free (iface->get_value_func); g_free (iface->glib_type_struct); @@ -692,6 +696,14 @@ size += ALIGN_VALUE (strlen (iface->gtype_name) + 1, 4); if (iface->gtype_init) size += ALIGN_VALUE (strlen (iface->gtype_init) + 1, 4); + if (iface->ref_func) + size += ALIGN_VALUE (strlen (iface->ref_func) + 1, 4); + if (iface->unref_func) + size += ALIGN_VALUE (strlen (iface->unref_func) + 1, 4); + if (iface->set_value_func) + size += ALIGN_VALUE (strlen (iface->set_value_func) + 1, 4); + if (iface->get_value_func) + size += ALIGN_VALUE (strlen (iface->get_value_func) + 1, 4); size += 2 * (n + (n % 2)); for (l = iface->members; l; l = l->next) @@ -2094,11 +2106,20 @@ blob->blob_type = BLOB_TYPE_OBJECT; blob->abstract = object->abstract; + blob->fundamental = object->fundamental; blob->deprecated = object->deprecated; blob->reserved = 0; blob->name = write_string (node->name, strings, data, offset2); blob->gtype_name = write_string (object->gtype_name, strings, data, offset2); blob->gtype_init = write_string (object->gtype_init, strings, data, offset2); + if (object->ref_func) + blob->ref_func = write_string (object->ref_func, strings, data, offset2); + if (object->unref_func) + blob->unref_func = write_string (object->unref_func, strings, data, offset2); + if (object->set_value_func) + blob->set_value_func = write_string (object->set_value_func, strings, data, offset2); + if (object->get_value_func) + blob->get_value_func = write_string (object->get_value_func, strings, data, offset2); if (object->parent) blob->parent = find_entry (module, modules, object->parent); else @@ -2298,33 +2319,6 @@ blob->size = 8; DO_ALIGNED_COPY(&data[blob->offset], parse_uint_value (constant->value), guint64); break; - case GI_TYPE_TAG_SHORT: - blob->size = sizeof (gshort); - *(gshort*)&data[blob->offset] = (gshort) parse_int_value (constant->value); - break; - case GI_TYPE_TAG_USHORT: - blob->size = sizeof (gushort); - *(gushort*)&data[blob->offset] = (gushort) parse_uint_value (constant->value); - break; - case GI_TYPE_TAG_INT: - blob->size = sizeof (gint); - *(gint*)&data[blob->offset] = (gint) parse_int_value (constant->value); - break; - case GI_TYPE_TAG_UINT: - blob->size = sizeof (guint); - *(gint*)&data[blob->offset] = (guint) parse_uint_value (constant->value); - break; - case GI_TYPE_TAG_SSIZE: /* FIXME */ - case GI_TYPE_TAG_LONG: - blob->size = sizeof (glong); - DO_ALIGNED_COPY(&data[blob->offset], parse_int_value (constant->value), glong); - break; - case GI_TYPE_TAG_SIZE: /* FIXME */ - case GI_TYPE_TAG_TIME_T: - case GI_TYPE_TAG_ULONG: - blob->size = sizeof (gulong); - DO_ALIGNED_COPY(&data[blob->offset], parse_uint_value (constant->value), gulong); - break; case GI_TYPE_TAG_FLOAT: blob->size = sizeof (gfloat); DO_ALIGNED_COPY(&data[blob->offset], parse_float_value (constant->value), gfloat); diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girnode.h gobject-introspection-0.9.2/girepository/girnode.h --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girnode.h 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girnode.h 2010-07-12 14:35:04.000000000 +0100 @@ -244,10 +244,16 @@ gboolean abstract; gboolean deprecated; + gboolean fundamental; gchar *gtype_name; gchar *gtype_init; + gchar *ref_func; + gchar *unref_func; + gchar *set_value_func; + gchar *get_value_func; + gchar *parent; gchar *glib_type_struct; diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girparser.c gobject-introspection-0.9.2/girepository/girparser.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girparser.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girparser.c 2010-07-12 14:35:04.000000000 +0100 @@ -328,17 +328,36 @@ typedef struct { const gchar *str; + guint size; + guint is_signed : 1; +} IntegerAliasInfo; + +static IntegerAliasInfo integer_aliases[] = { + { "char", SIZEOF_CHAR, 0 }, + { "short", SIZEOF_SHORT, 1 }, + { "ushort", SIZEOF_SHORT, 0 }, + { "int", SIZEOF_INT, 1 }, + { "uint", SIZEOF_INT, 0 }, + { "long", SIZEOF_LONG, 1 }, + { "ulong", SIZEOF_LONG, 0 }, + { "gsize", GLIB_SIZEOF_SIZE_T, 0 }, + { "gssize", GLIB_SIZEOF_SIZE_T, 1 }, +}; + +typedef struct { + const gchar *str; gint tag; gboolean pointer; } BasicTypeInfo; +#define BASIC_TYPE_FIXED_OFFSET 3 + static BasicTypeInfo basic_types[] = { { "none", GI_TYPE_TAG_VOID, 0 }, { "any", GI_TYPE_TAG_VOID, 1 }, { "bool", GI_TYPE_TAG_BOOLEAN, 0 }, - { "char", GI_TYPE_TAG_INT8, 0 }, - { "int8", GI_TYPE_TAG_INT8, 0 }, + { "int8", GI_TYPE_TAG_INT8, 0 }, /* Start of BASIC_TYPE_FIXED_OFFSET */ { "uint8", GI_TYPE_TAG_UINT8, 0 }, { "int16", GI_TYPE_TAG_INT16, 0 }, { "uint16", GI_TYPE_TAG_UINT16, 0 }, @@ -346,19 +365,8 @@ { "uint32", GI_TYPE_TAG_UINT32, 0 }, { "int64", GI_TYPE_TAG_INT64, 0 }, { "uint64", GI_TYPE_TAG_UINT64, 0 }, - { "short", GI_TYPE_TAG_SHORT, 0 }, - { "ushort", GI_TYPE_TAG_USHORT, 0 }, - { "int", GI_TYPE_TAG_INT, 0 }, - { "uint", GI_TYPE_TAG_UINT, 0 }, - { "long", GI_TYPE_TAG_LONG, 0 }, - { "ulong", GI_TYPE_TAG_ULONG, 0 }, - { "ssize_t", GI_TYPE_TAG_SSIZE, 0 }, - { "ssize", GI_TYPE_TAG_SSIZE, 0 }, - { "size_t", GI_TYPE_TAG_SIZE, 0 }, - { "size", GI_TYPE_TAG_SIZE, 0 }, { "float", GI_TYPE_TAG_FLOAT, 0 }, { "double", GI_TYPE_TAG_DOUBLE, 0 }, - { "time_t", GI_TYPE_TAG_TIME_T, 0 }, { "GType", GI_TYPE_TAG_GTYPE, 0 }, { "utf8", GI_TYPE_TAG_UTF8, 1 }, { "filename", GI_TYPE_TAG_FILENAME,1 }, @@ -375,6 +383,41 @@ if (g_str_has_prefix (str, basic_types[i].str)) return &(basic_types[i]); } + for (i = 0; i < G_N_ELEMENTS (integer_aliases); i++) + { + if (g_str_has_prefix (str, integer_aliases[i].str)) + { + switch (integer_aliases[i].size) + { + case sizeof(guint8): + if (integer_aliases[i].is_signed) + return &basic_types[BASIC_TYPE_FIXED_OFFSET]; + else + return &basic_types[BASIC_TYPE_FIXED_OFFSET+1]; + break; + case sizeof(guint16): + if (integer_aliases[i].is_signed) + return &basic_types[BASIC_TYPE_FIXED_OFFSET+2]; + else + return &basic_types[BASIC_TYPE_FIXED_OFFSET+3]; + break; + case sizeof(guint32): + if (integer_aliases[i].is_signed) + return &basic_types[BASIC_TYPE_FIXED_OFFSET+4]; + else + return &basic_types[BASIC_TYPE_FIXED_OFFSET+5]; + break; + case sizeof(guint64): + if (integer_aliases[i].is_signed) + return &basic_types[BASIC_TYPE_FIXED_OFFSET+6]; + else + return &basic_types[BASIC_TYPE_FIXED_OFFSET+7]; + break; + default: + g_assert_not_reached (); + } + } + } return NULL; } @@ -1640,6 +1683,11 @@ const gchar *typeinit; const gchar *deprecated; const gchar *abstract; + const gchar *fundamental; + const gchar *ref_func; + const gchar *unref_func; + const gchar *set_value_func; + const gchar *get_value_func; GIrNodeInterface *iface; if (!(strcmp (element_name, "class") == 0 && @@ -1656,6 +1704,11 @@ typeinit = find_attribute ("glib:get-type", attribute_names, attribute_values); deprecated = find_attribute ("deprecated", attribute_names, attribute_values); abstract = find_attribute ("abstract", attribute_names, attribute_values); + fundamental = find_attribute ("glib:fundamental", attribute_names, attribute_values); + ref_func = find_attribute ("glib:ref-func", attribute_names, attribute_values); + unref_func = find_attribute ("glib:unref-func", attribute_names, attribute_values); + set_value_func = find_attribute ("glib:set-value-func", attribute_names, attribute_values); + get_value_func = find_attribute ("glib:get-value-func", attribute_names, attribute_values); if (name == NULL) { @@ -1686,6 +1739,15 @@ iface->abstract = abstract && strcmp (abstract, "1") == 0; + if (ref_func) + iface->ref_func = g_strdup (ref_func); + if (unref_func) + iface->unref_func = g_strdup (unref_func); + if (set_value_func) + iface->set_value_func = g_strdup (set_value_func); + if (get_value_func) + iface->get_value_func = g_strdup (get_value_func); + push_node (ctx, (GIrNode *) iface); ctx->current_module->entries = g_list_append (ctx->current_module->entries, iface); @@ -1968,7 +2030,7 @@ { if (strcmp (element_name, "doc") != 0 || ctx->node_stack == NULL) return FALSE; - + state_switch (ctx, STATE_DOC); return TRUE; diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/girwriter.c gobject-introspection-0.9.2/girepository/girwriter.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/girwriter.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/girwriter.c 2010-07-12 14:35:04.000000000 +0100 @@ -757,24 +757,6 @@ case GI_TYPE_TAG_UINT64: xml_printf (file, "%" G_GUINT64_FORMAT, value->v_uint64); break; - case GI_TYPE_TAG_INT: - xml_printf (file, "%d", value->v_int); - break; - case GI_TYPE_TAG_UINT: - xml_printf (file, "%d", value->v_uint); - break; - case GI_TYPE_TAG_LONG: - xml_printf (file, "%ld", value->v_long); - break; - case GI_TYPE_TAG_ULONG: - xml_printf (file, "%ld", value->v_ulong); - break; - case GI_TYPE_TAG_SSIZE: - xml_printf (file, "%zd", value->v_ssize); - break; - case GI_TYPE_TAG_SIZE: - xml_printf (file, "%zd", value->v_size); - break; case GI_TYPE_TAG_FLOAT: xml_printf (file, "%f", value->v_float); break; @@ -999,8 +981,10 @@ const gchar *name; const gchar *type_name; const gchar *type_init; + const gchar *func; gboolean deprecated; gboolean is_abstract; + gboolean is_fundamental; GIObjectInfo *pnode; GIStructInfo *class_struct; gint i; @@ -1008,6 +992,7 @@ name = g_base_info_get_name ((GIBaseInfo *)info); deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info); is_abstract = g_object_info_get_abstract (info); + is_fundamental = g_object_info_get_fundamental (info); type_name = g_registered_type_info_get_type_name ((GIRegisteredTypeInfo*)info); type_init = g_registered_type_info_get_type_init ((GIRegisteredTypeInfo*)info); @@ -1033,6 +1018,25 @@ xml_printf (file, " glib:type-name=\"%s\" glib:get-type=\"%s\"", type_name, type_init); + if (is_fundamental) + xml_printf (file, " glib:fundamental=\"1\""); + + func = g_object_info_get_unref_function (info); + if (func) + xml_printf (file, " glib:unref-function=\"%s\"", func); + + func = g_object_info_get_ref_function (info); + if (func) + xml_printf (file, " glib:ref-function=\"%s\"", func); + + func = g_object_info_get_set_value_function (info); + if (func) + xml_printf (file, " glib:set-value-function=\"%s\"", func); + + func = g_object_info_get_get_value_function (info); + if (func) + xml_printf (file, " glib:get-value-function=\"%s\"", func); + if (deprecated) xml_printf (file, " deprecated=\"1\""); diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypelib.c gobject-introspection-0.9.2/girepository/gitypelib.c --- gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypelib.c 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/gitypelib.c 2010-07-12 14:35:04.000000000 +0100 @@ -183,7 +183,7 @@ CHECK_SIZE (PropertyBlob, 16); CHECK_SIZE (SignalBlob, 16); CHECK_SIZE (VFuncBlob, 20); - CHECK_SIZE (ObjectBlob, 44); + CHECK_SIZE (ObjectBlob, 60); CHECK_SIZE (InterfaceBlob, 40); CHECK_SIZE (ConstantBlob, 24); CHECK_SIZE (AttributeBlob, 12); @@ -288,12 +288,13 @@ } - if (header->major_version != 2 || header->minor_version != 0) + if (header->major_version != 3 || header->minor_version != 0) { g_set_error (error, G_TYPELIB_ERROR, G_TYPELIB_ERROR_INVALID_HEADER, - "Version mismatch"); + "Version mismatch; expected 3, found %d", + header->major_version); return FALSE; } @@ -908,17 +909,8 @@ 4, /* UINT32 */ 8, /* INT64 */ 8, /* UINT64 */ - sizeof (gshort), - sizeof (gushort), - sizeof (gint), - sizeof (guint), - sizeof (glong), - sizeof (gulong), - sizeof (gssize), - sizeof (gsize), sizeof (gfloat), sizeof (gdouble), - sizeof (time_t), 0, /* GTYPE */ 0, /* UTF8 */ 0, /* FILENAME */ @@ -932,6 +924,8 @@ ConstantBlob *blob; SimpleTypeBlob *type; + g_assert (G_N_ELEMENTS (value_size) == GI_TYPE_TAG_ERROR + 1); + if (typelib->len < offset + sizeof (ConstantBlob)) { g_set_error (error, diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypelib-internal.h gobject-introspection-0.9.2/girepository/gitypelib-internal.h --- gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypelib-internal.h 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/gitypelib-internal.h 2010-07-12 14:35:04.000000000 +0100 @@ -72,6 +72,11 @@ /* TYPELIB HISTORY ----- + +Version 1.1 +- Add ref/unref/set-value/get-value functions to Object, to be able + to support instantiatable fundamental types which are not GObject based. + Version 1.0 - Rename class_struct to gtype_struct, add to interfaces @@ -918,6 +923,8 @@ /** * ObjectBlob: * @blob_type: #BLOB_TYPE_OBJECT + * @fundamental: this object is not a GObject derived type, instead it's + * an additional fundamental type. * @gtype_name: String name of the associated #GType * @gtype_init: String naming the symbol which gets the runtime #GType * @parent: The directory index of the parent type. This is only set for @@ -938,12 +945,21 @@ * @signals: Describes the signals. * @vfuncs: Describes the virtual functions. * @constants: Describes the constants. + * @ref_func: String pointing to a function which can be called to increase + * the reference count for an instance of this object type. + * @unref_func: String pointing to a function which can be called to decrease + * the reference count for an instance of this object type. + * @set_value_func: String pointing to a function which can be called to + * convert a pointer of this object to a GValue + * @get_value_func: String pointing to a function which can be called to + * convert extract a pointer to this object from a GValue */ typedef struct { guint16 blob_type; /* 7 */ guint16 deprecated : 1; guint16 abstract : 1; - guint16 reserved :14; + guint16 fundamental : 1; + guint16 reserved :13; guint32 name; guint32 gtype_name; @@ -961,6 +977,11 @@ guint16 n_constants; guint16 reserved2; + guint32 ref_func; + guint32 unref_func; + guint32 set_value_func; + guint32 get_value_func; + guint32 reserved3; guint32 reserved4; diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypes.h gobject-introspection-0.9.2/girepository/gitypes.h --- gobject-introspection-0.9.1~git20100708.01772763/girepository/gitypes.h 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/gitypes.h 2010-07-12 14:35:04.000000000 +0100 @@ -319,17 +319,8 @@ * @GI_TYPE_TAG_UINT32: 32-bit unsigned integer * @GI_TYPE_TAG_INT64: 64-bit signed integer * @GI_TYPE_TAG_UINT64: 64-bit unsigned integer - * @GI_TYPE_TAG_SHORT: signed short - * @GI_TYPE_TAG_USHORT: unsigned hosrt - * @GI_TYPE_TAG_INT: signed integer - * @GI_TYPE_TAG_UINT: unsigned integer - * @GI_TYPE_TAG_LONG: signed long - * @GI_TYPE_TAG_ULONG: unsigned long - * @GI_TYPE_TAG_SSIZE: ssize_t - * @GI_TYPE_TAG_SIZE: size_t * @GI_TYPE_TAG_FLOAT: float * @GI_TYPE_TAG_DOUBLE: double floating point - * @GI_TYPE_TAG_TIME_T: time_t * @GI_TYPE_TAG_GTYPE: a #GType * @GI_TYPE_TAG_UTF8: a UTF-8 encoded string * @GI_TYPE_TAG_FILENAME: a filename, encoded in the same encoding @@ -355,31 +346,32 @@ GI_TYPE_TAG_UINT32 = 7, GI_TYPE_TAG_INT64 = 8, GI_TYPE_TAG_UINT64 = 9, - GI_TYPE_TAG_SHORT = 10, - GI_TYPE_TAG_USHORT = 11, - GI_TYPE_TAG_INT = 12, - GI_TYPE_TAG_UINT = 13, - GI_TYPE_TAG_LONG = 14, - GI_TYPE_TAG_ULONG = 15, - GI_TYPE_TAG_SSIZE = 16, - GI_TYPE_TAG_SIZE = 17, - GI_TYPE_TAG_FLOAT = 18, - GI_TYPE_TAG_DOUBLE = 19, - GI_TYPE_TAG_TIME_T = 20, - GI_TYPE_TAG_GTYPE = 21, - GI_TYPE_TAG_UTF8 = 22, - GI_TYPE_TAG_FILENAME = 23, + GI_TYPE_TAG_FLOAT = 10, + GI_TYPE_TAG_DOUBLE = 11, + GI_TYPE_TAG_GTYPE = 12, + GI_TYPE_TAG_UTF8 = 13, + GI_TYPE_TAG_FILENAME = 14, /* Non-basic types */ - GI_TYPE_TAG_ARRAY = 24, - GI_TYPE_TAG_INTERFACE = 25, - GI_TYPE_TAG_GLIST = 26, - GI_TYPE_TAG_GSLIST = 27, - GI_TYPE_TAG_GHASH = 28, - GI_TYPE_TAG_ERROR = 29 + GI_TYPE_TAG_ARRAY = 15, + GI_TYPE_TAG_INTERFACE = 16, + GI_TYPE_TAG_GLIST = 17, + GI_TYPE_TAG_GSLIST = 18, + GI_TYPE_TAG_GHASH = 19, + GI_TYPE_TAG_ERROR = 20 /* Note - there is only room currently for 32 tags. * See docs/typelib-format.txt SimpleTypeBlob definition */ } GITypeTag; +#define GI_TYPE_TAG_N_TYPES (GI_TYPE_TAG_ERROR+1) + +/* These were removed and no longer appear in the typelib; + * instead, the machine-specific versions like INT32 are + * always used. + */ +#define GI_TYPE_TAG_SHORT GI_TYPE_TAG_SHORT_WAS_REMOVED +#define GI_TYPE_TAG_INT GI_TYPE_TAG_INT_WAS_REMOVED +#define GI_TYPE_TAG_LONG GI_TYPE_TAG_LONG_WAS_REMOVED + /** * GIArrayType: * @GI_ARRAY_TYPE_C: a C array, char[] for instance diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/Makefile.am gobject-introspection-0.9.2/girepository/Makefile.am --- gobject-introspection-0.9.1~git20100708.01772763/girepository/Makefile.am 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/Makefile.am 2010-07-12 14:35:03.000000000 +0100 @@ -55,7 +55,7 @@ libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS) -libgirepository_1_0_la_LDFLAGS = -no-undefined +libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 libgirepository_parser_la_SOURCES = \ girmodule.c \ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/girepository/Makefile.in gobject-introspection-0.9.2/girepository/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/girepository/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/girepository/Makefile.in 2010-07-12 18:21:14.000000000 +0100 @@ -293,7 +293,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -369,7 +368,7 @@ libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS) -libgirepository_1_0_la_LDFLAGS = -no-undefined +libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 libgirepository_parser_la_SOURCES = \ girmodule.c \ girmodule.h \ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/annotationparser.py gobject-introspection-0.9.2/giscanner/annotationparser.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/annotationparser.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/annotationparser.py 2010-07-12 15:26:26.000000000 +0100 @@ -52,6 +52,10 @@ TAG_RENAME_TO = 'rename to' TAG_TYPE = 'type' TAG_TRANSFER = 'transfer' +TAG_UNREF_FUNC = 'unref func' +TAG_REF_FUNC = 'ref func' +TAG_SET_VALUE_FUNC = 'set value func' +TAG_GET_VALUE_FUNC = 'get value func' # Options - annotations for parameters and return values OPT_ALLOW_NONE = 'allow-none' @@ -361,6 +365,7 @@ self._parse_fields(class_, class_.fields) if block: class_.doc = block.comment + self._parse_type_instance_tags(class_, block) def _parse_interface(self, interface): block = self._blocks.get(interface.type_name) @@ -911,6 +916,16 @@ if OPT_FOREIGN in block.options: node.foreign = True + def _parse_type_instance_tags(self, node, block): + tag = self._get_tag(block, TAG_UNREF_FUNC) + node.unref_func = tag.value if tag else None + tag = self._get_tag(block, TAG_REF_FUNC) + node.ref_func = tag.value if tag else None + tag = self._get_tag(block, TAG_SET_VALUE_FUNC) + node.set_value_func = tag.value if tag else None + tag = self._get_tag(block, TAG_GET_VALUE_FUNC) + node.get_value_func = tag.value if tag else None + def _parse_rename_to_func(self, node, block): rename_to_tag = self._get_tag(block, TAG_RENAME_TO) if rename_to_tag is None: diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/ast.py gobject-introspection-0.9.2/giscanner/ast.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/ast.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/ast.py 2010-07-12 15:26:26.000000000 +0100 @@ -48,9 +48,8 @@ TYPE_UINT64 = 'uint64' TYPE_LONG = 'long' TYPE_ULONG = 'ulong' -TYPE_SSIZET = 'ssize_t' -TYPE_SIZET = 'size_t' -TYPE_TIMET = 'time_t' +TYPE_SIZET = 'gsize' +TYPE_SSIZET = 'gssize' TYPE_GTYPE = 'GType' TYPE_FLOAT = 'float' TYPE_DOUBLE = 'double' @@ -61,7 +60,7 @@ TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64, TYPE_UINT64, TYPE_SHORT, TYPE_USHORT, TYPE_INT, TYPE_UINT, TYPE_LONG, TYPE_ULONG, TYPE_SSIZET, - TYPE_SIZET, TYPE_FLOAT, TYPE_DOUBLE, TYPE_TIMET, + TYPE_SIZET, TYPE_FLOAT, TYPE_DOUBLE, TYPE_GTYPE] GIR_TYPES = [TYPE_NONE, TYPE_ANY] GIR_TYPES.extend(BASIC_GIR_TYPES) @@ -117,12 +116,7 @@ type_names['void*'] = TYPE_ANY type_names['void'] = TYPE_NONE -# Unix types that we special case here (and that have their own introspection -# type tag) because of wide use in GLib. -type_names['size_t'] = TYPE_SIZET -type_names['ssize_t'] = TYPE_SSIZET - -# One off C unix type definitions; note some of these may be GNU Libc +# Random C unix type definitions; note some of these may be GNU Libc # specific. If someone is actually bitten by this, feel free to do # the required configure goop to determine their size and replace # here. @@ -133,6 +127,8 @@ # methods are added under #ifdefs inside GLib itself. We could just (skip) # the relevant methods, but on the other hand, since these types are just # integers it's easy enough to expand them. +type_names['size_t'] = TYPE_SIZET +type_names['time_t'] = TYPE_LONG type_names['off_t'] = TYPE_SIZET type_names['pid_t'] = TYPE_INT type_names['uid_t'] = TYPE_UINT diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/config.py gobject-introspection-0.9.2/giscanner/config.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/config.py 2010-07-09 11:38:25.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/config.py 2010-07-12 18:21:42.000000000 +0100 @@ -20,6 +20,6 @@ DATADIR = "${prefix}/share" DATADIR = DATADIR.replace( - "${prefix}", "/usr") -GIR_DIR = "/usr/share/gir-1.0" + "${prefix}", "/usr/local") +GIR_DIR = "/usr/local/share/gir-1.0" GIR_SUFFIX = "gir-1.0" diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/dumper.py gobject-introspection-0.9.2/giscanner/dumper.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/dumper.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/dumper.py 2010-07-12 14:35:04.000000000 +0100 @@ -173,7 +173,8 @@ "Could not find c source file: %s" % (source, )) args.extend(list(sources)) if not self._options.quiet: - print "g-ir-scanner: compile: %r" % (args, ) + print "g-ir-scanner: compile: %s" % ( + subprocess.list2cmdline(args), ) subprocess.check_call(args) def _link(self, output, *sources): @@ -231,7 +232,8 @@ args.extend(list(sources)) if not self._options.quiet: - print "g-ir-scanner: link: %r" % (args, ) + print "g-ir-scanner: link: %s" % ( + subprocess.list2cmdline(args), ) subprocess.check_call(args) diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/girwriter.py gobject-introspection-0.9.2/giscanner/girwriter.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/girwriter.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/girwriter.py 2010-07-12 15:26:26.000000000 +0100 @@ -348,6 +348,17 @@ attrs.append(('glib:get-type', node.get_type)) if node.glib_type_struct: attrs.append(('glib:type-struct', node.glib_type_struct.name)) + if isinstance(node, GLibObject): + if node.fundamental: + attrs.append(('glib:fundamental', '1')) + if node.ref_func: + attrs.append(('glib:ref-func', node.ref_func)) + if node.unref_func: + attrs.append(('glib:unref-func', node.unref_func)) + if node.set_value_func: + attrs.append(('glib:set-value-func', node.set_value_func)) + if node.get_value_func: + attrs.append(('glib:get-value-func', node.get_value_func)) with self.tagcontext(tag_name, attrs): self._write_generic(node) if isinstance(node, GLibObject): diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/glibast.py gobject-introspection-0.9.2/giscanner/glibast.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/glibast.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/glibast.py 2010-07-12 15:26:26.000000000 +0100 @@ -120,6 +120,11 @@ Class.__init__(self, name, parent, is_abstract) self.type_name = type_name self.get_type = get_type + self.fundamental = False + self.unref_func = None + self.ref_func = None + self.set_value_func = None + self.get_value_func = None self.signals = [] self.ctype = ctype or type_name diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/glibtransformer.py gobject-introspection-0.9.2/giscanner/glibtransformer.py --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/glibtransformer.py 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/glibtransformer.py 2010-07-12 15:26:26.000000000 +0100 @@ -689,6 +689,8 @@ self._introspect_interface(xmlnode) elif xmlnode.tag == 'boxed': self._introspect_boxed(xmlnode) + elif xmlnode.tag == 'fundamental': + self._introspect_fundamental(xmlnode) else: raise ValueError("Unhandled introspection XML tag %s", xmlnode.tag) @@ -808,6 +810,36 @@ node.signals.append(signal) node.signals = sorted(node.signals) + def _introspect_fundamental(self, xmlnode): + # We only care about types that can be instantiatable, other + # fundamental types such as the Clutter.Fixed/CoglFixed registers + # are not yet interesting from an introspection perspective and + # are ignored + if not xmlnode.attrib.get('instantiatable', False): + return + + type_name = xmlnode.attrib['name'] + + # Get a list of parents here; some of them may be hidden, and what + # we really want to do is use the most-derived one that we know of. + if 'parents' in xmlnode.attrib: + parent_type_names = xmlnode.attrib['parents'].split(',') + parent_gitype = self._resolve_gtypename_chain(parent_type_names) + else: + parent_gitype = None + is_abstract = bool(xmlnode.attrib.get('abstract', False)) + node = GLibObject( + self._transformer.remove_prefix(type_name), + parent_gitype, + type_name, + xmlnode.attrib['get-type'], is_abstract) + node.fundamental = True + self._introspect_implemented_interfaces(node, xmlnode) + + self._add_record_fields(node) + self._add_attribute(node, replace=True) + self._register_internal_type(type_name, node) + def _add_record_fields(self, node): # add record fields record = self._get_attribute(node.name) diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/Makefile.in gobject-introspection-0.9.2/giscanner/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/Makefile.in 2010-07-09 11:38:17.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/Makefile.in 2010-07-12 18:21:14.000000000 +0100 @@ -287,7 +287,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerlexer.c gobject-introspection-0.9.2/giscanner/scannerlexer.c --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerlexer.c 2010-07-09 11:38:38.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/scannerlexer.c 2010-07-12 15:37:30.000000000 +0100 @@ -53,6 +53,7 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -83,8 +84,6 @@ #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -141,15 +140,7 @@ /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -838,7 +829,7 @@ static void process_directive (GISourceScanner *scanner); static int check_identifier (GISourceScanner *scanner, const char *); static int parse_ignored_macro (void); -#line 842 "scannerlexer.c" +#line 833 "scannerlexer.c" #define INITIAL 0 @@ -917,12 +908,7 @@ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -941,7 +927,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + unsigned n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1026,7 +1012,7 @@ #line 63 "scannerlexer.l" -#line 1030 "scannerlexer.c" +#line 1016 "scannerlexer.c" if ( !(yy_init) ) { @@ -1719,7 +1705,7 @@ #line 201 "scannerlexer.l" ECHO; YY_BREAK -#line 1723 "scannerlexer.c" +#line 1709 "scannerlexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2406,8 +2392,8 @@ /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerparser.c gobject-introspection-0.9.2/giscanner/scannerparser.c --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerparser.c 2010-07-09 11:38:38.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/scannerparser.c 2010-07-12 15:37:30.000000000 +0100 @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.2. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2006, 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 @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -95,7 +94,7 @@ /* Line 189 of yacc.c */ -#line 99 "scannerparser.c" +#line 98 "scannerparser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -280,7 +279,7 @@ /* Line 214 of yacc.c */ -#line 284 "scannerparser.c" +#line 283 "scannerparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -292,7 +291,7 @@ /* Line 264 of yacc.c */ -#line 296 "scannerparser.c" +#line 295 "scannerparser.c" #ifdef short # undef short @@ -342,7 +341,7 @@ #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1405,9 +1404,18 @@ /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1464,7 +1472,7 @@ we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -2209,7 +2217,7 @@ { case 2: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 145 "scannerparser.y" { (yyval.symbol) = g_hash_table_lookup (const_table, (yyvsp[(1) - (1)].str)); @@ -2223,7 +2231,7 @@ case 3: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 154 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2240,7 +2248,7 @@ case 4: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 166 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2249,7 +2257,7 @@ case 5: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 170 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2261,7 +2269,7 @@ case 7: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 178 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (3)].symbol); @@ -2270,7 +2278,7 @@ case 8: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 186 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2290,7 +2298,7 @@ case 9: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 201 "scannerparser.y" { char *strings, *string2; @@ -2306,7 +2314,7 @@ case 10: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 215 "scannerparser.y" { (yyval.str) = g_strdup (yytext); @@ -2315,7 +2323,7 @@ case 14: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 228 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2324,7 +2332,7 @@ case 15: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 232 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2333,7 +2341,7 @@ case 16: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 236 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2342,7 +2350,7 @@ case 17: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 240 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2351,7 +2359,7 @@ case 18: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 244 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2360,7 +2368,7 @@ case 19: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 248 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2369,7 +2377,7 @@ case 20: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 252 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2378,7 +2386,7 @@ case 24: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 265 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2387,7 +2395,7 @@ case 25: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 269 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2396,7 +2404,7 @@ case 26: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 273 "scannerparser.y" { switch ((yyvsp[(1) - (2)].unary_operator)) { @@ -2424,7 +2432,7 @@ case 27: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 296 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2433,7 +2441,7 @@ case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 300 "scannerparser.y" { ctype_free ((yyvsp[(3) - (4)].ctype)); @@ -2443,7 +2451,7 @@ case 29: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 308 "scannerparser.y" { (yyval.unary_operator) = UNARY_ADDRESS_OF; @@ -2452,7 +2460,7 @@ case 30: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 312 "scannerparser.y" { (yyval.unary_operator) = UNARY_POINTER_INDIRECTION; @@ -2461,7 +2469,7 @@ case 31: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 316 "scannerparser.y" { (yyval.unary_operator) = UNARY_PLUS; @@ -2470,7 +2478,7 @@ case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 320 "scannerparser.y" { (yyval.unary_operator) = UNARY_MINUS; @@ -2479,7 +2487,7 @@ case 33: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 324 "scannerparser.y" { (yyval.unary_operator) = UNARY_BITWISE_COMPLEMENT; @@ -2488,7 +2496,7 @@ case 34: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 328 "scannerparser.y" { (yyval.unary_operator) = UNARY_LOGICAL_NEGATION; @@ -2497,7 +2505,7 @@ case 36: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 336 "scannerparser.y" { ctype_free ((yyvsp[(2) - (4)].ctype)); @@ -2507,7 +2515,7 @@ case 38: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 345 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2518,7 +2526,7 @@ case 39: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 351 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2531,7 +2539,7 @@ case 40: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 359 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2544,7 +2552,7 @@ case 42: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 371 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2555,7 +2563,7 @@ case 43: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 377 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2566,7 +2574,7 @@ case 45: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 387 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2583,7 +2591,7 @@ case 46: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 399 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2594,7 +2602,7 @@ case 48: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 409 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2605,7 +2613,7 @@ case 49: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 415 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2616,7 +2624,7 @@ case 50: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 421 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2627,7 +2635,7 @@ case 51: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 427 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2638,7 +2646,7 @@ case 53: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 437 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2649,7 +2657,7 @@ case 54: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 443 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2660,7 +2668,7 @@ case 56: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 453 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2671,7 +2679,7 @@ case 58: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 463 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2682,7 +2690,7 @@ case 60: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 473 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2693,7 +2701,7 @@ case 62: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 483 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2706,7 +2714,7 @@ case 64: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 495 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, lineno); @@ -2719,7 +2727,7 @@ case 66: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 507 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_get_const_boolean ((yyvsp[(1) - (5)].symbol)) ? (yyvsp[(3) - (5)].symbol) : (yyvsp[(5) - (5)].symbol); @@ -2728,7 +2736,7 @@ case 68: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 515 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2737,7 +2745,7 @@ case 82: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 538 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -2746,7 +2754,7 @@ case 84: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 551 "scannerparser.y" { GList *l; @@ -2769,7 +2777,7 @@ case 85: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 569 "scannerparser.y" { ctype_free ((yyvsp[(1) - (2)].ctype)); @@ -2778,7 +2786,7 @@ case 86: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 576 "scannerparser.y" { (yyval.ctype) = (yyvsp[(2) - (2)].ctype); @@ -2788,7 +2796,7 @@ case 87: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 581 "scannerparser.y" { (yyval.ctype) = gi_source_type_new (CTYPE_INVALID); @@ -2798,7 +2806,7 @@ case 88: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 586 "scannerparser.y" { (yyval.ctype) = (yyvsp[(1) - (2)].ctype); @@ -2816,7 +2824,7 @@ case 90: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 600 "scannerparser.y" { (yyval.ctype) = (yyvsp[(2) - (2)].ctype); @@ -2826,7 +2834,7 @@ case 91: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 605 "scannerparser.y" { (yyval.ctype) = gi_source_type_new (CTYPE_INVALID); @@ -2836,7 +2844,7 @@ case 92: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 610 "scannerparser.y" { (yyval.ctype) = (yyvsp[(2) - (2)].ctype); @@ -2846,7 +2854,7 @@ case 93: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 615 "scannerparser.y" { (yyval.ctype) = gi_source_type_new (CTYPE_INVALID); @@ -2856,7 +2864,7 @@ case 94: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 623 "scannerparser.y" { (yyval.list) = g_list_append (NULL, (yyvsp[(1) - (1)].symbol)); @@ -2865,7 +2873,7 @@ case 95: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 627 "scannerparser.y" { (yyval.list) = g_list_append ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].symbol)); @@ -2874,7 +2882,7 @@ case 98: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 639 "scannerparser.y" { (yyval.storage_class_specifier) = STORAGE_CLASS_TYPEDEF; @@ -2883,7 +2891,7 @@ case 99: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 643 "scannerparser.y" { (yyval.storage_class_specifier) = STORAGE_CLASS_EXTERN; @@ -2892,7 +2900,7 @@ case 100: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 647 "scannerparser.y" { (yyval.storage_class_specifier) = STORAGE_CLASS_STATIC; @@ -2901,7 +2909,7 @@ case 101: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 651 "scannerparser.y" { (yyval.storage_class_specifier) = STORAGE_CLASS_AUTO; @@ -2910,7 +2918,7 @@ case 102: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 655 "scannerparser.y" { (yyval.storage_class_specifier) = STORAGE_CLASS_REGISTER; @@ -2919,7 +2927,7 @@ case 103: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 662 "scannerparser.y" { (yyval.ctype) = gi_source_type_new (CTYPE_VOID); @@ -2928,7 +2936,7 @@ case 104: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 666 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("char"); @@ -2937,7 +2945,7 @@ case 105: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 670 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("short"); @@ -2946,7 +2954,7 @@ case 106: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 674 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("int"); @@ -2955,7 +2963,7 @@ case 107: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 678 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("long"); @@ -2964,7 +2972,7 @@ case 108: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 682 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("float"); @@ -2973,7 +2981,7 @@ case 109: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 686 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("double"); @@ -2982,7 +2990,7 @@ case 110: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 690 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("signed"); @@ -2991,7 +2999,7 @@ case 111: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 694 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("unsigned"); @@ -3000,7 +3008,7 @@ case 112: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 698 "scannerparser.y" { (yyval.ctype) = gi_source_basic_type_new ("bool"); @@ -3009,7 +3017,7 @@ case 115: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 704 "scannerparser.y" { (yyval.ctype) = gi_source_typedef_new ((yyvsp[(1) - (1)].str)); @@ -3019,7 +3027,7 @@ case 116: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 712 "scannerparser.y" { (yyval.ctype) = (yyvsp[(1) - (5)].ctype); @@ -3043,7 +3051,7 @@ case 117: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 731 "scannerparser.y" { (yyval.ctype) = (yyvsp[(1) - (4)].ctype); @@ -3053,7 +3061,7 @@ case 118: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 736 "scannerparser.y" { (yyval.ctype) = (yyvsp[(1) - (2)].ctype); @@ -3063,7 +3071,7 @@ case 119: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 744 "scannerparser.y" { (yyval.ctype) = gi_source_struct_new (NULL); @@ -3072,7 +3080,7 @@ case 120: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 748 "scannerparser.y" { (yyval.ctype) = gi_source_union_new (NULL); @@ -3081,7 +3089,7 @@ case 122: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 756 "scannerparser.y" { (yyval.list) = g_list_concat ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); @@ -3090,7 +3098,7 @@ case 123: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 763 "scannerparser.y" { GList *l; @@ -3111,7 +3119,7 @@ case 124: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 782 "scannerparser.y" { (yyval.ctype) = (yyvsp[(1) - (2)].ctype); @@ -3121,7 +3129,7 @@ case 126: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 788 "scannerparser.y" { (yyval.ctype) = (yyvsp[(2) - (2)].ctype); @@ -3131,7 +3139,7 @@ case 127: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 793 "scannerparser.y" { (yyval.ctype) = gi_source_type_new (CTYPE_INVALID); @@ -3141,7 +3149,7 @@ case 128: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 801 "scannerparser.y" { (yyval.list) = g_list_append (NULL, (yyvsp[(1) - (1)].symbol)); @@ -3150,7 +3158,7 @@ case 129: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 805 "scannerparser.y" { (yyval.list) = g_list_append ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].symbol)); @@ -3159,7 +3167,7 @@ case 130: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 812 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3168,7 +3176,7 @@ case 132: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 817 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3177,7 +3185,7 @@ case 133: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 821 "scannerparser.y" { (yyval.symbol) = (yyvsp[(1) - (3)].symbol); @@ -3190,7 +3198,7 @@ case 134: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 832 "scannerparser.y" { (yyval.ctype) = gi_source_enum_new ((yyvsp[(2) - (5)].str)); @@ -3202,7 +3210,7 @@ case 135: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 839 "scannerparser.y" { (yyval.ctype) = gi_source_enum_new (NULL); @@ -3214,7 +3222,7 @@ case 136: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 846 "scannerparser.y" { (yyval.ctype) = gi_source_enum_new ((yyvsp[(2) - (6)].str)); @@ -3226,7 +3234,7 @@ case 137: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 853 "scannerparser.y" { (yyval.ctype) = gi_source_enum_new (NULL); @@ -3238,7 +3246,7 @@ case 138: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 860 "scannerparser.y" { (yyval.ctype) = gi_source_enum_new ((yyvsp[(2) - (2)].str)); @@ -3247,7 +3255,7 @@ case 139: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 867 "scannerparser.y" { /* reset flag before the first enum value */ @@ -3257,7 +3265,7 @@ case 140: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 872 "scannerparser.y" { (yyval.list) = g_list_append (NULL, (yyvsp[(2) - (2)].symbol)); @@ -3266,7 +3274,7 @@ case 141: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 876 "scannerparser.y" { (yyval.list) = g_list_append ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].symbol)); @@ -3275,7 +3283,7 @@ case 142: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 883 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, lineno); @@ -3288,7 +3296,7 @@ case 143: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 891 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, lineno); @@ -3302,7 +3310,7 @@ case 144: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 903 "scannerparser.y" { (yyval.type_qualifier) = TYPE_QUALIFIER_CONST; @@ -3311,7 +3319,7 @@ case 145: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 907 "scannerparser.y" { (yyval.type_qualifier) = TYPE_QUALIFIER_RESTRICT; @@ -3320,7 +3328,7 @@ case 146: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 911 "scannerparser.y" { (yyval.type_qualifier) = TYPE_QUALIFIER_EXTENSION; @@ -3329,7 +3337,7 @@ case 147: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 915 "scannerparser.y" { (yyval.type_qualifier) = TYPE_QUALIFIER_VOLATILE; @@ -3338,7 +3346,7 @@ case 148: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 922 "scannerparser.y" { (yyval.function_specifier) = FUNCTION_INLINE; @@ -3347,7 +3355,7 @@ case 149: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 929 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (2)].symbol); @@ -3357,7 +3365,7 @@ case 151: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 938 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3367,7 +3375,7 @@ case 152: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 943 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (3)].symbol); @@ -3376,7 +3384,7 @@ case 153: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 947 "scannerparser.y" { (yyval.symbol) = (yyvsp[(1) - (4)].symbol); @@ -3386,7 +3394,7 @@ case 154: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 952 "scannerparser.y" { (yyval.symbol) = (yyvsp[(1) - (3)].symbol); @@ -3396,7 +3404,7 @@ case 155: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 957 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3411,7 +3419,7 @@ case 156: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 967 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3423,7 +3431,7 @@ case 157: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 974 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3434,7 +3442,7 @@ case 158: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 983 "scannerparser.y" { (yyval.ctype) = gi_source_pointer_new (NULL); @@ -3444,7 +3452,7 @@ case 159: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 988 "scannerparser.y" { (yyval.ctype) = gi_source_pointer_new (NULL); @@ -3453,7 +3461,7 @@ case 160: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 992 "scannerparser.y" { (yyval.ctype) = gi_source_pointer_new ((yyvsp[(3) - (3)].ctype)); @@ -3463,7 +3471,7 @@ case 161: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 997 "scannerparser.y" { (yyval.ctype) = gi_source_pointer_new ((yyvsp[(2) - (2)].ctype)); @@ -3472,7 +3480,7 @@ case 163: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1005 "scannerparser.y" { (yyval.type_qualifier) = (yyvsp[(1) - (2)].type_qualifier) | (yyvsp[(2) - (2)].type_qualifier); @@ -3481,7 +3489,7 @@ case 164: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1012 "scannerparser.y" { (yyval.list) = g_list_append (NULL, (yyvsp[(1) - (1)].symbol)); @@ -3490,7 +3498,7 @@ case 165: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1016 "scannerparser.y" { (yyval.list) = g_list_append ((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].symbol)); @@ -3499,7 +3507,7 @@ case 166: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1023 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (2)].symbol); @@ -3509,7 +3517,7 @@ case 167: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1028 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (2)].symbol); @@ -3519,7 +3527,7 @@ case 168: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1033 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3529,7 +3537,7 @@ case 169: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1038 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_ELLIPSIS, lineno); @@ -3538,7 +3546,7 @@ case 170: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1045 "scannerparser.y" { GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3549,7 +3557,7 @@ case 171: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1051 "scannerparser.y" { GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3560,7 +3568,7 @@ case 174: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1065 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3570,7 +3578,7 @@ case 176: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1071 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (2)].symbol); @@ -3580,7 +3588,7 @@ case 177: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1079 "scannerparser.y" { (yyval.symbol) = (yyvsp[(2) - (3)].symbol); @@ -3589,7 +3597,7 @@ case 178: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1083 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3599,7 +3607,7 @@ case 179: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1088 "scannerparser.y" { (yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, lineno); @@ -3609,7 +3617,7 @@ case 180: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1093 "scannerparser.y" { (yyval.symbol) = (yyvsp[(1) - (3)].symbol); @@ -3619,7 +3627,7 @@ case 181: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1098 "scannerparser.y" { (yyval.symbol) = (yyvsp[(1) - (4)].symbol); @@ -3629,7 +3637,7 @@ case 182: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1103 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3640,7 +3648,7 @@ case 183: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1109 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3655,7 +3663,7 @@ case 184: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1119 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3666,7 +3674,7 @@ case 185: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1125 "scannerparser.y" { GISourceType *func = gi_source_function_new (); @@ -3681,7 +3689,7 @@ case 186: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1138 "scannerparser.y" { (yyval.str) = g_strdup (yytext); @@ -3690,7 +3698,7 @@ case 236: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1245 "scannerparser.y" { (yyval.str) = g_strdup (yytext + strlen ("#define ")); @@ -3699,7 +3707,7 @@ case 237: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1252 "scannerparser.y" { (yyval.str) = g_strdup (yytext + strlen ("#define ")); @@ -3708,7 +3716,7 @@ case 239: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1263 "scannerparser.y" { if ((yyvsp[(2) - (2)].symbol)->const_int_set || (yyvsp[(2) - (2)].symbol)->const_double_set || (yyvsp[(2) - (2)].symbol)->const_string != NULL) { @@ -3721,8 +3729,8 @@ -/* Line 1455 of yacc.c */ -#line 3726 "scannerparser.c" +/* Line 1464 of yacc.c */ +#line 3734 "scannerparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3933,7 +3941,7 @@ -/* Line 1675 of yacc.c */ +/* Line 1684 of yacc.c */ #line 1278 "scannerparser.y" static void diff -Nru gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerparser.h gobject-introspection-0.9.2/giscanner/scannerparser.h --- gobject-introspection-0.9.1~git20100708.01772763/giscanner/scannerparser.h 2010-07-09 11:38:38.000000000 +0100 +++ gobject-introspection-0.9.2/giscanner/scannerparser.h 2010-07-12 15:37:30.000000000 +0100 @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.2. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2006, 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 @@ -182,7 +181,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 1685 of yacc.c */ #line 55 "scannerparser.y" char *str; @@ -196,8 +195,8 @@ -/* Line 1676 of yacc.c */ -#line 201 "scannerparser.h" +/* Line 1685 of yacc.c */ +#line 200 "scannerparser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gobject-introspection-1.0.pc gobject-introspection-0.9.2/gobject-introspection-1.0.pc --- gobject-introspection-0.9.1~git20100708.01772763/gobject-introspection-1.0.pc 2010-07-09 11:38:25.000000000 +0100 +++ gobject-introspection-0.9.2/gobject-introspection-1.0.pc 2010-07-12 18:21:43.000000000 +0100 @@ -1,4 +1,4 @@ -prefix=/usr +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -18,4 +18,4 @@ Name: gobject-introspection Description: GObject Introspection -Version: 0.9.1 +Version: 0.9.2 diff -Nru gobject-introspection-0.9.1~git20100708.01772763/gobject-introspection-no-export-1.0.pc gobject-introspection-0.9.2/gobject-introspection-no-export-1.0.pc --- gobject-introspection-0.9.1~git20100708.01772763/gobject-introspection-no-export-1.0.pc 2010-07-09 11:38:25.000000000 +0100 +++ gobject-introspection-0.9.2/gobject-introspection-no-export-1.0.pc 2010-07-12 18:21:44.000000000 +0100 @@ -1,4 +1,4 @@ -prefix=/usr +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -18,4 +18,4 @@ Name: gobject-introspection Description: GObject Introspection -Version: 0.9.1 +Version: 0.9.2 diff -Nru gobject-introspection-0.9.1~git20100708.01772763/ltmain.sh gobject-introspection-0.9.2/ltmain.sh --- gobject-introspection-0.9.1~git20100708.01772763/ltmain.sh 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/ltmain.sh 2010-07-12 17:59:58.000000000 +0100 @@ -1,9 +1,10 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.2.10 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# 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,50 +33,54 @@ # # 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 +# --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 +# 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. +# 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.2.6b Debian-2.2.6b-2ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.10 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" +VERSION=2.2.10 TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3175 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +96,15 @@ 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. -# 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 @@ -107,15 +117,24 @@ 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"} -: ${ECHO="echo"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -159,32 +178,168 @@ func_dirname_and_basename () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + 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 "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED -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" +# 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: -# 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 @@ -258,6 +413,13 @@ : } +# 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 () @@ -326,9 +488,9 @@ 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"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +540,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +554,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +581,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -489,14 +651,19 @@ } - - - # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $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,19 +676,20 @@ # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { $SED -n '/^# Usage:/,/# Report bugs to/ { @@ -538,7 +706,10 @@ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p }' < "$progpath" - exit $? + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,7 +717,7 @@ # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + func_error "missing argument for $1." exit_cmd=exit } @@ -556,29 +727,6 @@ -# 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; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1867,6 +2067,11 @@ # Aesthetically quote it. func_quote_for_eval "$arg" install_prog="$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,8 +2081,10 @@ install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then files="$files $dest" dest=$arg @@ -1887,10 +2094,9 @@ case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2110,10 @@ *) # 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 @@ -1915,6 +2125,10 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" install_prog="$install_prog $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + install_shared_prog="$install_shared_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2137,13 @@ 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" + install_shared_prog="$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" @@ -2010,7 +2231,7 @@ 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\$%%"` + 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,9 +2244,9 @@ 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%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2264,7 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2183,7 +2404,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + 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,7 +2423,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +2442,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2323,6 +2544,10 @@ extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,7 +2557,7 @@ $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` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$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'" @@ -2371,7 +2596,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2415,10 +2640,10 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { @@ -2428,7 +2653,7 @@ " case $host in *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ + 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. */" @@ -2441,7 +2666,7 @@ lt_dlsym_const=const ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; $lt_dlsym_const lt_dlsymlist @@ -2457,7 +2682,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2515,16 +2740,16 @@ 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%"` + 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 "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "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%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +2763,8 @@ # 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@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +2774,7 @@ # 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,8 +2785,9 @@ 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 pe-i386(.*architecture: i386)?' >/dev/null ; then + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ @@ -2598,7 +2825,18 @@ $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 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,7 +2907,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +2922,30 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + 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_part1 [arg=no] +# func_emit_wrapper [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 +# 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,7 +2961,6 @@ # 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 @@ -2749,31 +2991,132 @@ 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\ + 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 () +{ " - $ECHO "\ + 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 \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + 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'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +3126,13 @@ esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED '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 + 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,7 +3140,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2877,7 +3203,7 @@ # 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/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " @@ -2894,64 +3220,18 @@ $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 + 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 + \$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 @@ -2978,23 +3258,19 @@ func_to_host_path () { func_to_host_path_result="$1" - if test -n "$1" ; then + 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"` + func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -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"` + func_to_host_path_result=`cygpath -w "$1" | + $SED -e "$lt_sed_naive_backslashify"` ;; * ) # Unfortunately, winepath does not exit with a non-zero @@ -3006,17 +3282,17 @@ # 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" |\ + 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="" + 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 " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: func_to_host_path_result="$1" @@ -3049,30 +3325,24 @@ func_to_host_pathlist () { func_to_host_pathlist_result="$1" - if test -n "$1" ; then + 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|:*$||'` + func_stripname : : "$1" + func_to_host_pathlist_tmp1=$func_stripname_result 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"` + func_to_host_pathlist_result=` + ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -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" |\ + func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | $SED -e "$lt_sed_naive_backslashify"` ;; * ) @@ -3088,18 +3358,17 @@ 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" + func_append 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 + 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 " \`$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 @@ -3116,7 +3385,7 @@ ;; esac case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + *: ) func_append func_to_host_pathlist_result ";" ;; esac ;; @@ -3141,31 +3410,23 @@ 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" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #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 @@ -3177,6 +3438,44 @@ #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,14 +3491,7 @@ # 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 - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +3522,6 @@ # 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 @@ -3246,22 +3534,13 @@ 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); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,31 +3550,17 @@ 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_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); 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 <"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +3782,14 @@ 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 */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +3811,7 @@ { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +3845,8 @@ { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +3863,8 @@ int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +3890,8 @@ int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +3944,8 @@ { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + 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,7 +3970,8 @@ } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + 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,8 +3997,9 @@ int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + 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,8 +4021,9 @@ } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4036,8 @@ tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4063,25 @@ 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 *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4090,32 @@ } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + 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) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : ""), - (value ? 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,95 +4160,12 @@ 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 : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4184,9 @@ 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 : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4196,152 @@ } } +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,6 +4386,7 @@ new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +4479,11 @@ esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4425,6 +4745,11 @@ continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4503,7 +4828,7 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; @@ -4522,7 +4847,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4708,7 +5033,7 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" + arg="$arg $func_quote_for_eval_result" compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" @@ -4754,18 +5079,19 @@ 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 + # 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 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" @@ -4925,7 +5251,7 @@ 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\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -5033,10 +5359,7 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5051,7 +5374,8 @@ # 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"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; *) deplibs="$deplibs $deplib" ;; @@ -5230,7 +5554,7 @@ 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 \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5240,15 +5564,15 @@ ;; esac if test "$valid_a_lib" != yes; then - $ECHO + 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." + 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 $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5321,7 +5645,7 @@ # 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'` + 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 "*) ;; @@ -5329,7 +5653,7 @@ esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + 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 @@ -5347,19 +5671,19 @@ # 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" fi + 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 continue fi # $pass = conv @@ -5583,7 +5907,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5686,9 +6010,9 @@ 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" + 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 @@ -5828,21 +6152,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + 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." + 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." + 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." + 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 @@ -5962,7 +6286,7 @@ 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'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -6130,7 +6454,7 @@ 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 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" libobjs="$libobjs $objs" @@ -6198,7 +6522,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6210,9 +6534,6 @@ revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) @@ -6435,14 +6756,14 @@ 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` + 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 "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"` + # 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 @@ -6483,7 +6804,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -6568,13 +6889,13 @@ newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + 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." + 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 ;; @@ -6611,22 +6932,22 @@ newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + 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." + 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 $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." + 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 ;; *) @@ -6672,7 +6993,7 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | @@ -6687,12 +7008,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + 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" + 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 @@ -6730,7 +7051,7 @@ 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 | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" @@ -6741,12 +7062,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + 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" + 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 @@ -6764,25 +7085,25 @@ ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + 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 "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6794,23 +7115,23 @@ 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 /'` + 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 + 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." + 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." + 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,16 +7141,16 @@ 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." + 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." + 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,9 +7167,9 @@ # 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'` + 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 @@ -6970,7 +7291,7 @@ done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= @@ -7036,7 +7357,7 @@ 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"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7137,7 +7458,8 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7150,12 +7472,12 @@ 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 + echo 'INPUT (' > $output for obj in $save_libobjs do $ECHO "$obj" >> $output done - $ECHO ')' >> $output + 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 @@ -7197,17 +7519,19 @@ # 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\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" 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\" + 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 + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7217,7 +7541,8 @@ # 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\" + 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 @@ -7276,7 +7601,7 @@ 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"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7441,7 +7766,7 @@ 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'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -7452,7 +7777,7 @@ 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 + 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,8 +7837,8 @@ 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 /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7530,8 +7855,8 @@ 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'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7668,8 +7993,8 @@ 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` + 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,15 +8006,15 @@ 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 ;; - *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 @@ -7698,7 +8023,7 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + 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. @@ -7745,7 +8070,7 @@ # 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'` + 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 @@ -7764,7 +8089,7 @@ 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'` + 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,7 +8101,7 @@ fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + 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 @@ -7800,18 +8125,7 @@ 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"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7932,7 +8246,7 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" generated="$generated $gentop" func_mkdir_p "$gentop" @@ -8043,7 +8357,7 @@ 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"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8128,9 +8442,27 @@ 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) tdlname=../bin/$dlname ;; + *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 diff -Nru gobject-introspection-0.9.1~git20100708.01772763/m4/libtool.m4 gobject-introspection-0.9.2/m4/libtool.m4 --- gobject-introspection-0.9.1~git20100708.01772763/m4/libtool.m4 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/m4/libtool.m4 2010-07-12 17:59:58.000000000 +0100 @@ -1,7 +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 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -37,7 +39,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -138,6 +143,9 @@ m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -179,7 +187,6 @@ _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +200,6 @@ ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -250,6 +240,28 @@ ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +420,7 @@ # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +430,7 @@ # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +529,20 @@ LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -533,9 +553,9 @@ # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -543,16 +563,38 @@ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -562,20 +604,11 @@ AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -601,7 +634,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -646,15 +679,13 @@ # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -940,6 +973,31 @@ [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 +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + 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 + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -967,7 +1025,7 @@ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -987,7 +1045,11 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + 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\"`' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -995,7 +1057,7 @@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1041,170 +1103,65 @@ # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-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! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -1236,7 +1193,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1388,10 +1345,19 @@ esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1416,15 +1382,15 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1464,7 +1430,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1527,6 +1493,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1591,8 +1562,8 @@ # 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"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1643,7 +1614,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1684,7 +1655,13 @@ # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1693,7 +1670,11 @@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -1869,16 +1850,16 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2037,6 +2018,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2045,16 +2027,23 @@ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2067,7 +2056,7 @@ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2087,7 +2076,13 @@ if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2175,7 +2170,7 @@ m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2228,23 +2223,12 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -2344,6 +2328,19 @@ hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + 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=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -2386,8 +2383,10 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) @@ -2454,26 +2453,35 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2485,18 +2493,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -2717,6 +2713,8 @@ The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -2829,6 +2827,7 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -2958,8 +2957,8 @@ fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3011,16 +3010,18 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3050,6 +3051,10 @@ lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3058,11 +3063,11 @@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3088,7 +3093,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3226,7 +3231,19 @@ NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3239,13 +3256,13 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3268,7 +3285,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3296,7 +3313,12 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3313,6 +3335,7 @@ m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3438,7 +3461,7 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3600,6 +3623,11 @@ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3738,8 +3766,8 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -3769,7 +3797,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3801,7 +3829,7 @@ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -3905,6 +3933,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -3947,6 +3981,13 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + 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' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -4010,7 +4051,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4022,25 +4063,25 @@ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # 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)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *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)='' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; esac ;; @@ -4072,7 +4113,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4182,8 +4223,10 @@ aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4194,9 +4237,6 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4261,13 +4301,36 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4301,11 +4364,12 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4341,6 +4405,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4362,6 +4427,11 @@ fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4391,11 +4461,12 @@ tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4406,13 +4477,17 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4428,17 +4503,17 @@ fi case $cc_basename in - xlf*) + 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(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _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~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4447,7 +4522,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4559,8 +4634,10 @@ else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4622,7 +4699,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4650,7 +4726,7 @@ # empty executable. _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4665,8 +4741,13 @@ # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -4705,7 +4786,7 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. @@ -4772,7 +4853,7 @@ ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -4791,7 +4872,7 @@ ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -4812,7 +4893,14 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -4840,19 +4928,19 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ) LDFLAGS="$save_LDFLAGS" else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4861,7 +4949,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -4914,17 +5002,17 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4934,13 +5022,13 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5131,36 +5219,38 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5330,37 +5420,21 @@ ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5382,6 +5456,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5484,7 +5560,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5596,7 +5672,7 @@ _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5611,8 +5687,13 @@ # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5645,6 +5726,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5705,6 +5787,11 @@ gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5729,7 +5816,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5794,7 +5881,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5837,7 +5924,7 @@ case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -5848,9 +5935,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5879,7 +5966,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5916,26 +6003,26 @@ pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -5943,7 +6030,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -5962,9 +6049,9 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5984,13 +6071,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6059,7 +6146,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6094,15 +6181,15 @@ case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6118,17 +6205,17 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6138,7 +6225,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6174,7 +6261,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6195,7 +6282,7 @@ esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6222,7 +6309,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6233,7 +6320,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6287,6 +6374,10 @@ CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6533,7 +6624,7 @@ solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6577,32 +6668,16 @@ ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6621,6 +6696,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6720,32 +6797,17 @@ ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6764,6 +6826,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6909,6 +6973,8 @@ _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 @@ -7276,7 +7342,7 @@ func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -7287,7 +7353,7 @@ # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } dnl func_dirname_and_basename @@ -7303,10 +7369,8 @@ func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -7317,20 +7381,20 @@ # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` } # func_arith arithmetic-term... diff -Nru gobject-introspection-0.9.1~git20100708.01772763/m4/lt~obsolete.m4 gobject-introspection-0.9.2/m4/lt~obsolete.m4 --- gobject-introspection-0.9.1~git20100708.01772763/m4/lt~obsolete.m4 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/m4/lt~obsolete.m4 2010-07-12 18:00:00.000000000 +0100 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff -Nru gobject-introspection-0.9.1~git20100708.01772763/m4/ltoptions.m4 gobject-introspection-0.9.2/m4/ltoptions.m4 --- gobject-introspection-0.9.1~git20100708.01772763/m4/ltoptions.m4 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/m4/ltoptions.m4 2010-07-12 17:59:59.000000000 +0100 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], diff -Nru gobject-introspection-0.9.1~git20100708.01772763/m4/ltversion.m4 gobject-introspection-0.9.2/m4/ltversion.m4 --- gobject-introspection-0.9.1~git20100708.01772763/m4/ltversion.m4 2010-07-09 11:38:13.000000000 +0100 +++ gobject-introspection-0.9.2/m4/ltversion.m4 2010-07-12 17:59:59.000000000 +0100 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3175 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_VERSION], [2.2.10]) +m4_define([LT_PACKAGE_REVISION], [1.3175]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' +[macro_version='2.2.10' +macro_revision='1.3175' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru gobject-introspection-0.9.1~git20100708.01772763/m4/Makefile.in gobject-introspection-0.9.2/m4/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/m4/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/m4/Makefile.in 2010-07-12 18:21:15.000000000 +0100 @@ -197,7 +197,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/Makefile.in gobject-introspection-0.9.2/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/Makefile.in 2010-07-12 18:21:18.000000000 +0100 @@ -284,7 +284,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/invoke/Makefile.in gobject-introspection-0.9.2/tests/invoke/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tests/invoke/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tests/invoke/Makefile.in 2010-07-12 18:21:15.000000000 +0100 @@ -283,7 +283,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/Makefile.in gobject-introspection-0.9.2/tests/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tests/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tests/Makefile.in 2010-07-12 18:21:15.000000000 +0100 @@ -237,7 +237,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/offsets/Makefile.in gobject-introspection-0.9.2/tests/offsets/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tests/offsets/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tests/offsets/Makefile.in 2010-07-12 18:21:16.000000000 +0100 @@ -281,7 +281,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/repository/Makefile.in gobject-introspection-0.9.2/tests/repository/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tests/repository/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tests/repository/Makefile.in 2010-07-12 18:21:16.000000000 +0100 @@ -239,7 +239,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/annotation-1.0-expected.gir gobject-introspection-0.9.2/tests/scanner/annotation-1.0-expected.gir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/annotation-1.0-expected.gir 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/annotation-1.0-expected.gir 2010-07-12 14:35:04.000000000 +0100 @@ -407,7 +407,7 @@ Length of the data - + @@ -425,7 +425,7 @@ Length of the data - + @@ -444,7 +444,7 @@ Length of the data - + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/annotation-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/annotation-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/annotation-1.0-expected.tgir 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/annotation-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,563 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/BarApp-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/BarApp-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/BarApp-1.0-expected.tgir 2010-07-09 11:39:13.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/BarApp-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/drawable-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/drawable-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/drawable-1.0-expected.tgir 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/drawable-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/foo-1.0-expected.gir gobject-introspection-0.9.2/tests/scanner/foo-1.0-expected.gir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/foo-1.0-expected.gir 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/foo-1.0-expected.gir 2010-07-12 14:35:04.000000000 +0100 @@ -405,7 +405,7 @@ - + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/foo-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/foo-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/foo-1.0-expected.tgir 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/foo-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,735 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/GtkFrob-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/GtkFrob-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/GtkFrob-1.0-expected.tgir 2010-07-09 11:39:13.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/GtkFrob-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/Makefile.am gobject-introspection-0.9.2/tests/scanner/Makefile.am --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/Makefile.am 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/Makefile.am 2010-07-12 14:35:04.000000000 +0100 @@ -29,18 +29,15 @@ AM_LDFLAGS += -no-undefined endif -# .gir --[scanner]-> .typelib --[generate]-> .tgir +# .gir --[scanner]-> .typelib GIRS = TYPELIBS = $(GIRS:.gir=.typelib) CHECKGIRS = $(GIRS:.gir=.gir.check) EXPECTEDGIRS = $(GIRS:.gir=-expected.gir) -TGIRS = $(GIRS:.gir=.tgir) -CHECKTGIRS = $(GIRS:.gir=.tgir.check) -EXPECTEDTGIRS = $(GIRS:.gir=-expected.tgir) INTROSPECTION_GIRS = $(GIRS) CLEANFILES = $(TYPELIBS) $(GIRS) -BUILT_SOURCES = $(TYPELIBS) $(GIRS) $(TGIRS) -EXTRA_DIST = $(EXPECTEDGIRS) $(EXPECTEDTGIRS) +BUILT_SOURCES = $(TYPELIBS) $(GIRS) +EXTRA_DIST = $(EXPECTEDGIRS) annotation-1.0.gir: utility-1.0.gir libannotation.la annotation_1_0_gir_PACKAGES = gobject-2.0 @@ -110,28 +107,7 @@ %.gir.check: %.gir @diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir" -# stop %.typelib rule from building %-expected.tgir (via %-expected.typelib) -%-expected.typelib: - @true - -%.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - $(AM_V_GEN) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ - -%.tgir.check: %.tgir - @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ - if test "$$?" = "0"; then \ - echo " TEST $*.tgir"; \ - rm -f $*.tgir; \ - else \ - exit 1; \ - fi - -distclean-local: - @if test "$(top_builddir)" != "$(top_srcdir)"; then \ - rm -f $(top_builddir)/tests/scanner/*.tgir; \ - fi - check-local: pre-check -check-local: $(CHECKGIRS) $(CHECKTGIRS) $(TYPELIBS) +check-local: $(CHECKGIRS) $(TYPELIBS) check-local: post-check diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/Makefile.in gobject-introspection-0.9.2/tests/scanner/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/Makefile.in 2010-07-12 18:21:17.000000000 +0100 @@ -322,7 +322,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -412,19 +411,16 @@ libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h -# .gir --[scanner]-> .typelib --[generate]-> .tgir +# .gir --[scanner]-> .typelib GIRS = annotation-1.0.gir drawable-1.0.gir foo-1.0.gir utility-1.0.gir \ GtkFrob-1.0.gir BarApp-1.0.gir TYPELIBS = $(GIRS:.gir=.typelib) CHECKGIRS = $(GIRS:.gir=.gir.check) EXPECTEDGIRS = $(GIRS:.gir=-expected.gir) -TGIRS = $(GIRS:.gir=.tgir) -CHECKTGIRS = $(GIRS:.gir=.tgir.check) -EXPECTEDTGIRS = $(GIRS:.gir=-expected.tgir) INTROSPECTION_GIRS = $(GIRS) CLEANFILES = $(TYPELIBS) $(GIRS) -BUILT_SOURCES = $(TYPELIBS) $(GIRS) $(TGIRS) -EXTRA_DIST = $(EXPECTEDGIRS) $(EXPECTEDTGIRS) +BUILT_SOURCES = $(TYPELIBS) $(GIRS) +EXTRA_DIST = $(EXPECTEDGIRS) annotation_1_0_gir_PACKAGES = gobject-2.0 annotation_1_0_gir_LIBS = libannotation.la annotation_1_0_gir_INCLUDES = GObject-2.0 utility-1.0 @@ -758,7 +754,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-local distclean-tags + distclean-tags dvi: dvi-am @@ -825,17 +821,17 @@ .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-generic clean-libtool clean-noinstPROGRAMS \ clean-testlibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-local \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-testlibLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-testlibLTLIBRARIES + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-testlibLTLIBRARIES installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-testlibLTLIBRARIES # Make sure the required variables are set, these should under normal @@ -947,29 +943,8 @@ %.gir.check: %.gir @diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir" -# stop %.typelib rule from building %-expected.tgir (via %-expected.typelib) -%-expected.typelib: - @true - -%.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - $(AM_V_GEN) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ - -%.tgir.check: %.tgir - @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ - if test "$$?" = "0"; then \ - echo " TEST $*.tgir"; \ - rm -f $*.tgir; \ - else \ - exit 1; \ - fi - -distclean-local: - @if test "$(top_builddir)" != "$(top_srcdir)"; then \ - rm -f $(top_builddir)/tests/scanner/*.tgir; \ - fi - check-local: pre-check -check-local: $(CHECKGIRS) $(CHECKTGIRS) $(TYPELIBS) +check-local: $(CHECKGIRS) $(TYPELIBS) check-local: post-check diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/utility-1.0-expected.gir gobject-introspection-0.9.2/tests/scanner/utility-1.0-expected.gir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/utility-1.0-expected.gir 2010-07-09 11:38:10.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/utility-1.0-expected.gir 2010-07-12 14:35:04.000000000 +0100 @@ -19,7 +19,7 @@ - + diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/utility-1.0-expected.tgir gobject-introspection-0.9.2/tests/scanner/utility-1.0-expected.tgir --- gobject-introspection-0.9.1~git20100708.01772763/tests/scanner/utility-1.0-expected.tgir 2010-07-09 11:39:12.000000000 +0100 +++ gobject-introspection-0.9.2/tests/scanner/utility-1.0-expected.tgir 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-0.9.1~git20100708.01772763/tools/Makefile.in gobject-introspection-0.9.2/tools/Makefile.in --- gobject-introspection-0.9.1~git20100708.01772763/tools/Makefile.in 2010-07-09 11:38:18.000000000 +0100 +++ gobject-introspection-0.9.2/tools/Makefile.in 2010-07-12 18:21:17.000000000 +0100 @@ -268,7 +268,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@