sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved AC_SUBST to the end of configure.ac

Browse source
This commit is contained in:
Artem Pavlenko 2005-04-03 20:24:03 +00:00
parent 55067772f6
commit 5c90bb1521
2 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
configure vendored
View file

@ -427,6 +427,7 @@ PACKAGE_STRING='mapnik 0.1'
PACKAGE_BUGREPORT=''
ac_unique_file="src/params.cc"
ac_default_prefix=
ac_subdirs_all="$ac_subdirs_all libltdl utils/shapeindex"
# Factoring default headers for most tests.
ac_includes_default="\
@ -465,7 +466,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLTDL LIBLTDL LIBOBJS pluginsdir TIFF_LDFLAGS POSTGRESQL_PREFIX POSTGRESQL_LIBS POSTGRESQL_CFLAGS BUILD_TIFF_READER_TRUE BUILD_TIFF_READER_FALSE SHAPE_DATASOURCE_TRUE SHAPE_DATASOURCE_FALSE RASTER_DATASOURCE_TRUE RASTER_DATASOURCE_FALSE POSTGIS_DATASOURCE_TRUE POSTGIS_DATASOURCE_FALSE LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLTDL LIBLTDL LIBOBJS TIFF_LDFLAGS POSTGRESQL_PREFIX POSTGRESQL_LIBS POSTGRESQL_CFLAGS pluginsdir BUILD_TIFF_READER_TRUE BUILD_TIFF_READER_FALSE SHAPE_DATASOURCE_TRUE SHAPE_DATASOURCE_FALSE RASTER_DATASOURCE_TRUE RASTER_DATASOURCE_FALSE POSTGIS_DATASOURCE_TRUE POSTGIS_DATASOURCE_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -1957,6 +1958,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
(/usr/local)
@ -3686,7 +3688,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 3689 "configure"' > conftest.$ac_ext
echo '#line 3691 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -5265,7 +5267,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:5268:" \
echo "$as_me:5270:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -6322,11 +6324,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6325: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6327: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6329: \$? = $ac_status" >&5
echo "$as_me:6331: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -6565,11 +6567,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6568: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6572: \$? = $ac_status" >&5
echo "$as_me:6574: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -6625,11 +6627,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6628: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6630: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:6632: \$? = $ac_status" >&5
echo "$as_me:6634: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -8810,7 +8812,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 8813 "configure"
#line 8815 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -8908,7 +8910,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 8911 "configure"
#line 8913 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11101,11 +11103,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:11104: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11106: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11108: \$? = $ac_status" >&5
echo "$as_me:11110: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -11161,11 +11163,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:11164: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11166: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:11168: \$? = $ac_status" >&5
echo "$as_me:11170: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -12522,7 +12524,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 12525 "configure"
#line 12527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12620,7 +12622,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 12623 "configure"
#line 12625 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13457,11 +13459,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13460: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13464: \$? = $ac_status" >&5
echo "$as_me:13466: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -13517,11 +13519,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13520: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:13524: \$? = $ac_status" >&5
echo "$as_me:13526: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -15552,11 +15554,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15555: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15557: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15559: \$? = $ac_status" >&5
echo "$as_me:15561: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -15795,11 +15797,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15798: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15802: \$? = $ac_status" >&5
echo "$as_me:15804: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@ -15855,11 +15857,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15858: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15862: \$? = $ac_status" >&5
echo "$as_me:15864: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -18040,7 +18042,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 18043 "configure"
#line 18045 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18138,7 +18140,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 18141 "configure"
#line 18143 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -22953,15 +22955,6 @@ fi
done
pluginsdir="${prefix}/plugins"
cat >>confdefs.h <<_ACEOF
#define _DATASOURCE_PLUGINS_DIR "$pluginsdir"
_ACEOF
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
@ -23380,6 +23373,14 @@ fi
ac_config_files="$ac_config_files Makefile m4/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile"
pluginsdir="$(prefix)/plugins"
cat >>confdefs.h <<_ACEOF
#define _DATASOURCE_PLUGINS_DIR "$pluginsdir"
_ACEOF
if test "$HAVE_LIBTIFF" = yes; then
@ -23421,6 +23422,7 @@ else
fi
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@ -24181,11 +24183,11 @@ s,@LIBTOOL@,$LIBTOOL,;t t
s,@INCLTDL@,$INCLTDL,;t t
s,@LIBLTDL@,$LIBLTDL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@pluginsdir@,$pluginsdir,;t t
s,@TIFF_LDFLAGS@,$TIFF_LDFLAGS,;t t
s,@POSTGRESQL_PREFIX@,$POSTGRESQL_PREFIX,;t t
s,@POSTGRESQL_LIBS@,$POSTGRESQL_LIBS,;t t
s,@POSTGRESQL_CFLAGS@,$POSTGRESQL_CFLAGS,;t t
s,@pluginsdir@,$pluginsdir,;t t
s,@BUILD_TIFF_READER_TRUE@,$BUILD_TIFF_READER_TRUE,;t t
s,@BUILD_TIFF_READER_FALSE@,$BUILD_TIFF_READER_FALSE,;t t
s,@SHAPE_DATASOURCE_TRUE@,$SHAPE_DATASOURCE_TRUE,;t t

9
configure.ac
View file

@ -7,6 +7,7 @@ AC_REVISION([$Revision: 1.1 $])
AC_CONFIG_SRCDIR([src/params.cc])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PREFIX_DEFAULT (/usr/local)
AC_LIBTOOL_DLOPEN
AC_CONFIG_SUBDIRS(libltdl utils/shapeindex)
@ -46,10 +47,6 @@ AC_FUNC_CLOSEDIR_VOID
AC_FUNC_MALLOC
AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt])
AC_SUBST([pluginsdir],["${prefix}/plugins"])
AC_DEFINE_UNQUOTED([_DATASOURCE_PLUGINS_DIR],["$pluginsdir"],[datasource plugins dir])
AP_ENABLE_DEBUG
#AP_CHECK_FREETYPE2
@ -86,9 +83,13 @@ fi
AC_CONFIG_FILES([Makefile m4/Makefile src/Makefile src/shape/Makefile src/raster/Makefile src/postgis/Makefile])
AC_SUBST([pluginsdir],["$(prefix)/plugins"])
AC_DEFINE_UNQUOTED([_DATASOURCE_PLUGINS_DIR],["$pluginsdir"],[datasource plugins dir])
AM_CONDITIONAL([BUILD_TIFF_READER],[test "$HAVE_LIBTIFF" = yes])
AM_CONDITIONAL([SHAPE_DATASOURCE],[test "$package_shape_enabled" = yes ])
AM_CONDITIONAL([RASTER_DATASOURCE],[test "$package_raster_enabled" = yes])
AM_CONDITIONAL([POSTGIS_DATASOURCE],[test "$package_postgis_enabled" = yes])
AC_OUTPUT