From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 14 Feb 2004 00:34:15 +0000 (+0000)
Subject: aclocal.m4 (WITH_CC): Add -fno-common to CFLAGS on Darwin, unless -fcommon or
X-Git-Tag: krb5-1.4-beta1~614
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2ba7f5c3a0a4a3eb6d4b3215f5b355d97e30f18;p=krb5.git

aclocal.m4 (WITH_CC): Add -fno-common to CFLAGS on Darwin, unless -fcommon or
-fno-common is already given.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16081 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e3119eeba..7306fd01e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
 	corresponding getsockname arg types.
 	(KRB5_GETSOCKNAME_ARGS): If nothing matches, assume struct
 	sockaddr and socklen_t.
+	(WITH_CC): Add -fno-common to CFLAGS on Darwin, unless -fcommon or
+	-fno-common is already given.
 
 2004-02-12  Tom Yu  <tlyu@mit.edu>
 
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 341876153..0bcefa3b9 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -485,6 +485,22 @@ if test "$GCC" = yes ; then
       CFLAGS="$CFLAGS -pedantic"
     fi
   fi
+  if test "`uname -s`" = Darwin ; then
+    # Someday this should be a feature test.
+    # One current (Jaguar = OS 10.2) problem:
+    # Archive library with foo.o undef sym X and bar.o common sym X,
+    # if foo.o is pulled in at link time, bar.o may not be, causing
+    # the linker to complain.
+    # Dynamic library problems too?
+    case "$CC $CFLAGS" in
+    *-fcommon*) ;; # why someone would do this, I don't know
+    *-fno-common*) ;; # okay, they're already doing the right thing
+    *)
+      AC_MSG_NOTICE(disabling the use of common storage on Darwin)
+      CFLAGS="$CFLAGS -fno-common"
+      ;;
+    esac
+  fi
 fi
 ])dnl
 dnl