silo-4.10.2-qtlibs.patch 3.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
  2. --- silo-4.9.1-old/configure 2014-01-18 23:19:15.755030306 +0100
  3. +++ silo-4.9.1-new/configure 2014-01-18 23:20:52.595031159 +0100
  4. @@ -27503,7 +27503,7 @@
  5. ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
  6. sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
  7. fi
  8. - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  9. + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  10. else
  11. # Use cached value or do search, starting with suggestions from
  12. # the command line
  13. @@ -27577,7 +27577,7 @@
  14. ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
  15. sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
  16. fi
  17. - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  18. + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  19. else
  20. # There is no valid definition for $QTDIR as Trolltech likes to see it
  21. ax_qt_dir=
  22. @@ -27589,7 +27589,7 @@
  23. ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
  24. sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
  25. fi
  26. - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  27. + ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  28. else
  29. # Normally, when there is no traditional Trolltech installation,
  30. # the library is installed in a place where the linker finds it
  31. @@ -27607,7 +27607,7 @@
  32. # See if we find the library without any special options.
  33. # Don't add top $LIBS permanently yet
  34. ax_save_LIBS="$LIBS"
  35. - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  36. + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  37. ax_qt_LIBS="$LIBS"
  38. ax_save_CXXFLAGS="$CXXFLAGS"
  39. CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
  40. @@ -27668,7 +27668,7 @@
  41. # That did not work. Try the multi-threaded version
  42. echo "Non-critical error, please neglect the above." >&5
  43. ax_qt_lib=qt-mt
  44. - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  45. + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  46. cat >conftest.$ac_ext <<_ACEOF
  47. /* confdefs.h. */
  48. _ACEOF
  49. @@ -27726,7 +27726,7 @@
  50. # That did not work. Try the OpenGL version
  51. echo "Non-critical error, please neglect the above." >&5
  52. ax_qt_lib=qt-gl
  53. - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  54. + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  55. cat >conftest.$ac_ext <<_ACEOF
  56. /* confdefs.h. */
  57. _ACEOF
  58. @@ -27809,7 +27809,7 @@
  59. fi
  60. done
  61. # Try with that one
  62. - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  63. + LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  64. cat >conftest.$ac_ext <<_ACEOF
  65. /* confdefs.h. */
  66. _ACEOF