HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use AC_PATH_PROG instead of which for portability (patch by Erik

Browse Source 
Southworth, thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4240 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-09-27 11:20:12 +00:00
parent 6334ec1676
commit 5bb28825aa
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@
visible (patch by Eugene Arshinov, thanks). visible (patch by Eugene Arshinov, thanks).
* src/callbacks.c: * src/callbacks.c:
Focus editor after entering a number in the goto line toolbar entry. 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> 2009-09-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

11
configure.in
View File

@ -17,9 +17,10 @@ AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
# check for C++ compiler explicitly and fail if none is found, do this check # check for C++ compiler explicitly and fail if none is found, do this check
# after AC_PROG_CXX has set the CXX environment variable # after AC_PROG_CXX has set the CXX environment variable
which $CXX >/dev/null 2>&1 AC_PATH_PROG([CXXCOMPILER], [$CXX])
if test "x$?" != "x0"; then if ! test -x "${CXXCOMPILER}"
AC_MSG_ERROR([No C++ compiler not found. Please install a C++ compiler.]) then
AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
fi fi
#AC_PROG_RANLIB #AC_PROG_RANLIB
@ -50,7 +51,7 @@ AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr])
# get svn revision (try GIT first, then check for SVN) # get svn revision (try GIT first, then check for SVN)
REVISION="r0" REVISION="r0"
GIT=`which git 2>/dev/null` AC_PATH_PROG([GIT], [git])
if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
then then
REVISION=r`git svn find-rev origin/trunk 2>/dev/null || REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
@ -59,7 +60,7 @@ then
fi fi
if test "x${REVISION}" = "xr0" if test "x${REVISION}" = "xr0"
then then
SVN=`which svn 2>/dev/null` AC_PATH_PROG([SVN], [svn])
if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}"
then then
REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4`