Author: robbinspg
Date: Thu Nov 30 07:26:56 2006
New Revision: 480964
URL: http://svn.apache.org/viewvc?view=rev&rev=480964
Log:
TUSCANY-681 Port to MacOSX
test for Darwin in configure.ac
Modified:
incubator/tuscany/cpp/sdo/build.sh
incubator/tuscany/cpp/sdo/configure.ac
incubator/tuscany/cpp/sdo/samples/build.sh
incubator/tuscany/cpp/sdo/samples/configure.ac
Modified: incubator/tuscany/cpp/sdo/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/build.sh?view=diff&rev=480964&r1=480963&r2=480964
==============================================================================
--- incubator/tuscany/cpp/sdo/build.sh (original)
+++ incubator/tuscany/cpp/sdo/build.sh Thu Nov 30 07:26:56 2006
@@ -35,6 +35,11 @@
WITH_AXIS2C=--with-axis2c=true
fi
+TUSCANY_SDOCPP_HOME=`pwd`
+cd ${TUSCANY_SDOCPP_HOME}/samples
+./autogen.sh
+
+cd $TUSCANY_SDOCPP_HOME
./autogen.sh
if [ x$TUSCANY_SDOCPP = x ]; then
Modified: incubator/tuscany/cpp/sdo/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/configure.ac?view=diff&rev=480964&r1=480963&r2=480964
==============================================================================
--- incubator/tuscany/cpp/sdo/configure.ac (original)
+++ incubator/tuscany/cpp/sdo/configure.ac Thu Nov 30 07:26:56 2006
@@ -39,15 +39,14 @@
if test "x$UNAME" = "xDarwin"; then
AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
AC_MSG_RESULT(yes)
+ AC_SUBST([libsuffix],[".dylib"])
+ is_darwin=true
else
AC_MSG_RESULT(no)
+ AC_SUBST([libsuffix],[".so"])
+ is_darwin=false
fi
-# Check for dynamic library suffixes
-AC_MSG_CHECKING([checking for dynamic library suffix])
-AC_CHECK_HEADER([sys/appleapiopts.h],
- [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
- [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
-)
+AM_CONDITIONAL([DARWIN], [test x$is_darmin = xtrue])
# Checks for libraries.
Modified: incubator/tuscany/cpp/sdo/samples/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/build.sh?view=diff&rev=480964&r1=480963&r2=480964
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/build.sh (original)
+++ incubator/tuscany/cpp/sdo/samples/build.sh Thu Nov 30 07:26:56 2006
@@ -23,12 +23,6 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
-echo "Using Axis2C installed at $AXIS2C_HOME"
-
./configure --prefix=${TUSCANY_SDOCPP} --enable-static=no
make
make install
Modified: incubator/tuscany/cpp/sdo/samples/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/configure.ac?view=diff&rev=480964&r1=480963&r2=480964
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sdo/samples/configure.ac Thu Nov 30 07:26:56 2006
@@ -33,12 +33,20 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
-# Check for dynamic library suffixes
-AC_MSG_CHECKING([checking for dynamic library suffix])
-AC_CHECK_HEADER([sys/appleapiopts.h],
- [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
- [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
-)
+# Check for running on Darwin
+AC_MSG_CHECKING([Checking if running on Darwin])
+UNAME=`uname -s`
+if test "x$UNAME" = "xDarwin"; then
+ AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
+ AC_MSG_RESULT(yes)
+ AC_SUBST([libsuffix],[".dylib"])
+ is_darwin=true
+else
+ AC_MSG_RESULT(no)
+ AC_SUBST([libsuffix],[".so"])
+ is_darwin=false
+fi
+AM_CONDITIONAL([DARWIN], [test x$is_darmin = xtrue])
AC_CONFIG_FILES([Makefile
misc/Makefile
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
