# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1157472837 0
# Node ID c2c916d4d95c7b79c1a383dcdd76b71d5ac6b0a8
# Parent  22cb019456bd34a37c7f1c58c85c4cb2a24fabf9
[gaim-migrate @ 17169]
Remove VERSION file from svn, it was only needed there for wingaim and was causing problems elsewhere when it was not overwritten.
Parse the version number from the configure.ac file for the wingaim build instead.

committer: Tailor Script <tailor@pidgin.im>

diff -r 22cb019456bd -r c2c916d4d95c Makefile.am
--- a/Makefile.am	Tue Sep 05 15:40:24 2006 +0000
+++ b/Makefile.am	Tue Sep 05 16:13:57 2006 +0000
@@ -16,7 +16,6 @@
 		config.h.mingw \
 		Makefile.mingw \
 		README.mingw \
-		VERSION \
 		VERSION.in \
 		gtk/plugins/win32/transparency/Makefile.mingw \
 		gtk/plugins/win32/transparency/win2ktrans.c \
diff -r 22cb019456bd -r c2c916d4d95c VERSION
--- a/VERSION	Tue Sep 05 15:40:24 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-2.0.0dev
diff -r 22cb019456bd -r c2c916d4d95c libgaim/win32/global.mak
--- a/libgaim/win32/global.mak	Tue Sep 05 15:40:24 2006 +0000
+++ b/libgaim/win32/global.mak	Tue Sep 05 16:13:57 2006 +0000
@@ -50,7 +50,17 @@
 GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/gaim-portable.exe
 
 GCCWARNINGS := -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef
-GAIM_VERSION := $(shell cat $(GAIM_TOP)/VERSION)
+
+# parse the version number from the configure.ac file if it is newer
+#AC_INIT([gaim], [2.0.0dev], [gaim-devel@lists.sourceforge.net])
+GAIM_VERSION := $(shell \
+  if [ ! $(GAIM_TOP)/VERSION -nt $(GAIM_TOP)/configure.ac ]; then \
+    awk 'BEGIN {FS="\\] *, *\\["} /^AC_INIT\(.+\)/ {printf("%s",$$2); exit}' \
+      $(GAIM_TOP)/configure.ac > $(GAIM_TOP)/VERSION; \
+  fi; \
+  cat $(GAIM_TOP)/VERSION \
+)
+
 DEFINES += 	-DVERSION=\"$(GAIM_VERSION)\" \
 		-DHAVE_CONFIG_H