commit 145fef0087972acdd30a24f998f19c676526f2a2
parent be2447680cd11024b3f973a80130f93e3584fc64
Author: Colin Leroy <colin@colino.net>
Date: Thu, 14 Feb 2013 09:59:35 +0000
2013-02-14 [colin] 3.9.0cvs67
* configure.ac
Fix perl detection
Diffstat:
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-14 [colin] 3.9.0cvs67
+
+ * configure.ac
+ Fix perl detection
+
2013-02-14 [colin] 3.9.0cvs66
* src/plugins/vcalendar/claws.def
diff --git a/PATCHSETS b/PATCHSETS
@@ -4564,3 +4564,4 @@
( diff -u /dev/null src/plugins/acpi_notifier/placeholder.txt; diff -u /dev/null src/plugins/address_dup_finder/placeholder.txt; diff -u /dev/null src/plugins/address_keeper/placeholder.txt; diff -u /dev/null src/plugins/archive/placeholder.txt; diff -u /dev/null src/plugins/att_remover/placeholder.txt; diff -u /dev/null src/plugins/attachwarner/placeholder.txt; diff -u /dev/null src/plugins/bsfilter/placeholder.txt; diff -u /dev/null src/plugins/clamd/placeholder.txt; diff -u /dev/null src/plugins/fetchinfo/placeholder.txt; diff -u /dev/null src/plugins/gdata/placeholder.txt; diff -u /dev/null src/plugins/geolocation/placeholder.txt; diff -u /dev/null src/plugins/gtkhtml2_viewer/placeholder.txt; diff -u /dev/null src/plugins/mailmbox/placeholder.txt; diff -u /dev/null src/plugins/newmail/placeholder.txt; diff -u /dev/null src/plugins/notification/placeholder.txt; diff -u /dev/null src/plugins/pdf_viewer/placeholder.txt; diff -u /dev/null src/plugins/perl/placeholder.txt; diff -u /dev/null src/plugins/python/placeholder.txt; diff -u /dev/null src/plugins/rssyl/placeholder.txt; diff -u /dev/null src/plugins/spam_report/placeholder.txt; diff -u /dev/null src/plugins/synce/placeholder.txt; diff -u /dev/null src/plugins/tnef_parse/placeholder.txt; diff -u /dev/null src/plugins/vcalendar/placeholder.txt; ) > 3.9.0cvs64.patchset
( cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/plugins/Makefile.am; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/address_dup_finder/placeholder.txt; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/synce/placeholder.txt; diff -u /dev/null src/plugins/vcalendar/Makefile.am; diff -u /dev/null src/plugins/vcalendar/Makefile.in; diff -u /dev/null src/plugins/vcalendar/common-views.c; diff -u /dev/null src/plugins/vcalendar/common-views.h; diff -u /dev/null src/plugins/vcalendar/day-view.c; diff -u /dev/null src/plugins/vcalendar/icaltime_as_local.c; diff -u /dev/null src/plugins/vcalendar/icaltime_as_local.h; diff -u /dev/null src/plugins/vcalendar/month-view.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/vcalendar/placeholder.txt; diff -u /dev/null src/plugins/vcalendar/plugin.c; diff -u /dev/null src/plugins/vcalendar/vcal_dbus.c; diff -u /dev/null src/plugins/vcalendar/vcal_dbus.h; diff -u /dev/null src/plugins/vcalendar/vcal_folder.c; diff -u /dev/null src/plugins/vcalendar/vcal_folder.h; diff -u /dev/null src/plugins/vcalendar/vcal_interface.h; diff -u /dev/null src/plugins/vcalendar/vcal_manager.c; diff -u /dev/null src/plugins/vcalendar/vcal_manager.h; diff -u /dev/null src/plugins/vcalendar/vcal_meeting_gtk.c; diff -u /dev/null src/plugins/vcalendar/vcal_meeting_gtk.h; diff -u /dev/null src/plugins/vcalendar/vcal_prefs.c; diff -u /dev/null src/plugins/vcalendar/vcal_prefs.h; diff -u /dev/null src/plugins/vcalendar/vcalendar.c; diff -u /dev/null src/plugins/vcalendar/vcalendar.h; diff -u /dev/null src/plugins/vcalendar/version.rc; diff -u /dev/null src/plugins/vcalendar/libical/.cvsignore; diff -u /dev/null src/plugins/vcalendar/libical/Makefile.am; diff -u /dev/null src/plugins/vcalendar/libical/Makefile.in; diff -u /dev/null src/plugins/vcalendar/libical/design-data/.cvsignore; diff -u /dev/null src/plugins/vcalendar/libical/design-data/Makefile.am; diff -u /dev/null src/plugins/vcalendar/libical/design-data/Makefile.in; diff -u /dev/null src/plugins/vcalendar/libical/design-data/parameters.csv; diff -u /dev/null src/plugins/vcalendar/libical/design-data/properties.csv; diff -u /dev/null src/plugins/vcalendar/libical/design-data/restrictions.csv; diff -u /dev/null src/plugins/vcalendar/libical/design-data/status.txt; diff -u /dev/null src/plugins/vcalendar/libical/design-data/value-types.csv; diff -u /dev/null src/plugins/vcalendar/libical/libical/.cvsignore; diff -u /dev/null src/plugins/vcalendar/libical/libical/Makefile.am; diff -u /dev/null src/plugins/vcalendar/libical/libical/Makefile.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalattendee.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalattendee.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalcomponent.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalcomponent.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedparameter.c.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedparameter.h.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedproperty.c.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedproperty.h.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedvalue.c.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalderivedvalue.h.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalduration.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalduration.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalenums.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalenums.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalerror.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalerror.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icallangbind.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icallangbind.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icallexer.l; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalmemory.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalmemory.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalmime.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalmime.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalparameter.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalparameter.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalparameterimpl.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalparser.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalparser.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalperiod.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalperiod.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalproperty.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalproperty.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalrecur.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalrecur.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalrestriction.c.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalrestriction.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icaltime.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icaltime.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icaltypes.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icaltypes.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalvalue.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalvalue.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalvalueimpl.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalversion.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalversion.h.in; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalyacc.output; diff -u /dev/null src/plugins/vcalendar/libical/libical/icalyacc.y; diff -u /dev/null src/plugins/vcalendar/libical/libical/pvl.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/pvl.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/sspm.c; diff -u /dev/null src/plugins/vcalendar/libical/libical/sspm.h; diff -u /dev/null src/plugins/vcalendar/libical/libical/vsnprintf.c; diff -u /dev/null src/plugins/vcalendar/libical/scripts/.cvsignore; diff -u /dev/null src/plugins/vcalendar/libical/scripts/Makefile.am; diff -u /dev/null src/plugins/vcalendar/libical/scripts/Makefile.in; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkderivedcomponents.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkderivedparameters.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkderivedproperties.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkderivedvalues.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkparameterrestrictions.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkrestrictionrecords.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/mkrestrictiontable.pl; diff -u /dev/null src/plugins/vcalendar/libical/scripts/readvaluesfile.pl; ) > 3.9.0cvs65.patchset
( diff -u /dev/null src/plugins/vcalendar/claws.def; diff -u /dev/null src/plugins/vcalendar/plugin.def; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/vcalendar/libical/Makefile.in; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/vcalendar/libical/design-data/Makefile.in; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/vcalendar/libical/libical/Makefile.in; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/vcalendar/libical/scripts/Makefile.in; ) > 3.9.0cvs66.patchset
+( cvs diff -u -r 1.654.2.4643 -r 1.654.2.4644 configure.ac; ) > 3.9.0cvs67.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -1034,8 +1034,14 @@ AC_ARG_ENABLE(vcalendar-plugin,
[ --disable-vcalendar-plugin do not build vcalendar plugin for ical rendering],
[ac_cv_enable_vcalendar_plugin=$enableval], [ac_cv_enable_vcalendar_plugin=yes])
if test x"$ac_cv_enable_vcalendar_plugin" = xyes; then
- AC_MSG_RESULT(yes)
- PLUGINS="vcalendar $PLUGINS"
+ AC_CHECK_PROGS(PERL, perl5 perl)
+ if test x"$PERL" != x; then
+ AC_MSG_RESULT(yes)
+ PLUGINS="vcalendar $PLUGINS"
+ else
+ AC_MSG_RESULT(no)
+ ac_cv_enable_vcalendar_plugin=no
+ fi
fi
AM_CONDITIONAL(BUILD_VCALENDAR_PLUGIN, test x"$ac_cv_enable_vcalendar_plugin" = xyes)
