[zaptel-commits] branch group/menuselect r1146 - /team/group/menuselect/

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Tue Jun 20 08:26:47 MST 2006


Author: russell
Date: Tue Jun 20 10:26:46 2006
New Revision: 1146

URL: http://svn.digium.com/view/zaptel?rev=1146&view=rev
Log:
use $(GREP), remove check for ar

Modified:
    team/group/menuselect/Makefile
    team/group/menuselect/configure
    team/group/menuselect/configure.ac
    team/group/menuselect/makeopts.in

Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1146&r1=1145&r2=1146&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Tue Jun 20 10:26:46 2006
@@ -100,7 +100,7 @@
 # version that we runs. If we build for 2.4 using 2.4 headers on a 2.6
 # system with udev mounted on /dev , no point in installing files to /dev
 # because they'll be wiped at next reboot.
-DYNFS:=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes")
+DYNFS:=$(shell ps ax | $(GREP) -v grep | $(GREP) -qw 'devfsd\|udevd' && echo "yes")
 
 # Check for udev rules directories
 ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
@@ -381,7 +381,7 @@
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
 	$(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
+	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | $(GREP) "SELinux status:" | $(GREP) -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
 	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
 	$(INSTALL) -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
 	$(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
@@ -419,9 +419,9 @@
 		echo "Updating from Subversion..." ; \
 		svn update | tee update.out; \
 		rm -f .version; \
-		if [ `grep -c ^C update.out` -gt 0 ]; then \
+		if [ `$(GREP) -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
-			grep ^C update.out | cut -b4- ; \
+			$(GREP) ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
 	else \

Modified: team/group/menuselect/configure
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure?rev=1146&r1=1145&r2=1146&view=diff
==============================================================================
--- team/group/menuselect/configure (original)
+++ team/group/menuselect/configure Tue Jun 20 10:26:46 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1138 .
+# From configure.ac Revision: 1144 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -4391,47 +4391,6 @@
 fi
 
 
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; 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_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $AR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AR="$AR" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_AR="$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_AR" && ac_cv_path_AR=":"
-  ;;
-esac
-fi
-AR=$ac_cv_path_AR
-if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5

Modified: team/group/menuselect/configure.ac
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/configure.ac?rev=1146&r1=1145&r2=1146&view=diff
==============================================================================
--- team/group/menuselect/configure.ac (original)
+++ team/group/menuselect/configure.ac Tue Jun 20 10:26:46 2006
@@ -64,7 +64,6 @@
 AST_CHECK_GNU_MAKE
 
 AC_PATH_PROG([GREP], [grep], :)
-AC_PATH_PROG([AR], [ar], :)
 AC_PATH_PROG([FIND], [find], :)
 AC_PATH_PROG([COMPRESS], [compress], :)
 AC_PATH_PROG([BASENAME], [basename], :)

Modified: team/group/menuselect/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/makeopts.in?rev=1146&r1=1145&r2=1146&view=diff
==============================================================================
--- team/group/menuselect/makeopts.in (original)
+++ team/group/menuselect/makeopts.in Tue Jun 20 10:26:46 2006
@@ -4,7 +4,6 @@
 
 INSTALL=@INSTALL@
 GREP=@GREP@
-AR=@AR@
 RANLIB=@RANLIB@
 FIND=@FIND@
 COMPRESS=@COMPRESS@



More information about the zaptel-commits mailing list