[patch] main-configure.in.diff

main-configure.in.diff (text/plain), 3.33 KB, created by Jimmy.Jazz on 2008-09-10 13:35:08 UTC

--- configure.in.13150	2008-08-29 21:28:34.000000000 +0200
+++ configure.in	2008-08-29 21:42:06.000000000 +0200
@@ -704,6 +704,63 @@
 	esac],
 	[with_svg="yes"])
 
+##########################libwww Support####################
+dnl
+dnl libwww are enabled by default
+dnl
+AC_ARG_ENABLE([system-libwww],
+	AC_HELP_STRING([--enable-system-libwww],[try the libwww system library]),
+	[case "${enableval}" in
+	  yes) with_system_libwww="yes";;
+	  no)  with_system_libwww="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-libwww) ;;
+	esac],
+	[with_system_libwww="no"])
+
+#If libwww is needed and we are asked
+#to use the system library, check if is present
+if test "$with_libwww" = "yes" -a "$with_system_libwww" = "yes" ; then
+    # check to see if we have a libwww library
+    AC_PATH_PROG([LIBWWW_CONFIG],[libwww-config])
+
+    if test "$LIBWWW_CONFIG" = "" ; then
+      AC_MSG_WARN(Not using system-provided libwww library)
+      with_system_libwww="no"
+    fi
+fi
+
+#if we use the builtin library,
+#check it is present
+if test "$with_libwww" = "yes" -a "$with_system_libwww" != "yes" \
+	-a ! -d "$srcdir/../libwww" ; then
+	AC_MSG_WARN(libwww source dir not found !!)
+	AC_MSG_WARN(Disabling libwww build !)
+	with_libwww="no"
+fi
+
+#At this point, we know everything about libwww,
+#so either set the variables we will need later,
+#or disable Annotations
+if test "$with_libwww" = "yes" ; then
+	if test "$with_system_libwww" != "yes" ; then
+		www_frag=$srcdir/amaya/Makefile.libwww
+		AC_SUBST_FILE(www_frag)
+	else
+		AMAYA_LIBWWW_INCLUDES=`$LIBWWW_CONFIG --cflags`
+		AMAYA_LIBWWW_LIBS=`$LIBWWW_CONFIG --libs`
+       fi
+else
+	with_libwww="no"
+fi
+
+#AC_SUBST(BUILDLIBWWW)
+
+AC_SUBST(AMAYA_LIBWWW_LIBS)
+AC_SUBST(AMAYA_LIBWWW_INCLUDES)
+
+###################End of libwww Support####################
+
+
 ##########################Annotations Support####################
 dnl
 dnl annotations are enabled by default
--- configure.in.13150	2008-08-29 22:23:33.000000000 +0200
+++ configure.in	2008-08-29 22:24:15.000000000 +0200
@@ -935,12 +935,6 @@
 
 
 if test "$build_amaya" = "yes" ; then
-    if test ! -f $srcdir/../libwww/Makefile.in ; then
-	AC_MSG_WARN(libwww sources not found !!)
-	AC_MSG_WARN(Disabling Amaya build !)
-	build_amaya="no"
-    fi
-
     if test ! -f $srcdir/amaya/MathML.S ; then
 	if test "$with_math" = "yes" ; then
 	    AC_MSG_WARN(MathML sources not found !!)
--- configure.in.13150	2008-08-29 23:17:50.000000000 +0200
+++ configure.in	2008-08-29 23:20:57.000000000 +0200
@@ -1143,8 +1143,12 @@
 #build_amaya=yes
 if test "$build_amaya" = "yes" ; then
     make_output="$make_output amaya/Makefile"
-    EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
-    $srcdir/amaya/Makefile.libwww"
+    if test "$with_system_libwww" = "yes" ; then
+	EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in"
+    else
+    	EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
+    	$srcdir/amaya/Makefile.libwww"
+    fi
 
     if test "$with_annot" = "yes" ; then
        make_output="$make_output annotlib/Makefile"
--- configure.in.13150	2008-08-29 23:30:55.000000000 +0200
+++ configure.in	2008-08-29 23:32:30.000000000 +0200
@@ -1084,7 +1084,7 @@
 dnl Include the option Makefile.xxx fragment according to the configure options
 dnl
 
-www_frag=$srcdir/amaya/Makefile.libwww
+www_frag=/dev/null
 AC_SUBST_FILE(www_frag)
 
 if test "$with_math" = "no" ; then