aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-28 19:17:38 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-28 19:17:38 +0000
commita4b8e112437175a0e8e67cf7d142dd77b86818eb (patch)
tree7db41cd5035f6015b41bc964afbcb8b70ac57f20
parent13892793293fb7996feeec6ecd8464a323ca7263 (diff)
Remove usage of `id` since it isn't useful and was causing breakge.
Solaris `id` doesn't support the -u argument. Instead of figuring out how to fix this to work on Solaris, I decided to check why it was necessary and where else it was used. It was only used in one place, and it hasn't been needed for a very long time (I question whether it was ever needed). git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@259748 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile5
-rwxr-xr-xconfigure44
-rw-r--r--configure.ac1
3 files changed, 2 insertions, 48 deletions
diff --git a/Makefile b/Makefile
index ea7e5e884..5b8c67c89 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,6 @@ export STRIP
export DOWNLOAD
export AWK
export GREP
-export ID
export OSARCH
export CURSES_DIR
export NCURSES_DIR
@@ -414,9 +413,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
rm -f build_tools/menuselect-deps
datafiles: _all
- if [ `$(ID) -u` = 0 ]; then \
- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
- fi
+ CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig;
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
diff --git a/configure b/configure
index f7e684e79..ecb269cef 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 242966 .
+# From configure.ac Revision: 259352 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for asterisk 1.4.
#
@@ -827,7 +827,6 @@ WGET
DOT
LN
DIRNAME
-ID
BASENAME
COMPRESS
FIND
@@ -6915,47 +6914,6 @@ $as_echo "no" >&6; }
fi
-# Extract the first word of "id", so it can be a program name with args.
-set dummy id; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ID+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $ID in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ID="$ID" # 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_ID="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_ID" && ac_cv_path_ID=":"
- ;;
-esac
-fi
-ID=$ac_cv_path_ID
-if test -n "$ID"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ID" >&5
-$as_echo "$ID" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
# Extract the first word of "dirname", so it can be a program name with args.
set dummy dirname; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/configure.ac b/configure.ac
index d9f5e7ad3..30cf48960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,6 @@ AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([FIND], [find], :)
AC_PATH_PROG([COMPRESS], [compress], :)
AC_PATH_PROG([BASENAME], [basename], :)
-AC_PATH_PROG([ID], [id], :)
AC_PATH_PROG([DIRNAME], [dirname], :)
AC_PATH_PROG([SHELL], [sh], :)
AC_PATH_PROG([LN], [ln], :)