Attachment #211781 for bug #293899

View | Details | Raw Unified | Return to bug 293899
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-218 / +460 lines)
0	-- configure	0	++ configure
Lines 782-793 Link Here
782	BUILD_WITH_GDK_TRUE	782	BUILD_WITH_GDK_TRUE
783	GDK_LIBS	783	GDK_LIBS
784	GDK_CFLAGS	784	GDK_CFLAGS
		785	GTK_DOC_USE_REBASE_FALSE
		786	GTK_DOC_USE_REBASE_TRUE
785	GTK_DOC_USE_LIBTOOL_FALSE	787	GTK_DOC_USE_LIBTOOL_FALSE
786	GTK_DOC_USE_LIBTOOL_TRUE	788	GTK_DOC_USE_LIBTOOL_TRUE
		789	GTK_DOC_BUILD_PDF_FALSE
		790	GTK_DOC_BUILD_PDF_TRUE
		791	GTK_DOC_BUILD_HTML_FALSE
		792	GTK_DOC_BUILD_HTML_TRUE
787	ENABLE_GTK_DOC_FALSE	793	ENABLE_GTK_DOC_FALSE
788	ENABLE_GTK_DOC_TRUE	794	ENABLE_GTK_DOC_TRUE
789	GTKDOC_CHECK
790	HTML_DIR	795	HTML_DIR
		796	GTKDOC_MKPDF
		797	GTKDOC_REBASE
		798	GTKDOC_CHECK
791	BUILD_POPPLER_GLIB_FALSE	799	BUILD_POPPLER_GLIB_FALSE
792	BUILD_POPPLER_GLIB_TRUE	800	BUILD_POPPLER_GLIB_TRUE
793	GLIB_MKENUMS	801	GLIB_MKENUMS
Lines 813-824 Link Here
813	BUILD_LIBJPEG_FALSE	821	BUILD_LIBJPEG_FALSE
814	BUILD_LIBJPEG_TRUE	822	BUILD_LIBJPEG_TRUE
815	LIBJPEG_LIBS	823	LIBJPEG_LIBS
816	BUILD_LIBOPENJPEG_FALSE
817	BUILD_LIBOPENJPEG_TRUE
818	LIBOPENJPEG_LIBS
819	BUILD_ZLIB_FALSE	824	BUILD_ZLIB_FALSE
820	BUILD_ZLIB_TRUE	825	BUILD_ZLIB_TRUE
821	ZLIB_LIBS	826	ZLIB_LIBS
		827	BUILD_LIBOPENJPEG_FALSE
		828	BUILD_LIBOPENJPEG_TRUE
		829	LIBOPENJPEG_LIBS
822	X_EXTRA_LIBS	830	X_EXTRA_LIBS
823	X_LIBS	831	X_LIBS
824	X_PRE_LIBS	832	X_PRE_LIBS
Lines 966-974 Link Here
966	enable_fixedpoint	974	enable_fixedpoint
967	with_x	975	with_x
968	enable_exceptions	976	enable_exceptions
		977	enable_libopenjpeg
969	enable_largefile	978	enable_largefile
970	enable_zlib	979	enable_zlib
971	enable_libopenjpeg
972	enable_libjpeg	980	enable_libjpeg
973	enable_libpng	981	enable_libpng
974	enable_splash_output	982	enable_splash_output
Lines 976-981 Link Here
976	enable_poppler_glib	984	enable_poppler_glib
977	with_html_dir	985	with_html_dir
978	enable_gtk_doc	986	enable_gtk_doc
		987	enable_gtk_doc_html
		988	enable_gtk_doc_pdf
979	enable_gdk	989	enable_gdk
980	enable_poppler_qt	990	enable_poppler_qt
981	enable_poppler_qt4	991	enable_poppler_qt4
Lines 1655-1669 Link Here
1655	--enable-xpdf-headers Install unsupported xpdf headers.	1665	--enable-xpdf-headers Install unsupported xpdf headers.
1656	--enable-fixedpoint use fixed point (instead of floating point) arithmetic	1666	--enable-fixedpoint use fixed point (instead of floating point) arithmetic
1657	--enable-exceptions use C++ exceptions	1667	--enable-exceptions use C++ exceptions
		1668	--disable-libopenjpeg Don't build against libopenjpeg.
1658	--disable-largefile omit support for large files	1669	--disable-largefile omit support for large files
1659	--enable-zlib Build with zlib	1670	--enable-zlib Build with zlib
1660	--disable-libopenjpeg Don't build against libopenjpeg.
1661	--disable-libjpeg Don't build against libjpeg.	1671	--disable-libjpeg Don't build against libjpeg.
1662	--disable-libpng Don't build against libpng.	1672	--disable-libpng Don't build against libpng.
1663	--disable-splash-output Don't build the Splash graphics backend.	1673	--disable-splash-output Don't build the Splash graphics backend.
1664	--disable-cairo-output Don't build the cairo graphics backend.	1674	--disable-cairo-output Don't build the cairo graphics backend.
1665	--disable-poppler-glib Don't compile poppler glib wrapper.	1675	--disable-poppler-glib Don't compile poppler glib wrapper.
1666	--enable-gtk-doc use gtk-doc to build documentation [default=no]	1676	--enable-gtk-doc use gtk-doc to build documentation [default=no]
		1677	--enable-gtk-doc-html build documentation in html format [default=yes]
		1678	--enable-gtk-doc-pdf build documentation in pdf format [default=no]
