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.

105 lines
3.2 KiB

  1. --- E-Xmms-0.3/configure.orig-rock-maint 2003-08-29 09:40:58.000000000 +0200
  2. +++ E-Xmms-0.3/configure 2003-08-29 10:16:32.000000000 +0200
  3. @@ -3702,51 +3702,6 @@
  4. fi
  5. -echo $ac_n "checking for Epplet_Init in -lepplet""... $ac_c" 1>&6
  6. -echo "configure:3707: checking for Epplet_Init in -lepplet" >&5
  7. -ac_lib_var=`echo epplet'_'Epplet_Init | sed 'y%./+-%__p_%'`
  8. -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  9. - echo $ac_n "(cached) $ac_c" 1>&6
  10. -else
  11. - ac_save_LIBS="$LIBS"
  12. -LIBS="-lepplet $EPPLET_LIBS $LIBS"
  13. -cat > conftest.$ac_ext <<EOF
  14. -#line 3715 "configure"
  15. -#include "confdefs.h"
  16. -/* Override any gcc2 internal prototype to avoid an error. */
  17. -/* We use char because int might match the return type of a gcc2
  18. - builtin and then its argument prototype would still apply. */
  19. -char Epplet_Init();
  20. -
  21. -int main() {
  22. -Epplet_Init()
  23. -; return 0; }
  24. -EOF
  25. -if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  26. - rm -rf conftest*
  27. - eval "ac_cv_lib_$ac_lib_var=yes"
  28. -else
  29. - echo "configure: failed program was:" >&5
  30. - cat conftest.$ac_ext >&5
  31. - rm -rf conftest*
  32. - eval "ac_cv_lib_$ac_lib_var=no"
  33. -fi
  34. -rm -f conftest*
  35. -LIBS="$ac_save_LIBS"
  36. -
  37. -fi
  38. -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  39. - echo "$ac_t""yes" 1>&6
  40. - EPPLET_LIBS=-lepplet
  41. -else
  42. - echo "$ac_t""no" 1>&6
  43. -
  44. -echo "Error : cannot link epplet library"
  45. -{ echo "configure: error: Fatal Error : Epplet library file libepplet.so not found" 1>&2; exit 1; }
  46. -fi
  47. -
  48. -
  49. -
  50. # Extract the first word of "imlib-config", so it can be a program name with args.
  51. set dummy imlib-config; ac_word=$2
  52. echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  53. @@ -4083,6 +4038,50 @@
  54. fi
  55. +
  56. +echo $ac_n "checking for Epplet_Init in -lepplet""... $ac_c" 1>&6
  57. +echo "configure:3707: checking for Epplet_Init in -lepplet" >&5
  58. +ac_lib_var=`echo epplet'_'Epplet_Init | sed 'y%./+-%__p_%'`
  59. +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  60. + echo $ac_n "(cached) $ac_c" 1>&6
  61. +else
  62. + ac_save_LIBS="$LIBS"
  63. +LIBS="-lepplet `$IMLIB_CONFIG --libs` -L$E16/lib $EPPLET_LIBS $LIBS"
  64. +cat > conftest.$ac_ext <<EOF
  65. +#line 3715 "configure"
  66. +#include "confdefs.h"
  67. +/* Override any gcc2 internal prototype to avoid an error. */
  68. +/* We use char because int might match the return type of a gcc2
  69. + builtin and then its argument prototype would still apply. */
  70. +char Epplet_Init();
  71. +
  72. +int main() {
  73. +Epplet_Init()
  74. +; return 0; }
  75. +EOF
  76. +if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  77. + rm -rf conftest*
  78. + eval "ac_cv_lib_$ac_lib_var=yes"
  79. +else
  80. + echo "configure: failed program was:" >&5
  81. + cat conftest.$ac_ext >&5
  82. + rm -rf conftest*
  83. + eval "ac_cv_lib_$ac_lib_var=no"
  84. +fi
  85. +rm -f conftest*
  86. +LIBS="$ac_save_LIBS"
  87. +
  88. +fi
  89. +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  90. + echo "$ac_t""yes" 1>&6
  91. + EPPLET_LIBS=-lepplet
  92. +else
  93. + echo "$ac_t""no" 1>&6
  94. +
  95. +echo "Error : cannot link epplet library"
  96. +{ echo "configure: error: Fatal Error : Epplet library file libepplet.so not found" 1>&2; exit 1; }
  97. +fi
  98. +
  99. #
  100. # ok enlightenment d00ds want to ignore civilization and install
  101. # everything in one place. The rest of use prefer sanity.