From 5a4d9e05f6cddc0b44915079d31724d6b60ed7f5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Jan 2006 01:17:14 +0000 Subject: port to apache 2.0 git-svn-id: file:///home/lennart/svn/public/mod_mime_xattr/trunk@12 f01872de-66d6-0310-9185-fc3b30f50adc --- Makefile.am | 8 +-- NOTICE | 1 - bootstrap.sh | 39 ++++++---- configure.ac | 63 ++++++++++++++-- doc/Makefile.am | 2 +- doc/README.html.in | 52 ++++++++------ doc/style.css | 19 ++--- src/Makefile.in | 43 +++++------ src/mod_mime_xattr.c | 198 ++++++++++++++++++++++++++++++--------------------- 9 files changed, 257 insertions(+), 168 deletions(-) delete mode 100644 NOTICE diff --git a/Makefile.am b/Makefile.am index d45b20d..609829e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -# Copyright 2004 Lennart Poettering +# Copyright 2004-2006 Lennart Poettering # # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You @@ -14,11 +14,11 @@ # implied. See the License for the specific language governing # permissions and limitations under the License. -EXTRA_DIST=bootstrap.sh README LICENSE NOTICE +EXTRA_DIST=bootstrap.sh README LICENSE src/mod_mime_xattr.c src/Makefile.in SUBDIRS=src doc MAINTAINERCLEANFILES = README -noinst_DATA = README NOTICE LICENSE +noinst_DATA = README LICENSE README: rm -f README @@ -30,7 +30,7 @@ homepage: all dist mkdir -p $$HOME/homepage/private/projects/mod_mime_xattr cp *.tar.gz $$HOME/homepage/private/projects/mod_mime_xattr cp doc/README.html doc/style.css $$HOME/homepage/private/projects/mod_mime_xattr - cp $$HOME/homepage/private/projects/mod_mime_xattr/README.html $$HOME/homepage/private/projects/mod_mime_xattr/index.html + ln -sf $$HOME/homepage/private/projects/mod_mime_xattr/README.html $$HOME/homepage/private/projects/mod_mime_xattr/index.html distcleancheck: @: diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 8587606..0000000 --- a/NOTICE +++ /dev/null @@ -1 +0,0 @@ -This software has been developed by Lennart Poettering diff --git a/bootstrap.sh b/bootstrap.sh index f843d46..19315af 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash # $Id$ -# Copyright 2004 Lennart Poettering +# Copyright 2004-2006 Lennart Poettering # # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You @@ -15,29 +15,44 @@ # implied. See the License for the specific language governing # permissions and limitations under the License. +VERSION=1.9 + run_versioned() { local P - type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1" + local V + + V=$(echo "$2" | sed -e 's,\.,,g') + + if [ -e "`which $1$V`" ] ; then + P="$1$V" + else + if [ -e "`which $1-$2`" ] ; then + P="$1-$2" + else + P="$1" + fi + fi shift 2 "$P" "$@" } +set -ex + if [ "x$1" = "xam" ] ; then - set -ex - run_versioned automake 1.7 -a -c + run_versioned automake "$VERSION" -a -c --foreign ./config.status else - set -ex rm -rf autom4te.cache rm -f config.cache - run_versioned aclocal 1.7 - autoheader - run_versioned automake 1.7 -a -c - autoconf -Wall - - ./configure --sysconfdir=/etc "$@" + run_versioned aclocal "$VERSION" + run_versioned autoconf 2.59 -Wall + run_versioned autoheader 2.59 + run_versioned automake "$VERSION" -a -c --foreign - make clean + if test "x$NOCONFIGURE" = "x"; then + CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" + make clean + fi fi diff --git a/configure.ac b/configure.ac index dd204f4..df981ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # $Id$ -# Copyright 2004 Lennart Poettering +# Copyright 2004-2006 Lennart Poettering # # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You @@ -17,11 +17,11 @@ # implied. See the License for the specific language governing # permissions and limitations under the License. -AC_PREREQ(2.59) -AC_INIT([mod_mime_xattr],[0.2],[mzzvzrkngge (at) 0pointer (dot) de]) +AC_PREREQ(2.57) +AC_INIT([mod_mime_xattr],[0.3],[mzzvzrkngge (at) 0pointer (dot) net]) AC_CONFIG_SRCDIR([src/mod_mime_xattr.c]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign -Wall]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/mod_mime_xattr/]) @@ -31,15 +31,66 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_MAKE_SET +test_gcc_flag() { + AC_LANG_CONFTEST([int main() {}]) + $CC -c conftest.c $CFLAGS $@ > /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 + + DESIRED_FLAGS="-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 -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline" + + if test "x$HAVE_NETLINK" = "xyes" ; then + # Test whether rtnetlink.h can be included when compiled with -std=c99 + # some distributions (e.g. archlinux) have broken headers that dont + # define __u64 with -std=c99 + AC_MSG_CHECKING([checking whether rtnetlink.h can be included with -std=c99]) + OLDCFLAGS="$CFLAGS" + CFLAGS="-std=c99" + AC_TRY_COMPILE([#include ], [], + use_stdc99=yes, use_stdc99=no) + + if test x"$use_stdc99" = xyes; then + DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + CFLAGS="$OLDCFLAGS" + else + DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS" + fi + + for flag in $DESIRED_FLAGS ; do + AC_MSG_CHECKING([whether $CC accepts $flag]) + if test_gcc_flag $flag ; then + CFLAGS="$CFLAGS $flag" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + done +fi + AC_ARG_WITH(apxs, AS_HELP_STRING(--with-apxs=PATH,/path/to/apxs), - [ AC_PATH_PROG(APXS, apxs, "notfound", "$withval:$PATH") ], - [ AC_PATH_PROG(APXS, apxs, "notfound", "/usr/local/apache/bin:/usr/local/bin:/usr/sbin:$PATH")]) + [ AC_PATH_PROGS(APXS, [apxs2 apxs], "notfound", "$withval:$PATH") ], + [ AC_PATH_PROGS(APXS, [apxs2 apxs], "notfound", "/usr/local/apache/bin:/usr/local/bin:/usr/sbin:$PATH")]) if test "x$APXS" = "xnotfound" ; then AC_MSG_ERROR([*** Sorry, could not find apxs ***]) fi +AC_ARG_WITH(apachectl, + AS_HELP_STRING(--with-apachectl=PATH,/path/to/apachectl), + [ AC_PATH_PROGS(APACHECTL, [apache2ctl apachectl], "notfound", "$withval:$PATH") ], + [ AC_PATH_PROGS(APACHECTL, [apache2ctl apachectl], "notfound", "/usr/local/apache/bin:/usr/local/bin:/usr/sbin:$PATH")]) + # Check for libattr AC_CHECK_LIB([attr], [getxattr],, [AC_MSG_ERROR([*** Sorry, you have to install libattr ***])]) AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([*** Sorry, you have to install the libattr headers ***])]) diff --git a/doc/Makefile.am b/doc/Makefile.am index f21e42c..50afd4f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -# Copyright 2004 Lennart Poettering +# Copyright 2004-2006 Lennart Poettering # # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You diff --git a/doc/README.html.in b/doc/README.html.in index 575ffd9..4d69132 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,7 +10,7 @@

mod_mime_xattr @PACKAGE_VERSION@

-

Copyright 2004 Lennart Poettering <@PACKAGE_BUGREPORT@>

+

Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@>