1667	--disable-gdk Compile without gdk.	1679	--disable-gdk Compile without gdk.
1668	--disable-poppler-qt Don't compile poppler qt wrapper.	1680	--disable-poppler-qt Don't compile poppler qt wrapper.
1669	--disable-poppler-qt4 Don't compile poppler Qt4 wrapper.	1681	--disable-poppler-qt4 Don't compile poppler Qt4 wrapper.
Lines 2264-2269 Link Here
2264		2276
2265	} # ac_fn_cxx_check_func	2277	} # ac_fn_cxx_check_func
2266		2278
		2279	# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
		2280	# ---------------------------------------------------------
		2281	# Tests whether HEADER exists, giving a warning if it cannot be compiled using
		2282	# the include files in INCLUDES and setting the cache variable VAR
		2283	# accordingly.
		2284	ac_fn_cxx_check_header_mongrel ()
		2285	{
		2286	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
		2287	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
		2288	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
		2289	$as_echo_n "checking for $2... " >&6; }
		2290	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
		2291	$as_echo_n "(cached) " >&6
		2292	fi
		2293	eval ac_res=\$$3
		2294	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
		2295	$as_echo "$ac_res" >&6; }
		2296	else
		2297	# Is the header compilable?
		2298	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
		2299	$as_echo_n "checking $2 usability... " >&6; }
		2300	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		2301	/* end confdefs.h. */
		2302	$4
		2303	#include <$2>
		2304	_ACEOF
		2305	if ac_fn_cxx_try_compile "$LINENO"; then :
		2306	ac_header_compiler=yes
		2307	else
		2308	ac_header_compiler=no
		2309	fi
		2310	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
		2311	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
		2312	$as_echo "$ac_header_compiler" >&6; }
		2313
		2314	# Is the header present?
		2315	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
		2316	$as_echo_n "checking $2 presence... " >&6; }
		2317	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		2318	/* end confdefs.h. */
		2319	#include <$2>
		2320	_ACEOF
		2321	if ac_fn_cxx_try_cpp "$LINENO"; then :
		2322	ac_header_preproc=yes
		2323	else
		2324	ac_header_preproc=no
		2325	fi
		2326	rm -f conftest.err conftest.$ac_ext
		2327	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
		2328	$as_echo "$ac_header_preproc" >&6; }
		2329
		2330	# So? What about this header?
		2331	case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
		2332	yes:no: )
		2333	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
		2334	$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
		2335	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
		2336	$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
		2337	;;
		2338	no:yes:* )
		2339	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
		2340	$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
		2341	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
		2342	$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2343	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2344	$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2345	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2346	$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2347	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2348	$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2349	( cat <<\_ASBOX
2350	## ------------------------------------------------------------------------- ##
2351	## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=poppler ##
2352	## ------------------------------------------------------------------------- ##
2353	_ASBOX
2354	) \| sed "s/^/$as_me: WARNING: /" >&2
2355	;;
2356	esac
2357	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2358	$as_echo_n "checking for $2... " >&6; }
2359	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2360	$as_echo_n "(cached) " >&6
2361	else
2362	eval "$3=\$ac_header_compiler"
2363	fi
2364	eval ac_res=\$$3
2365	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2366	$as_echo "$ac_res" >&6; }
2367	fi
2368	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2369
2370	} # ac_fn_cxx_check_header_mongrel
2371
2267	# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES	2372	# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
2268	# -------------------------------------------------------	2373	# -------------------------------------------------------
2269	# Tests whether HEADER exists, giving a warning if it cannot be compiled using	2374	# Tests whether HEADER exists, giving a warning if it cannot be compiled using
Lines 5166-5178 Link Here
5166	else	5271	else
5167	lt_cv_nm_interface="BSD nm"	5272	lt_cv_nm_interface="BSD nm"
5168	echo "int some_variable = 0;" > conftest.$ac_ext	5273	echo "int some_variable = 0;" > conftest.$ac_ext
5169	(eval echo "\"\$as_me:5169: $ac_compile\"" >&5)	5274	(eval echo "\"\$as_me:5274: $ac_compile\"" >&5)
5170	(eval "$ac_compile" 2>conftest.err)	5275	(eval "$ac_compile" 2>conftest.err)
5171	cat conftest.err >&5	5276	cat conftest.err >&5
5172	(eval echo "\"\$as_me:5172: $NM \\\"conftest.$ac_objext\\\"\"" >&5)	5277	(eval echo "\"\$as_me:5277: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5173	(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)	5278	(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5174	cat conftest.err >&5	5279	cat conftest.err >&5
5175	(eval echo "\"\$as_me:5175: output\"" >&5)	5280	(eval echo "\"\$as_me:5280: output\"" >&5)
5176	cat conftest.out >&5	5281	cat conftest.out >&5
5177	if $GREP 'External.*some_variable' conftest.out > /dev/null; then	5282	if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5178	lt_cv_nm_interface="MS dumpbin"	5283	lt_cv_nm_interface="MS dumpbin"
Lines 6375-6381 Link Here
6375	;;	6480	;;
6376	--irix6*)	6481	--irix6*)
6377	# Find out which ABI we are using.	6482	# Find out which ABI we are using.
6378	echo '#line 6378 "configure"' > conftest.$ac_ext	6483	echo '#line 6483 "configure"' > conftest.$ac_ext
6379	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5	6484	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6380	(eval $ac_compile) 2>&5	6485	(eval $ac_compile) 2>&5
6381	ac_status=$?	6486	ac_status=$?
Lines 7903-7913 Link Here
7903	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	8008	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7904	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	8009	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7905	-e 's:$: $lt_compiler_flag:'`	8010	-e 's:$: $lt_compiler_flag:'`
7906	(eval echo "\"\$as_me:7906: $lt_compile\"" >&5)	8011	(eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
7907	(eval "$lt_compile" 2>conftest.err)	8012	(eval "$lt_compile" 2>conftest.err)
7908	ac_status=$?	8013	ac_status=$?
7909	cat conftest.err >&5	8014	cat conftest.err >&5
7910	echo "$as_me:7910: \$? = $ac_status" >&5	8015	echo "$as_me:8015: \$? = $ac_status" >&5
7911	if (exit $ac_status) && test -s "$ac_outfile"; then	8016	if (exit $ac_status) && test -s "$ac_outfile"; then
7912	# The compiler can only warn and ignore the option if not recognized	8017	# The compiler can only warn and ignore the option if not recognized
7913	# So say no if there are warnings other than the usual output.	8018	# So say no if there are warnings other than the usual output.
Lines 8242-8252 Link Here
8242	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	8347	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8243	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	8348	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8244	-e 's:$: $lt_compiler_flag:'`	8349	-e 's:$: $lt_compiler_flag:'`
8245	(eval echo "\"\$as_me:8245: $lt_compile\"" >&5)	8350	(eval echo "\"\$as_me:8350: $lt_compile\"" >&5)
8246	(eval "$lt_compile" 2>conftest.err)	8351	(eval "$lt_compile" 2>conftest.err)
8247	ac_status=$?	8352	ac_status=$?
8248	cat conftest.err >&5	8353	cat conftest.err >&5
8249	echo "$as_me:8249: \$? = $ac_status" >&5	8354	echo "$as_me:8354: \$? = $ac_status" >&5
8250	if (exit $ac_status) && test -s "$ac_outfile"; then	8355	if (exit $ac_status) && test -s "$ac_outfile"; then
8251	# The compiler can only warn and ignore the option if not recognized	8356	# The compiler can only warn and ignore the option if not recognized
8252	# So say no if there are warnings other than the usual output.	8357	# So say no if there are warnings other than the usual output.
Lines 8347-8357 Link Here
8347	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	8452	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8348	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	8453	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8349	-e 's:$: $lt_compiler_flag:'`	8454	-e 's:$: $lt_compiler_flag:'`
8350	(eval echo "\"\$as_me:8350: $lt_compile\"" >&5)	8455	(eval echo "\"\$as_me:8455: $lt_compile\"" >&5)
8351	(eval "$lt_compile" 2>out/conftest.err)	8456	(eval "$lt_compile" 2>out/conftest.err)
8352	ac_status=$?	8457	ac_status=$?
8353	cat out/conftest.err >&5	8458	cat out/conftest.err >&5
8354	echo "$as_me:8354: \$? = $ac_status" >&5	8459	echo "$as_me:8459: \$? = $ac_status" >&5
8355	if (exit $ac_status) && test -s out/conftest2.$ac_objext	8460	if (exit $ac_status) && test -s out/conftest2.$ac_objext
8356	then	8461	then
8357	# The compiler can only warn and ignore the option if not recognized	8462	# The compiler can only warn and ignore the option if not recognized
Lines 8402-8412 Link Here
8402	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	8507	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8403	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	8508	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8404	-e 's:$: $lt_compiler_flag:'`	8509	-e 's:$: $lt_compiler_flag:'`
8405	(eval echo "\"\$as_me:8405: $lt_compile\"" >&5)	8510	(eval echo "\"\$as_me:8510: $lt_compile\"" >&5)
8406	(eval "$lt_compile" 2>out/conftest.err)	8511	(eval "$lt_compile" 2>out/conftest.err)
8407	ac_status=$?	8512	ac_status=$?
8408	cat out/conftest.err >&5	8513	cat out/conftest.err >&5
8409	echo "$as_me:8409: \$? = $ac_status" >&5	8514	echo "$as_me:8514: \$? = $ac_status" >&5
8410	if (exit $ac_status) && test -s out/conftest2.$ac_objext	8515	if (exit $ac_status) && test -s out/conftest2.$ac_objext
8411	then	8516	then
8412	# The compiler can only warn and ignore the option if not recognized	8517	# The compiler can only warn and ignore the option if not recognized
Lines 10785-10791 Link Here
10785	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2	10890	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10786	lt_status=$lt_dlunknown	10891	lt_status=$lt_dlunknown
10787	cat > conftest.$ac_ext <<_LT_EOF	10892	cat > conftest.$ac_ext <<_LT_EOF
10788	#line 10788 "configure"	10893	#line 10893 "configure"
10789	#include "confdefs.h"	10894	#include "confdefs.h"
10790		10895
10791	#if HAVE_DLFCN_H	10896	#if HAVE_DLFCN_H
Lines 10881-10887 Link Here
10881	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2	10986	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10882	lt_status=$lt_dlunknown	10987	lt_status=$lt_dlunknown
10883	cat > conftest.$ac_ext <<_LT_EOF	10988	cat > conftest.$ac_ext <<_LT_EOF
10884	#line 10884 "configure"	10989	#line 10989 "configure"
10885	#include "confdefs.h"	10990	#include "confdefs.h"
10886		10991
10887	#if HAVE_DLFCN_H	10992	#if HAVE_DLFCN_H
Lines 14435-14445 Link Here
14435	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	14540	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14436	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	14541	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14437	-e 's:$: $lt_compiler_flag:'`	14542	-e 's:$: $lt_compiler_flag:'`
14438	(eval echo "\"\$as_me:14438: $lt_compile\"" >&5)	14543	(eval echo "\"\$as_me:14543: $lt_compile\"" >&5)
14439	(eval "$lt_compile" 2>conftest.err)	14544	(eval "$lt_compile" 2>conftest.err)
14440	ac_status=$?	14545	ac_status=$?
14441	cat conftest.err >&5	14546	cat conftest.err >&5
14442	echo "$as_me:14442: \$? = $ac_status" >&5	14547	echo "$as_me:14547: \$? = $ac_status" >&5
14443	if (exit $ac_status) && test -s "$ac_outfile"; then	14548	if (exit $ac_status) && test -s "$ac_outfile"; then
14444	# The compiler can only warn and ignore the option if not recognized	14549	# The compiler can only warn and ignore the option if not recognized
14445	# So say no if there are warnings other than the usual output.	14550	# So say no if there are warnings other than the usual output.
Lines 14534-14544 Link Here
14534	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	14639	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14535	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	14640	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14536	-e 's:$: $lt_compiler_flag:'`	14641	-e 's:$: $lt_compiler_flag:'`
14537	(eval echo "\"\$as_me:14537: $lt_compile\"" >&5)	14642	(eval echo "\"\$as_me:14642: $lt_compile\"" >&5)
14538	(eval "$lt_compile" 2>out/conftest.err)	14643	(eval "$lt_compile" 2>out/conftest.err)
14539	ac_status=$?	14644	ac_status=$?
14540	cat out/conftest.err >&5	14645	cat out/conftest.err >&5
14541	echo "$as_me:14541: \$? = $ac_status" >&5	14646	echo "$as_me:14646: \$? = $ac_status" >&5
14542	if (exit $ac_status) && test -s out/conftest2.$ac_objext	14647	if (exit $ac_status) && test -s out/conftest2.$ac_objext
14543	then	14648	then
14544	# The compiler can only warn and ignore the option if not recognized	14649	# The compiler can only warn and ignore the option if not recognized
Lines 14586-14596 Link Here
14586	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \	14691	-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14587	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \	14692	-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14588	-e 's:$: $lt_compiler_flag:'`	14693	-e 's:$: $lt_compiler_flag:'`
14589	(eval echo "\"\$as_me:14589: $lt_compile\"" >&5)	14694	(eval echo "\"\$as_me:14694: $lt_compile\"" >&5)
14590	(eval "$lt_compile" 2>out/conftest.err)	14695	(eval "$lt_compile" 2>out/conftest.err)
14591	ac_status=$?	14696	ac_status=$?
14592	cat out/conftest.err >&5	14697	cat out/conftest.err >&5
14593	echo "$as_me:14593: \$? = $ac_status" >&5	14698	echo "$as_me:14698: \$? = $ac_status" >&5
14594	if (exit $ac_status) && test -s out/conftest2.$ac_objext	14699	if (exit $ac_status) && test -s out/conftest2.$ac_objext
14595	then	14700	then
14596	# The compiler can only warn and ignore the option if not recognized	14701	# The compiler can only warn and ignore the option if not recognized
Lines 17841-17846 Link Here
17841	done	17946	done
17842		17947
17843		17948
		17949	# Check whether --enable-libopenjpeg was given.
		17950	if test "${enable_libopenjpeg+set}" = set; then :
		17951	enableval=$enable_libopenjpeg; enable_libopenjpeg=$enableval
		17952	else
		17953	enable_libopenjpeg="try"
		17954	fi
		17955
		17956	if test x$enable_libopenjpeg = xyes; then
		17957	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
		17958	$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
		17959	if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
		17960	$as_echo_n "(cached) " >&6
		17961	else
		17962	ac_check_lib_save_LIBS=$LIBS
		17963	LIBS="-lopenjpeg $LIBS"
		17964	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		17965	/* end confdefs.h. */
		17966
		17967	/* Override any GCC internal prototype to avoid an error.
		17968	Use char because int might match the return type of a GCC
		17969	builtin and then its argument prototype would still apply. */
		17970	#ifdef __cplusplus
		17971	extern "C"
		17972	#endif
		17973	char opj_cio_open ();
		17974	int
		17975	main ()
		17976	{
		17977	return opj_cio_open ();
		17978	;
		17979	return 0;
		17980	}
		17981	_ACEOF
		17982	if ac_fn_cxx_try_link "$LINENO"; then :
		17983	ac_cv_lib_openjpeg_opj_cio_open=yes
		17984	else
		17985	ac_cv_lib_openjpeg_opj_cio_open=no
		17986	fi
		17987	rm -f core conftest.err conftest.$ac_objext \
		17988	conftest$ac_exeext conftest.$ac_ext
		17989	LIBS=$ac_check_lib_save_LIBS
		17990	fi
		17991	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
		17992	$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
		17993	if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
		17994	cat >>confdefs.h <<_ACEOF
		17995	#define HAVE_LIBOPENJPEG 1
		17996	_ACEOF
		17997
		17998	LIBS="-lopenjpeg $LIBS"
		17999
		18000	else
		18001	as_fn_error "\"* libopenjpeg library not found *\"" "$LINENO" 5
		18002	fi
		18003
		18004
		18005	for ac_header in openjpeg.h
		18006	do :
		18007	ac_fn_cxx_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
		18008	if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
		18009	cat >>confdefs.h <<_ACEOF
		18010	#define HAVE_OPENJPEG_H 1
		18011	_ACEOF
		18012
18013	else
18014	as_fn_error "\"* libopenjpeg headers not found *\"" "$LINENO" 5
18015	fi
18016
18017	done
18018
18019	elif test x$enable_libopenjpeg = xtry; then
18020	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
18021	$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
18022	if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
18023	$as_echo_n "(cached) " >&6
18024	else
18025	ac_check_lib_save_LIBS=$LIBS
18026	LIBS="-lopenjpeg $LIBS"
18027	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18028	/* end confdefs.h. */
18029
18030	/* Override any GCC internal prototype to avoid an error.
18031	Use char because int might match the return type of a GCC
18032	builtin and then its argument prototype would still apply. */
18033	#ifdef __cplusplus
18034	extern "C"
18035	#endif
18036	char opj_cio_open ();
18037	int
18038	main ()
18039	{
18040	return opj_cio_open ();
18041	;
18042	return 0;
18043	}
18044	_ACEOF
18045	if ac_fn_cxx_try_link "$LINENO"; then :
18046	ac_cv_lib_openjpeg_opj_cio_open=yes
18047	else
18048	ac_cv_lib_openjpeg_opj_cio_open=no
18049	fi
18050	rm -f core conftest.err conftest.$ac_objext \
18051	conftest$ac_exeext conftest.$ac_ext
18052	LIBS=$ac_check_lib_save_LIBS
18053	fi
18054	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
18055	$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
18056	if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
18057	enable_libopenjpeg="yes"
18058	else
18059	enable_libopenjpeg="no"
18060	fi
18061
18062	for ac_header in openjpeg.h
18063	do :
18064	ac_fn_cxx_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
18065	if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
18066	cat >>confdefs.h <<_ACEOF
18067	#define HAVE_OPENJPEG_H 1
18068	_ACEOF
18069
18070	else
18071	enable_libopenjpeg="no"
18072	fi
18073
18074	done
18075
18076	fi
18077
18078	if test x$enable_libopenjpeg = xyes; then
18079	LIBOPENJPEG_LIBS="-lopenjpeg"
18080
18081	$as_echo "#define ENABLE_LIBOPENJPEG 1" >>confdefs.h
18082
18083	fi
18084
18085	if test x$enable_libopenjpeg = xyes; then
18086	BUILD_LIBOPENJPEG_TRUE=
18087	BUILD_LIBOPENJPEG_FALSE='#'
18088	else
18089	BUILD_LIBOPENJPEG_TRUE='#'
18090	BUILD_LIBOPENJPEG_FALSE=
18091	fi
18092
18093
18094
17844	ac_ext=c	18095	ac_ext=c
17845	ac_cpp='$CPP $CPPFLAGS'	18096	ac_cpp='$CPP $CPPFLAGS'
17846	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'	18097	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Lines 18291-18443 Link Here
18291		18542
18292		18543
18293		18544
18294	# Check whether --enable-libopenjpeg was given.
18295	if test "${enable_libopenjpeg+set}" = set; then :
18296	enableval=$enable_libopenjpeg; enable_libopenjpeg=$enableval
18297	else
18298	enable_libopenjpeg="try"
18299	fi
18300
18301	if test x$enable_libopenjpeg = xyes; then
18302	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
18303	$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
18304	if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
18305	$as_echo_n "(cached) " >&6
18306	else
18307	ac_check_lib_save_LIBS=$LIBS
18308	LIBS="-lopenjpeg $LIBS"
18309	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18310	/* end confdefs.h. */
18311
18312	/* Override any GCC internal prototype to avoid an error.
18313	Use char because int might match the return type of a GCC
18314	builtin and then its argument prototype would still apply. */
18315	#ifdef __cplusplus
18316	extern "C"
18317	#endif
18318	char opj_cio_open ();
18319	int
18320	main ()
18321	{
18322	return opj_cio_open ();
18323	;
18324	return 0;
18325	}
18326	_ACEOF
18327	if ac_fn_c_try_link "$LINENO"; then :
18328	ac_cv_lib_openjpeg_opj_cio_open=yes
18329	else
18330	ac_cv_lib_openjpeg_opj_cio_open=no
18331	fi
18332	rm -f core conftest.err conftest.$ac_objext \
18333	conftest$ac_exeext conftest.$ac_ext
18334	LIBS=$ac_check_lib_save_LIBS
18335	fi
18336	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
18337	$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
18338	if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
18339	cat >>confdefs.h <<_ACEOF
18340	#define HAVE_LIBOPENJPEG 1
18341	_ACEOF
18342
18343	LIBS="-lopenjpeg $LIBS"
18344
18345	else
18346	as_fn_error "\"* libopenjpeg library not found *\"" "$LINENO" 5
18347	fi
18348
18349	for ac_header in openjpeg.h
18350	do :
18351	ac_fn_c_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
18352	if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
18353	cat >>confdefs.h <<_ACEOF
18354	#define HAVE_OPENJPEG_H 1
18355	_ACEOF
18356
18357	else
18358	as_fn_error "\"* libopenjpeg headers not found *\"" "$LINENO" 5
18359	fi
18360
18361	done
18362
18363	elif test x$enable_libopenjpeg = xtry; then
18364	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
18365	$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
18366	if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
18367	$as_echo_n "(cached) " >&6
18368	else
18369	ac_check_lib_save_LIBS=$LIBS
18370	LIBS="-lopenjpeg $LIBS"
18371	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18372	/* end confdefs.h. */
18373
18374	/* Override any GCC internal prototype to avoid an error.
18375	Use char because int might match the return type of a GCC
18376	builtin and then its argument prototype would still apply. */
18377	#ifdef __cplusplus
18378	extern "C"
18379	#endif
18380	char opj_cio_open ();
18381	int
18382	main ()
18383	{
18384	return opj_cio_open ();
18385	;
18386	return 0;
18387	}
18388	_ACEOF
18389	if ac_fn_c_try_link "$LINENO"; then :
18390	ac_cv_lib_openjpeg_opj_cio_open=yes
18391	else
18392	ac_cv_lib_openjpeg_opj_cio_open=no
18393	fi
18394	rm -f core conftest.err conftest.$ac_objext \
18395	conftest$ac_exeext conftest.$ac_ext
18396	LIBS=$ac_check_lib_save_LIBS
18397	fi
18398	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
18399	$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
18400	if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
18401	enable_libopenjpeg="yes"
18402	else
18403	enable_libopenjpeg="no"
18404	fi
18405
18406	for ac_header in openjpeg.h
18407	do :
18408	ac_fn_c_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
18409	if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
18410	cat >>confdefs.h <<_ACEOF
18411	#define HAVE_OPENJPEG_H 1
18412	_ACEOF
18413
18414	else
18415	enable_libopenjpeg="no"
18416	fi
18417
18418	done
18419
18420	fi
18421
18422	if test x$enable_libopenjpeg = xyes; then
18423	LIBOPENJPEG_LIBS="-lopenjpeg"
18424
18425	$as_echo "#define ENABLE_LIBOPENJPEG 1" >>confdefs.h
18426
18427	fi
18428
18429	if test x$enable_libopenjpeg = xyes; then
18430	BUILD_LIBOPENJPEG_TRUE=
18431	BUILD_LIBOPENJPEG_FALSE='#'
18432	else
18433	BUILD_LIBOPENJPEG_TRUE='#'
18434	BUILD_LIBOPENJPEG_FALSE=
18435	fi
18436
18437
18438
18439
18440
18441	# Check whether --enable-libjpeg was given.	18545	# Check whether --enable-libjpeg was given.
18442	if test "${enable_libjpeg+set}" = set; then :	18546	if test "${enable_libjpeg+set}" = set; then :
18443	enableval=$enable_libjpeg; enable_libjpeg=$enableval	18547	enableval=$enable_libjpeg; enable_libjpeg=$enableval
Lines 18740-18746 Link Here
18740	do	18844	do
18741	for j in png.h;	18845	for j in png.h;
18742	do	18846	do
18743	echo "configure: 18743: $i/$j" >&5	18847	echo "configure: 18847: $i/$j" >&5
18744	if test -r "$i/$j"; then	18848	if test -r "$i/$j"; then
18745	echo "taking that" >&5	18849	echo "taking that" >&5
18746	png_incdir=$i	18850	png_incdir=$i
Lines 19537-19590 Link Here
19537		19641
19538		19642
19539		19643
19540	# Check whether --with-html-dir was given.	19644	# Extract the first word of "gtkdoc-check", so it can be a program name with args.
19541	if test "${with_html_dir+set}" = set; then :	19645	set dummy gtkdoc-check; ac_word=$2
19542	withval=$with_html_dir;	19646	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
		19647	$as_echo_n "checking for $ac_word... " >&6; }
		19648	if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
		19649	$as_echo_n "(cached) " >&6
