You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2005/05/15 07:34:43 UTC
cvs commit: xml-security/c/src configure configure.ac
blautenb 2005/05/14 22:34:43
Modified: c/src configure configure.ac
Log:
Patch for Mac OS X compile - provided by Scott Cantor - cantor.2@osu.edu - See Bugzilla #34920
Revision Changes Path
1.33 +28 -1 xml-security/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure 15 May 2005 05:18:39 -0000 1.32
+++ configure 15 May 2005 05:34:43 -0000 1.33
@@ -4098,7 +4098,34 @@
# esac;;
# *-*-mvs*) platform=OS390 ;;
# *-*-osf*) platform=TRU64 ;;
-# *-apple-darwin*) platform=MACOSX ;;
+
+ *-apple-darwin*)
+ platform=MACOSX
+ shlibsuffix=.dylib
+ lib_name="lib${PACKAGE_TARNAME}.${package_lib_version}.dylib"
+ lib_major_name="lib${PACKAGE_TARNAME}.${package_lib_major}.dylib"
+ lib_short_name="lib${PACKAGE_TARNAME}.dylib"
+ if test "x${ac_cv_cxx_compiler_gnu}" = "xyes"; then
+ PLATFORM_OPTIONS="-Wall"
+ PIC="-fPIC"
+ else
+ # Not sure if these will work - only tested with g++
+ PIC="-KPIC"
+ PLATFORM_OPTIONS="-w1 -mp -prec_div"
+ fi
+ # Should use -D_REENTRANT - but not yet OK
+ PLATFORM_OPTIONS="${PLATFORM_OPTIONS} ${PIC} -DMACOSX"
+ CC1="${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
+ CC4="${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
+ MAKE_SHARED="${CXX} ${CXXFLAGS} -Xlinker -install_name -Xlinker \$(LIBNAME) -DMACOSX -dynamiclib ${PIC}"
+ LINK="${CXX} ${CXXFLAGS} -DMACOSX ${PIC}"
+ LINK_COMMAND_1="(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"
+ LINK_COMMAND_2="(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"
+ INSTALL_COMMAND_1="\$(INSTALL) \${THISLIB} \${DESTDIR}\${libdir}"
+ INSTALL_COMMAND_2="\$(RM) \$(DESTDIR)\${libdir}/\${LIBMAJORNAME} && \$(LN_S) \${LIBNAME}\$(DESTDIR)\${libdir}/\${LIBMAJORNAME}"
+ INSTALL_COMMAND_3="\$(RM) \$(DESTDIR)\${libdir}/\${LIBSHORTNAME} && \$(LN_S) \${LIBNAME}\$(DESTDIR)\${libdir}/\${LIBSHORTNAME}"
+ ;;
+
*) platform=UNKNOWN ;
{ { echo "$as_me:$LINENO: error: Unknown Platform. Aborting" >&5
echo "$as_me: error: Unknown Platform. Aborting" >&2;}
1.34 +28 -1 xml-security/c/src/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.ac 15 May 2005 05:18:39 -0000 1.33
+++ configure.ac 15 May 2005 05:34:43 -0000 1.34
@@ -282,7 +282,34 @@
# esac;;
# *-*-mvs*) platform=OS390 ;;
# *-*-osf*) platform=TRU64 ;;
-# *-apple-darwin*) platform=MACOSX ;;
+
+ *-apple-darwin*)
+ platform=MACOSX
+ shlibsuffix=.dylib
+ lib_name="lib${PACKAGE_TARNAME}.${package_lib_version}.dylib"
+ lib_major_name="lib${PACKAGE_TARNAME}.${package_lib_major}.dylib"
+ lib_short_name="lib${PACKAGE_TARNAME}.dylib"
+ if test "x${ac_cv_cxx_compiler_gnu}" = "xyes"; then
+ PLATFORM_OPTIONS=["-Wall"]
+ PIC=["-fPIC"]
+ else
+ # Not sure if these will work - only tested with g++
+ PIC=["-KPIC"]
+ PLATFORM_OPTIONS=["-w1 -mp -prec_div"]
+ fi
+ # Should use -D_REENTRANT - but not yet OK
+ PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} ${PIC} -DMACOSX"]
+ CC1=["${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
+ CC4=["${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
+ MAKE_SHARED=["${CXX} ${CXXFLAGS} -Xlinker -install_name -Xlinker \$(LIBNAME) -DMACOSX -dynamiclib ${PIC}"]
+ LINK=["${CXX} ${CXXFLAGS} -DMACOSX ${PIC}"]
+ LINK_COMMAND_1=["(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"]
+ LINK_COMMAND_2=["(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"]
+ INSTALL_COMMAND_1=["\$(INSTALL) \${THISLIB} \${DESTDIR}\${libdir}"]
+ INSTALL_COMMAND_2=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBMAJORNAME} && \$(LN_S) \${LIBNAME}\$(DESTDIR)\${libdir}/\${LIBMAJORNAME}"]
+ INSTALL_COMMAND_3=["\$(RM) \$(DESTDIR)\${libdir}/\${LIBSHORTNAME} && \$(LN_S) \${LIBNAME}\$(DESTDIR)\${libdir}/\${LIBSHORTNAME}"]
+ ;;
+
*) platform=UNKNOWN ;
AC_MSG_ERROR([Unknown Platform. Aborting])
;;