diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-01-15 01:45:37 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-01-15 01:45:37 +0000 |
| commit | 5e600062c097edc6d5fd88c62ccd9a31f21231fd (patch) | |
| tree | 1f5a0b63e5301da7eab3826c1cb01955de2414a5 | |
| parent | c1d1bbd0f39abbe7e42dfabe9a76d9a571233e22 (diff) | |
| download | nspr-hg-5e600062c097edc6d5fd88c62ccd9a31f21231fd.tar.gz | |
MACOS_DEPLOYMENT_TARGET only needs to be defined if we are building on
Mac OS X.
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.in | 36 |
2 files changed, 33 insertions, 33 deletions
@@ -3299,28 +3299,28 @@ EOF # Add Mac OS X support for loading CFM & CFBundle plugins if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define XP_MACOSX 1 EOF - OS_TARGET=MacOSX - fi + OS_TARGET=MacOSX - - MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` - MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` - MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` - if test -z "$MACOS_VERSION_MINOR"; then - MACOS_VERSION_MINOR=0 - fi - if test -z "$MACOS_VERSION_MICRO"; then - MACOS_VERSION_MICRO=0 - fi - MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` - cat >> confdefs.h <<EOF + + MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` + MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` + MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` + if test -z "$MACOS_VERSION_MINOR"; then + MACOS_VERSION_MINOR=0 + fi + if test -z "$MACOS_VERSION_MICRO"; then + MACOS_VERSION_MICRO=0 + fi + MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` + cat >> confdefs.h <<EOF #define MACOS_DEPLOYMENT_TARGET $MACOS_DEPLOYMENT_TARGET EOF + fi ;; *-dgux*) diff --git a/configure.in b/configure.in index ff690964..44ffe35a 100644 --- a/configure.in +++ b/configure.in @@ -878,25 +878,25 @@ case "$target" in # Add Mac OS X support for loading CFM & CFBundle plugins if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then - AC_DEFINE(XP_MACOSX) - OS_TARGET=MacOSX - fi - - dnl The C preprocessor can only handle integers in comparisons, so - dnl convert the version to the form AABBCC where AA=major release, - dnl BB=minor release, and CC=point/micro release. - - MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` - MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` - MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` - if test -z "$MACOS_VERSION_MINOR"; then - MACOS_VERSION_MINOR=0 - fi - if test -z "$MACOS_VERSION_MICRO"; then - MACOS_VERSION_MICRO=0 + AC_DEFINE(XP_MACOSX) + OS_TARGET=MacOSX + + dnl The C preprocessor can only handle integers in comparisons, so + dnl convert the version to the form AABBCC where AA=major release, + dnl BB=minor release, and CC=point/micro release. + + MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` + MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` + MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` + if test -z "$MACOS_VERSION_MINOR"; then + MACOS_VERSION_MINOR=0 + fi + if test -z "$MACOS_VERSION_MICRO"; then + MACOS_VERSION_MICRO=0 + fi + MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` + AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET) fi - MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` - AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET) ;; *-dgux*) |