Update of /cvsroot/mahogany/M
In directory usw-pr-cvs1:/tmp/cvs-serv3724
Modified Files:
configure configure.in makeopts.in
Log Message:
run Rez on the M binary under Mac OS X
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.275
retrieving revision 1.276
diff -b -u -2 -r1.275 -r1.276
--- configure 29 Jun 2002 00:52:21 -0000 1.275
+++ configure 3 Jul 2002 00:43:20 -0000 1.276
@@ -564,5 +564,5 @@
-# From configure.in Id: configure.in,v 1.261 2002/06/04 13:50:22 vadz Exp
+# From configure.in Id: configure.in,v 1.262 2002/06/29 00:52:21 vadz Exp
rm -f conftestdata
@@ -579,4 +579,16 @@
fi
+case "$OSTYPE" in
+ darwin* | Darwin*)
[...1519 lines suppressed...]
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5283,5 +5321,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5286: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5324: 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
@@ -5490,4 +5528,5 @@
s%@infodir@%$infodir%g
s%@mandir@%$mandir%g
+s%@MAKE_USE_MAC@%$MAKE_USE_MAC%g
s%@host@%$host%g
s%@host_alias@%$host_alias%g
@@ -5516,4 +5555,5 @@
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@SET_MAKE@%$SET_MAKE%g
+s%@REZ@%$REZ%g
s%@CXXCPP@%$CXXCPP%g
s%@MAKE_USE_LEAKTRACER@%$MAKE_USE_LEAKTRACER%g
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.262
retrieving revision 1.263
diff -b -u -2 -r1.262 -r1.263
--- configure.in 29 Jun 2002 00:52:21 -0000 1.262
+++ configure.in 3 Jul 2002 00:43:20 -0000 1.263
@@ -18,4 +18,16 @@
fi
+case "$OSTYPE" in
+ darwin* | Darwin*)
+ USE_MAC=1
+ MAKE_USE_MAC="USE_MAC=yes"
+ ;;
+ *)
+ USE_MAC=0
+ MAKE_USE_MAC=""
+ ;;
+esac
+AC_SUBST(MAKE_USE_MAC)
+
echo ""
echo "*** Configuring Mahogany for $OSTYPE ***"
@@ -82,6 +94,9 @@
esac
-M_OVERRIDES(dialup,special dial-up support,USE_DIALUP,1,
---disable-dialup disable dial-up support for modem users)
+dnl dialup is not currently supported under Mac OS X
+if test "$USE_MAC" = 0; then
+ M_OVERRIDES(dialup,special dial-up support,USE_DIALUP,1,
+ --disable-dialup disable dial-up support for modem users)
+fi
M_OVERRIDES(experimental,experimental code,USE_EXPERIMENTAL,0,
@@ -383,4 +398,8 @@
AC_PROG_MAKE_SET
+if test "$USE_MAC" = 1; then
+ AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
+fi
+
dnl --------------------------------------------------------------------------
dnl check for features and functions
@@ -522,14 +541,5 @@
if test "x$USE_DIALUP" = "x1"; then
- case "$OSTYPE" in
- darwin*)
- AC_MSG_WARN([Dialup support is not available under Mac OS X])
- USE_DIALUP=0
- ;;
-
- *)
AC_DEFINE(USE_DIALUP)
- ;;
- esac
fi
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -b -u -2 -r1.98 -r1.99
--- makeopts.in 9 Jan 2002 21:11:53 -0000 1.98
+++ makeopts.in 3 Jul 2002 00:43:20 -0000 1.99
@@ -36,4 +36,5 @@
@MAKE_HAVE_LIBMAL@
@MAKE_PISOCKLIB@
+@MAKE_USE_MAC@
ifdef HAVE_LIBMAL
@@ -89,4 +90,6 @@
RM := rm -f
M4 := @M4@
+
+REZ := @REZ@
# install stuff
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
No, I will not fix your computer.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
