libical r632 - trunk

[tml svn gnome org]

Author: tml
Date: Tue Jan 29 00:16:10 2008
New Revision: 632
URL: http://svn.gnome.org/viewvc/libical?rev=632&view=rev

Log:
2008-01-29  Tor Lillqvist  <tml novell com>

	* configure.in
	* Makefile.am: Use Automake conditional to set zoneinfo_dir
	instead of setting variable directly in the configure script. Then
	Automake won't barf when run in evolution-data-server which
	includes libical.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jan 29 00:16:10 2008
@@ -5,5 +5,9 @@
 	TEST \
 	TODO
 
+if OS_WIN32
+zoneinfo_dir = zoneinfo
+endif
+
 SUBDIRS = design-data doc scripts test-data src examples $(zoneinfo_dir)
 DIST_SUBDIRS = design-data doc scripts test-data src examples zoneinfo

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 29 00:16:10 2008
@@ -40,11 +40,6 @@
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 
-
-if test "x$os_win32" = "xyes"; then
-	zoneinfo_dir="zoneinfo"
-fi
-
 dnl *** bdb4 support
 
 AC_MSG_CHECKING(for Berkeley DB4 support)