Mercurial > octave-nkf

comparison configure.ac @ 11041:696829b6445b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: style fixes
author John W. Eaton <jwe@octave.org>
date Wed, 29 Sep 2010 02:24:41 -0400
parents 9ac165a67747
children 3cbc0d77db48
comparison
equal deleted inserted replaced
11040:9ac165a67747 11041:696829b6445b
765 LIBS="$save_LIBS" 765 LIBS="$save_LIBS"
766 CPPFLAGS="$save_CPPFLAGS" 766 CPPFLAGS="$save_CPPFLAGS"
767 767
768 ### Graphics/ImageMagick++ 768 ### Graphics/ImageMagick++
769 769
770 AC_ARG_WITH(magick, 770 AC_ARG_WITH([magick], [
771 [ --with-magick=LIB Library to use for image IO (options: GraphicsMagick(default) or ImageMagick)], 771 AS_HELP_STRING([--with-magick=LIB],
772 magick="$withval", 772 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], [
773 magick="GraphicsMagick") 773 magick="$withval"], [
774 774 magick="GraphicsMagick"])
775 775
776 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional." 776 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional."
777 777
778 MAGICK_CPPFLAGS= 778 MAGICK_CPPFLAGS=
779 MAGICK_LDFLAGS= 779 MAGICK_LDFLAGS=
780 MAGICK_LIBS= 780 MAGICK_LIBS=
781 781
782 PKG_CHECK_EXISTS([$magick++], [ 782 PKG_CHECK_EXISTS([$magick++], [
783 ## Make sure we only get -I, -L and -l flags. Some Graphics/ImageMagick++ 783 ## Make sure we only get -I, -L and -l flags. Some Graphics/ImageMagick++
784 ## packages adds extra flags that are useful when building 784 ## packages adds extra flags that are useful when building
785 ## Graphics/ImageMagick++ extentions. These extra flags break the Octave build. 785 ## Graphics/ImageMagick++ extentions. These extra flags break the
786 ## Octave build.
786 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` 787 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
787 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` 788 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
788 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` 789 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
789 790
790 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." 791 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional."
850 have_fontconfig=no 851 have_fontconfig=no
851 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."]) 852 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."])
852 fi 853 fi
853 854
854 ## fltk (www.fltk.org) 855 ## fltk (www.fltk.org)
855 AC_ARG_WITH(fltk-prefix, 856
856 [ --with-fltk-prefix=PFX Prefix where FLTK is installed (optional)], 857 AC_ARG_WITH([fltk-prefix], [
857 fltk_prefix="$withval", 858 AS_HELP_STRING([--with-fltk-prefix=PFX],
858 fltk_prefix="") 859 [Prefix where FLTK is installed (optional)])], [
859 AC_ARG_WITH(fltk-exec-prefix, 860 fltk_prefix="$withval"], [
860 [ --with-fltk-exec-prefix=PFX Exec prefix where FLTK is installed (optional)], 861 fltk_prefix=""])
861 fltk_exec_prefix="$withval", 862
862 fltk_exec_prefix="") 863 AC_ARG_WITH([fltk-exec-prefix], [
864 AS_HELP_STRING([--with-fltk-exec-prefix=PFX],
865 [Exec prefix where FLTK is installed (optional)])], [
866 fltk_exec_prefix="$withval"], [
867 fltk_exec_prefix=""])
863 868
864 if test -n "$fltk_exec_prefix"; then 869 if test -n "$fltk_exec_prefix"; then
865 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix" 870 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix"
866 if test "x${FLTK_CONFIG+set}" != xset ; then 871 if test "x${FLTK_CONFIG+set}" != xset ; then
867 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config" 872 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config"
873 if test x${FLTK_CONFIG+set} != xset ; then 878 if test x${FLTK_CONFIG+set} != xset ; then
874 FLTK_CONFIG="$fltk_prefix/bin/fltk-config" 879 FLTK_CONFIG="$fltk_prefix/bin/fltk-config"
875 fi 880 fi
876 fi 881 fi
877 882
878 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no) 883 AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no])
879 884
880 warn_fltk_config="" 885 warn_fltk_config=""
881 warn_fltk_opengl="" 886 warn_fltk_opengl=""
882 887
883 if test "$FLTK_CONFIG" = "no" ; then 888 if test "$FLTK_CONFIG" = "no" ; then
2431 AC_MSG_WARN([]) 2436 AC_MSG_WARN([])
2432 2437
2433 warn_msg_printed=true 2438 warn_msg_printed=true
2434 fi 2439 fi
2435 2440
2436
2437
2438
2439
2440 if $warn_msg_printed; then 2441 if $warn_msg_printed; then
2441 AC_MSG_NOTICE([]) 2442 AC_MSG_NOTICE([])
2442 AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR]) 2443 AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR])
2443 AC_MSG_NOTICE([NOTE: if the library on your system is missing required features.]) 2444 AC_MSG_NOTICE([NOTE: if the library on your system is missing required features.])
2444 fi 2445 fi