Changeset 8293 in orxonox.OLD for trunk/acinclude.m4

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

File:

• trunk/acinclude.m4 (modified) (2 diffs)

trunk/acinclude.m4

@@ -146 +146 @@
     for _lib_directory in ${QT_COMMON_LIB_DIRECTORIES}
     do
-      if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore4.a ; then
+      if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore4.a || \
+                        test -e ${_lib_directory}/QtCore.framework ; then
         QT_LIB_DIRECTORY=${_lib_directory}
         break
-      fi
+          fi
     done
     if test -n ${QT_LIB_DIRECTORY} ; then
@@ -205 +206 @@
     fi
 
-    echo "QT_LIBS = ${QT_LIBS}"
-    echo "QT_CXXFLAGS = ${QT_CXXFLAGS}"
-    echo "QT_LD_FLAGS = ${QT_LDFLAGS}"
+    echo "QT_LIBS          = ${QT_LIBS}"
+    echo "QT_CXXFLAGS      = ${QT_CXXFLAGS}"
+    echo "QT_LD_FLAGS      = ${QT_LDFLAGS}"
     echo "QT_BIN_DIRECTORY = ${QT_BIN_DIRECTORY}"