Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv8977
Modified Files:
configure configure.in makeopts.in
Log Message:
fixed resources compilation
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.299
retrieving revision 1.300
diff -b -u -2 -r1.299 -r1.300
--- configure 28 Jul 2003 21:21:11 -0000 1.299
+++ configure 30 Jul 2003 13:20:47 -0000 1.300
@@ -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)"
[...1592 lines suppressed...]
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5404,5 +5423,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5407: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5426: 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
@@ -5663,5 +5682,4 @@
[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
@@ -5678,4 +5696,5 @@
[EMAIL PROTECTED]@%$LATEX2HTML%g
[EMAIL PROTECTED]@%$MAKE_HAVE_DOCTOOLS%g
[EMAIL PROTECTED]@%$RESFLAGS%g
[EMAIL PROTECTED]@%$CXXFLAGS_RELAXED%g
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.285
retrieving revision 1.286
diff -b -u -2 -r1.285 -r1.286
--- configure.in 28 Jul 2003 21:21:11 -0000 1.285
+++ configure.in 30 Jul 2003 13:20:48 -0000 1.286
@@ -963,9 +963,4 @@
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
@@ -1176,4 +1171,16 @@
CPPFLAGS="-I$BUILDDIR/include $CPPFLAGS" ;;
esac
+
+dnl set include flags for cygwin resources
+dnl wx installation directory is needed for cygwin resources
+WX_INSTALL_DIR=`$WX_CONFIG_WITH_ARGS --prefix`
+
+RESFLAGS="--include-dir=$WX_INSTALL_DIR/include --include-dir=$SOURCEDIR/res"
+
+RESFLAGS="--include-dir=$SOURCEDIR/include $RESFLAGS"
+case "$BUILDDIR" in "$SOURCEDIR") ;; *)
+ RESFLAGS="--include-dir=$BUILDDIR/include $RESFLAGS" ;;
+esac
+AC_SUBST(RESFLAGS)
dnl add all extra/src directories to the search paths
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -b -u -2 -r1.104 -r1.105
--- makeopts.in 15 Jul 2003 00:47:32 -0000 1.104
+++ makeopts.in 30 Jul 2003 13:20:48 -0000 1.105
@@ -25,6 +25,6 @@
ICONDIR=$(SOURCEDIR)/src/icons
-# wx installation directory is needed for cygwin resources:
-WX_DIR := @WX_DIR@
+# resources:
+RESFLAGS := @RESFLAGS@
# this will be set or unset
-------------------------------------------------------
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
