Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 240776
Collapse All | Expand All

(-)configure.ac.orig (-89 / +189 lines)
Lines 50-55 Link Here
50
m4_define([openexr_required_version], [0.0.0])
50
m4_define([openexr_required_version], [0.0.0])
51
m4_define([sdl_required_version], [0.0.0])
51
m4_define([sdl_required_version], [0.0.0])
52
m4_define([graphviz_required_version], [0.0.0])
52
m4_define([graphviz_required_version], [0.0.0])
53
m4_define([libopenraw_required_version], [0.0.5])
53
54
54
AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version)
55
AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version)
55
AC_CONFIG_SRCDIR([gegl/gegl.h.in])
56
AC_CONFIG_SRCDIR([gegl/gegl.h.in])
Lines 453-475 Link Here
453
        *** Errors follow:
454
        *** Errors follow:
454
            $DEP_PKG_ERRORS]))
455
            $DEP_PKG_ERRORS]))
455
456
456
PKG_CHECK_MODULES(GIO, gio-2.0, 
457
AC_ARG_WITH(gio, [  --without-gio           build without GIO (from glib) support])
457
	have_gio="yes"
458
  if test x$with_gio != xno; then
458
	AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
459
    PKG_CHECK_MODULES(GIO, gio-2.0, 
459
	GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
460
      have_gio="yes"
460
	have_gio="no (gio not found)")
461
      AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
462
      GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
463
      have_gio="no  (gio not found)")
464
  else
465
    have_gio="no  (disabled by flag)"
466
  fi
461
AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
467
AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
462
468
463
# Rerun PKG_CONFIG to add gthread-2.0 cflags and libs
469
# Rerun PKG_CONFIG to add gthread-2.0 cflags and libs
464
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
470
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
465
DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
471
DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
466
472
467
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
473
AC_ARG_WITH(gtk, [  --without-gtk           build without GTK+ support])
468
  have_gtk="yes"
474
if test "x$with_gtk" != "xno"; then
469
  AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
475
  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
470
  GTK_CFLAGS="$GTK_CFLAGS"
476
    have_gtk="yes"
471
  GTK_LIBS="$GTK_LIBS",
477
    AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
472
  have_gtk="no  (gtk+ not found)")
478
    GTK_CFLAGS="$GTK_CFLAGS"
479
    GTK_LIBS="$GTK_LIBS",
480
    have_gtk="no  (gtk+ not found)")
481
else
482
  have_gtk="no  (disabled by flag)"
483
fi
473
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
484
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
474
485
475
AC_SUBST(GTK_CFLAGS)
486
AC_SUBST(GTK_CFLAGS)
Lines 538-548 Link Here
538
# Check for Lua
549
# Check for Lua
539
###############
550
###############
540
551
541
PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
552
AC_ARG_WITH(lua, [  --without-lua           build without Lua support])
542
  have_lua="yes",
553
  if test x$with_lua != xno; then
543
  [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
554
    PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
544
     have_lua="yes",
555
      have_lua="yes",
545
     have_lua="no  (usable lua not found)")])
556
      [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
557
         have_lua="yes",
558
         have_lua="no  (usable lua not found)")])
559
  else
560
    have_lua="no  (disabled by flag)"
561
  fi
546
AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes")
562
AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes")
547
563
548
AC_SUBST(LUA_CFLAGS) 
564
AC_SUBST(LUA_CFLAGS) 
Lines 553-569 Link Here
553
# Checks for Ruby used to make API docs
569
# Checks for Ruby used to make API docs
554
#######################################
570
#######################################
555
571
556
AC_CHECK_PROG(RUBY, ruby, yes, no)
572
AC_ARG_WITH(ruby, [  --without-ruby          build without Ruby support])
557
if test "$RUBY" = "no"; then
573
  if test x$with_ruby != xno; then
558
  AC_MSG_WARN([
574
    AC_CHECK_PROG(RUBY, ruby, yes, no)
575
    if test "$RUBY" = "no"; then
576
      AC_MSG_WARN([
559
*** Could not find Ruby interpreter. The HTML API reference
577
*** Could not find Ruby interpreter. The HTML API reference
560
will not be updated.
578
will not be updated.
561
])
579
])
562
  have_ruby=no
580
      have_ruby=no
563
else
581
    else
564
  RUBY_BIN="$RUBY"
582
      RUBY_BIN="$RUBY"
565
  have_ruby=yes
583
      have_ruby=yes
566
fi
584
    fi
585
  else
586
    have_ruby="no  (disabled by flag)"
587
  fi
