Browse code

git-* commands are gone, use 'git svn'. correct include position for fdpassing.h

git-svn: trunk@4813

Török Edvin authored on 2009/02/18 04:40:17
Showing 4 changed files
... ...
@@ -1,3 +1,9 @@
1
+Tue Feb 17 22:10:10 EET 2009 (edwin)
2
+------------------------------------
3
+ * libclamav/Makefile.am, libclamav/Makefile.in,
4
+ unit_tests/check_clamd.c: git-* commands are gone, use 'git svn'.
5
+ correct include position for fdpassing.h
6
+
1 7
 Tue Feb 17 20:35:21 EET 2009 (edwin)
2 8
 ------------------------------------
3 9
  * clamd/server-th.c, clamd/session.c, clamd/session.h,
... ...
@@ -280,9 +280,9 @@ version.h.tmp:
280 280
 	rm -f $@;\
281 281
 	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
282 282
 	if test $$REVISION = "exported"; then\
283
-		REVISION="$$(LANG=C cd "$(top_srcdir)"; git-svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
283
+		REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
284 284
 		if test -n "$$REVISION"; then\
285
-			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git-describe --always 2>/dev/null)";\
285
+			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
286 286
 		fi;\
287 287
 	fi;\
288 288
 	if test -n "$$REVISION"; then\
... ...
@@ -1236,9 +1236,9 @@ version.h.tmp:
1236 1236
 	rm -f $@;\
1237 1237
 	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
1238 1238
 	if test $$REVISION = "exported"; then\
1239
-		REVISION="$$(LANG=C cd "$(top_srcdir)"; git-svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
1239
+		REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
1240 1240
 		if test -n "$$REVISION"; then\
1241
-			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git-describe --always 2>/dev/null)";\
1241
+			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
1242 1242
 		fi;\
1243 1243
 	fi;\
1244 1244
 	if test -n "$$REVISION"; then\
... ...
@@ -2,6 +2,7 @@
2 2
 #include "clamav-config.h"
3 3
 #endif
4 4
 
5
+#include "shared/fdpassing.h"
5 6
 #include <arpa/inet.h>
6 7
 #include <fcntl.h>
7 8
 #include <stdio.h>
... ...
@@ -27,7 +28,6 @@
27 27
 #include "checks_common.h"
28 28
 #include "libclamav/version.h"
29 29
 #include "libclamav/cltypes.h"
30
-#include "shared/fdpassing.h"
31 30
 
32 31
 #ifdef CHECK_HAVE_LOOPS
33 32