Attachment #59437 for bug #92758

View | Details | Raw Unified | Return to bug 92758 | Differences between
Collapse All | Expand All




GNOME_PRINT_UI_REQUIRED=2.4.0
GNOME_VFS_REQUIRED=2.6.0
GCONF_REQUIRED=2.6.0
dnl BONOBO_REQUIRED=2.6.0
dnl BONOBO_UI_REQUIRED=2.6.0
VTE_REQUIRED=0.7.0
VTE_NEW_REQUIRED=0.9.0
LIBXML_REQUIRED=2.4.23

AC_SUBST(GNOME_PRINT_UI_REQUIRED)
AC_SUBST(GNOME_VFS_REQUIRED)
AC_SUBST(GCONF_REQUIRED)
dnl AC_SUBST(BONOBO_REQUIRED)
dnl AC_SUBST(BONOBO_UI_REQUIRED)
AC_SUBST(VTE_REQUIRED)
AC_SUBST(LIBXML_REQUIRED)
AC_SUBST(PANGO_REQUIRED)

CFLAGS_DISABLE_CHECKS="-DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
CFLAGS_OPTIMIZE="-Os -s"
CXXFLAGS_OPTIMIZE="-Os -s -fno-exceptions -fno-check-new"

if test "x$GCC" = xyes; then
    CFLAGS_WARNINGS=""
    CFLAGS_OPTIMIZE=""

      CFLAGS="$CFLAGS -DNDEBUG ${CFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}"
      CXXFLAGS="$CXXFLAGS -DNDEBUG ${CXXFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}")

dnl Enable Glade UI Plugin
AC_ARG_ENABLE(glade-ui,
	  [  --with-glade-plugin		Build the Glade Plugin],
	  [ enable_glade_plugin=$enableval ],
	  [ enable_glade_plugin="no" ])

dnl Enable the Class Inheritance through Graphviz
AC_ARG_ENABLE(class-inheritance,
	  [  --enable-class-inheritance	Build support for the class inheritance plugin],
	  [ enable_class_inheritance=$enableval ],
	  [ enable_class_inheritance="no" ])

dnl Enable the subversion plugin
AC_ARG_ENABLE(subversion,
	  [  --enable-subversion		Build support for the subversion plugin],
	  [ enable_subversion=$enableval ],
	  [ enable_subversion="no" ])

dnl Enable versioned user preferences directory
AC_ARG_WITH(pref-suffix,
      [  --with-pref-suffix=VALUE       	Suffix to add to user preferences dir.],
      PREF_SUFFIX="$withval")


AC_SUBST(PREF_SUFFIX)
AC_DEFINE_UNQUOTED(PREF_SUFFIX,
      "${PREF_SUFFIX}",


dnl Check for autogen
dnl -----------------
AC_PATH_PROG(AUTOGEN_PATH, autogen, no)

if test x$AUTOGEN_PATH = xno; then
   AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])
fi


dnl Check for Glade3
dnl ---------------------

if test x$enable_glade_plugin = xyes ; then
	PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
else
	libgladeui_found="no"
fi

AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
AC_SUBST(PLUGIN_GLADE_CFLAGS)
AC_SUBST(PLUGIN_GLADE_LIBS)

dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
dnl (other than /usr or /usr/local), following pkgconfig check will fail.
dnl ----------------------------------------------

if test x$enable_class_inheritance = xyes ; then
   PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
   PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])
else
   libgraphviz_found="no"
fi

AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])
AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)
AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)

  AC_MSG_RESULT(no)
  GTKDOC=false
fi

dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xauto ; then

dnl  (stolen from kdevelop ;-)
dnl  **********************************************************

if test x$enable_subversion = xno ; then
	SVN_INCLUDE=""
