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

[Suman Manjunath]

On Wed, 2009-09-16 at 02:52 -0400, Suman Manjunath wrote:
> 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

hm.. the first patch seems to have a bug when different combinations of
--enable-python is tried. I have attached a revised one. 
I tested this one with: 
 * --enable-python
 * --disable-python
 * <nothing specified>
and all of them compile and generate a proper tarball.

Sorry for the earlier buggy patch.

> 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  
> > 
-------------- next part --------------
commit a5b427ccb42182a1c43d7bf9af359610a4dd88a4
Author: Suman Manjunath <msuman at gnome.org>
Date:   Wed Sep 16 04:00:34 2009 -0400

    Don't generate makefile for the python-binding sub-directory if
    the option is not enabled.
    
    Author:    Suman Manjunath <msuman at gnome.org>
    
    	modified:   configure.in
    	modified:   src/Makefile.am

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..028a21e 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