Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv5117
Modified Files:
CHANGES configure configure.in makeopts.in
Log Message:
Mahogany can now be compiled with cygwin's -mno-cygwin switch (mingw)
Index: CHANGES
===================================================================
RCS file: /cvsroot/mahogany/M/CHANGES,v
retrieving revision 1.314
retrieving revision 1.315
diff -b -u -2 -r1.314 -r1.315
--- CHANGES 23 Jun 2003 18:42:18 -0000 1.314
+++ CHANGES 15 Jul 2003 00:47:31 -0000 1.315
@@ -10,4 +10,5 @@
-------------------------------
+14.07.03 NB: Mahogany can now be compiled with cygwin's -mno-cygwin switch (mingw)
23.06.03 VZ: fixed SSL compilation on RedHat 9
23.06.03 NB: Mahogany can now be compiled with cygwin
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.295
retrieving revision 1.296
diff -b -u -2 -r1.295 -r1.296
--- configure 23 Jun 2003 19:33:36 -0000 1.295
+++ configure 15 Jul 2003 00:47:31 -0000 1.296
@@ -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)"
[...1595 lines suppressed...]
@@ -5324,5 +5381,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5327: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5384: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5347,5 +5404,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5350: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5407: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5555,4 +5612,5 @@
[EMAIL PROTECTED]@%$mandir%g
[EMAIL PROTECTED]@%$MAKE_USE_MAC%g
[EMAIL PROTECTED]@%$MAKE_USE_MINGW%g
[EMAIL PROTECTED]@%$MAKE_USE_RESOURCES%g
[EMAIL PROTECTED]@%$host%g
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.280
retrieving revision 1.281
diff -b -u -2 -r1.280 -r1.281
--- configure.in 23 Jun 2003 19:33:40 -0000 1.280
+++ configure.in 15 Jul 2003 00:47:32 -0000 1.281
@@ -23,5 +23,11 @@
MAKE_USE_MAC="USE_MAC=yes"
;;
- CYGWIN*)
+ cygwin* | CYGWIN*)
+ USE_RESOURCES=1
+ MAKE_USE_RESOURCES="USE_RESOURCES=yes"
+ ;;
+ mingw* | MINGW*)
+ USE_MINGW=1
+ MAKE_USE_MINGW="USE_MINGW=yes"
USE_RESOURCES=1
MAKE_USE_RESOURCES="USE_RESOURCES=yes"
@@ -30,4 +36,6 @@
USE_MAC=0
MAKE_USE_MAC=""
+ USE_MINGW=0
+ MAKE_USE_MINGW=""
USE_RESOURCES=0
MAKE_USE_RESOURCES=""
@@ -35,4 +43,5 @@
esac
AC_SUBST(MAKE_USE_MAC)
+AC_SUBST(MAKE_USE_MINGW)
AC_SUBST(MAKE_USE_RESOURCES)
@@ -958,5 +967,8 @@
esac
-dnl we need to set the target for c-client library
+dnl we need to set the target for c-client library except for mingw, for which
+dnl we use separate makefile
+case "$USE_MINGW" in
+0)
case "$USE_CCOSTYPE" in
''|0|1) AC_MSG_CHECKING(for c-client library OS type)
@@ -993,5 +1005,5 @@
OpenBSD*)
CCOSTYPE=bso ;;
- CYGWIN*)
+ cygwin*|CYGWIN*)
CCOSTYPE=cyg ;;
*)
@@ -1006,4 +1018,8 @@
AC_MSG_RESULT($CCOSTYPE) ;;
*) CCOSTYPE="$USE_CCOSTYPE" ;;
+esac
+;;
+1)
+;;
esac
AC_SUBST(CCOSTYPE)
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -b -u -2 -r1.103 -r1.104
--- makeopts.in 23 Jun 2003 19:15:59 -0000 1.103
+++ makeopts.in 15 Jul 2003 00:47:32 -0000 1.104
@@ -38,4 +38,5 @@
@MAKE_PISOCKLIB@
@MAKE_USE_MAC@
[EMAIL PROTECTED]@
@MAKE_USE_RESOURCES@
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
