Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv29815
Modified Files:
configure.in
Log Message:
fixes for the last check in; don't use ldd under Mac (it doesn't exist there)
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.289
retrieving revision 1.290
diff -b -u -2 -r1.289 -r1.290
--- configure.in 19 Aug 2003 08:15:37 -0000 1.289
+++ configure.in 19 Aug 2003 16:20:23 -0000 1.290
@@ -413,11 +413,4 @@
AC_PROG_MAKE_SET
-if test "$USE_MAC" = 1; then
- AC_PATH_PROG(SETFILE, SetFile, true, [$PATH:/Developer/Tools])
-
- REZFLAGS=`$WX_CONFIG_WITH_ARGS --rezflags`
- AC_SUBST(REZFLAGS)
-fi
-
dnl --------------------------------------------------------------------------
dnl check for features and functions
@@ -578,5 +571,5 @@
# it complains about it ("changing the order of system
# directories search")
- if "$prefix" != "/usr/local"; then
+ if test "$prefix" != "/usr/local"; then
ssl_inc="$prefix/include"
fi
@@ -946,4 +939,12 @@
AC_SUBST(GUI_LIBS_STATIC)
+dnl Mac-specific post-link step
+if test "$USE_MAC" = 1; then
+ AC_PATH_PROG(SETFILE, SetFile, true, [$PATH:/Developer/Tools])
+
+ REZFLAGS=`$WX_CONFIG_WITH_ARGS --rezflags`
+ AC_SUBST(REZFLAGS)
+fi
+
case "$USE_THREADS" in 1)
AC_CACHE_CHECK(if wxWindows was compiled with threads,
@@ -1110,7 +1111,12 @@
AC_MSG_CHECKING(how to link modules)
dnl check for wxGTK dynamic linkage
+ if test "$USE_MAC" = 0; then
+ LDD="ldd"
+ else
+ LDD="otool -L"
+ fi
echo "int main() { return 0; }" >conftest.c
if $CXX -o conftest $WX_LIBS conftest.c && \
- ldd conftest | fgrep libwx >/dev/null
+ $(LDD) conftest | fgrep libwx >/dev/null
then
m_cv_USE_MODULES=dynamic
-------------------------------------------------------
This SF.net email is sponsored by Dice.com.
Did you know that Dice has over 25,000 tech jobs available today? From
careers in IT to Engineering to Tech Sales, Dice has tech jobs from the
best hiring companies. http://www.dice.com/index.epl?rel_code=104
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