else
	AC_MSG_CHECKING(for svn libraries)

	APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
	SVN_SUBDIR="svn"
	AC_ARG_WITH(apr-config,
	[[  --with-apr-config=FILE    Use the given path to apr-config when determining
								APR configuration; defaults to "apr-config"]],
	[
	if test "$withval" != "yes" -a "$withval" != ""; then
	APR_CONFIGS=$withval
		fi
	])
	AC_MSG_CHECKING([for APR])
	APR_CONFIG=""
	for VALUE in $APR_CONFIGS ; do
			if $VALUE --cflags > /dev/null; then
					APR_CONFIG=$VALUE
					break
			fi
	done
	test $VALUE && APR_CONFIG=$VALUE
	if test $APR_CONFIG ; then
		AC_MSG_RESULT([found])
	else
		AC_MSG_RESULT([not found])
			SVN_SUBDIR=
	dnl    AC_MSG_ERROR([APR is required. Try --with-apr-config.])
	fi
			
	APR_CFLAGS="`$APR_CONFIG --cflags`"
	APR_INCLUDE="`$APR_CONFIG --includes`"
	APR_LIBS="`$APR_CONFIG --link-ld --libs`"

	dnl
	dnl APR util
	dnl

	APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
	AC_ARG_WITH(apu-config,
	[[  --with-apu-config=FILE    Use the given path to apu-config when determining
								APR util configuration; defaults to "apu-config"]],
	[
		if test "$withval" != "yes" -a "$withval" != ""; then
			APU_CONFIGS=$withval
		fi
	])
	AC_MSG_CHECKING([for APR util])
	APU_CONFIG=""
	for VALUE in $APU_CONFIGS ; do
			if $VALUE --includes > /dev/null; then
					APU_CONFIG=$VALUE
					break
			fi
	done
	if test $APU_CONFIG ; then
		AC_MSG_RESULT([found])
	else
		AC_MSG_RESULT([not found])
			SVN_SUBDIR=
	fi
	APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
	APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"

	AC_MSG_CHECKING(for Subversion svn-config)
	AC_ARG_WITH(subversion-dir,
			[  --with-subversion-dir=DIR           where Subversion is installed ],
			[
					SVNCONFIG="$withval/bin/svn-config"
			])

	if test -z "$SVNCONFIG"; then
			_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
			if test -n "$_SVNCONFIG"; then
					SVNCONFIG="$_SVNCONFIG/bin/svn-config"
			fi
	fi
])
AC_MSG_CHECKING([for APR util])
APU_CONFIG=""
for VALUE in $APU_CONFIGS ; do
		if $VALUE --includes > /dev/null; then
				APU_CONFIG=$VALUE
				break
		fi
done
if test $APU_CONFIG ; then
	AC_MSG_RESULT([found])
else
	AC_MSG_RESULT([not found])
		SVN_SUBDIR=
fi
APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"

AC_MSG_CHECKING(for Subversion svn-config)
AC_ARG_WITH(subversion-dir,
		[  --with-subversion-dir=DIR           where Subversion is installed ],
		[
				SVNCONFIG="$withval/bin/svn-config"
		])

if test -z "$SVNCONFIG"; then
		_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
		if test -n "$_SVNCONFIG"; then
				SVNCONFIG="$_SVNCONFIG/bin/svn-config"
		fi
