libical.la -> libical-evolution.la

2003-09-22  Hans Petter Jansson  <hpj@ximian.com>

	* calendar/cal-util/Makefile.am (libical_util_la_LIBADD):
	libical.la -> libical-evolution.la

	* calendar/importers/Makefile.am
	(libevolution_calendar_importers_la_LIBADD):
	libicalvcal.la -> libicalvcal-evolution.la

	* shell/Makefile.am (evolution_LDADD):
	libical.la -> libical-evolution.la

	* libical/configure.in: Require flex 2.5.31 and add a test for it.
	Rename WITH_CXX conditional to WITH_CXX_BINDINGS.

	* libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to
	lib names.

	* libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names.

	* libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS.

	* libical/src/libicalcap/Makefile.am: Add -evolution to lib names.
	Install to Evolution's priv dirs.

	* libical/src/libicalvcal/Makefile.am: Ditto.

	* libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names. Install in privlibdir. Install includes to
	$(privincludedir)/libical.

	* libical/src/libicalss/Makefile.am: Ditto.

	* libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison
	with reentrant and bison-bridge. Use new Flex variable names.

	* libical/src/libical/icallexer.l:
	* libical/src/libical/icalyacc.y:
	* libical/src/libicalss/icalsslexer.c:
	* libical/src/libicalss/icalssyacc.c:
	* libical/src/libicalss/icalssyacc.h: Removed from repository.

svn path=/trunk/; revision=22633

1 files changed, 20 insertions, 16 deletions

diff --git a/libical/configure.in b/libical/configure.in
index 46d889ddf2..59c3fece7d 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -95,21 +95,25 @@ AM_CONDITIONAL(WITH_BDB4, test x$WITH_BDB4 = xyes)
 
 dnl *** Yacc/Bison support
 
-AC_MSG_CHECKING(whether to support development)
-AC_ARG_WITH(devel, [  --with-devel            Add development options],
-[case $with_devel in  
-    yes)	DEV="yes"
-		AC_MSG_RESULT(yes)
-		AC_MSG_RESULT(Setting up for development: -Wall, flex, bison)
-		AC_MSG_RESULT(** Note that you will need flex 2.5.7 or higher)
-		;;
-    no)		AC_MSG_RESULT(no)
-		;;
-    *)		AC_MSG_RESULT(no)
-		AC_MSG_RESULT(Ignoring unknown argument to --with-devel: $with_devel)
-		;;
-esac],
-AC_MSG_RESULT(no))
+if test "x$USE_MAINTAINER_MODE" == xyes; then
+	DEV="yes"
+	AC_MSG_RESULT([Setting up for development: -Wall, flex, bison])
+
+	AC_MSG_CHECKING(for flex >= 2.5.31)
+	flex_major=$(flex --version | sed 's/flex \(version\)\? \?'// | cut -d '.' -f 1    2>/dev/null)
+	flex_minor=$(flex --version | sed 's/flex \(version\)\? \?'// | cut -d '.' -f 2    2>/dev/null)
+	flex_revision=$(flex --version | sed 's/flex \(version\)\? \?'// | cut -d '.' -f 3 2>/dev/null)
+
+	if (( $flex_major < 2 || \
+	       ($flex_major == 2 && $flex_minor < 5) || \
+	       ($flex_major == 2 && $flex_minor == 5 && $flex_revision < 31) )); then
+		AC_MSG_RESULT($flex_major.$flex_minor.$flex_revision - no)
+		AC_MSG_ERROR([You need flex >= 2.5.31 to build libical for development - http://lex.sourceforge.net/])
+	else
+		AC_MSG_RESULT($flex_major.$flex_minor.$flex_revision - yes)
+	fi
+fi
+
 AM_CONDITIONAL(DEV, test x$DEV = xyes)
 
 AC_CHECK_PROGS(AR, ar aal, ar)
@@ -214,7 +218,7 @@ dnl **************************************************
 
 AC_ARG_ENABLE(cxx, 
 [  --enable-cxx           Enable C++ bindings],,enable_cxx="no")
-AM_CONDITIONAL(WITH_CXX, test x$enable_cxx = "xyes")
+AM_CONDITIONAL(WITH_CXX_BINDINGS, test x$enable_cxx = "xyes")
 
 dnl **************************************************
 dnl * Check for Java