Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv24098

Modified Files:
        configure.in configure 
Removed Files:
        makeversion.in 
Log Message:
removed makeversion.in; the version info is only in include/Mversion.h now

Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.283
retrieving revision 1.284
diff -b -u -2 -r1.283 -r1.284
--- configure.in        28 Jul 2003 20:12:37 -0000      1.283
+++ configure.in        28 Jul 2003 20:32:02 -0000      1.284
@@ -84,4 +84,5 @@
        M_OVERRIDES(optimize,optimization,USE_OPT,1,
        --disable-optimize      disable optimization (automatic if debugging))
+       debug_option="no"
        ;;
 
@@ -99,4 +100,6 @@
        M_OVERRIDES(efence,ElectricFence,USE_EFENCE,0,
        --with-efence           use ElectricFence for debugging)
+
+       debug_option="yes"
 esac
 
@@ -1352,4 +1355,7 @@
                ;;
        esac
+
+       grep "^#define M_VERSION_[MR]" $src/include/Mversion.h | \
+           sed 's/^#define \+\(\w\+\) \+\([0-9]\+\)/\1=\2/' > makeversion
 ],
 src="$srcdir" SRC="$SOURCEDIR" OBJ="$BUILDDIR"
@@ -1358,4 +1364,16 @@
 
 AC_OUTPUT($OUTPUT)
+
+dnl show the configuration used
+. ./makeversion
+
+echo
+echo "Configured Mahogany " \
+     "${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE} for ${host}."
+echo ""
+echo " wxWindows version used:                 ${WX_VERSION}"
+echo " Debug mode:                             ${debug_option}"
+echo " SSL support:                            ${ssl_option}"
+echo " Modules support:                        ${m_cv_USE_MODULES}"
 exit 0
 

Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.297
retrieving revision 1.298
diff -b -u -2 -r1.297 -r1.298
--- configure   26 Jul 2003 13:56:33 -0000      1.297
+++ configure   28 Jul 2003 20:32:02 -0000      1.298
@@ -49,9 +49,12 @@
   --with-ssl=ssldir       specify path where OpenSSL is installed"
 ac_help="$ac_help
-  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)"
-ac_help="$ac_help
-  --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)"
+  --with-wxdir=PATH       Use uninstalled version of wxWindows in PATH"
 ac_help="$ac_help
   --with-wx-config=CONFIG   wx-config script to use (optional)"
+ac_help="$ac_help
+  --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)"
+ac_help="$ac_help
[...1599 lines suppressed...]
+       grep "^#define M_VERSION_[MR]" $src/include/Mversion.h | \
+           sed 's/^#define \+\(\w\+\) \+\([0-9]\+\)/\1=\2/' > makeversion
 
 
@@ -5946,4 +5938,15 @@
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+
+. ./makeversion
+
+echo
+echo "Configured Mahogany " \
+     "${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE} for ${host}."
+echo ""
+echo " wxWindows version used:                 ${WX_VERSION}"
+echo " Debug mode:                             ${debug_option}"
+echo " SSL support:                            ${ssl_option}"
+echo " Modules support:                        ${m_cv_USE_MODULES}"
 exit 0
 

--- makeversion.in DELETED ---



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to