567
AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes")
588
AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes")
568
589
569
AC_SUBST(RUBY_BIN)
590
AC_SUBST(RUBY_BIN)
Lines 573-581 Link Here
573
# Check for Cairo
594
# Check for Cairo
574
#################
595
#################
575
596
576
PKG_CHECK_MODULES(CAIRO, cairo,
597
AC_ARG_WITH(cairo, [  --without-cairo         build without Cairo and without pangocairo])
577
  have_cairo="yes",
598
  if test x$with_cairo != xno; then
578
  have_cairo="no  (usable cairo not found)")
599
    PKG_CHECK_MODULES(CAIRO, cairo,
600
      have_cairo="yes",
601
      have_cairo="no  (usable cairo not found)")
602
  else
603
    have_cairo="no  (disabled by flag)"
604
  fi
579
AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes")
605
AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes")
580
606
581
AC_SUBST(CAIRO_CFLAGS) 
607
AC_SUBST(CAIRO_CFLAGS) 
Lines 586-599 Link Here
586
# Checks for Pango stuff
612
# Checks for Pango stuff
587
########################
613
########################
588
614
589
PKG_CHECK_MODULES(PANGO, pango,
615
AC_ARG_WITH(pango, [  --without-pango         build without Pango and without pangocairo])
590
  have_pango="yes",
616
  if test x$with_pango != xno; then
591
  have_pango="no  (usable pango not found)")
617
    PKG_CHECK_MODULES(PANGO, pango,
618
      have_pango="yes",
619
      have_pango="no  (usable pango not found)")
620
  else
621
    have_pango="no  (disabled by flag)"
622
  fi
592
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
623
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
593
624
594
PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
625
if test x$with_pango != xno && test x$with_cairo != xno; then
595
  have_pangocairo="yes",
626
  PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
596
  have_pangocairo="no  (usable pangocairo not found)")
627
    have_pangocairo="yes",
628
    have_pangocairo="no  (usable pangocairo not found)")
629
else
630
  have_pangocairo="no  (disabled by flag)"
631
fi
597
AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes")
632
AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes")
598
633
599
AC_SUBST(PANGO_CFLAGS) 
634
AC_SUBST(PANGO_CFLAGS) 
Lines 606-614 Link Here
606
# Check for gdk-pixbuf
641
# Check for gdk-pixbuf
607
######################
642
######################
608
643
609
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
644
AC_ARG_WITH(gdkpixbuf, [  --without-gdkpixbuf     build without GDKPixbuf support])
610
  have_gdk_pixbuf="yes",
645
  if test x$with_gdkpixbuf != xno; then
611
  have_gdk_pixbuf="no  (gdk-pixbuf not found)")
646
    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
647
      have_gdk_pixbuf="yes",
648
      have_gdk_pixbuf="no  (gdk-pixbuf not found)")
649
  else
650
    have_gdk_pixbuf="no  (disabled by flag)"
651
  fi
612
AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes")
652
AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes")
613
653
614
654
Lines 641-646 Link Here
641
        jpeg_ok="no  (JPEG header file not found)"
681
        jpeg_ok="no  (JPEG header file not found)"
642
      fi
682
      fi
643
    fi
683
    fi
684
  else
685
    if test x$with_libjpeg == xno; then
686
      jpeg_ok="no  (disabled by flag)"
687
    fi
644
  fi
688
  fi
645
689
646
  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
690
  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
Lines 655-663 Link Here
655
# Check for libpng
699
# Check for libpng
656
##################
700
##################
657
701
658
PKG_CHECK_MODULES(PNG, libpng,
702
AC_ARG_WITH(libpng, [  --without-libpng        build without PNG support])
659
  have_libpng="yes",
703
  if test x$with_libpng != xno; then
660
  have_libpng="no  (usable libpng not found)")
704
    PKG_CHECK_MODULES(PNG, libpng,
705
      have_libpng="yes",
706
      have_libpng="no  (usable libpng not found)")
707
  else
708
    have_libpng="no  (disabled by flag)"
709
  fi
661
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes")
710
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes")
662
711
663
AC_SUBST(PNG_CFLAGS) 
712
AC_SUBST(PNG_CFLAGS) 
Lines 668-676 Link Here
668
# Check for librsvg
717
# Check for librsvg
669
###################
718
###################
670
719
671
PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
720
AC_ARG_WITH(librsvg, [  --without-librsvg       build without SVG support])
672
  have_librsvg="yes",
721
  if test x$with_librsvg != xno; then
673
  have_librsvg="no  (usable librsvg not found)")
722
    PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
723
      have_librsvg="yes",
