Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 237322 | Differences between
and this patch

Collapse All | Expand All

(-)configure.in.13150 (+57 lines)
Lines 704-709 Link Here
704
	esac],
704
	esac],
705
	[with_svg="yes"])
705
	[with_svg="yes"])
706
706
707
##########################libwww Support####################
708
dnl
709
dnl libwww are enabled by default
710
dnl
711
AC_ARG_ENABLE([system-libwww],
712
	AC_HELP_STRING([--enable-system-libwww],[try the libwww system library]),
713
	[case "${enableval}" in
714
	  yes) with_system_libwww="yes";;
715
	  no)  with_system_libwww="no" ;;
716
	  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-libwww) ;;
717
	esac],
718
	[with_system_libwww="no"])
719
720
#If libwww is needed and we are asked
721
#to use the system library, check if is present
722
if test "$with_libwww" = "yes" -a "$with_system_libwww" = "yes" ; then
723
    # check to see if we have a libwww library
724
    AC_PATH_PROG([LIBWWW_CONFIG],[libwww-config])
725
726
    if test "$LIBWWW_CONFIG" = "" ; then
727
      AC_MSG_WARN(Not using system-provided libwww library)
728
      with_system_libwww="no"
729
    fi
730
fi
731
732
#if we use the builtin library,
733
#check it is present
734
if test "$with_libwww" = "yes" -a "$with_system_libwww" != "yes" \
735
	-a ! -d "$srcdir/../libwww" ; then
736
	AC_MSG_WARN(libwww source dir not found !!)
737
	AC_MSG_WARN(Disabling libwww build !)
738
	with_libwww="no"
739
fi
740
741
#At this point, we know everything about libwww,
742
#so either set the variables we will need later,
743
#or disable Annotations
744
if test "$with_libwww" = "yes" ; then
745
	if test "$with_system_libwww" != "yes" ; then
746
		www_frag=$srcdir/amaya/Makefile.libwww
747
		AC_SUBST_FILE(www_frag)
748
	else
749
		AMAYA_LIBWWW_INCLUDES=`$LIBWWW_CONFIG --cflags`
750
		AMAYA_LIBWWW_LIBS=`$LIBWWW_CONFIG --libs`
751
       fi
752
else
753
	with_libwww="no"
754
fi
755
756
#AC_SUBST(BUILDLIBWWW)
757
758
AC_SUBST(AMAYA_LIBWWW_LIBS)
759
AC_SUBST(AMAYA_LIBWWW_INCLUDES)
760
761
###################End of libwww Support####################
762
763
707
##########################Annotations Support####################
764
##########################Annotations Support####################
708
dnl
765
dnl
709
dnl annotations are enabled by default
766
dnl annotations are enabled by default
(-)configure.in.13150 (-6 lines)
Lines 935-946 Link Here
935
935
936
936
937
if test "$build_amaya" = "yes" ; then
937
if test "$build_amaya" = "yes" ; then
938
    if test ! -f $srcdir/../libwww/Makefile.in ; then
939
	AC_MSG_WARN(libwww sources not found !!)
940
	AC_MSG_WARN(Disabling Amaya build !)
941
	build_amaya="no"
942
    fi
943
944
    if test ! -f $srcdir/amaya/MathML.S ; then
938
    if test ! -f $srcdir/amaya/MathML.S ; then
945
	if test "$with_math" = "yes" ; then
939
	if test "$with_math" = "yes" ; then
946
	    AC_MSG_WARN(MathML sources not found !!)
940
	    AC_MSG_WARN(MathML sources not found !!)
(-)configure.in.13150 (-2 / +6 lines)
Lines 1143-1150 Link Here
1143
#build_amaya=yes
1143
#build_amaya=yes
1144
if test "$build_amaya" = "yes" ; then
1144
if test "$build_amaya" = "yes" ; then
1145
    make_output="$make_output amaya/Makefile"
1145
    make_output="$make_output amaya/Makefile"
1146
    EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
1146
    if test "$with_system_libwww" = "yes" ; then
1147
    $srcdir/amaya/Makefile.libwww"
1147
	EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in"
1148
    else
1149
    	EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
1150
    	$srcdir/amaya/Makefile.libwww"
1151
    fi
1148
1152
1149
    if test "$with_annot" = "yes" ; then
1153
    if test "$with_annot" = "yes" ; then
1150
       make_output="$make_output annotlib/Makefile"
1154
       make_output="$make_output annotlib/Makefile"
(-)configure.in.13150 (-1 / +1 lines)
Lines 1084-1090 Link Here
1084
dnl Include the option Makefile.xxx fragment according to the configure options
1084
dnl Include the option Makefile.xxx fragment according to the configure options
1085
dnl
1085
dnl
1086
1086
1087
www_frag=$srcdir/amaya/Makefile.libwww
1087
www_frag=/dev/null
1088
AC_SUBST_FILE(www_frag)
1088
AC_SUBST_FILE(www_frag)
1089
1089
1090
if test "$with_math" = "no" ; then
1090
if test "$with_math" = "no" ; then

Return to bug 237322