Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv18082
Modified Files:
Makefile configure configure.in makeopts.in
Log Message:
resources for cygwin
Index: Makefile
===================================================================
RCS file: /cvsroot/mahogany/M/Makefile,v
retrieving revision 1.63
retrieving revision 1.64
diff -b -u -2 -r1.63 -r1.64
--- Makefile 16 Jul 2002 13:56:32 -0000 1.63
+++ Makefile 23 Jun 2003 19:15:56 -0000 1.64
@@ -3,5 +3,5 @@
FILES := configure.in configure Makefile makeopts.in makerules
-SUB_DIRS := include extra src
+SUB_DIRS := include extra res src
ALL_DIRS := $(SUB_DIRS) doc
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.293
retrieving revision 1.294
diff -b -u -2 -r1.293 -r1.294
--- configure 23 Jun 2003 18:42:14 -0000 1.293
+++ configure 23 Jun 2003 19:15:56 -0000 1.294
@@ -49,12 +49,9 @@
--with-ssl=ssldir specify path where OpenSSL is installed"
ac_help="$ac_help
- --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
- --with-wx-exec-prefix=PREFIX
- Exec prefix where wxWindows is installed (optional)"
+ --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)"
[...1589 lines suppressed...]
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5385,5 +5438,5 @@
COPY=Makefile
DIR=
-for dir in `cd $srcdir; find include extra src locale doc -type d -print`
+for dir in `cd $srcdir; find include extra src locale doc res -type d -print`
do case "$dir" in
CVS | */CVS) continue ;;
@@ -5544,4 +5597,5 @@
[EMAIL PROTECTED]@%$mandir%g
[EMAIL PROTECTED]@%$MAKE_USE_MAC%g
[EMAIL PROTECTED]@%$MAKE_USE_RESOURCES%g
[EMAIL PROTECTED]@%$host%g
[EMAIL PROTECTED]@%$host_alias%g
@@ -5593,4 +5647,5 @@
[EMAIL PROTECTED]@%$GUI_LIBS_SEMISTATIC%g
[EMAIL PROTECTED]@%$GUI_LIBS_STATIC%g
[EMAIL PROTECTED]@%$WX_DIR%g
[EMAIL PROTECTED]@%$CCOSTYPE%g
[EMAIL PROTECTED]@%$MAKE_PISOCKLIB%g
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.278
retrieving revision 1.279
diff -b -u -2 -r1.278 -r1.279
--- configure.in 23 Jun 2003 18:42:18 -0000 1.278
+++ configure.in 23 Jun 2003 19:15:58 -0000 1.279
@@ -23,10 +23,17 @@
MAKE_USE_MAC="USE_MAC=yes"
;;
+ CYGWIN*)
+ USE_RESOURCES=1
+ MAKE_USE_RESOURCES="USE_RESOURCES=yes"
+ ;;
*)
USE_MAC=0
MAKE_USE_MAC=""
+ USE_RESOURCES=0
+ MAKE_USE_RESOURCES=""
;;
esac
AC_SUBST(MAKE_USE_MAC)
+AC_SUBST(MAKE_USE_RESOURCES)
echo ""
@@ -932,4 +939,9 @@
esac
+dnl wx installation directory is needed for cygwin resources
+WX_INSTALL_DIR=`$WX_CONFIG_WITH_ARGS --prefix`
+WX_DIR="$WX_INSTALL_DIR"
+AC_SUBST(WX_DIR)
+
dnl --------------------------------------------------------------------------
dnl c-client library: set the proper OSTYPE and compiler variables
@@ -1255,5 +1267,5 @@
COPY=Makefile
DIR=
-for dir in `cd $srcdir; find include extra src locale doc -type d -print`
+for dir in `cd $srcdir; find include extra src locale doc res -type d -print`
do case "$dir" in
CVS | */CVS) continue ;;
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -b -u -2 -r1.102 -r1.103
--- makeopts.in 8 Apr 2003 15:04:21 -0000 1.102
+++ makeopts.in 23 Jun 2003 19:15:59 -0000 1.103
@@ -25,4 +25,7 @@
ICONDIR=$(SOURCEDIR)/src/icons
+# wx installation directory is needed for cygwin resources:
+WX_DIR := @WX_DIR@
+
# this will be set or unset
@MAKE_USE_PYTHON@
@@ -35,4 +38,5 @@
@MAKE_PISOCKLIB@
@MAKE_USE_MAC@
[EMAIL PROTECTED]@
ifdef HAVE_LIBMAL
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
