SF.net SVN: geany:[4240] trunk

[ntrel at users.sourceforge.net]

Revision: 4240
          http://geany.svn.sourceforge.net/geany/?rev=4240&view=rev
Author:   ntrel
Date:     2009-09-27 11:20:12 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
Use AC_PATH_PROG instead of which for portability (patch by Erik
Southworth, thanks).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-27 11:06:04 UTC (rev 4239)
+++ trunk/ChangeLog	2009-09-27 11:20:12 UTC (rev 4240)
@@ -5,6 +5,9 @@
    visible (patch by Eugene Arshinov, thanks).
  * src/callbacks.c:
    Focus editor after entering a number in the goto line toolbar entry.
+ * configure.in:
+   Use AC_PATH_PROG instead of which for portability (patch by Erik
+   Southworth, thanks).
 
 
 2009-09-24  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-09-27 11:06:04 UTC (rev 4239)
+++ trunk/configure.in	2009-09-27 11:20:12 UTC (rev 4240)
@@ -17,9 +17,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
@@ -50,7 +51,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 ||
@@ -59,7 +60,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.