1 --- dgee-0.1.6/apache/Makefile.am~ Fri Oct 24 00:10:01 2003
2 +++ dgee-0.1.6/apache/Makefile.am Sat Dec 6 00:40:29 2003
6 install-mod: $(MOD_DGEE) install-mod-conf
7 - $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
8 +# $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
9 + $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache1/
10 + $(INSTALL) $(MOD_DGEE) $(DESTDIR)$(libexecdir)/apache1/
14 --- dgee-0.1.6/apache/Makefile.am~ Sat Dec 6 00:50:13 2003
15 +++ dgee-0.1.6/apache/Makefile.am Sat Dec 6 00:52:28 2003
18 if [ -e $(MOD_DGEE) ] ; \
20 - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
21 - [ "`id -u`" != 0 ] || chown -f @USER@:@GROUP@ $(DESTDIR)$(sysconfdir); \
22 - $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir) ; \
23 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/apache/conf.d ; \
24 + [ "`id -u`" != 0 ] || chown -f @USER@:@GROUP@ $(DESTDIR)$(sysconfdir)/apache/conf.d; \
25 + $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir)/apache/conf.d/40_mod_dgee.conf ; \
28 install-mod: $(MOD_DGEE) install-mod-conf
29 --- dgee-0.1.6/configure.in~ 2003-10-30 23:26:50.000000000 +0200
30 +++ dgee-0.1.6/configure.in 2006-03-05 11:37:32.000000000 +0200
37 dnl Location of Apache's apxs
39 - [ --with-apache=libpath Implicitly point to directory containing apache apxs (use --without to disable apache (v1) support) [Enabled]],
40 + [ --with-apache=libpath Enable Apache (and Implicitly point to directory containing apache apxs if required) [Disabled]],
41 [if test "$withval" = yes; then
42 APXSBASE=/usr/local/sbin
44 --- dgee-0.1.6/configure.in~ 2006-03-05 11:56:03.000000000 +0200
45 +++ dgee-0.1.6/configure.in 2006-03-05 12:00:21.000000000 +0200
47 [ --with-apache2=libpath Enable Apache2 (and Implicitly point to directory containing apache2 apxs if required) [Disabled]],
48 [if test "$withval" = yes; then
49 APXS2BASE=/usr/local/sbin
56 --- dgee-0.1.6/configure.in~ 2006-03-05 12:00:21.000000000 +0200
57 +++ dgee-0.1.6/configure.in 2006-03-05 12:02:19.000000000 +0200
59 [if test "$withval" = yes; then
60 APXSBASE=/usr/local/sbin
78 test -n "$ARFLAGS" || ARFLAGS="cr"
81 -dnl Check for apxs in the path.
82 -AC_PATH_PROG([APXS], [apxs], [/usr/local/sbin/apxs], [$APXSBASE:$PATH:/usr/local/sbin:/usr/sbin])
83 -AC_PATH_PROG([APXS2], [apxs2], [/usr/local/sbin/apxs2], [$APXS2BASE:$PATH:/usr/local/sbin:/usr/sbin])
85 dnl Checks for typedefs, structures, and compiler characteristics.
88 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:10:06.000000000 +0200
89 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:10:07.000000000 +0200
93 install-mod: $(MOD_DGEE2) install-mod-conf
94 - $(APXS2) -i -S LIBEXECDIR=$(MOD_DGEE2_DIR) -a $<
95 + $(APXS2) -i -S DESTDIR=$(DESTDIR) $<
99 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:10:35.000000000 +0200
100 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:11:40.000000000 +0200
103 $(MOD_DGEE2): mod_dgee2.c replace
104 $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
105 - @( if [ ! -e "$(MOD_DGEE2)" ] ; \
107 - echo Info: ERROR $(MOD_DGEE2) not created... ;\
108 - echo Info: If this compile fails because apxs cannot be found, then ;\
109 - echo Info: reconfigure DGEE with --with-apache2=directory where apache2 apxs;\
110 - echo Info: may be found. If you don\'t have apxs installed, then you may;\
111 - echo Info: be able to use the mod_dgee2.so in the ./precompiled directory.;\
112 - echo Info: Do \"cp apache2/precompiled/mod_dgee2.so apache\" before doing;\
113 - echo Info: the install if this is the case. ;\
117 $(edit) mod_dgee2.conf > mod_dgee2.conf.tmp
118 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:12:11.000000000 +0200
119 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:13:05.000000000 +0200
123 install-mod: $(MOD_DGEE2) install-mod-conf
124 - $(APXS2) -i -S DESTDIR=$(DESTDIR) $<
125 + $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
129 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:13:15.000000000 +0200
130 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:23:00.000000000 +0200
135 -$(MOD_DGEE2): mod_dgee2.c replace
136 +$(MOD_DGEE2): mod_dgee2.c
137 $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
140 --- dgee-0.1.6/apache/Makefile.am~ 2006-03-05 12:23:22.000000000 +0200
141 +++ dgee-0.1.6/apache/Makefile.am 2006-03-05 12:24:03.000000000 +0200
143 $(INSTALL) $(MOD_DGEE_CONF) $(DESTDIR)$(sysconfdir)/apache/webapps.d ; \
146 -install-mod: $(MOD_DGEE) install-mod-conf
147 -# $(APXS) -i -S LIBEXECDIR=$(MOD_DGEE_DIR) -a $<
148 +install-mod: $(MOD_DGEE)
149 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache1/
150 $(INSTALL) $(MOD_DGEE) $(DESTDIR)$(libexecdir)/apache1/
152 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:23:00.000000000 +0200
153 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:24:34.000000000 +0200
157 install-mod: $(MOD_DGEE2) install-mod-conf
158 + $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
159 $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
162 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:31:52.000000000 +0200
163 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:49:31.000000000 +0200
167 $(MOD_DGEE2): mod_dgee2.c
168 - $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c $(LFLAG)
169 + $(APXS2) -DEAPI -DDOTGNUVERSION="'\""$(DOTGNUVERSION)"\"'" -DDGVERSION="'\""$(DGVERSION)"\"'" $(ALLINC) -c mod_dgee2.c -o mod_dgee.la $(LFLAG)
172 $(edit) mod_dgee2.conf > mod_dgee2.conf.tmp
175 install-mod: $(MOD_DGEE2) install-mod-conf
176 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
177 - $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee2.la
178 + $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee.la
182 --- dgee-0.1.6/apache2/Makefile.am~ 2006-03-05 12:51:56.000000000 +0200
183 +++ dgee-0.1.6/apache2/Makefile.am 2006-03-05 12:54:18.000000000 +0200
186 install-mod: $(MOD_DGEE2) install-mod-conf
187 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/apache/
188 - $(APXS2) -i -S DESTDIR=$(DESTDIR) mod_dgee.la
189 + $(APXS2) -i -n mod_dgee -S DESTDIR=$(DESTDIR) mod_dgee.la