[FA-commits] libical Makefile.am, 1.6, 1.7 bootstrap, 1.3, 1.4 configure.in, 1.51, 1.52

[dothebart <dot...@us...>]

Update of /cvsroot/freeassociation/libical
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32665

Modified Files:
	Makefile.am bootstrap configure.in 
Log Message:
* if the user wants our timezone, he may configure us to load them.


Index: bootstrap
===================================================================
RCS file: /cvsroot/freeassociation/libical/bootstrap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bootstrap	26 Jan 2008 14:36:15 -0000	1.3
+++ bootstrap	26 Jan 2008 15:54:42 -0000	1.4
@@ -8,14 +8,19 @@
 # Remove any vestiges of pre-6.05 build environments
 rm -f .libs modules *.so *.lo *.la 2>/dev/null
 
+
+echo ... running aclocal ...
+aclocal
+
+echo ... running liboolize ...
 libtoolize --force
 
+echo ... running autoheader ...
+autoheader
+
 echo ... running automake ...
 automake
 
-echo ... running aclocal ...
-aclocal
-
 echo ... running autoconf ...
 autoconf
 
@@ -24,8 +29,6 @@
 echo ... removing autoheader cache files ...
 rm -rf autom4te*.cache
 
-echo ... running autoheader ...
-autoheader
 
 echo
 echo This script has been tested with autoconf 2.53 and

Index: Makefile.am
===================================================================
RCS file: /cvsroot/freeassociation/libical/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	2 Jan 2008 20:07:22 -0000	1.6
+++ Makefile.am	26 Jan 2008 15:54:42 -0000	1.7
@@ -7,4 +7,4 @@
 	TODO
 
 SUBDIRS = design-data doc scripts test-data src examples $(zoneinfo_dir)
-DIST_SUBDIRS = design-data doc scripts test-data src examples zoneinfo
+DIST_SUBDIRS = design-data doc scripts test-data src examples @ZONE_INFO@

Index: configure.in
===================================================================
RCS file: /cvsroot/freeassociation/libical/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- configure.in	18 Jan 2008 05:07:47 -0000	1.51
+++ configure.in	26 Jan 2008 15:54:42 -0000	1.52
@@ -26,21 +26,47 @@
 dnl *** check for Win32
 
 AC_MSG_CHECKING([for Win32])
+echo "---------$host----------"
 case "$host" in
 *-mingw*)
+    use_builtin_timezone=yes
     os_win32=yes
     ;;
-*)  os_win32=no
+*linux*)
+    use_builtin_timezone=no
+    os_win32=no
+    ;;
+*)  
+    use_builtin_timezone=yes
+    os_win32=no
     ;;
 esac
+
 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 should we override the system default?
+AC_ARG_WITH(builtintz, [  --with-builtintz             deliver our own zonefiles?],
+		       [if test "x$withval" = "xyes" ; then
+			     use_builtin_timezone="yes"
+			  fi
+			  if test "x$withval" = "xno" ; then
+			     use_builtin_timezone="no"
+			  fi]
+		)
+
+zoneinfodir=""
+if test "$use_builtin_timezone" = "yes"; then
+   AC_DEFINE(USE_BUILTIN_TZDATA, [], [whether we should bring our own TZ-Data])
+   zoneinfodir=zoneinfo
+fi
+AC_SUBST(ZONE_INFO, "$zoneinfodir")
+
+
 
 dnl *** bdb4 support