gtk-engines-qtpixmap-0.28-gtk_switches.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
  1. diff -NurdB QtPixmap-0.28/configure.in QtPixmap-0.28-patched/configure.in
  2. --- QtPixmap-0.28/configure.in 2004-02-03 06:26:07.000000000 -0500
  3. +++ QtPixmap-0.28-patched/configure.in 2005-08-02 21:59:35.000000000 -0500
  4. @@ -19,23 +19,28 @@
  5. FOUND_IMLIB=0
  6. FOUND_GTK2=0
  7. -AC_PATH_PROG(gtkconf, gtk-config, no)
  8. -if test -n "$gtkconf"; then
  9. - vers=`$gtkconf --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
  10. - if test -n "$vers" && test "$vers" -ge 1002009; then
  11. - GTK_LIBS="`$gtkconf --libs`"
  12. - GTK_CFLAGS="`$gtkconf --cflags`"
  13. - AC_SUBST(GTK_LIBS)
  14. - AC_SUBST(GTK_CFLAGS)
  15. - FOUND_GTK1=1
  16. +AC_ARG_ENABLE([gtk1],
  17. + AS_HELP_STRING([--enable-gtk1],[Enable Gtk+1 engine (default=yes)]),
  18. + [enable_gtk1=$enableval],
  19. + [enable_gtk1=yes])
  20. +
  21. +if test x$enable_gtk1 = xyes; then
  22. + AC_PATH_PROG(gtkconf, gtk-config, no)
  23. + if test -n "$gtkconf"; then
  24. + vers=`$gtkconf --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
  25. + if test -n "$vers" && test "$vers" -ge 1002009; then
  26. + GTK_LIBS="`$gtkconf --libs`"
  27. + GTK_CFLAGS="`$gtkconf --cflags`"
  28. + AC_SUBST(GTK_LIBS)
  29. + AC_SUBST(GTK_CFLAGS)
  30. + FOUND_GTK1=1
  31. + else
  32. + AC_MSG_ERROR([Not compiling for GTK1.x - you need at least Gtk v1.2.9])
  33. + fi
  34. else
  35. - AC_MSG_WARN([Not compiling for GTK1.x - you need at least Gtk v1.2.9])
  36. + AC_MSG_ERROR([Not compiling for GTK1.x - Gtk1.x not installed, need at least v1.2.9])
  37. fi
  38. -else
  39. - AC_MSG_WARN([Not compiling for GTK1.x - Gtk1.x not installed, need at least v1.2.9])
  40. -fi
  41. -if test $FOUND_GTK1 -eq 1; then
  42. AC_PATH_PROG(imlibconf, imlib-config, no)
  43. if test -n "$imlibconf"; then
  44. vers=`$imlibconf --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
  45. @@ -46,29 +51,36 @@
  46. AC_SUBST(GDK_IMLIB_CFLAGS)
  47. FOUND_IMLIB=1
  48. else
  49. - AC_MSG_WARN([Not compiling for GTK1.x - you need at least IMLIB v1.8.0])
  50. + AC_MSG_ERROR([Not compiling for GTK1.x - you need at least IMLIB v1.8.0])
  51. fi
  52. else
  53. - AC_MSG_WARN([Not compiling for GTK1.x - IMLIB not installed, need at least v1.8.0])
  54. + AC_MSG_ERROR([Not compiling for GTK1.x - IMLIB not installed, need at least v1.8.0])
  55. fi
  56. fi
  57. -AC_PATH_PROG(pkgconfig, pkg-config, no)
  58. -if test -n "$pkg-config"; then
  59. - GTK2_VERSION=`$pkgconfig --variable=gtk_binary_version gtk+-2.0`
  60. - if test -n "$GTK2_VERSION"; then
  61. - GTK2_CFLAGS=`$pkgconfig gtk+-2.0 --cflags`
  62. - GTK2_LIBS=`$pkgconfig gtk+-2.0 --libs`
  63. - AC_SUBST(GTK2_CFLAGS)
  64. - AC_SUBST(GTK2_LIBS)
  65. - AC_SUBST(GTK2_VERSION)
  66. - FOUND_GTK2=1
  67. +AC_ARG_ENABLE([gtk2],
  68. + AS_HELP_STRING([--enable-gtk2],[Enable Gtk+2 engine (default=yes)]),
  69. + [enable_gtk2=$enableval],
  70. + [enable_gtk2=yes])
  71. +
  72. +if test x$enable_gtk2 = xyes; then
  73. + AC_PATH_PROG(pkgconfig, pkg-config, no)
  74. + if test -n "$pkg-config"; then
  75. + GTK2_VERSION=`$pkgconfig --variable=gtk_binary_version gtk+-2.0`
  76. + if test -n "$GTK2_VERSION"; then
  77. + GTK2_CFLAGS=`$pkgconfig gtk+-2.0 --cflags`
  78. + GTK2_LIBS=`$pkgconfig gtk+-2.0 --libs`
  79. + AC_SUBST(GTK2_CFLAGS)
  80. + AC_SUBST(GTK2_LIBS)
  81. + AC_SUBST(GTK2_VERSION)
  82. + FOUND_GTK2=1
  83. + else
  84. + AC_MSG_ERROR([Not compiling for GTK2.x - Gtk2.x not installed])
  85. + fi
  86. else
  87. - AC_MSG_WARN([Not compiling for GTK2.x - Gtk2.x not installed])
  88. + AC_MSG_ERROR([Not compiling for GTK2.x - pkg-config not installed])
  89. fi
  90. -else
  91. - AC_MSG_WARN([Not compiling for GTK2.x - pkg-config not installed])
  92. fi
  93. if (test $FOUND_IMLIB -eq 0) && (test $FOUND_GTK2 -eq 0); then