724
      have_librsvg="no  (usable librsvg not found)")
725
  else
726
    have_librsvg="no  (disabled by flag)"
727
  fi
674
AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes")
728
AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes")
675
729
676
AC_SUBST(RSVG_CFLAGS) 
730
AC_SUBST(RSVG_CFLAGS) 
Lines 681-689 Link Here
681
# Check for OpenEXR
735
# Check for OpenEXR
682
###################
736
###################
683
737
684
PKG_CHECK_MODULES(OPENEXR, OpenEXR,
738
AC_ARG_WITH(openexr, [  --without-openexr       build without OpenEXR])
685
  have_openexr="yes",
739
  if test x$with_openexr != xno; then
686
  have_openexr="no  (usable OpenEXR not found)")
740
    PKG_CHECK_MODULES(OPENEXR, OpenEXR,
741
      have_openexr="yes",
742
      have_openexr="no  (usable OpenEXR not found)")
743
  else
744
    have_openexr="no  (disabled by flag)"
745
  fi
687
AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes")
746
AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes")
688
747
689
AC_SUBST(OPENEXR_CFLAGS) 
748
AC_SUBST(OPENEXR_CFLAGS) 
Lines 694-709 Link Here
694
# Check for SDL
753
# Check for SDL
695
###############
754
###############
696
755
697
dnl check for SDL
756
AC_ARG_WITH(libsdl, [  --without-libsdl        build without SDL support])
698
AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
757
  if test x$with_libsdl != xno; then
699
if test "$SDL_CONFIG" = "no"; then
758
    dnl check for SDL
700
  have_sdl="no  (usable libsdl not found)"
759
    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
701
  AC_MSG_RESULT([*** Check for SDL library failed.])
760
    if test "$SDL_CONFIG" = "no"; then
702
else
761
      have_sdl="no  (usable libsdl not found)"
703
  have_sdl="yes"
762
      AC_MSG_RESULT([*** Check for SDL library failed.])
704
  SDL_CFLAGS=`$SDL_CONFIG --cflags`
763
    else
705
  SDL_LIBS=`$SDL_CONFIG --libs`
764
      have_sdl="yes"
706
fi
765
      SDL_CFLAGS=`$SDL_CONFIG --cflags`
766
      SDL_LIBS=`$SDL_CONFIG --libs`
767
    fi
768
  else
769
    have_sdl="no  (disabled by flag)"
770
  fi
707
AM_CONDITIONAL(HAVE_SDL, test "x$have_sdl" = "xyes")
771
AM_CONDITIONAL(HAVE_SDL, test "x$have_sdl" = "xyes")
708
772
709
AC_SUBST(SDL_CFLAGS)
773
AC_SUBST(SDL_CFLAGS)
Lines 714-723 Link Here
714
# Check for libopenraw
778
# Check for libopenraw
715
####################
779
####################
716
780
717
dnl check for libopenraw
781
AC_ARG_WITH(libopenraw, [  --without-libopenraw        build without libopenraw support])
718
PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0,
782
  if test x$with_libopenraw != xno; then
719
  have_openraw="yes",
783
    dnl check for libopenraw
720
  have_openraw="no (usable libopenraw not found)")
784
    PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= libopenraw,
785
      have_openraw="yes",
786
      have_openraw="no  (usable libopenraw not found)")
787
    else
788
      have_openraw="no  (disabled by flag)"
789
    fi
721
AM_CONDITIONAL(HAVE_OPENRAW, test "x$have_openraw" = "xyes")
790
AM_CONDITIONAL(HAVE_OPENRAW, test "x$have_openraw" = "xyes")
722
791
723
AC_SUBST(OPENRAW_CFLAGS) 
792
AC_SUBST(OPENRAW_CFLAGS) 
Lines 728-740 Link Here
728
# Check for graphviz
797
# Check for graphviz
729
####################
798
####################
730
 
799
 
731
AC_PATH_PROG(GRAPHVIZ, dot, no)
800
AC_ARG_WITH(graphviz, [  --without-graphviz      build without graphviz support])
732
if test "$GRAPHVIZ" = "no"; then
801
  if test x$with_graphviz != xno; then
733
  have_graphviz="no  (graphviz not found)"
802
    AC_PATH_PROG(GRAPHVIZ, dot, no)
734
  AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
803
    if test "$GRAPHVIZ" = "no"; then
735
else
804
      have_graphviz="no  (graphviz not found)"
736
  have_graphviz="yes"
805
      AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
737
fi
806
    else
807
      have_graphviz="yes"
808
    fi
809
  else
