Changeset 343
- Timestamp:
- 07/07/07 00:08:00 (1 year ago)
- Files:
-
- wifidog/wifidog-client/libhttpd/Makefile.in (modified) (23 diffs)
- wifidog/wifidog-client/libhttpd/api.c (modified) (1 diff)
- wifidog/wifidog-client/libhttpd/httpd.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
wifidog/wifidog-client/libhttpd/Makefile.in
r218 r343 1 # Makefile.in generated by automake 1. 9.6from Makefile.am.1 # Makefile.in generated by automake 1.10 from Makefile.am. 2 2 # @configure_input@ 3 3 4 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004, 2005 Free Software Foundation, Inc.5 # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 20 20 21 21 22 srcdir = @srcdir@23 top_srcdir = @top_srcdir@24 22 VPATH = @srcdir@ 25 23 pkgdatadir = $(datadir)/@PACKAGE@ 26 24 pkglibdir = $(libdir)/@PACKAGE@ 27 25 pkgincludedir = $(includedir)/@PACKAGE@ 28 top_builddir = ..29 26 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 30 INSTALL = @INSTALL@31 27 install_sh_DATA = $(install_sh) -c -m 644 32 28 install_sh_PROGRAM = $(install_sh) -c … … 64 60 am_libhttpd_la_OBJECTS = protocol.lo api.lo version.lo ip_acl.lo 65 61 libhttpd_la_OBJECTS = $(am_libhttpd_la_OBJECTS) 66 DEFAULT_INCLUDES = -I. -I$( srcdir) -I$(top_builddir)62 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ 67 63 depcomp = $(SHELL) $(top_srcdir)/config/depcomp 68 64 am__depfiles_maybe = depfiles 69 65 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 70 66 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 71 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \72 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \73 $(AM_C FLAGS) $(CFLAGS)67 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 68 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 69 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 74 70 CCLD = $(CC) 75 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ 76 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 71 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 72 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 73 $(LDFLAGS) -o $@ 77 74 SOURCES = $(libhttpd_la_SOURCES) 78 75 DIST_SOURCES = $(libhttpd_la_SOURCES) … … 83 80 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 84 81 ACLOCAL = @ACLOCAL@ 85 AMDEP_FALSE = @AMDEP_FALSE@86 AMDEP_TRUE = @AMDEP_TRUE@87 82 AMTAR = @AMTAR@ 88 83 AR = @AR@ … … 104 99 DEFS = @DEFS@ 105 100 DEPDIR = @DEPDIR@ 106 DOC_FALSE = @DOC_FALSE@107 DOC_TRUE = @DOC_TRUE@108 101 DOT = @DOT@ 109 102 DOXYGEN = @DOXYGEN@ … … 113 106 ECHO_T = @ECHO_T@ 114 107 EGREP = @EGREP@ 115 ENABLE_DOXYGEN_FALSE = @ENABLE_DOXYGEN_FALSE@116 ENABLE_DOXYGEN_TRUE = @ENABLE_DOXYGEN_TRUE@117 108 EXEEXT = @EXEEXT@ 118 109 F77 = @F77@ 119 110 FFLAGS = @FFLAGS@ 120 111 GREP = @GREP@ 112 INSTALL = @INSTALL@ 121 113 INSTALL_DATA = @INSTALL_DATA@ 122 114 INSTALL_PROGRAM = @INSTALL_PROGRAM@ … … 130 122 LTLIBOBJS = @LTLIBOBJS@ 131 123 MAINT = @MAINT@ 132 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@133 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@134 124 MAKEINFO = @MAKEINFO@ 125 MKDIR_P = @MKDIR_P@ 135 126 OBJEXT = @OBJEXT@ 136 127 PACKAGE = @PACKAGE@ … … 150 141 WIFIDOG_MINOR_VERSION = @WIFIDOG_MINOR_VERSION@ 151 142 WIFIDOG_VERSION = @WIFIDOG_VERSION@ 143 abs_builddir = @abs_builddir@ 144 abs_srcdir = @abs_srcdir@ 145 abs_top_builddir = @abs_top_builddir@ 146 abs_top_srcdir = @abs_top_srcdir@ 152 147 ac_ct_CC = @ac_ct_CC@ 153 148 ac_ct_CXX = @ac_ct_CXX@ 154 149 ac_ct_F77 = @ac_ct_F77@ 155 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@156 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@157 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@158 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@159 150 am__include = @am__include@ 160 151 am__leading_dot = @am__leading_dot@ … … 168 159 build_os = @build_os@ 169 160 build_vendor = @build_vendor@ 161 builddir = @builddir@ 170 162 datadir = @datadir@ 171 163 datarootdir = @datarootdir@ … … 198 190 sbindir = @sbindir@ 199 191 sharedstatedir = @sharedstatedir@ 192 srcdir = @srcdir@ 200 193 sysconfdir = @sysconfdir@ 201 194 target_alias = @target_alias@ 195 top_builddir = @top_builddir@ 196 top_srcdir = @top_srcdir@ 202 197 lib_LTLIBRARIES = libhttpd.la 203 198 libhttpd_la_SOURCES = protocol.c \ … … 244 239 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 245 240 @$(NORMAL_INSTALL) 246 test -z "$(libdir)" || $( mkdir_p) "$(DESTDIR)$(libdir)"241 test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" 247 242 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 248 243 if test -f $$p; then \ … … 255 250 uninstall-libLTLIBRARIES: 256 251 @$(NORMAL_UNINSTALL) 257 @ set -x;list='$(lib_LTLIBRARIES)'; for p in $$list; do \252 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 258 253 p=$(am__strip_dir) \ 259 254 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ … … 270 265 done 271 266 libhttpd.la: $(libhttpd_la_OBJECTS) $(libhttpd_la_DEPENDENCIES) 272 $(LINK) -rpath $(libdir) $(libhttpd_la_ LDFLAGS) $(libhttpd_la_OBJECTS) $(libhttpd_la_LIBADD) $(LIBS)267 $(LINK) -rpath $(libdir) $(libhttpd_la_OBJECTS) $(libhttpd_la_LIBADD) $(LIBS) 273 268 274 269 mostlyclean-compile: … … 284 279 285 280 .c.o: 286 @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \287 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi281 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 282 @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 288 283 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 289 284 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ … … 291 286 292 287 .c.obj: 293 @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \294 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi288 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` 289 @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po 295 290 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 296 291 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ … … 298 293 299 294 .c.lo: 300 @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \301 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi295 @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 296 @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo 302 297 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ 303 298 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ … … 309 304 clean-libtool: 310 305 -rm -rf .libs _libs 311 312 distclean-libtool:313 -rm -f libtool314 uninstall-info-am:315 306 install-pkgincludeHEADERS: $(pkginclude_HEADERS) 316 307 @$(NORMAL_INSTALL) 317 test -z "$(pkgincludedir)" || $( mkdir_p) "$(DESTDIR)$(pkgincludedir)"308 test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" 318 309 @list='$(pkginclude_HEADERS)'; for p in $$list; do \ 319 310 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ … … 380 371 381 372 distdir: $(DISTFILES) 382 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 383 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 384 list='$(DISTFILES)'; for file in $$list; do \ 385 case $$file in \ 386 $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ 387 $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ 388 esac; \ 373 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 374 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 375 list='$(DISTFILES)'; \ 376 dist_files=`for file in $$list; do echo $$file; done | \ 377 sed -e "s|^$$srcdirstrip/||;t" \ 378 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 379 case $$dist_files in \ 380 */*) $(MKDIR_P) `echo "$$dist_files" | \ 381 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ 382 sort -u` ;; \ 383 esac; \ 384 for file in $$dist_files; do \ 389 385 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ 390 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \391 if test "$$dir" != "$$file" && test "$$dir" != "."; then \392 dir="/$$dir"; \393 $(mkdir_p) "$(distdir)$$dir"; \394 else \395 dir=''; \396 fi; \397 386 if test -d $$d/$$file; then \ 387 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ 398 388 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ 399 389 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ … … 411 401 installdirs: 412 402 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"; do \ 413 test -z "$$dir" || $( mkdir_p) "$$dir"; \403 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 414 404 done 415 405 install: install-am … … 446 436 -rm -f Makefile 447 437 distclean-am: clean-am distclean-compile distclean-generic \ 448 distclean- libtool distclean-tags438 distclean-tags 449 439 450 440 dvi: dvi-am … … 460 450 install-data-am: install-pkgincludeHEADERS 461 451 452 install-dvi: install-dvi-am 453 462 454 install-exec-am: install-libLTLIBRARIES 463 455 456 install-html: install-html-am 457 464 458 install-info: install-info-am 465 459 466 460 install-man: 461 462 install-pdf: install-pdf-am 463 464 install-ps: install-ps-am 467 465 468 466 installcheck-am: … … 486 484 ps-am: 487 485 488 uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ 489 uninstall-pkgincludeHEADERS 486 uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS 487 488 .MAKE: install-am install-strip 490 489 491 490 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ … … 493 492 distclean-compile distclean-generic distclean-libtool \ 494 493 distclean-tags distdir dvi dvi-am html html-am info info-am \ 495 install install-am install-data install-data-am install-exec \ 496 install-exec-am install-info install-info-am \ 497 install-libLTLIBRARIES install-man install-pkgincludeHEADERS \ 494 install install-am install-data install-data-am install-dvi \ 495 install-dvi-am install-exec install-exec-am install-html \ 496 install-html-am install-info install-info-am \ 497 install-libLTLIBRARIES install-man install-pdf install-pdf-am \ 498 install-pkgincludeHEADERS install-ps install-ps-am \ 498 499 install-strip installcheck installcheck-am installdirs \ 499 500 maintainer-clean maintainer-clean-generic mostlyclean \ 500 501 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 501 502 pdf pdf-am ps ps-am tags uninstall uninstall-am \ 502 uninstall-info-am uninstall-libLTLIBRARIES \ 503 uninstall-pkgincludeHEADERS 503 uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS 504 504 505 505 wifidog/wifidog-client/libhttpd/api.c
r336 r343 574 574 575 575 #if 0 576 /* XXX: For WifiDog, we only process the query string parameters 576 /* XXX: For WifiDog, we only process the query string parameters 577 577 but keep the GET variables in the request.query! 578 578 */ wifidog/wifidog-client/libhttpd/httpd.h
r336 r343 15 15 ** 16 16 ** 17 ** $Id: httpd.h 274 2004-11-17 23:54:25Z alexcv$17 ** $Id: httpd.h 1239 2007-05-30 19:21:21Z david $ 18 18 ** 19 19 */ … … 102 102 host[HTTP_MAX_URL], /* acv@acv.ca/wifidog: Added decoding 103 103 of host: header if present. */ 104 ifModified[HTTP_MAX_URL];104 ifModified[HTTP_MAX_URL]; 105 105 #if(0) 106 106 userAgent[HTTP_MAX_URL],
