Changeset 960 for trunk/configure.acTweet

Timestamp:

Sep 19, 2011, 1:32:18 AM (8 years ago)

Author:

sam

Message:

osx: link with the proper OpenGL libraries on OS X.

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -103 +103 @@
  [MAKE_FSELF=no])
 AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
+
+
+LIBS_save="$LIBS"
+LIBS="$LIBS -Wl,-framework -Wl,OpenGL"
+AC_MSG_CHECKING(for -framework OpenGL)
+AC_TRY_LINK([], [],
+ [ac_cv_my_have_cocoa="yes"
+  AC_MSG_RESULT(yes)
+  GL_LIBS="${GL_LIBS} -framework OpenGL"
+  CXXFLAGS="${CXXFLAGS} -ObjC++"],
+ [AC_MSG_RESULT(no)])
+LIBS="$LIBS_save"
 
 
@@ -233 +245 @@
 
 
-dnl Use Cocoa?
-ac_cv_my_have_cocoa="no"
-LIBS_save="$LIBS"
-LIBS="$LIBS -Wl,-framework -Wl,Cocoa"
-AC_MSG_CHECKING(for -framework Cocoa)
-AC_TRY_LINK([], [],
- [ac_cv_my_have_cocoa="yes"
-  AC_MSG_RESULT(yes)
-  CXXFLAGS="${CXXFLAGS} -ObjC++"],
- [AC_MSG_RESULT(no)])
-LIBS="$LIBS_save"
-AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" != "no")
-
-
 dnl Use EGL?
 ac_cv_my_have_egl="no"