[svn-commits] tilghman: trunk r907 - /trunk/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jul  7 13:57:19 2011
New Revision: 907

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=907
Log:
Xcode 4 (Mac OS X) has transitioned to the LLVM compiler, which uses the 'weak' attribute, instead of 'weak_import'.

Modified:
    trunk/aclocal.m4
    trunk/autoconfig.h.in
    trunk/configure
    trunk/configure.ac
    trunk/menuselect.c

Modified: trunk/aclocal.m4
URL: http://svnview.digium.com/svn/menuselect/trunk/aclocal.m4?view=diff&rev=907&r1=906&r2=907
==============================================================================
--- trunk/aclocal.m4 (original)
+++ trunk/aclocal.m4 Thu Jul  7 13:57:19 2011
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: trunk/autoconfig.h.in
URL: http://svnview.digium.com/svn/menuselect/trunk/autoconfig.h.in?view=diff&rev=907&r1=906&r2=907
==============================================================================
--- trunk/autoconfig.h.in (original)
+++ trunk/autoconfig.h.in Thu Jul  7 13:57:19 2011
@@ -25,6 +25,9 @@
 
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
+
+/* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
+#undef HAVE_ATTRIBUTE_weak
 
 /* Define to 1 if your GCC C compiler supports the 'weak_import' attribute. */
 #undef HAVE_ATTRIBUTE_weak_import
@@ -107,6 +110,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/menuselect/trunk/configure.ac?view=diff&rev=907&r1=906&r2=907
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jul  7 13:57:19 2011
@@ -53,6 +53,7 @@
 
 AST_GCC_ATTRIBUTE(weak_import)
 AST_GCC_ATTRIBUTE(weakref)
+AST_GCC_ATTRIBUTE(weak)
 
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS([asprintf getloadavg setenv strcasestr strndup strnlen strsep unsetenv vasprintf])

Modified: trunk/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect.c?view=diff&rev=907&r1=906&r2=907
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Thu Jul  7 13:57:19 2011
@@ -703,7 +703,7 @@
 	}
 
 	/* If weak linking is not supported, move module uses which are other modules to the dependency list */
-#if !defined(HAVE_ATTRIBUTE_weak_import) && !defined(HAVE_ATTRIBUTE_weakref)
+#if !defined(HAVE_ATTRIBUTE_weak_import) && !defined(HAVE_ATTRIBUTE_weakref) && !defined(HAVE_ATTRIBUTE_weak)
 	AST_LIST_TRAVERSE(&categories, cat, list) {
 		AST_LIST_TRAVERSE(&cat->members, mem, list) {
 			AST_LIST_TRAVERSE_SAFE_BEGIN(&mem->uses, use, list) {