# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1316155196 0
# Node ID 924c8087a755458f8315406340dbe08d24f13e83
# Parent  1e0cd8dafdfb59b28335858f1c23bfd96380540d
Attempt to use the subversion revision number as the sub version number.

diff -r 1e0cd8dafdfb -r 924c8087a755 Makefile.in
--- a/Makefile.in	Thu Sep 15 21:28:23 2011 +0000
+++ b/Makefile.in	Fri Sep 16 06:39:56 2011 +0000
@@ -7,7 +7,7 @@
 # Uncomment DEPRECATED line to force use of GTK 3.x support
 #
 #DEPRECATED = -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_DISABLE_SINGLE_INCLUDES
-CCFLAGS = $(DEPRECATED) @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES
+CCFLAGS = $(DEPRECATED) @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
 LFLAGS	=	@LIBS@ @ARCH@
 ARFLAGS = @ARFLAGS@
 INSTALL =	@INSTALL@
@@ -26,6 +26,7 @@
 TARGETS = @TARGETS@
 VER_MAJ	=	@DW_MAJOR_VERSION@
 VER_MIN	=	@DW_MINOR_VERSION@
+VER_REV =	@SVNVERSION@
 SOSUFFIX=	@SOSUFFIX@
 SONAME=	@SONAME@
 LIBPREFIX = @LIBPREFIX@
diff -r 1e0cd8dafdfb -r 924c8087a755 configure.in
--- a/configure.in	Thu Sep 15 21:28:23 2011 +0000
+++ b/configure.in	Fri Sep 16 06:39:56 2011 +0000
@@ -32,6 +32,12 @@
 if test x"$MAKE" = x; then
    AC_CHECK_PROG(MAKE, make, make)
 fi
+AC_CHECK_PROG(SVNVERSION, svnversion, svnversion)
+if test x"$SVNVERSION" = x; then
+   SVNVERSION=0
+else
+   SVNVERSION="\` $SVNVERSION -n . | tr -d M \`"
+fi
 
 AC_PROG_INSTALL
 
diff -r 1e0cd8dafdfb -r 924c8087a755 gtk/dw.c
--- a/gtk/dw.c	Thu Sep 15 21:28:23 2011 +0000
+++ b/gtk/dw.c	Fri Sep 16 06:39:56 2011 +0000
@@ -10824,7 +10824,11 @@
    strcpy(env->buildTime, __TIME__);
    env->DWMajorVersion = DW_MAJOR_VERSION;
    env->DWMinorVersion = DW_MINOR_VERSION;
+#ifdef VER_REV
+   env->DWSubVersion = VER_REV;
+#else
    env->DWSubVersion = DW_SUB_VERSION;
+#endif
 
    for(z=1;z<len;z++)
    {
diff -r 1e0cd8dafdfb -r 924c8087a755 gtk3/dw.c
--- a/gtk3/dw.c	Thu Sep 15 21:28:23 2011 +0000
+++ b/gtk3/dw.c	Fri Sep 16 06:39:56 2011 +0000
@@ -9583,7 +9583,11 @@
    strcpy(env->buildTime, __TIME__);
    env->DWMajorVersion = DW_MAJOR_VERSION;
    env->DWMinorVersion = DW_MINOR_VERSION;
+#ifdef VER_REV
+   env->DWSubVersion = atoi(VER_REV);
+#else
    env->DWSubVersion = DW_SUB_VERSION;
+#endif
 
    for(z=1;z<len;z++)
    {
diff -r 1e0cd8dafdfb -r 924c8087a755 mac/dw.m
--- a/mac/dw.m	Thu Sep 15 21:28:23 2011 +0000
+++ b/mac/dw.m	Fri Sep 16 06:39:56 2011 +0000
@@ -7916,7 +7916,11 @@
     strcpy(env->buildTime, __TIME__);
     env->DWMajorVersion = DW_MAJOR_VERSION;
     env->DWMinorVersion = DW_MINOR_VERSION;
+#ifdef VER_REV
+    env->DWSubVersion = VER_REV;
+#else
     env->DWSubVersion = DW_SUB_VERSION;
+#endif
 
     env->MajorVersion = DWOSMajor;
     env->MinorVersion = DWOSMinor;
diff -r 1e0cd8dafdfb -r 924c8087a755 os2/dw.c
--- a/os2/dw.c	Thu Sep 15 21:28:23 2011 +0000
+++ b/os2/dw.c	Fri Sep 16 06:39:56 2011 +0000
@@ -9659,7 +9659,11 @@
    strcpy(env->buildTime, __TIME__);
    env->DWMajorVersion = DW_MAJOR_VERSION;
    env->DWMinorVersion = DW_MINOR_VERSION;
+#ifdef VER_REV
+   env->DWSubVersion = VER_REV;
+#else
    env->DWSubVersion = DW_SUB_VERSION;
+#endif
 }
 
 /* The next few functions are support functions for the OS/2 folder browser */
diff -r 1e0cd8dafdfb -r 924c8087a755 win/dw.c
--- a/win/dw.c	Thu Sep 15 21:28:23 2011 +0000
+++ b/win/dw.c	Fri Sep 16 06:39:56 2011 +0000
@@ -9830,7 +9830,11 @@
    strcpy(env->buildTime, __TIME__);
    env->DWMajorVersion = DW_MAJOR_VERSION;
    env->DWMinorVersion = DW_MINOR_VERSION;
+#ifdef VER_REV
+   env->DWSubVersion = VER_REV;
+#else
    env->DWSubVersion = DW_SUB_VERSION;
+#endif
 }
 
 /*