6 files changed, 36 insertions, 34 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 89bfaf11ed..a249c445f3 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,20 @@
+2003-02-06  Dan Winship  <danw@ximian.com>
+
+	* configure.in: AC_SUBST privlibdir, privincludedir, privdatadir
+	(sent from ../configure). Add descriptions to AC_DEFINEs. Don't
+	bother checking for python since we don't build it anyway.
+
+	* acconfig.h: Gone
+
+	* src/libical/Makefile.am: install library in privlibdir and
+	headers under privincludedir. Look for zone files in privdatadir
+
+	* src/libicalvcal/Makefile.am: install in privlibdir
+
+	* zoneinfo/Makefile.am (zoneinfodatadir): define in terms of
+	privdatadir
+	(install-data-local): update
+
 2002-12-19  Joe Shaw  <joe@ximian.com>
 
 	* configure.in: Add AC_CONFIG_AUX_DIR(..) so it looks for ylwrap in
diff --git a/libical/acconfig.h b/libical/acconfig.h
deleted file mode 100644
index f4909b0c46..0000000000
--- a/libical/acconfig.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define to make icalerror_* calls abort instead of internally
-   signalling an error */
-#undef ICAL_ERRORS_ARE_FATAL
-
-/* Define to make icalcluster_commit() save to a temp file and mv to
-   the original file instead of writing to the orig file directly */
-#undef ICAL_SAFESAVES
-
-/* Define to terminate lines with "\n" instead of "\r\n" */
-#undef ICAL_UNIX_NEWLINE
-
-/* Define if your libc defines a "timezone" variable */
-#undef HAVE_TIMEZONE
- 
-/* Define if your libc defines a struct tm containing a "tm_gmtoff" member */  
-#undef HAVE_TM_GMTOFF
-
-/* Define to 1 if your compile does not like lines like: struct
-   something foo[]*/
-#undef ICAL_NO_EMPTY_ARRAY_DECL
diff --git a/libical/configure.in b/libical/configure.in
index 71b5183831..02275e8d74 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -7,6 +7,11 @@ dnl Set the aux dir to .. (the toplevel evolution directory) so ylwrap
 dnl is found in the correct directory for automake >= 1.5
 AC_CONFIG_AUX_DIR(..)
 
+dnl subst in evolution's private directories
+AC_SUBST(privlibdir)
+AC_SUBST(privincludedir)
+AC_SUBST(privdatadir)
+
 dnl  Initialize maintainer mode
 AM_MAINTAINER_MODE
 
@@ -25,10 +30,10 @@ AC_SUBST(AR)
 AC_CHECK_PROGS(AR, ar aal, ar)
 AC_CHECK_PROGS(PERL, perl5 perl)  
 
-dnl AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1)
-AC_DEFINE(ICAL_SAFESAVES,1)
-AC_DEFINE(ICAL_UNIX_NEWLINE,1)
-dnl AC_DEFINE(ICAL_NO_EMPTY_ARRAY_DECL)
+dnl AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1,[Define to make icalerror_* calls abort instead of internally signalling an error])
+AC_DEFINE(ICAL_SAFESAVES,1,[Define to make icalcluster_commit() save to a temp file and mv to the original file instead of writing to the orig file directly])
+AC_DEFINE(ICAL_UNIX_NEWLINE,1,[Define to terminate lines with "\n" instead of "\r\n"])
+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.
 dnl Replace `main' with a function in -lical:
@@ -51,7 +56,7 @@ dnl * Check for Python
 dnl **************************************************
 python_val=false
 AC_ARG_ENABLE(python-bindings, 
-[  --enable-python-bindings=[yes/no] Enable python bindings],,enable_python_bindings=yes)
+[  --enable-python-bindings=[yes/no] Enable python bindings],,enable_python_bindings=no)
 if test "x$enable_python_bindings" = "xyes"; then
 	python_val=true
 else
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index e8075d58d9..656ffbcdae 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.33 2001/10/30 01:49:30 damon Exp $
+#  $Id: Makefile.am,v 1.34 2003/02/06 18:13:56 danw Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -26,7 +26,7 @@
 DESIGNDATA = $(top_srcdir)/design-data
 ICALSCRIPTS = $(top_srcdir)/scripts
 
-lib_LTLIBRARIES = libical-evolution.la
+privlib_LTLIBRARIES = libical-evolution.la
 
 noinst_LTLIBRARIES = libical-static.la
 libical_static_la_SOURCES = $(libical_evolution_la_SOURCES)
@@ -36,7 +36,7 @@ YFLAGS = -d -v -t -pical_yy
 LFLAGS = -Pical_yy
 LEX_OUTPUT_ROOT = lex.ical_yy
 
-CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
+CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
 
 all: ical.h
 
@@ -99,7 +99,7 @@ libical_evolution_la_SOURCES =	\
 	icallangbind.c
 
 #libicalincludedir = $(includedir)/$(PACKAGE)
-libicalincludedir = $(includedir)/evolution
+libicalincludedir = $(privincludedir)
 
 libicalinclude_HEADERS =  ical.h 
 
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
index e8e8310941..f9d8dd39d9 100644
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libicalvcal-evolution.la
+privlib_LTLIBRARIES = libicalvcal-evolution.la
 
 INCLUDES =			\
 	-I$(top_builddir)	\
@@ -19,7 +19,7 @@ libicalvcal_evolution_la_SOURCES =	\
 	vcaltmp.h		\
 	vcaltmp.c
 
-#libicalvcalincludedir = $(includedir)/evolution/libicalvcal
+#libicalvcalincludedir = $(privincludedir)/libicalvcal
 
 #libicalvcalinclude_HEADERS =	\
 #	icalvcal.h		\
diff --git a/libical/zoneinfo/Makefile.am b/libical/zoneinfo/Makefile.am
index 70f660d620..78b2be521e 100644
--- a/libical/zoneinfo/Makefile.am
+++ b/libical/zoneinfo/Makefile.am
@@ -1,5 +1,5 @@
 
-zoneinfodatadir = $(datadir)/$(PACKAGE)/zoneinfo
+zoneinfodatadir = $(privdatadir)/zoneinfo
 
 zoneinfodata_DATA = zones.tab
 
@@ -22,9 +22,9 @@ DIRS = \
 install-data-local:
 	@$(NORMAL_INSTALL)
 	for dir in $(DIRS); do \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/zoneinfo/$$dir; \
+	  $(mkinstalldirs) $(DESTDIR)$(zoneinfodatadir)/$$dir; \
 	  for tzfile in $(srcdir)/$$dir/*.ics; do \
-	    $(INSTALL_DATA) $$tzfile $(DESTDIR)$(datadir)/$(PACKAGE)/zoneinfo/$$dir; \
+	    $(INSTALL_DATA) $$tzfile $(DESTDIR)$(zoneinfodatadir)/$$dir; \
 	  done \
 	done