19543	else	19650	else
19544	with_html_dir='${datadir}/gtk-doc/html'	19651	case $GTKDOC_CHECK in
19545	fi	19652	[\\/]* \| ?:[\\/]*)
19546		19653	ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
19547	HTML_DIR="$with_html_dir"	19654	;;
19548		19655	*)
		19656	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		19657	for as_dir in $PATH
		19658	do
		19659	IFS=$as_save_IFS
		19660	test -z "$as_dir" && as_dir=.
		19661	for ac_exec_ext in '' $ac_executable_extensions; do
		19662	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
		19663	ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
		19664	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
		19665	break 2
		19666	fi
		19667	done
		19668	done
		19669	IFS=$as_save_IFS
19549		19670
19550	# Check whether --enable-gtk-doc was given.	19671	;;
19551	if test "${enable_gtk_doc+set}" = set; then :	19672	esac
19552	enableval=$enable_gtk_doc;
19553	else
19554	enable_gtk_doc=no
19555	fi	19673	fi
19556		19674	GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
19557		19675	if test -n "$GTKDOC_CHECK"; then
19558	if test x$enable_gtk_doc = xyes; then	19676	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
19559	if test -n "$PKG_CONFIG" && \	19677	$as_echo "$GTKDOC_CHECK" >&6; }
19560	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
19561	($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
19562	ac_status=$?
19563	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19564	test $ac_status = 0; }; then
19565	:
19566	else	19678	else
19567	as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5	19679	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		19680	$as_echo "no" >&6; }
19568	fi	19681	fi
19569	fi
19570		19682
19571	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
19572	$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
19573	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
19574	$as_echo "$enable_gtk_doc" >&6; }
19575		19683
19576	for ac_prog in gtkdoc-check	19684	for ac_prog in gtkdoc-rebase
19577	do	19685	do
19578	# Extract the first word of "$ac_prog", so it can be a program name with args.	19686	# Extract the first word of "$ac_prog", so it can be a program name with args.
19579	set dummy $ac_prog; ac_word=$2	19687	set dummy $ac_prog; ac_word=$2
19580	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	19688	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19581	$as_echo_n "checking for $ac_word... " >&6; }	19689	$as_echo_n "checking for $ac_word... " >&6; }
19582	if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :	19690	if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
19583	$as_echo_n "(cached) " >&6	19691	$as_echo_n "(cached) " >&6
19584	else	19692	else
19585	case $GTKDOC_CHECK in	19693	case $GTKDOC_REBASE in
19586	[\\/]* \| ?:[\\/]*)	19694	[\\/]* \| ?:[\\/]*)
19587	ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.	19695	ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
19588	;;	19696	;;
19589	*)	19697	*)
19590	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	19698	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
Lines 19594-19600 Link Here
19594	test -z "$as_dir" && as_dir=.	19702	test -z "$as_dir" && as_dir=.
19595	for ac_exec_ext in '' $ac_executable_extensions; do	19703	for ac_exec_ext in '' $ac_executable_extensions; do
19596	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	19704	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19597	ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"	19705	ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
19598	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	19706	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19599	break 2	19707	break 2
19600	fi	19708	fi
Lines 19605-19622 Link Here
19605	;;	19713	;;
19606	esac	19714	esac
19607	fi	19715	fi
19608	GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK	19716	GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
19609	if test -n "$GTKDOC_CHECK"; then	19717	if test -n "$GTKDOC_REBASE"; then
19610	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5	19718	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
19611	$as_echo "$GTKDOC_CHECK" >&6; }	19719	$as_echo "$GTKDOC_REBASE" >&6; }
19612	else	19720	else
19613	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5	19721	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19614	$as_echo "no" >&6; }	19722	$as_echo "no" >&6; }
19615	fi	19723	fi
19616		19724
19617		19725
19618	test -n "$GTKDOC_CHECK" && break	19726	test -n "$GTKDOC_REBASE" && break
19619	done	19727	done
		19728	test -n "$GTKDOC_REBASE" \|\| GTKDOC_REBASE="true"
		19729
		19730	# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
		19731	set dummy gtkdoc-mkpdf; ac_word=$2
		19732	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
		19733	$as_echo_n "checking for $ac_word... " >&6; }
		19734	if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
		19735	$as_echo_n "(cached) " >&6
		19736	else
		19737	case $GTKDOC_MKPDF in
		19738	[\\/]* \| ?:[\\/]*)
		19739	ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
		19740	;;
		19741	*)
		19742	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		19743	for as_dir in $PATH
		19744	do
		19745	IFS=$as_save_IFS
		19746	test -z "$as_dir" && as_dir=.
		19747	for ac_exec_ext in '' $ac_executable_extensions; do
		19748	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
		19749	ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
		19750	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
		19751	break 2
		19752	fi
		19753	done
		19754	done
		19755	IFS=$as_save_IFS
		19756
		19757	;;
		19758	esac
		19759	fi
		19760	GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
		19761	if test -n "$GTKDOC_MKPDF"; then
		19762	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
		19763	$as_echo "$GTKDOC_MKPDF" >&6; }
		19764	else
		19765	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		19766	$as_echo "no" >&6; }
		19767	fi
		19768
		19769
		19770
		19771
		19772	# Check whether --with-html-dir was given.
		19773	if test "${with_html_dir+set}" = set; then :
		19774	withval=$with_html_dir;
		19775	else
		19776	with_html_dir='${datadir}/gtk-doc/html'
		19777	fi
		19778
		19779	HTML_DIR="$with_html_dir"
		19780
		19781
		19782	# Check whether --enable-gtk-doc was given.
		19783	if test "${enable_gtk_doc+set}" = set; then :
		19784	enableval=$enable_gtk_doc;
		19785	else
		19786	enable_gtk_doc=no
		19787	fi
		19788
		19789
		19790	if test x$enable_gtk_doc = xyes; then
		19791	if test -n "$PKG_CONFIG" && \
