mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

124 lines
4.1 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/public/epplets-extra16/e-xmms.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- E-Xmms-0.3/configure.orig-rock-maint 2003-08-29 09:40:58.000000000 +0200
  20. +++ E-Xmms-0.3/configure 2003-08-29 10:16:32.000000000 +0200
  21. @@ -3702,51 +3702,6 @@
  22. fi
  23. -echo $ac_n "checking for Epplet_Init in -lepplet""... $ac_c" 1>&6
  24. -echo "configure:3707: checking for Epplet_Init in -lepplet" >&5
  25. -ac_lib_var=`echo epplet'_'Epplet_Init | sed 'y%./+-%__p_%'`
  26. -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  27. - echo $ac_n "(cached) $ac_c" 1>&6
  28. -else
  29. - ac_save_LIBS="$LIBS"
  30. -LIBS="-lepplet $EPPLET_LIBS $LIBS"
  31. -cat > conftest.$ac_ext <<EOF
  32. -#line 3715 "configure"
  33. -#include "confdefs.h"
  34. -/* Override any gcc2 internal prototype to avoid an error. */
  35. -/* We use char because int might match the return type of a gcc2
  36. - builtin and then its argument prototype would still apply. */
  37. -char Epplet_Init();
  38. -
  39. -int main() {
  40. -Epplet_Init()
  41. -; return 0; }
  42. -EOF
  43. -if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  44. - rm -rf conftest*
  45. - eval "ac_cv_lib_$ac_lib_var=yes"
  46. -else
  47. - echo "configure: failed program was:" >&5
  48. - cat conftest.$ac_ext >&5
  49. - rm -rf conftest*
  50. - eval "ac_cv_lib_$ac_lib_var=no"
  51. -fi
  52. -rm -f conftest*
  53. -LIBS="$ac_save_LIBS"
  54. -
  55. -fi
  56. -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  57. - echo "$ac_t""yes" 1>&6
  58. - EPPLET_LIBS=-lepplet
  59. -else
  60. - echo "$ac_t""no" 1>&6
  61. -
  62. -echo "Error : cannot link epplet library"
  63. -{ echo "configure: error: Fatal Error : Epplet library file libepplet.so not found" 1>&2; exit 1; }
  64. -fi
  65. -
  66. -
  67. -
  68. # Extract the first word of "imlib-config", so it can be a program name with args.
  69. set dummy imlib-config; ac_word=$2
  70. echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  71. @@ -4083,6 +4038,50 @@
  72. fi
  73. +
  74. +echo $ac_n "checking for Epplet_Init in -lepplet""... $ac_c" 1>&6
  75. +echo "configure:3707: checking for Epplet_Init in -lepplet" >&5
  76. +ac_lib_var=`echo epplet'_'Epplet_Init | sed 'y%./+-%__p_%'`
  77. +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  78. + echo $ac_n "(cached) $ac_c" 1>&6
  79. +else
  80. + ac_save_LIBS="$LIBS"
  81. +LIBS="-lepplet `$IMLIB_CONFIG --libs` -L$E16/lib $EPPLET_LIBS $LIBS"
  82. +cat > conftest.$ac_ext <<EOF
  83. +#line 3715 "configure"
  84. +#include "confdefs.h"
  85. +/* Override any gcc2 internal prototype to avoid an error. */
  86. +/* We use char because int might match the return type of a gcc2
  87. + builtin and then its argument prototype would still apply. */
  88. +char Epplet_Init();
  89. +
  90. +int main() {
  91. +Epplet_Init()
  92. +; return 0; }
  93. +EOF
  94. +if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  95. + rm -rf conftest*
  96. + eval "ac_cv_lib_$ac_lib_var=yes"
  97. +else
  98. + echo "configure: failed program was:" >&5
  99. + cat conftest.$ac_ext >&5
  100. + rm -rf conftest*
  101. + eval "ac_cv_lib_$ac_lib_var=no"
  102. +fi
  103. +rm -f conftest*
  104. +LIBS="$ac_save_LIBS"
  105. +
  106. +fi
  107. +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  108. + echo "$ac_t""yes" 1>&6
  109. + EPPLET_LIBS=-lepplet
  110. +else
  111. + echo "$ac_t""no" 1>&6
  112. +
  113. +echo "Error : cannot link epplet library"
  114. +{ echo "configure: error: Fatal Error : Epplet library file libepplet.so not found" 1>&2; exit 1; }
  115. +fi
  116. +
  117. #
  118. # ok enlightenment d00ds want to ignore civilization and install
  119. # everything in one place. The rest of use prefer sanity.