diff options
author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-11 17:43:14 +0000 |
---|---|---|
committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-11 17:43:14 +0000 |
commit | 12abb7a7f487ad3e6b72ed733ac9e86c8220daa3 (patch) | |
tree | 1a9ca792ee533a5007f627e01644ae2e26834e83 | |
parent | 81fd2c8de1bb4a1c4624400d78ea083ec2d5fdd2 (diff) |
Move chkconfig logic to configure script rather than Makefile.
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2720 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | aclocal.m4 | 4 | ||||
-rwxr-xr-x | configure | 47 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | makeopts.in | 1 |
5 files changed, 49 insertions, 9 deletions
@@ -89,11 +89,6 @@ ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d)) UDEVRULES=yes endif -CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null) -ifndef CHKCONFIG -CHKCONFIG:=: -endif - ifneq ($(wildcard .version),) ZAPTELVERSION:=$(shell cat .version) else @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1569 . +# From configure.ac Revision: 2108 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -670,6 +670,7 @@ GNU_MAKE HOSTCC GREP LN +CHKCONFIG WGET FETCH DOWNLOAD @@ -3156,6 +3157,47 @@ echo "${ECHO_T}no" >&6; } fi +# Extract the first word of "chkconfig", so it can be a program name with args. +set dummy chkconfig; 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_CHKCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CHKCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHKCONFIG="$CHKCONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CHKCONFIG="$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 +IFS=$as_save_IFS + + test -z "$ac_cv_path_CHKCONFIG" && ac_cv_path_CHKCONFIG=":" + ;; +esac +fi +CHKCONFIG=$ac_cv_path_CHKCONFIG +if test -n "$CHKCONFIG"; then + { echo "$as_me:$LINENO: result: $CHKCONFIG" >&5 +echo "${ECHO_T}$CHKCONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + # Extract the first word of "wget", so it can be a program name with args. set dummy wget; ac_word=$2 @@ -6010,6 +6052,7 @@ GNU_MAKE!$GNU_MAKE$ac_delim HOSTCC!$HOSTCC$ac_delim GREP!$GREP$ac_delim LN!$LN$ac_delim +CHKCONFIG!$CHKCONFIG$ac_delim WGET!$WGET$ac_delim FETCH!$FETCH$ac_delim DOWNLOAD!$DOWNLOAD$ac_delim @@ -6030,7 +6073,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index f2b916e..738fa13 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_SUBST(HOSTCC) AC_PATH_PROG([GREP], [grep], :) AC_PATH_PROG([SHELL], [sh], :) AC_PATH_PROG([LN], [ln], :) +AC_PATH_PROG([CHKCONFIG], [chkconfig], :) AC_PATH_PROG([WGET], [wget], :) if test "${WGET}" != ":" ; then diff --git a/makeopts.in b/makeopts.in index 6f4e0bb..095e558 100644 --- a/makeopts.in +++ b/makeopts.in @@ -5,6 +5,7 @@ INSTALL=@INSTALL@ GREP=@GREP@ SHELL=@SHELL@ LN=@LN@ +CHKCONFIG=@CHKCONFIG@ prefix = @prefix@ exec_prefix = @exec_prefix@ |