2007-11-05 Geoff Norton <gnorton@novell.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 84b9f01213fc5111f0018e460821989897012f3e..443d783748fb9a2cf05a3c93339c995f618f9476 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.2.5)
+AM_INIT_AUTOMAKE(mono,1.2.5.99)
 AM_MAINTAINER_MODE
 
 API_VER=1.0
@@ -413,7 +413,7 @@ else
   olivedir=../olive
 fi
 
-if test -d $olivedir; then
+if test -d $srcdir/$olivedir; then
 olive_topdir='$(top_srcdir)/'$olivedir
 fi
 
@@ -457,6 +457,8 @@ embedded)
   GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
   BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
   BUILD_GLIB_LIBS="$GLIB_LIBS"
+  GMODULE_CFLAGS="$GLIB_CFLAGS"
+  GMODULE_LIBS="$GLIB_LIBS"
   AC_CONFIG_SUBDIRS(eglib)
   ;;
 system)
@@ -2165,6 +2167,9 @@ fi
     export VERSION
     [myver=$($AWK 'BEGIN {
       split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+      if(length(vsplit [1]) > 4) {
+        split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+      }
       print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
     }')]