Skip to content

Commit 9a869ad

Browse files
author
g_j_m
committedSep 15, 2006
Fix for the problem with the auto* process failing when svnversion isn't
available. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5828 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent db8db7e commit 9a869ad

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed
 

‎Makefile.am

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ BUILT_SOURCES = qgssvnversion.h
6363

6464
.PHONY : qgssvnversion.h
6565
qgssvnversion.h:
66-
@QGSSVNDEF="#define QGSSVNVERSION \"`svnversion .`\"" && \
66+
@if [ "$(HAVE_SVNVERSION)" == "yes" ]; then \
67+
QGSSVNDEF="#define QGSSVNVERSION \"`svnversion .`\""; \
68+
else \
69+
QGSSVNDEF="#define QGSSVNVERSION \"unknown\""; \
70+
fi; \
6771
if [ "`grep QGSSVNVERSION qgssvnversion.h 2>/dev/null`" != "$$QGSSVNDEF" ]; then \
6872
echo $$QGSSVNDEF > qgssvnversion.h; \
6973
fi

‎configure.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ dnl check lib64 environment
8080
dnl ---------------------------------------------------------------------------
8181
AQ_CHECK_LIB64
8282

83+
dnl ---------------------------------------------------------------------------
84+
dnl svnversion check
85+
dnl ---------------------------------------------------------------------------
86+
AC_CHECK_PROG(HAVE_SVNVERSION, [svnversion], [yes], [no])
8387

8488
dnl ---------------------------------------------------------------------------
8589
dnl Qt check

0 commit comments

Comments
 (0)