19792	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
19793	($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
19794	ac_status=$?
19795	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
19796	test $ac_status = 0; }; then
19797	:
19798	else
19799	as_fn_error "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5
19800	fi
19801	fi
19802
19803	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
19804	$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
19805	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
19806	$as_echo "$enable_gtk_doc" >&6; }
19807
19808	# Check whether --enable-gtk-doc-html was given.
19809	if test "${enable_gtk_doc_html+set}" = set; then :
19810	enableval=$enable_gtk_doc_html;
19811	else
19812	enable_gtk_doc_html=yes
19813	fi
19814
19815	# Check whether --enable-gtk-doc-pdf was given.
19816	if test "${enable_gtk_doc_pdf+set}" = set; then :
19817	enableval=$enable_gtk_doc_pdf;
19818	else
19819	enable_gtk_doc_pdf=no
19820	fi
19821
19822
19823	if test -n "$GTKDOC_MKPDF"; then
19824	enable_gtk_doc_pdf=no
19825	fi
19620		19826
19621		19827
19622	if test x$enable_gtk_doc = xyes; then	19828	if test x$enable_gtk_doc = xyes; then
Lines 19627-19632 Link Here
19627	ENABLE_GTK_DOC_FALSE=	19833	ENABLE_GTK_DOC_FALSE=
19628	fi	19834	fi
19629		19835
		19836	if test x$enable_gtk_doc_html = xyes; then
		19837	GTK_DOC_BUILD_HTML_TRUE=
		19838	GTK_DOC_BUILD_HTML_FALSE='#'
		19839	else
		19840	GTK_DOC_BUILD_HTML_TRUE='#'
		19841	GTK_DOC_BUILD_HTML_FALSE=
		19842	fi
		19843
		19844	if test x$enable_gtk_doc_pdf = xyes; then
		19845	GTK_DOC_BUILD_PDF_TRUE=
		19846	GTK_DOC_BUILD_PDF_FALSE='#'
		19847	else
		19848	GTK_DOC_BUILD_PDF_TRUE='#'
		19849	GTK_DOC_BUILD_PDF_FALSE=
		19850	fi
		19851
