get_ical_data.sh is now run at compile time

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 8538c4c2bc5d2a0b7aa2867155c028b57a50ee42..ef9690cbb46c7a993cab39065bddf4ab452bbc52 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -46,6 +46,7 @@ clean:
 distclean: clean
        rm -f Makefile config.cache config.log config.status \
                po/webcit/Makefile \
 distclean: clean
        rm -f Makefile config.cache config.log config.status \
                po/webcit/Makefile \

+               ical_maps.c \

                $(srcdir)/TAGS
 
 setup: setup.o gettext.o
                $(srcdir)/TAGS
 
 setup: setup.o gettext.o


@@ -87,6 +88,9 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
        paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
        $(LIBS)
 
        paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
        $(LIBS)
 

+ical_maps.c: scripts/get_ical_data.sh
+       sh scripts/get_ical_data.sh
+

 %.o: %.c ${HEADERS}
        echo "CC $<"
        $(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
 %.o: %.c ${HEADERS}
        echo "CC $<"
        $(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<

diff --git a/webcit/bootstrap b/webcit/bootstrap
index 22d784a68bd3c96fcd44722f314c231fa96c7d31..43c30e3c2e582ef2cfd92ce23d081bf4f5fd8286 100755 (executable)
--- a/webcit/bootstrap
+++ b/webcit/bootstrap
@@ -6,34 +6,31 @@
 # Remove any vestiges of pre-6.05 build environments
 rm -f .libs modules *.so *.lo *.la 2>/dev/null
 
 # Remove any vestiges of pre-6.05 build environments
 rm -f .libs modules *.so *.lo *.la 2>/dev/null
 

-if ./scripts/get_ical_data.sh; then
-
-    echo ... running aclocal ...
-    aclocal
+echo ... running aclocal ...
+aclocal

     
     

-    echo ... running autoconf ...
-    autoconf
+echo ... running autoconf ...
+autoconf

 
 # If your autoconf version changes, the autom4te.cache stuff will mess you up.
 # Get rid of it.
 
 # If your autoconf version changes, the autom4te.cache stuff will mess you up.
 # Get rid of it.

-    echo ... removing autoheader cache files ...
-    rm -rf autom4te*.cache
+echo ... removing autoheader cache files ...
+rm -rf autom4te*.cache

     
     

-    echo ... running autoheader ...
-    autoheader
+echo ... running autoheader ...
+autoheader

     
     

-    echo ... mk_module_init.sh ...
-    ./scripts/mk_module_init.sh
+echo ... mk_module_init.sh ...
+./scripts/mk_module_init.sh

 
 
 
 

-    echo
-    echo This script has been tested with autoconf 2.53 and
-    echo automake 1.5. Other versions may work, but I recommend the latest
-    echo compatible versions of these.
-    echo
-    echo Also note that autoconf and automake should be configured
-    echo with the same prefix.
-    echo
-fi
+echo
+echo This script has been tested with autoconf 2.53 and
+echo automake 1.5. Other versions may work, but I recommend the latest
+echo compatible versions of these.
+echo
+echo Also note that autoconf and automake should be configured
+echo with the same prefix.
+echo

 
 grep '^#define CLIENT_VERSION' webcit.h | sed 's/[^0-9]*//g' >package-version.txt
 
 grep '^#define CLIENT_VERSION' webcit.h | sed 's/[^0-9]*//g' >package-version.txt

diff --git a/webcit/scripts/get_ical_data.sh b/webcit/scripts/get_ical_data.sh
index 3f80db31bb5e96730564273f3630410760259b80..0bce6d866ec0ec85eee769fd0167052c8497c808 100755 (executable)
--- a/webcit/scripts/get_ical_data.sh
+++ b/webcit/scripts/get_ical_data.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
 #!/bin/sh

+
+echo Running $0
+
+

 ICAL=/usr/local/ctdlsupport/include/libical/ical.h
 if test -f /usr/include/libical/ical.h; then 
     ICAL=/usr/include/libical/ical.h
 ICAL=/usr/local/ctdlsupport/include/libical/ical.h
 if test -f /usr/include/libical/ical.h; then 
     ICAL=/usr/include/libical/ical.h