sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 259748 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r259748 | qwell | 2010-04-28 14:17:38 -0500 (Wed, 28 Apr 2010) | 7 lines
  
  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: https://origsvn.digium.com/svn/asterisk/trunk@259760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker 2010-04-28 19:19:54 +00:00
parent dc9295da58
commit 038af9fada
3 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -85,7 +85,6 @@ export STRIP
export DOWNLOAD
export AWK
export GREP
export ID
export MD5
export WGET_EXTRA_ARGS
@ -490,9 +489,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.

44
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 258351 .
# From configure.ac Revision: 259353 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for asterisk 1.6.
#
@ -990,7 +990,6 @@ WGET
DOT
LN
DIRNAME
ID
BASENAME
COMPRESS
FIND
@ -7132,47 +7131,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

1
configure.ac
View File

@ -189,7 +189,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], :)