From 32744efb214aa3ffbf15a9918b3bd3b3d41e7264 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 16 Jun 2009 17:10:52 +0200 Subject: autoconfization --- .gitignore | 19 ++++ Makefile | 16 ---- Makefile.am | 63 +++++++++++++ bootstrap.sh | 61 ++++++++++++ configure.ac | 107 +++++++++++++++++++++ m4/acx_pthread.m4 | 271 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ rtkit-daemon.c | 9 +- rtkit-test.c | 2 - rtkit.c | 2 + rtkitctl.c | 4 + 10 files changed, 531 insertions(+), 23 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.am create mode 100755 bootstrap.sh create mode 100644 configure.ac create mode 100644 m4/acx_pthread.m4 diff --git a/.gitignore b/.gitignore index 94ade70..e07d762 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,23 @@ +stamp* +*.tar.gz +.deps/ +.libs/ +*.cache rtkit-daemon rtkit-test rtkitctl *.o +Makefile.in +aclocal.m4 +compile +config.guess +config.h +config.h.in +config.h.in~ +config.log +config.status +config.sub +configure +depcomp +install-sh +missing diff --git a/Makefile b/Makefile deleted file mode 100644 index ac36b07..0000000 --- a/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -CFLAGS=-Wextra -Wall -O0 -g `pkg-config --cflags dbus-1` -pthread -fdiagnostics-show-option -DPACKAGE_VERSION=\"0.1\" -rdynamic -LIBS= `pkg-config --libs dbus-1` -lrt - -all: rtkit-daemon rtkit-test rtkitctl - -rtkit-daemon: rtkit-daemon.o rtkit.h - $(CC) $(CFLAGS) $(LIBS) -o rtkit-daemon $^ - -rtkit-test: rtkit-test.o rtkit.o rtkit.h - $(CC) $(CFLAGS) $(LIBS) -o rtkit-test $^ - -rtkitctl: rtkitctl.o rtkit.h - $(CC) $(CFLAGS) $(LIBS) -o rtkitctl $^ - -clean: - rm -rf rtkit-daemon rtkit-test rtkitctl *.o diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..c5aee5b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,63 @@ +# This file is part of RealtimeKit. +# +# Copyright 2009 Lennart Poettering +# +# RealtimeKit is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RealtimeKit 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 RealtimeKit. If not, see . + +ACLOCAL_AMFLAGS = -I m4 + +policykitdir = $(datadir)/polkit-1/actions/ +dbussystemdir = $(sysconfdir)/dbus-1/system.d/ +dbusservicedir = $(datadir)/dbus-1/system-services/ + +EXTRA_DIST = \ + GPL \ + LICENSE \ + org.freedesktop.RealtimeKit1.policy \ + org.freedesktop.RealtimeKit1.conf \ + org.freedesktop.RealtimeKit1.service + +libexec_PROGRAMS = \ + rtkit-daemon +sbin_PROGRAMS = \ + rtkitctl +noinst_PROGRAMS = \ + rtkit-test +policykit_DATA = \ + org.freedesktop.RealtimeKit1.policy +dbussystem_DATA = \ + org.freedesktop.RealtimeKit1.conf +dbusservice_DATA = \ + org.freedesktop.RealtimeKit1.service + +rtkit_daemon_SOURCES = \ + rtkit-daemon.c rtkit.h +rtkit_daemon_LDADD = \ + $(DBUS_LIBS) +rtkit_daemon_CFLAGS = \ + $(DBUS_CFLAGS) + +rtkitctl_SOURCES = \ + rtkitctl.c rtkit.h +rtkitctl_LDADD = \ + $(DBUS_LIBS) +rtkitctl_CFLAGS = \ + $(DBUS_CFLAGS) + +rtkit_test_SOURCES = \ + rtkit-test.c rtkit.c rtkit.h +rtkit_test_LDADD = \ + $(DBUS_LIBS) +rtkit_test_CFLAGS = \ + $(DBUS_CFLAGS) diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..eb0f80f --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +# This file is part of RealtimeKit. +# +# Copyright 2009 Lennart Poettering +# +# RealtimeKit is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RealtimeKit 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 RealtimeKit. If not, see . + +VERSION=1.9 + +run_versioned() { + local P + local V + + V=$(echo "$2" | sed -e 's,\.,,g') + + if [ -e "`which $1$V 2> /dev/null`" ] ; then + P="$1$V" + else + if [ -e "`which $1-$2 2> /dev/null`" ] ; then + P="$1-$2" + else + P="$1" + fi + fi + + shift 2 + "$P" "$@" +} + +set -ex + +if [ "x$1" = "xam" ] ; then + run_versioned automake "$VERSION" -a -c --foreign + ./config.status +else + rm -rf autom4te.cache + rm -f config.cache + + mkdir -p m4 + run_versioned aclocal "$VERSION" -I m4 + run_versioned autoconf 2.59 -Wall + run_versioned autoheader 2.59 + run_versioned automake "$VERSION" --copy --foreign --add-missing + + if test "x$NOCONFIGURE" = "x"; then + CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" + make clean + fi +fi diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..dcd358f --- /dev/null +++ b/configure.ac @@ -0,0 +1,107 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +# This file is part of RealtimeKit. +# +# Copyright 2009 Lennart Poettering +# +# RealtimeKit is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RealtimeKit 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 RealtimeKit. If not, see . + +AC_PREREQ(2.57) + +AC_INIT([rtkit], 0.1, [mzegxvg (at) 0pointer (dot) net]) +AC_CONFIG_SRCDIR([rtkit-daemon.c]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR(m4) + +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) + +AC_SUBST(PACKAGE_URL, [https://http://git.0pointer.de/?p=librtkit.git]) + +AC_CANONICAL_HOST + +if type -p stow > /dev/null && test -d /usr/local/stow ; then + AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) + ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" +fi + +#### Checks for programs. #### + +# CC + +AC_PROG_CC +AC_PROG_CC_C99 +AM_PROG_CC_C_O +AC_PROG_GCC_TRADITIONAL +AC_USE_SYSTEM_EXTENSIONS + +# GCC flags + +test_gcc_flag() { + AC_LANG_CONFTEST([int main(int argc, char*argv[]) {}]) + $CC -c conftest.c $CFLAGS "$1" -o conftest.o > /dev/null 2> /dev/null + ret=$? + rm -f conftest.o + return $ret +} + +# If using GCC specify some additional parameters +if test "x$GCC" = "xyes" ; then + + # We use gnu99 instead of c99 because many have interpreted the standard + # in a way that int64_t isn't defined on non-64 bit platforms. + DESIRED_FLAGS="-std=gnu99 -Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -ffast-math" + + for flag in $DESIRED_FLAGS ; do + AC_MSG_CHECKING([whether $CC accepts $flag]) + if test_gcc_flag $flag ; then + CFLAGS="$CFLAGS $flag" + CXXFLAGS="$CXXFLAGS $flag" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + done +fi + +ACX_PTHREAD +LIBS="$PTHREAD_LIBS $LIBS" +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +CC="$PTHREAD_CC" + +AC_SYS_LARGEFILE + +AC_SEARCH_LIBS([sched_setscheduler], [rt]) +AC_SEARCH_LIBS([clock_gettime], [rt]) + +PKG_CHECK_MODULES(DBUS, dbus-1) + +################################### +# Output # +################################### + +AC_CONFIG_FILES([ +Makefile +]) +AC_OUTPUT + +echo " + ---{ $PACKAGE_NAME $VERSION }--- + + prefix: ${prefix} + sysconfdir: ${sysconfdir} + localstatedir: ${localstatedir} + Compiler: ${CC} + CFLAGS: ${CFLAGS} +" diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 new file mode 100644 index 0000000..798d6d1 --- /dev/null +++ b/m4/acx_pthread.m4 @@ -0,0 +1,271 @@ +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/acx_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. e.g. you should link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threads programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. +# +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +AC_DEFUN([ACX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_SAVE +AC_LANG_C +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_MSG_RESULT($acx_pthread_ok) + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], + [acx_pthread_ok=yes]) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT($acx_pthread_ok) + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_TRY_LINK([#include ], [int attr=$attr; return attr;], + [attr_name=$attr; break]) + done + AC_MSG_RESULT($attr_name) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_CC) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + acx_pthread_ok=no + $2 +fi +AC_LANG_RESTORE +])dnl ACX_PTHREAD diff --git a/rtkit-daemon.c b/rtkit-daemon.c index 987cd40..2419ae9 100644 --- a/rtkit-daemon.c +++ b/rtkit-daemon.c @@ -19,9 +19,9 @@ along with RealtimeKit. If not, see . ***/ -#pragma GCC diagnostic ignored "-Wunused-parameter" - -#define _GNU_SOURCE +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -56,7 +56,7 @@ #endif #ifndef SCHED_RESET_ON_FORK -#warning "Your libc lacks the definition of SCHED_RESET_ON_FORK. We'll now define it ourselves, however make sure your kernel is new enough!" +/* "Your libc lacks the definition of SCHED_RESET_ON_FORK. We'll now define it ourselves, however make sure your kernel is new enough! */ #define SCHED_RESET_ON_FORK 0x40000000 #endif @@ -930,7 +930,6 @@ static int reset_all(void) { for (;;) { const struct dirent *tde; unsigned long long tid; - int r; if (!(tde = readdir(td))) break; diff --git a/rtkit-test.c b/rtkit-test.c index e9cb3c0..2841b52 100644 --- a/rtkit-test.c +++ b/rtkit-test.c @@ -19,8 +19,6 @@ along with RealtimeKit. If not, see . ***/ -#pragma GCC diagnostic ignored "-Wunused-parameter" - #include #include #include diff --git a/rtkit.c b/rtkit.c index 353968a..aecc4e3 100644 --- a/rtkit.c +++ b/rtkit.c @@ -30,7 +30,9 @@ #ifdef __linux__ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include #include diff --git a/rtkitctl.c b/rtkitctl.c index b5ae553..3c57512 100644 --- a/rtkitctl.c +++ b/rtkitctl.c @@ -19,6 +19,10 @@ along with RealtimeKit. If not, see . ***/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include -- cgit