2 commits - autogen.sh calendaring/calendaring.i

[Thomas Brüderli]

 autogen.sh                |    1 +
 calendaring/calendaring.i |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit fc59f1f45ace084044a78dbedf5f5d9cffa56937
Author: Thomas Brüderli <bruederli at kolabsys.com>
Date:   Tue Oct 23 12:59:30 2012 +0200

    Define target location for PHP modules

diff --git a/autogen.sh b/autogen.sh
index c5cce51..06308cc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,6 +61,7 @@ if [ ${doprep} -eq 1 ]; then
         -DINCLUDE_INSTALL_DIR=/usr/include \
         -DUSE_LIBCALENDARING=ON \
         -DPHP_BINDINGS=ON \
+        -DPHP_INSTALL_DIR=/usr/lib64/php/modules \
         -DPYTHON_BINDINGS=ON \
         ..
 fi


commit a45467d28f271acd430516af9db3065c88d41b5a
Author: Thomas Brüderli <bruederli at kolabsys.com>
Date:   Tue Oct 23 12:57:23 2012 +0200

    Avoid name clash with native PHP class

diff --git a/calendaring/calendaring.i b/calendaring/calendaring.i
index 6ee44ac..fc935e4 100644
--- a/calendaring/calendaring.i
+++ b/calendaring/calendaring.i
@@ -13,6 +13,7 @@
 %import "../shared.i"
 
 %rename(EventCal) Kolab::Calendaring::Event;
+%rename(KolabCalendar) Kolab::Calendaring::Calendar;
 
 %include "../calendaring/calendaring.h"
 %include "../calendaring/event.h"