Hello community,
here is the log from the commit of package sysprof
checked in at Fri Jun 9 23:34:36 CEST 2006.
--------
--- sysprof/sysprof.changes 2006-03-02 20:09:43.000000000 +0100
+++ sysprof/sysprof.changes 2006-06-09 16:38:32.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 9 16:36:34 CEST 2006 - jpr@suse.de
+
+- Update to 1.0.3
+- Fixes for newer kernels
+- Only build on i386 and x86_64
+
+-------------------------------------------------------------------
Old:
----
sysprof-1.0.2.tar.bz2
New:
----
sysprof-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sysprof.spec ++++++
--- /var/tmp/diff_new_pack.hxAAFL/_old 2006-06-09 23:34:16.000000000 +0200
+++ /var/tmp/diff_new_pack.hxAAFL/_new 2006-06-09 23:34:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package sysprof (Version 1.0.2)
+# spec file for package sysprof (Version 1.0.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,13 +12,14 @@
Name: sysprof
BuildRequires: gtk2-devel kernel-source kernel-syms libglade2-devel
+ExclusiveArch: %ix86 x86_64
%define kernel_version %(uname -r)
%define kernel_version_ %(uname -r|tr - _)
%define prefix /opt/gnome
%define sysconfdir /etc%prefix
Summary: sampling CPU profiler
-Version: 1.0.2
-Release: 2
+Version: 1.0.3
+Release: 1
License: GPL
Group: Development/Tools/Debuggers
URL: http://www.daimi.au.dk/~sandmann/sysprof/
@@ -103,6 +104,10 @@
%prefix/share/pixmaps/*.png
%changelog -n sysprof
+* Fri Jun 09 2006 - jpr@suse.de
+- Update to 1.0.3
+- Fixes for newer kernels
+- Only build on i386 and x86_64
* Thu Mar 02 2006 - jpr@suse.de
- Initial package check in
- Package for profiling application performance
++++++ sysprof-1.0.2.tar.bz2 -> sysprof-1.0.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/ChangeLog new/sysprof-1.0.3/ChangeLog
--- old/sysprof-1.0.2/ChangeLog 2006-02-24 03:38:33.000000000 +0100
+++ new/sysprof-1.0.3/ChangeLog 2006-06-09 04:58:32.000000000 +0200
@@ -1,3 +1,19 @@
+2006-06-08 Soren Sandmann
+
+ * =-=-=-= Release sysprof 1.0.3 =-=-=-=
+
+ * configure.ac: Bump version number
+
+ * announce-1.0.3: Add this file.
+
+ * sysprof.c (RESET_DEAD_PERIOD): Increase this to 250
+
+2006-06-05 Soren Sandmann
+
+ * module/sysprof-module.c (init_module): Copy the proc_fops and
+ update the poll entry in the copy, rather than writing directly to
+ the proc_fops. Fixes compilation on the latest kernels.
+
Thu Feb 23 21:37:21 2006 Soeren Sandmann
* =-=-=-= Release sysprof 1.0.2 =-=-=-=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/Makefile.in new/sysprof-1.0.3/Makefile.in
--- old/sysprof-1.0.2/Makefile.in 2006-02-24 03:27:00.000000000 +0100
+++ new/sysprof-1.0.3/Makefile.in 2006-06-09 04:50:19.000000000 +0200
@@ -81,6 +81,7 @@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/aclocal.m4 new/sysprof-1.0.3/aclocal.m4
--- old/sysprof-1.0.2/aclocal.m4 2006-02-24 03:26:56.000000000 +0100
+++ new/sysprof-1.0.3/aclocal.m4 2006-06-09 04:50:12.000000000 +0200
@@ -859,61 +859,160 @@
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+$$1_PKG_ERRORS
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [$4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/configure new/sysprof-1.0.3/configure
--- old/sysprof-1.0.2/configure 2006-02-24 03:27:01.000000000 +0100
+++ new/sysprof-1.0.3/configure 2006-06-09 04:50:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sysprof 1.0.2.
+# Generated by GNU Autoconf 2.59 for sysprof 1.0.3.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,12 +267,12 @@
# Identity of this package.
PACKAGE_NAME='sysprof'
PACKAGE_TARNAME='sysprof'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='sysprof 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='sysprof 1.0.3'
PACKAGE_BUGREPORT=''
ac_unique_file="sysprof.glade"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG DEP_CFLAGS DEP_LIBS MODULE_SUBDIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG DEP_CFLAGS DEP_LIBS MODULE_SUBDIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -729,6 +729,18 @@
ac_env_CPPFLAGS_value=$CPPFLAGS
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_env_DEP_CFLAGS_set=${DEP_CFLAGS+set}
+ac_env_DEP_CFLAGS_value=$DEP_CFLAGS
+ac_cv_env_DEP_CFLAGS_set=${DEP_CFLAGS+set}
+ac_cv_env_DEP_CFLAGS_value=$DEP_CFLAGS
+ac_env_DEP_LIBS_set=${DEP_LIBS+set}
+ac_env_DEP_LIBS_value=$DEP_LIBS
+ac_cv_env_DEP_LIBS_set=${DEP_LIBS+set}
+ac_cv_env_DEP_LIBS_value=$DEP_LIBS
#
# Report the --help message.
@@ -737,7 +749,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 sysprof 1.0.2 to adapt to many kinds of systems.
+\`configure' configures sysprof 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -799,7 +811,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sysprof 1.0.2:";;
+ short | recursive ) echo "Configuration of sysprof 1.0.3:";;
esac
cat <<\_ACEOF
@@ -822,6 +834,9 @@
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
+ PKG_CONFIG path to pkg-config utility
+ DEP_CFLAGS C compiler flags for DEP, overriding pkg-config
+ DEP_LIBS linker flags for DEP, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -921,7 +936,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-sysprof configure 1.0.2
+sysprof configure 1.0.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -935,7 +950,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sysprof $as_me 1.0.2, which was
+It was created by sysprof $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1548,7 +1563,7 @@
# Define the identity of the package.
PACKAGE='sysprof'
- VERSION='1.0.2'
+ VERSION='1.0.3'
# Some tools Automake needs.
@@ -2920,11 +2935,11 @@
dep_modules="gtk+-2.0 > 2.6.0 gthread-2.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
- succeeded=no
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
@@ -2949,7 +2964,6 @@
done
done
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
@@ -2963,60 +2977,141 @@
echo "${ECHO_T}no" >&6
fi
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for $dep_modules" >&5
-echo $ECHO_N "checking for $dep_modules... $ECHO_C" >&6
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if $PKG_CONFIG --exists "$dep_modules" ; then
- echo "$as_me:$LINENO: result: yes" >&5
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- succeeded=yes
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ PKG_CONFIG=""
+ fi
- echo "$as_me:$LINENO: checking DEP_CFLAGS" >&5
-echo $ECHO_N "checking DEP_CFLAGS... $ECHO_C" >&6
- DEP_CFLAGS=`$PKG_CONFIG --cflags "$dep_modules"`
- echo "$as_me:$LINENO: result: $DEP_CFLAGS" >&5
-echo "${ECHO_T}$DEP_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking DEP_LIBS" >&5
-echo $ECHO_N "checking DEP_LIBS... $ECHO_C" >&6
- DEP_LIBS=`$PKG_CONFIG --libs "$dep_modules"`
- echo "$as_me:$LINENO: result: $DEP_LIBS" >&5
-echo "${ECHO_T}$DEP_LIBS" >&6
- else
- DEP_CFLAGS=""
- DEP_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dep_modules"`
+fi
- fi
+pkg_failed=no
+echo "$as_me:$LINENO: checking for DEP" >&5
+echo $ECHO_N "checking for DEP... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DEP_CFLAGS"; then
+ pkg_cv_DEP_CFLAGS="$DEP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$dep_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$dep_modules") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_DEP_CFLAGS=`$PKG_CONFIG --cflags "$dep_modules" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DEP_LIBS"; then
+ pkg_cv_DEP_LIBS="$DEP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$dep_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$dep_modules") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_DEP_LIBS=`$PKG_CONFIG --libs "$dep_modules" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
+if test $pkg_failed = yes; then
- if test $succeeded = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: sysprof dependencies not satisfied" >&5
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$dep_modules"`
+ else
+ DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dep_modules"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DEP_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: sysprof dependencies not satisfied" >&5
echo "$as_me: error: sysprof dependencies not satisfied" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: sysprof dependencies not satisfied" >&5
+echo "$as_me: error: sysprof dependencies not satisfied" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ DEP_CFLAGS=$pkg_cv_DEP_CFLAGS
+ DEP_LIBS=$pkg_cv_DEP_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ :
+fi
# libiberty and libbfd
@@ -3627,7 +3722,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by sysprof $as_me 1.0.2, which was
+This file was extended by sysprof $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3690,7 +3785,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-sysprof config.status 1.0.2
+sysprof config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -3924,6 +4019,7 @@
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@DEP_CFLAGS@,$DEP_CFLAGS,;t t
s,@DEP_LIBS@,$DEP_LIBS,;t t
s,@MODULE_SUBDIR@,$MODULE_SUBDIR,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/configure.ac new/sysprof-1.0.3/configure.ac
--- old/sysprof-1.0.2/configure.ac 2006-02-24 03:26:18.000000000 +0100
+++ new/sysprof-1.0.3/configure.ac 2006-06-09 04:47:04.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.54)
-AC_INIT([sysprof], [1.0.2])
+AC_INIT([sysprof], [1.0.3])
AC_CONFIG_SRCDIR(sysprof.glade)
AM_INIT_AUTOMAKE(no-define)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/module/sysprof-module.c new/sysprof-1.0.3/module/sysprof-module.c
--- old/sysprof-1.0.2/module/sysprof-module.c 2006-02-24 03:38:48.000000000 +0100
+++ new/sysprof-1.0.3/module/sysprof-module.c 2006-06-09 05:00:06.000000000 +0200
@@ -217,14 +217,19 @@
int
init_module(void)
{
+ static struct file_operations fops;
+
trace_proc_file =
create_proc_entry ("sysprof-trace", S_IFREG | S_IRUGO, &proc_root);
if (!trace_proc_file)
return 1;
+
+ fops = *trace_proc_file->proc_fops;
+ fops.poll = procfile_poll;
trace_proc_file->read_proc = procfile_read;
- trace_proc_file->proc_fops->poll = procfile_poll;
+ trace_proc_file->proc_fops = &fops;
trace_proc_file->size = sizeof (SysprofStackTrace);
register_timer_hook (timer_notify);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysprof-1.0.2/sysprof.c new/sysprof-1.0.3/sysprof.c
--- old/sysprof-1.0.2/sysprof.c 2006-02-24 03:37:00.000000000 +0100
+++ new/sysprof-1.0.3/sysprof.c 2006-06-09 04:54:13.000000000 +0200
@@ -336,7 +336,7 @@
return first_ms - second_ms;
}
-#define RESET_DEAD_PERIOD 25
+#define RESET_DEAD_PERIOD 250
static void
on_read (gpointer data)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org