Revision: 4796 http://geany.svn.sourceforge.net/geany/?rev=4796&view=rev Author: ntrel Date: 2010-03-31 16:36:36 +0000 (Wed, 31 Mar 2010)

Log Message: ----------- Revert commit to use AC_PATH_PROG instead of 'which' (fixes #2973764).

Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-31 16:21:28 UTC (rev 4795) +++ trunk/ChangeLog 2010-03-31 16:36:36 UTC (rev 4796) @@ -7,6 +7,9 @@ * src/plugindata.h, src/stash.c, src/stash.h, src/plugins.c, plugins/geanyfunctions.h: Add Stash widget functions to API. + * configure.ac: + Revert commit to use AC_PATH_PROG instead of 'which' (fixes + #2973764).

2010-03-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-03-31 16:21:28 UTC (rev 4795) +++ trunk/configure.ac 2010-03-31 16:36:36 UTC (rev 4796) @@ -17,9 +17,8 @@ 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 -AC_PATH_PROG([CXXCOMPILER], [$CXX]) -if ! test -x "${CXXCOMPILER}" -then +which $CXX >/dev/null 2>&1 +if test "x$?" != "x0"; then AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.]) fi

@@ -51,7 +50,7 @@

# get svn revision (try GIT first, then check for SVN) REVISION="r0" -AC_PATH_PROG([GIT], [git]) +GIT=`which git 2>/dev/null` if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" then REVISION=r`git svn find-rev origin/trunk 2>/dev/null || @@ -60,7 +59,7 @@ fi if test "x${REVISION}" = "xr0" then - AC_PATH_PROG([SVN], [svn]) + SVN=`which svn 2>/dev/null` 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.