libical-1.0HEADlibical-1.0master

1 files changed, 52 insertions, 59 deletions

diff --git a/configure.in b/configure.in
index 6aa8315..a6c94e0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT([libical], [0.43], [http://freeassociation.sf.net/])
+AC_INIT([libical], [1.00], [http://freeassociation.sf.net/])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 
@@ -35,6 +35,10 @@ case "$host" in
     use_builtin_timezone=no
     os_win32=no
     ;;
+*kfreebsd*-gnu*)
+    use_builtin_timezone=no
+    os_win32=no
+    ;;
 *)  
     use_builtin_timezone=yes
     os_win32=no
@@ -219,6 +223,7 @@ AC_DEFINE(NO_WARN_DEPRECATED,1,[Define to 1 if you DO NOT WANT to see deprecated
 AC_DEFINE(NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK,1,[Define to 1 if you DO NO WANT to see the warning messages related to ICAL_MALFORMEDDATA_ERROR and parsing .ics zoneinfo files])
 
 AC_DEFINE(ICAL_UNIX_NEWLINE,1,[Define to terminate lines with "\n" instead of "\r\n"])
+AC_DEFINE(ICAL_ALLOW_EMPTY_PROPERTIES,0,[Define to prevent empty properties from being replaced with X-LIC-ERROR properties])
 dnl AC_DEFINE(ICAL_NO_EMPTY_ARRAY_DECL,1,[Define to 1 if your compile does not like lines like: struct something foo[]])
 
 dnl Checks for libraries.
@@ -257,7 +262,7 @@ AC_CHECK_TYPE(intptr_t)
 AC_STRUCT_TM
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(gmtime_r isspace iswspace strdup snprintf unsetenv)
+AC_CHECK_FUNCS(gmtime_r isspace iswspace strdup snprintf unsetenv setenv)
 
 dnl **************************************************
 dnl * Check for C++
@@ -267,6 +272,14 @@ AC_ARG_ENABLE(cxx,
 [  --enable-cxx           Enable C++ bindings],,enable_cxx="no")
 AM_CONDITIONAL(WITH_CXX_BINDINGS, test x$enable_cxx = "xyes")
 
+AC_PREFIX_DEFAULT(/usr/local/libical)
+if test "$prefix" = NONE; then
+	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$ac_default_prefix/share/libical", [where our self provided zonefiles should live])
+	ssl_dir="$ac_default_prefix/keys"
+else
+	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$prefix/share/libical", [where our self provided zonefiles should live])
+fi
+
 dnl **************************************************
 dnl * Check for Java
 dnl **************************************************
@@ -312,65 +325,45 @@ AC_ARG_ENABLE(python,
 [  --enable-python         Enable python bindings],,enable_python="no")
 
 if test "x$enable_python" = "xyes"; then
-	python_val=true
+  AM_PATH_PYTHON([2.3], , [:])
+  AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+  AC_CHECK_PROG(swig_val, swig, true, false)
+  AM_CONDITIONAL([HAVE_SWIG], [test "x$swig_val" = "xtrue"])
+  
+  PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+  AC_CHECK_HEADER([python$PYTHON_VERSION/Python.h],[],[AC_MSG_ERROR([Can't find python header files])])
+  if test -f "$PY_PREFIX/include/python$PYTHON_VERSION/Python.h"; then
+    
+    PY_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
+    AC_SUBST(PY_CFLAGS)
+    
+    # SWIG needs PIC in order to work.
+    CFLAGS="$CFLAGS -fPIC"
+  fi
+  
+  AC_CONFIG_FILES([src/python/Makefile])
 else
-	python_val=false
+  AM_CONDITIONAL([HAVE_PYTHON], false)
+  AM_CONDITIONAL([HAVE_SWIG], false)
 fi
 
-if test $python_val = true; then
-        
-	AC_CHECK_PROG(python_val, python, true, false)
-	AC_CHECK_PROG(python_val, swig, true, false)
-
-	  PY_PREFIX=`python -c 'import sys ; print sys.prefix'`
-	  PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'`
-	  changequote(<<, >>)dnl
-	  PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
-	  changequote([, ])dnl
-	  AC_CHECK_HEADER([python$PY_VERSION/Python.h],[],[AC_MSG_ERROR([Can't find python header files])])
-	  if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
-		  PY_LIBS="python$PY_VERSION"
-		  if test -d '$PY_EXEC_PREFIX/lib/python$PY_VERSION/config'; then		  
-		  	  PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
-			  PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
-		  else  	  
-		  	  PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib64/python$PY_VERSION/config"
-			  PY_MAKEFILE="$PY_EXEC_PREFIX/lib64/python$PY_VERSION/config/Makefile"
-		  fi
-		  PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
-		  
-		  PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
-		  PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
-		  PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
-		  PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
-		  AC_SUBST(PY_LIBS)
-		  AC_SUBST(PY_LIB_LOC)
-		  AC_SUBST(PY_CFLAGS)
-		  AC_SUBST(PY_EXTRA_LIBS)
-		  # SWIG needs PIC in order to work.
-		  CFLAGS="$CFLAGS -fPIC"
-	  else
-		  python_val=false
-	  fi
+if test "$use_builtin_timezone" = "yes"; then
+  AC_CONFIG_FILES([zoneinfo/Makefile])
 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
-])
 
+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/libical/icalerror.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