19630	if test -n "$LIBTOOL"; then	19852	if test -n "$LIBTOOL"; then
19631	GTK_DOC_USE_LIBTOOL_TRUE=	19853	GTK_DOC_USE_LIBTOOL_TRUE=
19632	GTK_DOC_USE_LIBTOOL_FALSE='#'	19854	GTK_DOC_USE_LIBTOOL_FALSE='#'
Lines 19635-19640 Link Here
19635	GTK_DOC_USE_LIBTOOL_FALSE=	19857	GTK_DOC_USE_LIBTOOL_FALSE=
19636	fi	19858	fi
19637		19859
		19860	if test -n "$GTKDOC_REBASE"; then
		19861	GTK_DOC_USE_REBASE_TRUE=
		19862	GTK_DOC_USE_REBASE_FALSE='#'
		19863	else
		19864	GTK_DOC_USE_REBASE_TRUE='#'
		19865	GTK_DOC_USE_REBASE_FALSE=
		19866	fi
		19867
19638		19868
19639		19869
19640	# Check whether --enable-gdk was given.	19870	# Check whether --enable-gdk was given.
Lines 21415-21428 Link Here
21415	as_fn_error "conditional \"ENABLE_XPDF_HEADERS\" was never defined.	21645	as_fn_error "conditional \"ENABLE_XPDF_HEADERS\" was never defined.
21416	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21646	Usually this means the macro was only invoked conditionally." "$LINENO" 5
21417	fi	21647	fi
21418	if test -z "${BUILD_ZLIB_TRUE}" && test -z "${BUILD_ZLIB_FALSE}"; then
21419	as_fn_error "conditional \"BUILD_ZLIB\" was never defined.
21420	Usually this means the macro was only invoked conditionally." "$LINENO" 5
21421	fi
21422	if test -z "${BUILD_LIBOPENJPEG_TRUE}" && test -z "${BUILD_LIBOPENJPEG_FALSE}"; then	21648	if test -z "${BUILD_LIBOPENJPEG_TRUE}" && test -z "${BUILD_LIBOPENJPEG_FALSE}"; then
21423	as_fn_error "conditional \"BUILD_LIBOPENJPEG\" was never defined.	21649	as_fn_error "conditional \"BUILD_LIBOPENJPEG\" was never defined.
21424	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21650	Usually this means the macro was only invoked conditionally." "$LINENO" 5
21425	fi	21651	fi
		21652	if test -z "${BUILD_ZLIB_TRUE}" && test -z "${BUILD_ZLIB_FALSE}"; then
		21653	as_fn_error "conditional \"BUILD_ZLIB\" was never defined.
		21654	Usually this means the macro was only invoked conditionally." "$LINENO" 5
		21655	fi