fi

	AC_SUBST(SVNCONFIG)
	if test -x "$SVNCONFIG"; then
			SVNLD="`$SVNCONFIG --ldflags`"
			SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"
			dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
			SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
			AC_MSG_RESULT(yes)
	else
			AC_MSG_RESULT(not found)
			dnl just a fallback to debian's config so that it works for me :)
			AC_ARG_WITH(svn-include,
									[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
									[
									if test "$withval" != "yes" -a "$withval" != ""; then
											SVN_INCLUDES=$withval
									fi
									])
			if test -z "$SVN_INCLUDES"; then
				SVN_INCLUDES="/usr/local/include /usr/include"
			fi
			AC_MSG_CHECKING([for Subversion headers])
			SVN_INCLUDE=""
			for VALUE in $SVN_INCLUDES ; do
					if test -f $VALUE/subversion-1/svn_types.h ; then
							SVN_INCLUDE=$VALUE
							break
					fi
			done
			if test $SVN_INCLUDE ; then
					AC_MSG_RESULT([found])
			else
					AC_MSG_RESULT([not found])
					SVN_SUBDIR=
			fi
			SVN_LIBS="/usr/local/lib /usr/lib"
			AC_ARG_WITH(svn-lib,
							[[  --with-svn-lib=DIR  Use the given path to the subversion libraries.]],
							[
								if test "$withval" != "yes" -a "$withval" != ""; then
									SVN_LIBS=$withval
								fi
							])
			AC_MSG_CHECKING([for Subversion libraries])
			SVN_LIB=""
			for VALUE in $SVN_LIBS ; do
					if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
							SVN_LIB=$VALUE
							break
					fi
			done
			if test $SVN_LIB ; then
					AC_MSG_RESULT([found])
			else
					AC_MSG_RESULT([not found])
					SVN_SUBDIR=
			fi
	fi
				SVN_SUBDIR=
		fi
		SVN_LIBS="/usr/local/lib /usr/lib"
		AC_ARG_WITH(svn-lib,
						[[  --with-svn-lib=DIR  Use the given path to the subversion libraries.]],
						[
							if test "$withval" != "yes" -a "$withval" != ""; then
								SVN_LIBS=$withval
							fi
						])
		AC_MSG_CHECKING([for Subversion libraries])
		SVN_LIB=""
		for VALUE in $SVN_LIBS ; do
				if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
						SVN_LIB=$VALUE
						break
				fi
		done
		if test $SVN_LIB ; then
				AC_MSG_RESULT([found])
		else
				AC_MSG_RESULT([not found])
				SVN_SUBDIR=
		fi
fi


	NEON_CONFIGS="neon-config"
	AC_ARG_WITH(neon-config,
	[[  --with-neon-config=FILE    Use the given path to neon-config when determining
								Neon configuration; defaults to "neon-config"]],
	[
		if test "$withval" != "yes" -a "$withval" != ""; then
			NEON_CONFIGS=$withval
	fi
])
AC_MSG_CHECKING([for Neon])
NEON_CONFIG=""
for VALUE in $NEON_CONFIGS ; do
		if $VALUE --cflags > /dev/null; then
				NEON_CONFIG=$VALUE
				break
		fi
	])
	AC_MSG_CHECKING([for Neon])
	NEON_CONFIG=""
	for VALUE in $NEON_CONFIGS ; do
			if $VALUE --cflags > /dev/null; then
					NEON_CONFIG=$VALUE
					break
			fi
	done
	if test $NEON_CONFIG ; then
		AC_MSG_RESULT([found])
	else
		AC_MSG_RESULT([not found])
			SVN_SUBDIR=
	fi

	SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
	SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
	SVN_CFLAGS="$APR_CFLAGS"
fi

AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])


Return to bug 92758

Lines 17-24 Link Here

(-)configure.in.old (-159 / +197 lines)
17	GNOME_PRINT_UI_REQUIRED=2.4.0	17	GNOME_PRINT_UI_REQUIRED=2.4.0
18	GNOME_VFS_REQUIRED=2.6.0	18	GNOME_VFS_REQUIRED=2.6.0
19	GCONF_REQUIRED=2.6.0	19	GCONF_REQUIRED=2.6.0
20	BONOBO_REQUIRED=2.6.0	20	dnl BONOBO_REQUIRED=2.6.0
21	BONOBO_UI_REQUIRED=2.6.0	21	dnl BONOBO_UI_REQUIRED=2.6.0
22	VTE_REQUIRED=0.7.0	22	VTE_REQUIRED=0.7.0
23	VTE_NEW_REQUIRED=0.9.0	23	VTE_NEW_REQUIRED=0.9.0
24	LIBXML_REQUIRED=2.4.23	24	LIBXML_REQUIRED=2.4.23
Lines 44-51 Link Here
44	AC_SUBST(GNOME_PRINT_UI_REQUIRED)	44	AC_SUBST(GNOME_PRINT_UI_REQUIRED)
45	AC_SUBST(GNOME_VFS_REQUIRED)	45	AC_SUBST(GNOME_VFS_REQUIRED)
46	AC_SUBST(GCONF_REQUIRED)	46	AC_SUBST(GCONF_REQUIRED)
47	AC_SUBST(BONOBO_REQUIRED)	47	dnl AC_SUBST(BONOBO_REQUIRED)
48	AC_SUBST(BONOBO_UI_REQUIRED)	48	dnl AC_SUBST(BONOBO_UI_REQUIRED)
49	AC_SUBST(VTE_REQUIRED)	49	AC_SUBST(VTE_REQUIRED)
50	AC_SUBST(LIBXML_REQUIRED)	50	AC_SUBST(LIBXML_REQUIRED)
51	AC_SUBST(PANGO_REQUIRED)	51	AC_SUBST(PANGO_REQUIRED)
Lines 65-70 Link Here
65	CFLAGS_DISABLE_CHECKS="-DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"	65	CFLAGS_DISABLE_CHECKS="-DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
66	CFLAGS_OPTIMIZE="-Os -s"	66	CFLAGS_OPTIMIZE="-Os -s"
67	CXXFLAGS_OPTIMIZE="-Os -s -fno-exceptions -fno-check-new"	67	CXXFLAGS_OPTIMIZE="-Os -s -fno-exceptions -fno-check-new"
		68
