From 4d83da07cdbe3cb768bc56f543ee9396b14fb48a Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Tue, 19 Aug 2014 14:02:41 +0200 Subject: [PATCH] get rid of autogen.sh and bootstrap.sh --- README | 5 ++--- autogen.sh | 60 ---------------------------------------------------- bootstrap.sh | 51 -------------------------------------------- 3 files changed, 2 insertions(+), 114 deletions(-) delete mode 100755 autogen.sh delete mode 100755 bootstrap.sh diff --git a/README b/README index 1233fd7..eba8f3c 100644 --- a/README +++ b/README @@ -4,10 +4,9 @@ containing only the common and core components TO BUILD FROM GIT: -./bootstrap # first time -./configure ... # if other flags desired +autoreconf # first time +./configure make -make check # to run some tests requires: libtool, pkgconfig, autoconf, automake diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 6aebf96..0000000 --- a/autogen.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi 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 Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -AM_VERSION=1.11 -AC_VERSION=2.63 - -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 - # re-run only automake (after changes to Makefile.am) - run_versioned automake "$AM_VERSION" -a -c --foreign - ./config.status -else - rm -rf autom4te.cache - rm -f config.cache - - test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize - "$LIBTOOLIZE" -c --force - - run_versioned aclocal "$AM_VERSION" -I common - run_versioned autoconf "$AC_VERSION" -Wall - run_versioned autoheader "$AC_VERSION" - run_versioned automake "$AM_VERSION" -a -c --foreign -fi diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100755 index 2b5c56f..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi 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 Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -FLAGS="--sysconfdir=/etc --localstatedir=/var --enable-tests" - -case `uname -s` in - Darwin) - export LIBTOOLIZE=/opt/local/bin/glibtoolize - export CFLAGS="-I/opt/local/include" - export LDFLAGS="-L/opt/local/lib" - export PKG_CONFIG_PATH="/opt/local/lib/pkgconfig" - FLAGS="$FLAGS --prefix=/opt/local" - ;; - FreeBSD) - cp /usr/local/share/aclocal/libtool15.m4 common - cp /usr/local/share/aclocal/pkg.m4 common - export LIBTOOLIZE=/usr/local/bin/libtoolize15 - export CFLAGS="-I/usr/local/include" - export LDFLAGS="-L/usr/local/lib" - export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" - FLAGS="$FLAGS --prefix=/opt" - ;; - NetBSD) - export LIBTOOLIZE=libtoolize - export CFLAGS="-I/usr/pkg/include" - export LDFLAGS="-L/usr/pkg/lib" - export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" - FLAGS="$FLAGS --prefix=/opt" - ;; - Linux) - ;; -esac - -export CFLAGS="$CFLAGS -g -O0" -sh autogen.sh && ./configure $FLAGS "$@" -- 2.39.5