21426	if test -z "${BUILD_LIBJPEG_TRUE}" && test -z "${BUILD_LIBJPEG_FALSE}"; then	21656	if test -z "${BUILD_LIBJPEG_TRUE}" && test -z "${BUILD_LIBJPEG_FALSE}"; then
21427	as_fn_error "conditional \"BUILD_LIBJPEG\" was never defined.	21657	as_fn_error "conditional \"BUILD_LIBJPEG\" was never defined.
21428	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21658	Usually this means the macro was only invoked conditionally." "$LINENO" 5
Lines 21447-21456 Link Here
21447	as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.	21677	as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
21448	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21678	Usually this means the macro was only invoked conditionally." "$LINENO" 5
21449	fi	21679	fi
		21680	if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
		21681	as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
		21682	Usually this means the macro was only invoked conditionally." "$LINENO" 5
		21683	fi
		21684	if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
		21685	as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
		21686	Usually this means the macro was only invoked conditionally." "$LINENO" 5
		21687	fi
21450	if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then	21688	if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
21451	as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.	21689	as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
21452	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21690	Usually this means the macro was only invoked conditionally." "$LINENO" 5
21453	fi	21691	fi
		21692	if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
		21693	as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
		21694	Usually this means the macro was only invoked conditionally." "$LINENO" 5
		21695	fi
21454	if test -z "${BUILD_WITH_GDK_TRUE}" && test -z "${BUILD_WITH_GDK_FALSE}"; then	21696	if test -z "${BUILD_WITH_GDK_TRUE}" && test -z "${BUILD_WITH_GDK_FALSE}"; then
21455	as_fn_error "conditional \"BUILD_WITH_GDK\" was never defined.	21697	as_fn_error "conditional \"BUILD_WITH_GDK\" was never defined.
21456	Usually this means the macro was only invoked conditionally." "$LINENO" 5	21698	Usually this means the macro was only invoked conditionally." "$LINENO" 5

Return to bug 293899