fltk-config-dynlibs.patch 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
  2. --- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500
  3. +++ fltk-1.3.3/fltk-config.in 2014-12-31 15:49:01.636277725 -0500
  4. @@ -54,21 +54,6 @@
  5. bindir="$selfdir/fluid"
  6. includedir="$selfdir"
  7. libdir="$selfdir/lib"
  8. -
  9. - if test -f "$libdir/libfltk_jpeg.a"; then
  10. - CFLAGS="-I$includedir/jpeg $CFLAGS"
  11. - CXXFLAGS="-I$includedir/jpeg $CXXFLAGS"
  12. - fi
  13. -
  14. - if test -f "$libdir/libfltk_z.a"; then
  15. - CFLAGS="-I$includedir/zlib $CFLAGS"
  16. - CXXFLAGS="-I$includedir/zlib $CXXFLAGS"
  17. - fi
  18. -
  19. - if test -f "$libdir/libfltk_png.a"; then
  20. - CFLAGS="-I$includedir/png $CFLAGS"
  21. - CXXFLAGS="-I$includedir/png $CXXFLAGS"
  22. - fi
  23. fi
  24. if test -d $includedir/FL/images; then
  25. @@ -76,11 +61,6 @@
  26. CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
  27. fi
  28. -if test -f "$libdir/libfltk_cairo.a"; then
  29. - CFLAGS="$CAIROFLAGS $CFLAGS"
  30. - CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
  31. -fi
  32. -
  33. # libraries to link with:
  34. LIBNAME="@LIBNAME@"
  35. DSONAME="@DSONAME@"
  36. @@ -230,25 +210,20 @@
  37. fi
  38. # Calculate needed libraries
  39. -LDSTATIC="$libdir/libfltk.a $LDLIBS"
  40. LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
  41. if test x$use_forms = xyes; then
  42. LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
  43. - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
  44. fi
  45. if test x$use_gl = xyes; then
  46. LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
  47. - LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
  48. fi
  49. if test x$use_images = xyes; then
  50. LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
  51. - LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
  52. fi
  53. if test x$use_cairo = xyes; then
  54. LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
  55. - LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
  56. fi
  57. LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
  58. @@ -359,26 +334,26 @@
  59. fi
  60. if test "$echo_libs" = "yes"; then
  61. - USELIBS="$libdir/libfltk.a"
  62. + USELIBS="$libdir/libfltk.so"
  63. if test x$use_forms = xyes; then
  64. - USELIBS="$libdir/libfltk_forms.a $USELIBS"
  65. + USELIBS="$libdir/libfltk_forms.so $USELIBS"
  66. fi
  67. if test x$use_gl = xyes; then
  68. - USELIBS="$libdir/libfltk_gl.a $USELIBS"
  69. + USELIBS="$libdir/libfltk_gl.so $USELIBS"
  70. fi
  71. if test x$use_cairo = xyes; then
  72. - USELIBS="$libdir/libfltk_cairo.a $USELIBS"
  73. + USELIBS="$libdir/libfltk_cairo.so $USELIBS"
  74. fi
  75. if test x$use_images = xyes; then
  76. - USELIBS="$libdir/libfltk_images.a $USELIBS"
  77. + USELIBS="$libdir/libfltk_images.so $USELIBS"
  78. for lib in fltk_jpeg fltk_png fltk_z; do
  79. - if test -f $libdir/lib$lib.a; then
  80. - USELIBS="$libdir/lib$lib.a $USELIBS"
  81. + if test -f $libdir/lib$lib.so; then
  82. + USELIBS="$libdir/lib$lib.so $USELIBS"
  83. fi
  84. done
  85. fi