[svn-commits] qwell: trunk r2720 - /trunk/

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Jul 11 12:43:14 2007
New Revision: 2720

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2720
Log:
Move chkconfig logic to configure script rather than Makefile.

Modified:
    trunk/Makefile
    trunk/aclocal.m4
    trunk/configure
    trunk/configure.ac
    trunk/makeopts.in

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2720&r1=2719&r2=2720
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 11 12:43:14 2007
@@ -87,11 +87,6 @@
 # Check for udev rules directories
 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),)

Modified: trunk/aclocal.m4
URL: http://svn.digium.com/view/zaptel/trunk/aclocal.m4?view=diff&rev=2720&r1=2719&r2=2720
==============================================================================
--- trunk/aclocal.m4 (original)
+++ trunk/aclocal.m4 Wed Jul 11 12:43:14 2007
@@ -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.

Modified: trunk/configure
URL: http://svn.digium.com/view/zaptel/trunk/configure?view=diff&rev=2720&r1=2719&r2=2720
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jul 11 12:43:14 2007
@@ -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 @@
 HOSTCC
 GREP
 LN
+CHKCONFIG
 WGET
 FETCH
 DOWNLOAD
@@ -3150,6 +3151,47 @@
 if test -n "$LN"; then
   { echo "$as_me:$LINENO: result: $LN" >&5
 echo "${ECHO_T}$LN" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+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; }
@@ -6010,6 +6052,7 @@
 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 @@
 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

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/zaptel/trunk/configure.ac?view=diff&rev=2720&r1=2719&r2=2720
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jul 11 12:43:14 2007
@@ -43,6 +43,7 @@
 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

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/zaptel/trunk/makeopts.in?view=diff&rev=2720&r1=2719&r2=2720
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Wed Jul 11 12:43:14 2007
@@ -5,6 +5,7 @@
 GREP=@GREP@
 SHELL=@SHELL@
 LN=@LN@
+CHKCONFIG=@CHKCONFIG@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@