68	if test "x$GCC" = xyes; then	69	if test "x$GCC" = xyes; then
69	CFLAGS_WARNINGS=""	70	CFLAGS_WARNINGS=""
70	CFLAGS_OPTIMIZE=""	71	CFLAGS_OPTIMIZE=""
Lines 99-109 Link Here
99	CFLAGS="$CFLAGS -DNDEBUG ${CFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}"	100	CFLAGS="$CFLAGS -DNDEBUG ${CFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}"
100	CXXFLAGS="$CXXFLAGS -DNDEBUG ${CXXFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}")	101	CXXFLAGS="$CXXFLAGS -DNDEBUG ${CXXFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}")
101		102
		103	dnl Enable Glade UI Plugin
		104	AC_ARG_ENABLE(glade-ui,
		105	[ --with-glade-plugin Build the Glade Plugin],
		106	[ enable_glade_plugin=$enableval ],
		107	[ enable_glade_plugin="no" ])
		108
		109	dnl Enable the Class Inheritance through Graphviz
		110	AC_ARG_ENABLE(class-inheritance,
		111	[ --enable-class-inheritance Build support for the class inheritance plugin],
		112	[ enable_class_inheritance=$enableval ],
		113	[ enable_class_inheritance="no" ])
		114
		115	dnl Enable the subversion plugin
		116	AC_ARG_ENABLE(subversion,
		117	[ --enable-subversion Build support for the subversion plugin],
		118	[ enable_subversion=$enableval ],
		119	[ enable_subversion="no" ])
		120
102	dnl Enable versioned user preferences directory	121	dnl Enable versioned user preferences directory
103	AC_ARG_WITH(pref-suffix,	122	AC_ARG_WITH(pref-suffix,
104	[ --with-pref-suffix=VALUE Suffix to add to user preferences dir.],	123	[ --with-pref-suffix=VALUE Suffix to add to user preferences dir.],
105	PREF_SUFFIX="$withval")	124	PREF_SUFFIX="$withval")
106		125
		126
107	AC_SUBST(PREF_SUFFIX)	127	AC_SUBST(PREF_SUFFIX)
108	AC_DEFINE_UNQUOTED(PREF_SUFFIX,	128	AC_DEFINE_UNQUOTED(PREF_SUFFIX,
109	"${PREF_SUFFIX}",	129	"${PREF_SUFFIX}",
Lines 222-228 Link Here
222		242
223	dnl Check for autogen	243	dnl Check for autogen
224	dnl -----------------	244	dnl -----------------
225	AC_PATH_PROG(AUTOGEN_PATH, autogen,no)	245	AC_PATH_PROG(AUTOGEN_PATH, autogen, no)
		246
226	if test x$AUTOGEN_PATH = xno; then	247	if test x$AUTOGEN_PATH = xno; then
227	AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])	248	AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])
228	fi	249	fi
Lines 247-253 Link Here
247		268
248	dnl Check for Glade3	269	dnl Check for Glade3
249	dnl ---------------------	270	dnl ---------------------
250	PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])	271
		272	if test x$enable_glade_plugin = xyes ; then
		273	PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
		274	else
		275	libgladeui_found="no"
		276	fi
		277
251	AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])	278	AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
252	AC_SUBST(PLUGIN_GLADE_CFLAGS)	279	AC_SUBST(PLUGIN_GLADE_CFLAGS)
253	AC_SUBST(PLUGIN_GLADE_LIBS)	280	AC_SUBST(PLUGIN_GLADE_LIBS)
Lines 261-268 Link Here
261	dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix	288	dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
262	dnl (other than /usr or /usr/local), following pkgconfig check will fail.	289	dnl (other than /usr or /usr/local), following pkgconfig check will fail.
263	dnl ----------------------------------------------	290	dnl ----------------------------------------------
264	PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"	291
265	PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])	292	if test x$enable_class_inheritance = xyes ; then
		293	PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
		294	PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])
		295	else
		296	libgraphviz_found="no"
		297	fi
		298
