1 |
hanno 08/10/13 10:35:44 |
2 |
|
3 |
Added: gegl-20-configure-ac.patch |
4 |
Log: |
5 |
gegl: some fixes to configure call |
6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc9-00169-gb34c873 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-libs/gegl/files/gegl-20-configure-ac.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/gegl/files/gegl-20-configure-ac.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/gegl/files/gegl-20-configure-ac.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gegl-20-configure-ac.patch |
15 |
=================================================================== |
16 |
--- configure.ac.orig 2008-10-05 23:10:15.000000000 +0200 |
17 |
+++ configure.ac 2008-10-10 00:46:24.000000000 +0200 |
18 |
@@ -50,6 +50,7 @@ |
19 |
m4_define([openexr_required_version], [0.0.0]) |
20 |
m4_define([sdl_required_version], [0.0.0]) |
21 |
m4_define([graphviz_required_version], [0.0.0]) |
22 |
+m4_define([libopenraw_required_version], [0.0.5]) |
23 |
|
24 |
AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version) |
25 |
AC_CONFIG_SRCDIR([gegl/gegl.h.in]) |
26 |
@@ -453,23 +454,33 @@ |
27 |
*** Errors follow: |
28 |
$DEP_PKG_ERRORS])) |
29 |
|
30 |
-PKG_CHECK_MODULES(GIO, gio-2.0, |
31 |
- have_gio="yes" |
32 |
- AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.]) |
33 |
- GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0", |
34 |
- have_gio="no (gio not found)") |
35 |
+AC_ARG_WITH(gio, [ --without-gio build without GIO (from glib) support]) |
36 |
+ if test x$with_gio != xno; then |
37 |
+ PKG_CHECK_MODULES(GIO, gio-2.0, |
38 |
+ have_gio="yes" |
39 |
+ AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.]) |
40 |
+ GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0", |
41 |
+ have_gio="no (gio not found)") |
42 |
+ else |
43 |
+ have_gio="no (disabled by flag)" |
44 |
+ fi |
45 |
AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes") |
46 |
|
47 |
# Rerun PKG_CONFIG to add gthread-2.0 cflags and libs |
48 |
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0` |
49 |
DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0` |
50 |
|
51 |
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION, |
52 |
- have_gtk="yes" |
53 |
- AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.]) |
54 |
- GTK_CFLAGS="$GTK_CFLAGS" |
55 |
- GTK_LIBS="$GTK_LIBS", |
56 |
- have_gtk="no (gtk+ not found)") |
57 |
+AC_ARG_WITH(gtk, [ --without-gtk build without GTK+ support]) |
58 |
+if test "x$with_gtk" != "xno"; then |
59 |
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION, |
60 |
+ have_gtk="yes" |
61 |
+ AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.]) |
62 |
+ GTK_CFLAGS="$GTK_CFLAGS" |
63 |
+ GTK_LIBS="$GTK_LIBS", |
64 |
+ have_gtk="no (gtk+ not found)") |
65 |
+else |
66 |
+ have_gtk="no (disabled by flag)" |
67 |
+fi |
68 |
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes") |
69 |
|
70 |
AC_SUBST(GTK_CFLAGS) |
71 |
@@ -538,11 +549,16 @@ |
72 |
# Check for Lua |
73 |
############### |
74 |
|
75 |
-PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION, |
76 |
- have_lua="yes", |
77 |
- [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION, |
78 |
- have_lua="yes", |
79 |
- have_lua="no (usable lua not found)")]) |
80 |
+AC_ARG_WITH(lua, [ --without-lua build without Lua support]) |
81 |
+ if test x$with_lua != xno; then |
82 |
+ PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION, |
83 |
+ have_lua="yes", |
84 |
+ [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION, |
85 |
+ have_lua="yes", |
86 |
+ have_lua="no (usable lua not found)")]) |
87 |
+ else |
88 |
+ have_lua="no (disabled by flag)" |
89 |
+ fi |
90 |
AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes") |
91 |
|
92 |
AC_SUBST(LUA_CFLAGS) |
93 |
@@ -553,17 +569,22 @@ |
94 |
# Checks for Ruby used to make API docs |
95 |
####################################### |
96 |
|
97 |
-AC_CHECK_PROG(RUBY, ruby, yes, no) |
98 |
-if test "$RUBY" = "no"; then |
99 |
- AC_MSG_WARN([ |
100 |
+AC_ARG_WITH(ruby, [ --without-ruby build without Ruby support]) |
101 |
+ if test x$with_ruby != xno; then |
102 |
+ AC_CHECK_PROG(RUBY, ruby, yes, no) |
103 |
+ if test "$RUBY" = "no"; then |
104 |
+ AC_MSG_WARN([ |
105 |
*** Could not find Ruby interpreter. The HTML API reference |
106 |
will not be updated. |
107 |
]) |
108 |
- have_ruby=no |
109 |
-else |
110 |
- RUBY_BIN="$RUBY" |
111 |
- have_ruby=yes |
112 |
-fi |
113 |
+ have_ruby=no |
114 |
+ else |
115 |
+ RUBY_BIN="$RUBY" |
116 |
+ have_ruby=yes |
117 |
+ fi |
118 |
+ else |
119 |
+ have_ruby="no (disabled by flag)" |
120 |
+ fi |
121 |
AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes") |
122 |
|
123 |
AC_SUBST(RUBY_BIN) |
124 |
@@ -573,9 +594,14 @@ |
125 |
# Check for Cairo |
126 |
################# |
127 |
|
128 |
-PKG_CHECK_MODULES(CAIRO, cairo, |
129 |
- have_cairo="yes", |
130 |
- have_cairo="no (usable cairo not found)") |
131 |
+AC_ARG_WITH(cairo, [ --without-cairo build without Cairo and without pangocairo]) |
132 |
+ if test x$with_cairo != xno; then |
133 |
+ PKG_CHECK_MODULES(CAIRO, cairo, |
134 |
+ have_cairo="yes", |
135 |
+ have_cairo="no (usable cairo not found)") |
136 |
+ else |
137 |
+ have_cairo="no (disabled by flag)" |
138 |
+ fi |
139 |
AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes") |
140 |
|
141 |
AC_SUBST(CAIRO_CFLAGS) |
142 |
@@ -586,14 +612,23 @@ |
143 |
# Checks for Pango stuff |
144 |
######################## |
145 |
|
146 |
-PKG_CHECK_MODULES(PANGO, pango, |
147 |
- have_pango="yes", |
148 |
- have_pango="no (usable pango not found)") |
149 |
+AC_ARG_WITH(pango, [ --without-pango build without Pango and without pangocairo]) |
150 |
+ if test x$with_pango != xno; then |
151 |
+ PKG_CHECK_MODULES(PANGO, pango, |
152 |
+ have_pango="yes", |
153 |
+ have_pango="no (usable pango not found)") |
154 |
+ else |
155 |
+ have_pango="no (disabled by flag)" |
156 |
+ fi |
157 |
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") |
158 |
|
159 |
-PKG_CHECK_MODULES(PANGOCAIRO, pangocairo, |
160 |
- have_pangocairo="yes", |
161 |
- have_pangocairo="no (usable pangocairo not found)") |
162 |
+if test x$with_pango != xno && test x$with_cairo != xno; then |
163 |
+ PKG_CHECK_MODULES(PANGOCAIRO, pangocairo, |
164 |
+ have_pangocairo="yes", |
165 |
+ have_pangocairo="no (usable pangocairo not found)") |
166 |
+else |
167 |
+ have_pangocairo="no (disabled by flag)" |
168 |
+fi |
169 |
AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes") |
170 |
|
171 |
AC_SUBST(PANGO_CFLAGS) |
172 |
@@ -606,9 +641,14 @@ |
173 |
# Check for gdk-pixbuf |
174 |
###################### |
175 |
|
176 |
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version, |
177 |
- have_gdk_pixbuf="yes", |
178 |
- have_gdk_pixbuf="no (gdk-pixbuf not found)") |
179 |
+AC_ARG_WITH(gdkpixbuf, [ --without-gdkpixbuf build without GDKPixbuf support]) |
180 |
+ if test x$with_gdkpixbuf != xno; then |
181 |
+ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version, |
182 |
+ have_gdk_pixbuf="yes", |
183 |
+ have_gdk_pixbuf="no (gdk-pixbuf not found)") |
184 |
+ else |
185 |
+ have_gdk_pixbuf="no (disabled by flag)" |
186 |
+ fi |
187 |
AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes") |
188 |
|
189 |
|
190 |
@@ -641,6 +681,10 @@ |
191 |
jpeg_ok="no (JPEG header file not found)" |
192 |
fi |
193 |
fi |
194 |
+ else |
195 |
+ if test x$with_libjpeg == xno; then |
196 |
+ jpeg_ok="no (disabled by flag)" |
197 |
+ fi |
198 |
fi |
199 |
|
200 |
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then |
201 |
@@ -655,9 +699,14 @@ |
202 |
# Check for libpng |
203 |
################## |
204 |
|
205 |
-PKG_CHECK_MODULES(PNG, libpng, |
206 |
- have_libpng="yes", |
207 |
- have_libpng="no (usable libpng not found)") |
208 |
+AC_ARG_WITH(libpng, [ --without-libpng build without PNG support]) |
209 |
+ if test x$with_libpng != xno; then |
210 |
+ PKG_CHECK_MODULES(PNG, libpng, |
211 |
+ have_libpng="yes", |
212 |
+ have_libpng="no (usable libpng not found)") |
213 |
+ else |
214 |
+ have_libpng="no (disabled by flag)" |
215 |
+ fi |
216 |
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes") |
217 |
|
218 |
AC_SUBST(PNG_CFLAGS) |
219 |
@@ -668,9 +717,14 @@ |
220 |
# Check for librsvg |
221 |
################### |
222 |
|
223 |
-PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version, |
224 |
- have_librsvg="yes", |
225 |
- have_librsvg="no (usable librsvg not found)") |
226 |
+AC_ARG_WITH(librsvg, [ --without-librsvg build without SVG support]) |
227 |
+ if test x$with_librsvg != xno; then |
228 |
+ PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version, |
229 |
+ have_librsvg="yes", |
230 |
+ have_librsvg="no (usable librsvg not found)") |
231 |
+ else |
232 |
+ have_librsvg="no (disabled by flag)" |
233 |
+ fi |
234 |
AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes") |
235 |
|
236 |
AC_SUBST(RSVG_CFLAGS) |
237 |
@@ -681,9 +735,14 @@ |
238 |
# Check for OpenEXR |
239 |
################### |
240 |
|
241 |
-PKG_CHECK_MODULES(OPENEXR, OpenEXR, |
242 |
- have_openexr="yes", |
243 |
- have_openexr="no (usable OpenEXR not found)") |
244 |
+AC_ARG_WITH(openexr, [ --without-openexr build without OpenEXR]) |
245 |
+ if test x$with_openexr != xno; then |
246 |
+ PKG_CHECK_MODULES(OPENEXR, OpenEXR, |
247 |
+ have_openexr="yes", |
248 |
+ have_openexr="no (usable OpenEXR not found)") |
249 |
+ else |
250 |
+ have_openexr="no (disabled by flag)" |
251 |
+ fi |
252 |
AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes") |
253 |
|
254 |
AC_SUBST(OPENEXR_CFLAGS) |
255 |
@@ -694,16 +753,21 @@ |
256 |
# Check for SDL |
257 |
############### |
258 |
|
259 |
-dnl check for SDL |
260 |
-AC_PATH_PROG(SDL_CONFIG, sdl-config, no) |
261 |
-if test "$SDL_CONFIG" = "no"; then |
262 |
- have_sdl="no (usable libsdl not found)" |
263 |
- AC_MSG_RESULT([*** Check for SDL library failed.]) |
264 |
-else |
265 |
- have_sdl="yes" |
266 |
- SDL_CFLAGS=`$SDL_CONFIG --cflags` |
267 |
- SDL_LIBS=`$SDL_CONFIG --libs` |
268 |
-fi |
269 |
+AC_ARG_WITH(libsdl, [ --without-libsdl build without SDL support]) |
270 |
+ if test x$with_libsdl != xno; then |
271 |
+ dnl check for SDL |
272 |
+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no) |
273 |
+ if test "$SDL_CONFIG" = "no"; then |
274 |
+ have_sdl="no (usable libsdl not found)" |
275 |
+ AC_MSG_RESULT([*** Check for SDL library failed.]) |
276 |
+ else |
277 |
+ have_sdl="yes" |
278 |
+ SDL_CFLAGS=`$SDL_CONFIG --cflags` |
279 |
+ SDL_LIBS=`$SDL_CONFIG --libs` |
280 |
+ fi |
281 |
+ else |
282 |
+ have_sdl="no (disabled by flag)" |
283 |
+ fi |
284 |
AM_CONDITIONAL(HAVE_SDL, test "x$have_sdl" = "xyes") |
285 |
|
286 |
AC_SUBST(SDL_CFLAGS) |
287 |
@@ -714,10 +778,15 @@ |
288 |
# Check for libopenraw |
289 |
#################### |
290 |
|
291 |
-dnl check for libopenraw |
292 |
-PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0, |
293 |
- have_openraw="yes", |
294 |
- have_openraw="no (usable libopenraw not found)") |
295 |
+AC_ARG_WITH(libopenraw, [ --without-libopenraw build without libopenraw support]) |
296 |
+ if test x$with_libopenraw != xno; then |
297 |
+ dnl check for libopenraw |
298 |
+ PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= libopenraw, |
299 |
+ have_openraw="yes", |
300 |
+ have_openraw="no (usable libopenraw not found)") |
301 |
+ else |
302 |
+ have_openraw="no (disabled by flag)" |
303 |
+ fi |
304 |
AM_CONDITIONAL(HAVE_OPENRAW, test "x$have_openraw" = "xyes") |
305 |
|
306 |
AC_SUBST(OPENRAW_CFLAGS) |
307 |
@@ -728,13 +797,18 @@ |
308 |
# Check for graphviz |
309 |
#################### |
310 |
|
311 |
-AC_PATH_PROG(GRAPHVIZ, dot, no) |
312 |
-if test "$GRAPHVIZ" = "no"; then |
313 |
- have_graphviz="no (graphviz not found)" |
314 |
- AC_MSG_RESULT([*** Check for dot command from graphviz failed.]) |
315 |
-else |
316 |
- have_graphviz="yes" |
317 |
-fi |
318 |
+AC_ARG_WITH(graphviz, [ --without-graphviz build without graphviz support]) |
319 |
+ if test x$with_graphviz != xno; then |
320 |
+ AC_PATH_PROG(GRAPHVIZ, dot, no) |
321 |
+ if test "$GRAPHVIZ" = "no"; then |
322 |
+ have_graphviz="no (graphviz not found)" |
323 |
+ AC_MSG_RESULT([*** Check for dot command from graphviz failed.]) |
324 |
+ else |
325 |
+ have_graphviz="yes" |
326 |
+ fi |
327 |
+ else |
328 |
+ have_graphviz="no (disabled by flag)" |
329 |
+ fi |
330 |
AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes") |
331 |
|
332 |
|
333 |
@@ -742,13 +816,18 @@ |
334 |
# Check for enscript |
335 |
#################### |
336 |
|
337 |
-AC_PATH_PROG(ENSCRIPT, enscript, no) |
338 |
-if test "$ENSCRIPT" = "no"; then |
339 |
- have_enscript="no (enscript not found)" |
340 |
- AC_MSG_RESULT([*** Check for enscript command failed.]) |
341 |
-else |
342 |
- have_enscript="yes" |
343 |
-fi |
344 |
+AC_ARG_WITH(enscript, [ --without-enscript build without enscript support]) |
345 |
+ if test x$with_enscript != xno; then |
346 |
+ AC_PATH_PROG(ENSCRIPT, enscript, no) |
347 |
+ if test "$ENSCRIPT" = "no"; then |
348 |
+ have_enscript="no (enscript not found)" |
349 |
+ AC_MSG_RESULT([*** Check for enscript command failed.]) |
350 |
+ else |
351 |
+ have_enscript="yes" |
352 |
+ fi |
353 |
+ else |
354 |
+ have_enscript="no (disabled by flag)" |
355 |
+ fi |
356 |
AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes") |
357 |
|
358 |
|
359 |
@@ -756,13 +835,18 @@ |
360 |
# Check for asciidoc |
361 |
#################### |
362 |
|
363 |
-AC_PATH_PROG(ASCIIDOC, asciidoc, no) |
364 |
-if test "$ASCIIDOC" = "no"; then |
365 |
- have_asciidoc="no (asciidoc not found)" |
366 |
- AC_MSG_RESULT([*** Check for asciidoc failed.]) |
367 |
-else |
368 |
- have_asciidoc="yes" |
369 |
-fi |
370 |
+AC_ARG_WITH(asciidoc, [ --without-asciidoc build without asciidoc support]) |
371 |
+ if test x$with_asciidoc != xno; then |
372 |
+ AC_PATH_PROG(ASCIIDOC, asciidoc, no) |
373 |
+ if test "$ASCIIDOC" = "no"; then |
374 |
+ have_asciidoc="no (asciidoc not found)" |
375 |
+ AC_MSG_RESULT([*** Check for asciidoc failed.]) |
376 |
+ else |
377 |
+ have_asciidoc="yes" |
378 |
+ fi |
379 |
+ else |
380 |
+ have_asciidoc="no (disabled by flag)" |
381 |
+ fi |
382 |
AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes") |
383 |
|
384 |
|
385 |
@@ -770,14 +854,24 @@ |
386 |
# Check for avcodec and avformat libraries |
387 |
########################################## |
388 |
|
389 |
-PKG_CHECK_MODULES(AVCODEC, libavcodec, |
390 |
- have_libavcodec="yes", |
391 |
- have_libavcodec="no (usable libavcodec not found)") |
392 |
+AC_ARG_WITH(libavcodec, [ --without-libavcodec build without avcodec support]) |
393 |
+ if test x$with_libavcodec != xno; then |
394 |
+ PKG_CHECK_MODULES(AVCODEC, libavcodec, |
395 |
+ have_libavcodec="yes", |
396 |
+ have_libavcodec="no (usable libavcodec not found)") |
397 |
+ else |
398 |
+ have_libavcodec="no (disabled by flag)" |
399 |
+ fi |
400 |
AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes") |
401 |
|
402 |
-PKG_CHECK_MODULES(AVFORMAT, libavformat, |
403 |
- have_libavformat="yes", |
404 |
- have_libavformat="no (usable libavformat not found)") |
405 |
+AC_ARG_WITH(libavformat, [ --without-libavformat build without avformat support]) |
406 |
+ if test x$with_libavformat != xno; then |
407 |
+ PKG_CHECK_MODULES(AVFORMAT, libavformat, |
408 |
+ have_libavformat="yes", |
409 |
+ have_libavformat="no (usable libavformat not found)") |
410 |
+ else |
411 |
+ have_libavformat="no (disabled by flag)" |
412 |
+ fi |
413 |
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes") |
414 |
|
415 |
AC_SUBST(AVCODEC_CFLAGS) |
416 |
@@ -790,9 +884,13 @@ |
417 |
# Check for V4L |
418 |
############### |
419 |
|
420 |
-have_v4l=no |
421 |
-AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes) |
422 |
- |
423 |
+AC_ARG_WITH(v4l, [ --without-v4l build without video4linux support]) |
424 |
+ if test x$with_v4l != xno; then |
425 |
+ have_v4l=no |
426 |
+ AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes) |
427 |
+ else |
428 |
+ have_v4l="no (disabled by flag)" |
429 |
+ fi |
430 |
AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes") |
431 |
|
432 |
|
433 |
@@ -901,3 +999,5 @@ |
434 |
avformat: $have_libavformat |
435 |
V4L: $have_v4l |
436 |
]); |
437 |
+ |
438 |
+# vim:ts=2:et:sw=2 |