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.

125 lines
4.0 KiB

  1. --- ./configure.in.orig 2005-02-18 19:07:21.000000000 +0100
  2. +++ ./configure.in 2005-03-20 20:38:15.000000000 +0100
  3. @@ -217,8 +216,9 @@
  4. echo "enabling gedit plugin..."
  5. echo "checking for supported versions of gedit..."
  6. - PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, ,
  7. - [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0)])
  8. + PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, ,
  9. + [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, ,
  10. + [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0)])])
  11. AC_SUBST(GEDIT_CFLAGS)
  12. fi
  13. --- ./configure.orig 2005-02-18 19:12:32.000000000 +0100
  14. +++ ./configure 2005-03-31 17:02:39.000000000 +0200
  15. @@ -20572,6 +20572,99 @@
  16. else
  17. PKG_CONFIG_MIN_VERSION=0.9.0
  18. if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
  19. + echo "$as_me:$LINENO: checking for gedit-2.10 >= 2.9.0" >&5
  20. +echo $ECHO_N "checking for gedit-2.10 >= 2.9.0... $ECHO_C" >&6
  21. +
  22. + if $PKG_CONFIG --exists "gedit-2.10 >= 2.9.0" ; then
  23. + echo "$as_me:$LINENO: result: yes" >&5
  24. +echo "${ECHO_T}yes" >&6
  25. + succeeded=yes
  26. +
  27. + echo "$as_me:$LINENO: checking GEDIT_CFLAGS" >&5
  28. +echo $ECHO_N "checking GEDIT_CFLAGS... $ECHO_C" >&6
  29. + GEDIT_CFLAGS=`$PKG_CONFIG --cflags "gedit-2.10 >= 2.9.0"`
  30. + echo "$as_me:$LINENO: result: $GEDIT_CFLAGS" >&5
  31. +echo "${ECHO_T}$GEDIT_CFLAGS" >&6
  32. +
  33. + echo "$as_me:$LINENO: checking GEDIT_LIBS" >&5
  34. +echo $ECHO_N "checking GEDIT_LIBS... $ECHO_C" >&6
  35. + GEDIT_LIBS=`$PKG_CONFIG --libs "gedit-2.10 >= 2.9.0"`
  36. + echo "$as_me:$LINENO: result: $GEDIT_LIBS" >&5
  37. +echo "${ECHO_T}$GEDIT_LIBS" >&6
  38. + else
  39. + GEDIT_CFLAGS=""
  40. + GEDIT_LIBS=""
  41. + ## If we have a custom action on failure, don't print errors, but
  42. + ## do set a variable so people can do so.
  43. + GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gedit-2.10 >= 2.9.0"`
  44. +
  45. + fi
  46. +
  47. +
  48. +
  49. + else
  50. + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
  51. + echo "*** See http://www.freedesktop.org/software/pkgconfig"
  52. + fi
  53. + fi
  54. +
  55. + if test $succeeded = yes; then
  56. + :
  57. + else
  58. +
  59. + succeeded=no
  60. +
  61. + if test -z "$PKG_CONFIG"; then
  62. + # Extract the first word of "pkg-config", so it can be a program name with args.
  63. +set dummy pkg-config; ac_word=$2
  64. +echo "$as_me:$LINENO: checking for $ac_word" >&5
  65. +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  66. +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
  67. + echo $ECHO_N "(cached) $ECHO_C" >&6
  68. +else
  69. + case $PKG_CONFIG in
  70. + [\\/]* | ?:[\\/]*)
  71. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
  72. + ;;
  73. + *)
  74. + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  75. +for as_dir in $PATH
  76. +do
  77. + IFS=$as_save_IFS
  78. + test -z "$as_dir" && as_dir=.
  79. + for ac_exec_ext in '' $ac_executable_extensions; do
  80. + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  81. + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  82. + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  83. + break 2
  84. + fi
  85. +done
  86. +done
  87. +
  88. + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
  89. + ;;
  90. +esac
  91. +fi
  92. +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  93. +
  94. +if test -n "$PKG_CONFIG"; then
  95. + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
  96. +echo "${ECHO_T}$PKG_CONFIG" >&6
  97. +else
  98. + echo "$as_me:$LINENO: result: no" >&5
  99. +echo "${ECHO_T}no" >&6
  100. +fi
  101. +
  102. + fi
  103. +
  104. + if test "$PKG_CONFIG" = "no" ; then
  105. + echo "*** The pkg-config script could not be found. Make sure it is"
  106. + echo "*** in your path, or set the PKG_CONFIG environment variable"
  107. + echo "*** to the full path to pkg-config."
  108. + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
  109. + else
  110. + PKG_CONFIG_MIN_VERSION=0.9.0
  111. + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
  112. echo "$as_me:$LINENO: checking for gedit-2.8 >= 2.8.0" >&5
  113. echo $ECHO_N "checking for gedit-2.8 >= 2.8.0... $ECHO_C" >&6
  114. @@ -20711,6 +20804,8 @@
  115. fi
  116. + fi
  117. +
  118. fi