266	AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])	299	AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])
267	AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)	300	AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)
268	AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)	301	AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)
Lines 334-339 Link Here
334	AC_MSG_RESULT(no)	367	AC_MSG_RESULT(no)
335	GTKDOC=false	368	GTKDOC=false
336	fi	369	fi
		370
337	dnl Let people disable the gtk-doc stuff.	371	dnl Let people disable the gtk-doc stuff.
338	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)	372	AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
339	if test x$enable_gtk_doc = xauto ; then	373	if test x$enable_gtk_doc = xauto ; then
Lines 597-765 Link Here
597	dnl (stolen from kdevelop ;-)	631	dnl (stolen from kdevelop ;-)
598	dnl **********************************************************	632	dnl **********************************************************
599		633
600	AC_MSG_CHECKING(for svn libraries)	634	if test x$enable_subversion = xno ; then
		635	SVN_INCLUDE=""
		636	else
		637	AC_MSG_CHECKING(for svn libraries)
601		638
602	APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"	639	APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
603	SVN_SUBDIR="svn"	640	SVN_SUBDIR="svn"
604	AC_ARG_WITH(apr-config,	641	AC_ARG_WITH(apr-config,
605	[[ --with-apr-config=FILE Use the given path to apr-config when determining	642	[[ --with-apr-config=FILE Use the given path to apr-config when determining
606	APR configuration; defaults to "apr-config"]],	643	APR configuration; defaults to "apr-config"]],
607	[	644	[
608	if test "$withval" != "yes" -a "$withval" != ""; then	645	if test "$withval" != "yes" -a "$withval" != ""; then
609	APR_CONFIGS=$withval	646	APR_CONFIGS=$withval
		647	fi
		648	])
		649	AC_MSG_CHECKING([for APR])
		650	APR_CONFIG=""
		651	for VALUE in $APR_CONFIGS ; do
		652	if $VALUE --cflags > /dev/null; then
		653	APR_CONFIG=$VALUE
		654	break
		655	fi
		656	done
		657	test $VALUE && APR_CONFIG=$VALUE
		658	if test $APR_CONFIG ; then
		659	AC_MSG_RESULT([found])
		660	else
		661	AC_MSG_RESULT([not found])
		662	SVN_SUBDIR=
		663	dnl AC_MSG_ERROR([APR is required. Try --with-apr-config.])
610	fi	664	fi
611	])	665
612	AC_MSG_CHECKING([for APR])	666	APR_CFLAGS="`$APR_CONFIG --cflags`"
613	APR_CONFIG=""	667	APR_INCLUDE="`$APR_CONFIG --includes`"
614	for VALUE in $APR_CONFIGS ; do	668	APR_LIBS="`$APR_CONFIG --link-ld --libs`"
615	if $VALUE --cflags > /dev/null; then	669
616	APR_CONFIG=$VALUE	670	dnl
617	break	671	dnl APR util
		672	dnl
		673
		674	APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
		675	AC_ARG_WITH(apu-config,
		676	[[ --with-apu-config=FILE Use the given path to apu-config when determining
		677	APR util configuration; defaults to "apu-config"]],
		678	[
		679	if test "$withval" != "yes" -a "$withval" != ""; then
		680	APU_CONFIGS=$withval
618	fi	681	fi
619	done	682	])
620	test $VALUE && APR_CONFIG=$VALUE	683	AC_MSG_CHECKING([for APR util])
621	if test $APR_CONFIG ; then	684	APU_CONFIG=""
622	AC_MSG_RESULT([found])	685	for VALUE in $APU_CONFIGS ; do
623	else	686	if $VALUE --includes > /dev/null; then
624	AC_MSG_RESULT([not found])	687	APU_CONFIG=$VALUE
625	SVN_SUBDIR=	688	break
626	dnl AC_MSG_ERROR([APR is required. Try --with-apr-config.])	689	fi
627	fi	690	done
628		691	if test $APU_CONFIG ; then
629	APR_CFLAGS="`$APR_CONFIG --cflags`"	692	AC_MSG_RESULT([found])
630	APR_INCLUDE="`$APR_CONFIG --includes`"	693	else
631	APR_LIBS="`$APR_CONFIG --link-ld --libs`"	694	AC_MSG_RESULT([not found])
632		695	SVN_SUBDIR=
633	dnl	696	fi
634	dnl APR util	697	APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
635	dnl	698	APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
636		699
637	APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"	700	AC_MSG_CHECKING(for Subversion svn-config)
638	AC_ARG_WITH(apu-config,	701	AC_ARG_WITH(subversion-dir,
639	[[ --with-apu-config=FILE Use the given path to apu-config when determining	702	[ --with-subversion-dir=DIR where Subversion is installed ],
640	APR util configuration; defaults to "apu-config"]],	703	[
641	[	704	SVNCONFIG="$withval/bin/svn-config"
642	if test "$withval" != "yes" -a "$withval" != ""; then	705	])
643	APU_CONFIGS=$withval	706
		707	if test -z "$SVNCONFIG"; then
		708	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
		709	if test -n "$_SVNCONFIG"; then
		710	SVNCONFIG="$_SVNCONFIG/bin/svn-config"
		711	fi
644	fi	712	fi
645	])
646	AC_MSG_CHECKING([for APR util])
647	APU_CONFIG=""
648	for VALUE in $APU_CONFIGS ; do
649	if $VALUE --includes > /dev/null; then
650	APU_CONFIG=$VALUE
651	break
652	fi
653	done
654	if test $APU_CONFIG ; then
655	AC_MSG_RESULT([found])
656	else
657	AC_MSG_RESULT([not found])
658	SVN_SUBDIR=
659	fi
660	APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
661	APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
662
663	AC_MSG_CHECKING(for Subversion svn-config)
664	AC_ARG_WITH(subversion-dir,
665	[ --with-subversion-dir=DIR where Subversion is installed ],
666	[
667	SVNCONFIG="$withval/bin/svn-config"
668	])
669
670	if test -z "$SVNCONFIG"; then
671	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
672	if test -n "$_SVNCONFIG"; then
673	SVNCONFIG="$_SVNCONFIG/bin/svn-config"
674	fi
675	fi
676		713
677	AC_SUBST(SVNCONFIG)	714	AC_SUBST(SVNCONFIG)
678	if test -x "$SVNCONFIG"; then	715	if test -x "$SVNCONFIG"; then
679	SVNLD="`$SVNCONFIG --ldflags`"	716	SVNLD="`$SVNCONFIG --ldflags`"
680	SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"	717	SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"
681	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed	718	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
682	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"	719	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
683	AC_MSG_RESULT(yes)	720	AC_MSG_RESULT(yes)
684	else	721	else
685	AC_MSG_RESULT(not found)	722	AC_MSG_RESULT(not found)
686	dnl just a fallback to debian's config so that it works for me :)	723	dnl just a fallback to debian's config so that it works for me :)
687	AC_ARG_WITH(svn-include,	724	AC_ARG_WITH(svn-include,
688	[[ --with-svn-include=DIR Use the given path to the subversion headers.]],	725	[[ --with-svn-include=DIR Use the given path to the subversion headers.]],
689	[	726	[
		727	if test "$withval" != "yes" -a "$withval" != ""; then
		728	SVN_INCLUDES=$withval
		729	fi
		730	])
		731	if test -z "$SVN_INCLUDES"; then
		732	SVN_INCLUDES="/usr/local/include /usr/include"
		733	fi
		734	AC_MSG_CHECKING([for Subversion headers])
		735	SVN_INCLUDE=""
		736	for VALUE in $SVN_INCLUDES ; do
		737	if test -f $VALUE/subversion-1/svn_types.h ; then
		738	SVN_INCLUDE=$VALUE
		739	break
		740	fi
		741	done
		742	if test $SVN_INCLUDE ; then
		743	AC_MSG_RESULT([found])
		744	else
		745	AC_MSG_RESULT([not found])
		746	SVN_SUBDIR=
		747	fi
		748	SVN_LIBS="/usr/local/lib /usr/lib"
		749	AC_ARG_WITH(svn-lib,
		750	[[ --with-svn-lib=DIR Use the given path to the subversion libraries.]],
		751	[
690	if test "$withval" != "yes" -a "$withval" != ""; then	752	if test "$withval" != "yes" -a "$withval" != ""; then
691	SVN_INCLUDES=$withval	753	SVN_LIBS=$withval
692	fi	754	fi
693	])	755	])
694	if test -z "$SVN_INCLUDES"; then	756	AC_MSG_CHECKING([for Subversion libraries])
695	SVN_INCLUDES="/usr/local/include /usr/include"	757	SVN_LIB=""
696	fi	758	for VALUE in $SVN_LIBS ; do
697	AC_MSG_CHECKING([for Subversion headers])	759	if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
698	SVN_INCLUDE=""	760	SVN_LIB=$VALUE
699	for VALUE in $SVN_INCLUDES ; do	761	break
700	if test -f $VALUE/subversion-1/svn_types.h ; then	762	fi
701	SVN_INCLUDE=$VALUE	763	done
702	break	764	if test $SVN_LIB ; then
703	fi	765	AC_MSG_RESULT([found])
704	done	766	else
705	if test $SVN_INCLUDE ; then	767	AC_MSG_RESULT([not found])
706	AC_MSG_RESULT([found])	768	SVN_SUBDIR=
707	else	769	fi
708	AC_MSG_RESULT([not found])	770	fi
709	SVN_SUBDIR=
710	fi
711	SVN_LIBS="/usr/local/lib /usr/lib"
712	AC_ARG_WITH(svn-lib,
713	[[ --with-svn-lib=DIR Use the given path to the subversion libraries.]],
714	[
715	if test "$withval" != "yes" -a "$withval" != ""; then
716	SVN_LIBS=$withval
717	fi
718	])
719	AC_MSG_CHECKING([for Subversion libraries])
720	SVN_LIB=""
721	for VALUE in $SVN_LIBS ; do
722	if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
723	SVN_LIB=$VALUE
724	break
725	fi
726	done
727	if test $SVN_LIB ; then
728	AC_MSG_RESULT([found])
729	else
730	AC_MSG_RESULT([not found])
731	SVN_SUBDIR=
732	fi
733	fi
734		771
735		772
736	NEON_CONFIGS="neon-config"	773	NEON_CONFIGS="neon-config"
737	AC_ARG_WITH(neon-config,	774	AC_ARG_WITH(neon-config,
738	[[ --with-neon-config=FILE Use the given path to neon-config when determining	775	[[ --with-neon-config=FILE Use the given path to neon-config when determining
739	Neon configuration; defaults to "neon-config"]],	776	Neon configuration; defaults to "neon-config"]],
740	[	777	[
741	if test "$withval" != "yes" -a "$withval" != ""; then	778	if test "$withval" != "yes" -a "$withval" != ""; then
742	NEON_CONFIGS=$withval	779	NEON_CONFIGS=$withval
743	fi
744	])
745	AC_MSG_CHECKING([for Neon])
746	NEON_CONFIG=""
747	for VALUE in $NEON_CONFIGS ; do
748	if $VALUE --cflags > /dev/null; then
749	NEON_CONFIG=$VALUE
750	break
751	fi	780	fi
752	done	781	])
753	if test $NEON_CONFIG ; then	782	AC_MSG_CHECKING([for Neon])
754	AC_MSG_RESULT([found])	783	NEON_CONFIG=""
755	else	784	for VALUE in $NEON_CONFIGS ; do
756	AC_MSG_RESULT([not found])	785	if $VALUE --cflags > /dev/null; then
757	SVN_SUBDIR=	786	NEON_CONFIG=$VALUE
758	fi	787	break
		788	fi
		789	done
		790	if test $NEON_CONFIG ; then
		791	AC_MSG_RESULT([found])
		792	else
		793	AC_MSG_RESULT([not found])
		794	SVN_SUBDIR=
		795	fi
759		796
760	SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"	797	SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
761	SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"	798	SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
762	SVN_CFLAGS="$APR_CFLAGS"	799	SVN_CFLAGS="$APR_CFLAGS"
		800	fi
763		801
764	AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])	802	AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])
765		803