810
    have_graphviz="no  (disabled by flag)"
811
  fi
738
AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes")
812
AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes")
739
813
740
814
Lines 742-754 Link Here
742
# Check for enscript
816
# Check for enscript
743
####################
817
####################
744
 
818
 
745
AC_PATH_PROG(ENSCRIPT, enscript, no)
819
AC_ARG_WITH(enscript, [  --without-enscript      build without enscript support])
746
if test "$ENSCRIPT" = "no"; then
820
  if test x$with_enscript != xno; then
747
  have_enscript="no  (enscript not found)"
821
    AC_PATH_PROG(ENSCRIPT, enscript, no)
748
  AC_MSG_RESULT([*** Check for enscript command failed.])
822
    if test "$ENSCRIPT" = "no"; then
749
else
823
      have_enscript="no  (enscript not found)"
750
  have_enscript="yes"
824
      AC_MSG_RESULT([*** Check for enscript command failed.])
751
fi
825
    else
826
      have_enscript="yes"
827
    fi
828
  else
829
    have_enscript="no  (disabled by flag)"
830
  fi
752
AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes")
831
AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes")
753
832
754
833
Lines 756-768 Link Here
756
# Check for asciidoc
835
# Check for asciidoc
757
####################
836
####################
758
 
837
 
759
AC_PATH_PROG(ASCIIDOC, asciidoc, no)
838
AC_ARG_WITH(asciidoc, [  --without-asciidoc      build without asciidoc support])
760
if test "$ASCIIDOC" = "no"; then
839
  if test x$with_asciidoc != xno; then
761
  have_asciidoc="no  (asciidoc not found)"
840
    AC_PATH_PROG(ASCIIDOC, asciidoc, no)
762
  AC_MSG_RESULT([*** Check for asciidoc failed.])
841
    if test "$ASCIIDOC" = "no"; then
763
else
842
      have_asciidoc="no  (asciidoc not found)"
764
  have_asciidoc="yes"
843
      AC_MSG_RESULT([*** Check for asciidoc failed.])
765
fi
844
    else
845
      have_asciidoc="yes"
846
    fi
847
  else
848
    have_asciidoc="no  (disabled by flag)"
849
  fi
766
AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
850
AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
767
851
768
852
Lines 770-783 Link Here
770
# Check for avcodec and avformat libraries
854
# Check for avcodec and avformat libraries
771
##########################################
855
##########################################
772
856
773
PKG_CHECK_MODULES(AVCODEC, libavcodec,
857
AC_ARG_WITH(libavcodec, [  --without-libavcodec    build without avcodec support])
774
  have_libavcodec="yes",
858
  if test x$with_libavcodec != xno; then
775
  have_libavcodec="no  (usable libavcodec not found)")
859
    PKG_CHECK_MODULES(AVCODEC, libavcodec,
860
      have_libavcodec="yes",
861
      have_libavcodec="no  (usable libavcodec not found)")
862
  else
863
    have_libavcodec="no  (disabled by flag)"
864
  fi
776
AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes")
865
AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes")
777
 
866
 
778
PKG_CHECK_MODULES(AVFORMAT, libavformat,
867
AC_ARG_WITH(libavformat, [  --without-libavformat   build without avformat support])
779
  have_libavformat="yes",
868
  if test x$with_libavformat != xno; then
780
  have_libavformat="no  (usable libavformat not found)")
869
    PKG_CHECK_MODULES(AVFORMAT, libavformat,
870
      have_libavformat="yes",
871
      have_libavformat="no  (usable libavformat not found)")
872
  else
873
    have_libavformat="no  (disabled by flag)"
874
  fi
781
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
875
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
782
876
783
AC_SUBST(AVCODEC_CFLAGS) 
877
AC_SUBST(AVCODEC_CFLAGS) 
Lines 790-798 Link Here
790
# Check for V4L
884
# Check for V4L
791
###############
885
###############
792
 
886
 
793
have_v4l=no
887
AC_ARG_WITH(v4l, [  --without-v4l           build without video4linux support])
794
AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
888
  if test x$with_v4l != xno; then
795
889
    have_v4l=no
890
    AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
891
  else
892
    have_v4l="no  (disabled by flag)"
893
  fi
796
AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes")
894
AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes")
797
895
798
896
Lines 901-903 Link Here
901
  avformat:       $have_libavformat
999
  avformat:       $have_libavformat
902
  V4L:            $have_v4l
1000
  V4L:            $have_v4l
903
]);
1001
]);
1002
1003
# vim:ts=2:et:sw=2

Return to bug 240776