|
 |
3423d02 |
diff -Naupr lighttpd-1.4.18.orig/src/Makefile.am lighttpd-1.4.18/src/Makefile.am
|
|
|
3423d02 |
--- lighttpd-1.4.18.orig/src/Makefile.am 2007-09-03 00:23:53.000000000 +0200
|
|
|
3423d02 |
+++ lighttpd-1.4.18/src/Makefile.am 2007-10-16 19:13:56.000000000 +0200
|
|
|
3423d02 |
@@ -241,6 +241,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
|
|
|
3423d02 |
mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
|
|
|
3423d02 |
mod_accesslog_la_LIBADD = $(common_libadd)
|
|
|
3423d02 |
|
|
|
3423d02 |
+lib_LTLIBRARIES += mod_geoip.la
|
|
|
3423d02 |
+mod_geoip_la_SOURCES = mod_geoip.c
|
|
|
3423d02 |
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
|
|
|
3423d02 |
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
|
|
|
3423d02 |
+
|
|
|
3423d02 |
|
|
|
3423d02 |
hdr = server.h buffer.h network.h log.h keyvalue.h \
|
|
|
3423d02 |
response.h request.h fastcgi.h chunk.h \
|
|
|
3423d02 |
diff -Naupr lighttpd-1.4.18.orig/src/Makefile.in lighttpd-1.4.18/src/Makefile.in
|
|
|
3423d02 |
--- lighttpd-1.4.18.orig/src/Makefile.in 2007-09-09 21:55:29.000000000 +0200
|
|
|
3423d02 |
+++ lighttpd-1.4.18/src/Makefile.in 2007-10-16 19:16:47.000000000 +0200
|
|
|
3423d02 |
@@ -126,6 +126,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
|
|
|
3423d02 |
mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
|
3423d02 |
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
|
3423d02 |
$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
|
3423d02 |
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
|
|
3423d02 |
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
|
|
|
3423d02 |
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
|
|
|
3423d02 |
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
|
3423d02 |
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
|
3423d02 |
+ $(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
|
3423d02 |
mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
|
|
3423d02 |
am_mod_alias_la_OBJECTS = mod_alias.lo
|
|
|
3423d02 |
mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
|
|
|
3423d02 |
@@ -413,7 +419,7 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
|
|
|
3423d02 |
$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
|
|
|
3423d02 |
$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
|
|
|
3423d02 |
$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
|
|
|
3423d02 |
- $(spawn_fcgi_SOURCES)
|
|
|
3423d02 |
+ $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES)
|
|
|
3423d02 |
DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
|
|
|
3423d02 |
$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
|
|
|
3423d02 |
$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
|
|
|
3423d02 |
@@ -433,7 +439,7 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
|
|
|
3423d02 |
$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
|
|
|
3423d02 |
$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
|
|
|
3423d02 |
$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
|
|
|
3423d02 |
- $(spawn_fcgi_SOURCES)
|
|
|
3423d02 |
+ $(spawn_fcgi_SOURCES) $(mod_geoip_la_SOURCES)
|
|
|
3423d02 |
HEADERS = $(noinst_HEADERS)
|
|
|
3423d02 |
ETAGS = etags
|
|
|
3423d02 |
CTAGS = ctags
|
|
|
3423d02 |
@@ -614,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
|
|
|
3423d02 |
mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
|
|
|
3423d02 |
mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
|
|
|
3423d02 |
mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
|
|
|
3423d02 |
- mod_redirect.la mod_status.la mod_accesslog.la
|
|
|
3423d02 |
+ mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
|
|
|
3423d02 |
@NO_RDYNAMIC_TRUE@liblightcomp_la_SOURCES = $(common_src)
|
|
|
3423d02 |
@NO_RDYNAMIC_TRUE@liblightcomp_la_CFLAGS = $(AM_CFLAGS)
|
|
|
3423d02 |
@NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
|
|
|
3423d02 |
@@ -721,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
|
|
|
3423d02 |
mod_accesslog_la_SOURCES = mod_accesslog.c
|
|
|
3423d02 |
mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
|
|
|
3423d02 |
mod_accesslog_la_LIBADD = $(common_libadd)
|
|
|
3423d02 |
+mod_geoip_la_SOURCES = mod_geoip.c
|
|
|
3423d02 |
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
|
|
|
3423d02 |
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
|
|
|
3423d02 |
hdr = server.h buffer.h network.h log.h keyvalue.h \
|
|
|
3423d02 |
response.h request.h fastcgi.h chunk.h \
|
|
|
3423d02 |
settings.h http_chunk.h http_auth_digest.h \
|
|
|
3423d02 |
@@ -822,6 +831,8 @@ mod_access.la: $(mod_access_la_OBJECTS)
|
|
|
3423d02 |
$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
|
|
|
3423d02 |
mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES)
|
|
|
3423d02 |
$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
|
|
|
3423d02 |
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES)
|
|
|
3423d02 |
+ $(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
|
|
|
3423d02 |
mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES)
|
|
|
3423d02 |
$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
|
|
|
3423d02 |
mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES)
|
|
|
3423d02 |
@@ -1043,6 +1054,7 @@ distclean-compile:
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_access.Plo@am__quote@
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_accesslog.Plo@am__quote@
|
|
|
3423d02 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_geoip.Plo@am__quote@
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_alias.Plo@am__quote@
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_auth.Plo@am__quote@
|
|
|
3423d02 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_cgi.Plo@am__quote@
|