[mapserver-commits] r12921 - in trunk/mapserver/mapcache: . src
svn at osgeo.org
svn at osgeo.org
Mon Dec 26 07:46:01 EST 2011
Author: tbonfort
Date: 2011-12-26 04:46:01 -0800 (Mon, 26 Dec 2011)
New Revision: 12921
Modified:
trunk/mapserver/mapcache/Makefile
trunk/mapserver/mapcache/Makefile.inc.in
trunk/mapserver/mapcache/aclocal.m4
trunk/mapserver/mapcache/configure
trunk/mapserver/mapcache/configure.in
trunk/mapserver/mapcache/src/Makefile
trunk/mapserver/mapcache/src/http.c
Log:
build libmapcache library, link against libmapserver.la
Modified: trunk/mapserver/mapcache/Makefile
===================================================================
--- trunk/mapserver/mapcache/Makefile 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/Makefile 2011-12-26 12:46:01 UTC (rev 12921)
@@ -3,7 +3,13 @@
all: .header
cd src; $(MAKE) $(MFLAGS)
-install-module: .header
+install-lib: .header
+ cd src; $(MAKE) $(MFLAGS) install-lib
+
+install: .header install-lib
+ cd src; $(MAKE) $(MFLAGS) install
+
+install-module: .header install-lib
cd src; $(MAKE) $(MFLAGS) install-module
# make clean and rerun if essential files have been modified
Modified: trunk/mapserver/mapcache/Makefile.inc.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.inc.in 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/Makefile.inc.in 2011-12-26 12:46:01 UTC (rev 12921)
@@ -1,3 +1,8 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+
TARGETS=mapcache mapcache_seed @MODULE_TARGET@
APXS=@APXS@
HTTPD=@HTTPD@
@@ -2,2 +7,3 @@
CC=@CC@
+INSTALL=@INSTALL@
APACHECTL=@APACHECTL@
Modified: trunk/mapserver/mapcache/aclocal.m4
===================================================================
--- trunk/mapserver/mapcache/aclocal.m4 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/aclocal.m4 2011-12-26 12:46:01 UTC (rev 12921)
@@ -0,0 +1,14 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([acinclude.m4])
Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/configure 2011-12-26 12:46:01 UTC (rev 12921)
@@ -660,6 +660,9 @@
EGREP
GREP
CPP
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
OBJEXT
EXEEXT
ac_ct_CC
@@ -2960,8 +2963,130 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5610,8 +5735,7 @@
if test "$enable_mapserver" == "yes"; then
MAPSERVER_ENABLED="-DUSE_MAPSERVER"
- MAPSERVER_LIB=`../mapserver-config --libs`
- MAPSERVER_LIB="$MAPSERVER_LIB ../../libmapserver.a"
+ MAPSERVER_LIB="../../libmapserver.la"
MAPSERVER_LIB=$MAPSERVER_LIB
fi
@@ -6316,6 +6440,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
+INSTALL='$INSTALL'
test -n "\$AWK" || AWK=awk
_ACEOF
@@ -6751,6 +6876,10 @@
# CONFIG_FILE
#
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -6804,6 +6933,7 @@
s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/configure.in 2011-12-26 12:46:01 UTC (rev 12921)
@@ -5,6 +5,7 @@
: ${CFLAGS="-Wall"}
AC_PROG_CC
+AC_PROG_INSTALL
dnl ---------------------------------------------------------------------
dnl Checks for header files.
@@ -468,8 +469,7 @@
)
if test "$enable_mapserver" == "yes"; then
AC_SUBST(MAPSERVER_ENABLED,"-DUSE_MAPSERVER")
- MAPSERVER_LIB=`../mapserver-config --libs`
- MAPSERVER_LIB="$MAPSERVER_LIB ../../libmapserver.a"
+ MAPSERVER_LIB="../../libmapserver.la"
AC_SUBST(MAPSERVER_LIB,$MAPSERVER_LIB)
fi
])
Modified: trunk/mapserver/mapcache/src/Makefile
===================================================================
--- trunk/mapserver/mapcache/src/Makefile 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/src/Makefile 2011-12-26 12:46:01 UTC (rev 12921)
@@ -2,28 +2,32 @@
all: $(TARGETS)
+install-lib: libmapcache.la
+ $(LIBTOOL) --mode=install $(INSTALL) libmapcache.la $(libdir)
+
install-module: mod_mapcache.o
$(APXS) -i -a -n mapcache mod_mapcache.la
-install-fcgi: mapcache.fcgi fcgihelp
+.c.o:
+ $(LIBTOOL) --tag CC --mode=compile $(CC) $(ALL_ENABLED) $(CFLAGS) $(INCLUDES) -c $<
-fcgihelp:
- echo "fcgi help"
+libmapcache.la: $(OBJS)
+ $(LIBTOOL) --mode=link --tag CC $(CC) -rpath $(libdir) $(LOBJS) -Wl,"$(LIBS)" -o $@
-.c.o:
- $(LIBTOOL) --tag CC --mode=compile $(CC) $(ALL_ENABLED) $(CFLAGS) $(INCLUDES) -c $<
-
mod_mapcache.la: mod_mapcache.o
-mod_mapcache.o: mod_mapcache.c $(OBJS)
- $(APXS) "-Wc,$(ALL_ENABLED) $(CFLAGS) $(INCLUDES)" "-Wl,$(LIBS)" -c mod_mapcache.c $(LOBJS)
+mod_mapcache.o: mod_mapcache.c libmapcache.la
+ $(APXS) -Wc,"$(ALL_ENABLED) $(CFLAGS) $(INCLUDES)" -Wl,"$(LIBS)" -c mod_mapcache.c libmapcache.la
-mapcache: fastcgi_mapcache.c $(OBJS)
- $(LIBTOOL) --mode=link --tag CC $(CC) -o mapcache $(CFLAGS) $(ALL_ENABLED) $(INCLUDES) $(FASTCGI_ENABLED) $(FASTCGI_INC) fastcgi_mapcache.c $(LOBJS) $(LIBS) $(FASTCGI_LIB)
+mapcache: fastcgi_mapcache.c libmapcache.la
+ $(LIBTOOL) --mode=link --tag CC $(CC) -rpath $(bindir) -o mapcache $(CFLAGS) $(ALL_ENABLED) $(INCLUDES) $(FASTCGI_ENABLED) $(FASTCGI_INC) fastcgi_mapcache.c libmapcache.la $(LIBS) $(FASTCGI_LIB)
-mapcache_seed: mapcache_seed.c $(OBJS)
- $(LIBTOOL) --mode=link --tag CC $(CC) -o mapcache_seed $(ALL_ENABLED) $(CFLAGS) $(INCLUDES) $(SEEDER_EXTRAINC) mapcache_seed.c $(LOBJS) $(LIBS) $(SEEDER_EXTRALIBS)
+mapcache_seed: mapcache_seed.c libmapcache.la
+ $(LIBTOOL) --mode=link --tag CC $(CC) -rpath $(bindir) -o mapcache_seed $(ALL_ENABLED) $(CFLAGS) $(INCLUDES) $(SEEDER_EXTRAINC) mapcache_seed.c libmapcache.la $(LIBS) $(SEEDER_EXTRALIBS)
+install: install-lib mapcache mapcache_seed
+ $(LIBTOOL) --mode=install $(INSTALL) mapcache $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) mapcache_seed $(bindir)
clean:
rm -f *.o
@@ -34,6 +38,6 @@
rm -f *.la
rm -f *.sla
rm -rf *.dSYM
- rm -f mapcache.fcgi
+ rm -f mapcache
rm -f mapcache_seed
Modified: trunk/mapserver/mapcache/src/http.c
===================================================================
--- trunk/mapserver/mapcache/src/http.c 2011-12-26 12:44:54 UTC (rev 12920)
+++ trunk/mapserver/mapcache/src/http.c 2011-12-26 12:46:01 UTC (rev 12921)
@@ -66,6 +66,9 @@
*colonptr = '\0';
*endptr = '\0';
apr_table_setn(h->headers,header,colonptr+2);
+#ifdef DEBUG
+ h->ctx->log(h->ctx,MAPCACHE_DEBUG,"received header %s: %s",header, colonptr+2);
+#endif
}
return size*nmemb;
More information about the mapserver-commits
mailing list