Mercurial > octave

changeset 22208:83963bad5e7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements to Qt & OpenGL linking on the Mac (bug #41574) * configure.ac: Remove -Wl, prefixes from "-framework Carbon". * acinclude.m4: Remove -Wl, prefixes from "-framework OpenGL".
author Michael C. Grant <mcg@cvxr.com>
date Fri, 21 Feb 2014 13:00:32 -0600
parents 99454a60bf5e
children cfa684a0539d
files configure.ac m4/acinclude.m4
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Jul 07 18:04:28 2016 +1000
+++ b/configure.ac	Fri Feb 21 13:00:32 2014 -0600
@@ -1230,8 +1230,8 @@
 if test $have_framework_carbon = yes; then
   AC_DEFINE(HAVE_FRAMEWORK_CARBON, 1,
     [Define to 1 if framework CARBON is available.])
-  CARBON_LIBS="-Wl,-framework -Wl,Carbon"
-  AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to CARBON_LIBS])
+  CARBON_LIBS="-framework Carbon"
+  AC_MSG_NOTICE([adding -framework Carbon to CARBON_LIBS])
   AC_SUBST(CARBON_LIBS)
 fi
 
--- a/m4/acinclude.m4	Thu Jul 07 18:04:28 2016 +1000
+++ b/m4/acinclude.m4	Fri Feb 21 13:00:32 2014 -0600
@@ -1015,8 +1015,8 @@
   if test $have_framework_opengl = yes; then
     AC_DEFINE(HAVE_FRAMEWORK_OPENGL, 1,
       [Define to 1 if framework OPENGL is available.])
-    OPENGL_LIBS="-Wl,-framework -Wl,OpenGL"
-    AC_MSG_NOTICE([adding -Wl,-framework -Wl,OpenGL to OPENGL_LIBS])
+    OPENGL_LIBS="-framework OpenGL"
+    AC_MSG_NOTICE([adding -framework OpenGL to OPENGL_LIBS])
     OCTAVE_CHECK_FUNC_GLUTESSCALLBACK_THREEDOTS
   else
     case $canonical_host_type in