[Xfce4-commits] <xfce4-cpugraph-plugin:master> Work on the auto* system
Florian
noreply at xfce.org
Sat Apr 17 16:16:52 CEST 2010
Updating branch refs/heads/master
to 9626720bb7b25d9a851985393d792874e182dc93 (commit)
from 11305a011760d3d45e82e69a29a1187cc21e4189 (commit)
commit 9626720bb7b25d9a851985393d792874e182dc93
Author: Florian <frivoal at gmail.com>
Date: Mon Mar 29 12:35:20 2010 +0900
Work on the auto* system
Some macros used in configure.ac are documented as obsolete. Use the
appropriate replacement. Also fix things it warns about, and use the new
version of XDT_I18N.
autogen.sh | 15 ++---
compile | 142 ----------------------------------------------
configure.ac | 9 +--
panel-plugin/Makefile.am | 2 +-
4 files changed, 10 insertions(+), 158 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 4da6b80..6bc0c8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,23 +1,20 @@
#!/bin/sh
#
-# $Id$
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
+
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
your system, which are required to build this software.
- Please install the xfce4-dev-tools package first, it is available
- from http://www.xfce.org/.
+ Please install the xfce4-dev-tools package first, available from
+ http://xfce.org/~benny/projects/xfce4-dev-tools/.
EOF
exit 1
}
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
\ No newline at end of file
+xdt-autogen $@
diff --git a/compile b/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey at cygnus.com>.
-#
-# 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, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/configure.ac b/configure.ac
index 30f6b30..d0f33fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ m4_define([cpugraph_version],[0.4.0])
AC_INIT([xfce4-cpugraph-plugin], [cpugraph_version],
[xfce-goodies-dev at lists.berlios.de])
+AC_USE_SYSTEM_EXTENSIONS()
CPUGRAPH_VERSION=cpugraph_version()
AM_INIT_AUTOMAKE([xfce4-cpugraph-plugin], [$CPUGRAPH_VERSION])
@@ -16,15 +17,11 @@ AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
-dnl Check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-
dnl Check for basic programs
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_INTLTOOL
+AM_PROG_CC_C_O
dnl Check for standard header files
AC_HEADER_STDC
@@ -33,7 +30,7 @@ dnl configure the panel plugin
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
dnl translations
-XDT_I18N([be ca cs en_GB eu fr hu nb_NO pl pt_PT sq uk])
+XDT_I18N([@LINGUAS@])
dnl Check for debugging support
XDT_FEATURE_DEBUG()
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index b3f5484..141d8a6 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -41,7 +41,7 @@ DISTCLEANFILES = \
$(desktop_DATA) $(desktop_in_files)
# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
+cpugraph.desktop.in: cpugraph.desktop.in.in
sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
$< > $@
More information about the Xfce4-commits
mailing list