Merged revisions 66029-66030 via svnmerge from

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

........
r66029 | qwell | 2007-05-24 15:53:18 -0500 (Thu, 24 May 2007) | 2 lines

Following moving strip to AC_PATH_TOOL, we need to do something similar for ar.

........
r66030 | qwell | 2007-05-24 15:54:16 -0500 (Thu, 24 May 2007) | 2 lines

Rebuild configure script for previous ar fix.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-05-24 20:55:51 +00:00
parent 54bccb409b
commit 09e734a563
2 changed files with 106 additions and 142 deletions

View File

@@ -118,7 +118,6 @@ then
AC_CHECK_TOOL(CXX, g++, :)
AC_CHECK_TOOL(LD, ld, :)
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar, :)
fi
# Checks for programs.
@@ -136,6 +135,7 @@ AC_PROG_RANLIB
AST_CHECK_GNU_MAKE
AC_PATH_TOOL([STRIP], [strip], :)
AC_PATH_TOOL([AR], [ar], :)
GNU_LD=0
if test "x$with_gnu_ld" = "xyes" ; then
@@ -144,7 +144,6 @@ fi
AC_SUBST(GNU_LD)
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], :)