Revision: 4576 http://geany.svn.sourceforge.net/geany/?rev=4576&view=rev Author: ntrel Date: 2010-01-28 16:24:42 +0000 (Thu, 28 Jan 2010)
Log Message: ----------- Backport: Use AC_PATH_PROG instead of which for portability (patch by Erik Southworth, thanks).
Modified Paths: -------------- branches/geany-0.18.1/ChangeLog branches/geany-0.18.1/configure.in
Modified: branches/geany-0.18.1/ChangeLog =================================================================== --- branches/geany-0.18.1/ChangeLog 2010-01-28 16:15:07 UTC (rev 4575) +++ branches/geany-0.18.1/ChangeLog 2010-01-28 16:24:42 UTC (rev 4576) @@ -1,3 +1,10 @@ +2009-09-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * configure.in: + Use AC_PATH_PROG instead of which for portability (patch by Erik + Southworth, thanks). + + 2009-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* doc/geany.txt, doc/geany.html:
Modified: branches/geany-0.18.1/configure.in =================================================================== --- branches/geany-0.18.1/configure.in 2010-01-28 16:15:07 UTC (rev 4575) +++ branches/geany-0.18.1/configure.in 2010-01-28 16:24:42 UTC (rev 4576) @@ -15,9 +15,10 @@ AC_PROG_CXX # check for C++ compiler explicitly and fail if none is found, do this check # after AC_PROG_CXX has set the CXX environment variable -which $CXX >/dev/null 2>&1 -if test "x$?" != "x0"; then - AC_MSG_ERROR([No C++ compiler not found. Please install a C++ compiler.]) +AC_PATH_PROG([CXXCOMPILER], [$CXX]) +if ! test -x "${CXXCOMPILER}" +then + AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.]) fi
#AC_PROG_RANLIB @@ -48,7 +49,7 @@
# get svn revision (try GIT first, then check for SVN) REVISION="r0" -GIT=`which git 2>/dev/null` +AC_PATH_PROG([GIT], [git]) if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" then REVISION=r`git svn find-rev origin/trunk 2>/dev/null || @@ -57,7 +58,7 @@ fi if test "x${REVISION}" = "xr0" then - SVN=`which svn 2>/dev/null` + AC_PATH_PROG([SVN], [svn]) if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" then REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.