[Freeassociation-devel] r965 through r968 are Patrick's patches

[Suman Manjunath]

Hi.. 

I tried a local build after generating a tarball from SVN. There were a
couple of build failures. Attached patch fixes it. 

1) We don't build the python bindings for some reason. Yet, we generate
the makefiles for the sub-directory. We don't compile the sub-directory
regardless of the user preference of --enable-python ( => the python
subdir is not bundled in the tarball). So, when someone tries to compile
with a tarball, it goes boom!
[Please note: even with the patch attached, --enable-python will _not_
build the python bindings. Not sure what the problem was before, I chose
to leave it as it was. (in fact, I did try to fix this as well and
succeeded with some hacks, in doing so, --enable-python needed an
--enable-static]

2) Similar issue with the zoneinfo sub-directory. Respect the user
preference of --without-builtintz

HTH

-Suman

On Tue, 2009-09-15 at 22:42 -0400, IGnatius T Foobar wrote:
> 
>  r965 through r968 represent the application of Patrick's four patches.  
> Testing can now commence, followed by bumping the version number and 
> getting ready for a release.  
>    
>   -- Art  
>   
> 
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry® Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay 
> ahead of the curve. Join us from November 9-12, 2009. Register now!
> http://p.sf.net/sfu/devconf
> _______________________________________________
> Freeassociation-devel mailing list
> Freeassociation-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/freeassociation-devel
-------------- next part --------------
commit e2ff5e7bf6c19eb2844ea2202c54973d61f102e3
Author: Suman Manjunath <msuman at novell.com>
Date:   Wed Sep 16 02:36:12 2009 -0400

    Fixes for configure.in - respect user preference to build Python bindings.

diff --git a/libical/configure.in b/libical/configure.in
index 6cea14e..3c9d384 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -360,21 +360,25 @@ fi
 python_val=false
 AM_CONDITIONAL(WITH_PYTHON, test $python_val = true)
 
-AC_OUTPUT([
-Makefile
-design-data/Makefile
-doc/Makefile
-examples/Makefile
-scripts/Makefile
-src/Makefile
-src/libical/Makefile
-src/libical/icalversion.h
-src/libicalss/Makefile
-src/libicalvcal/Makefile
-src/test/Makefile
-src/python/Makefile
-test-data/Makefile
-zoneinfo/Makefile
-libical.pc
-])
+if test "$use_builtin_timezone" = "yes"; then
+  AC_CONFIG_FILES([zoneinfo/Makefile])
+fi
+if test $python_val = true ; then
+  AC_CONFIG_FILES([src/python/Makefile])
+fi
 
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([design-data/Makefile])
+AC_CONFIG_FILES([doc/Makefile])
+AC_CONFIG_FILES([examples/Makefile])
+AC_CONFIG_FILES([scripts/Makefile])
+AC_CONFIG_FILES([src/Makefile])
+AC_CONFIG_FILES([src/libical/Makefile])
+AC_CONFIG_FILES([src/libical/icalversion.h])
+AC_CONFIG_FILES([src/libicalss/Makefile])
+AC_CONFIG_FILES([src/libicalvcal/Makefile])
+AC_CONFIG_FILES([src/test/Makefile])
+AC_CONFIG_FILES([test-data/Makefile])
+AC_CONFIG_FILES([libical.pc])
+
+AC_OUTPUT
diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am
index 11129a2..66c6581 100644
--- a/libical/src/Makefile.am
+++ b/libical/src/Makefile.am
@@ -1,3 +1,9 @@
-SUBDIRS = libical libicalss libicalvcal test
+if WITH_PYTHON
+  python_dir = python
+else
+  python_dir = 
+endif
+
+SUBDIRS = libical libicalss libicalvcal test $(python_dir)
 
 include_HEADERS = ical.h