Changeset 6677

Timestamp:

08/22/07 13:06:40 (11 months ago)

Author:

tbonfort

Message:

typos in agg configure logic - changed error message when libaggfontfreetype.a wasn't found

Files:

• trunk/mapserver/configure (modified) (604 diffs)
• trunk/mapserver/configure.in (modified) (2 diffs)

trunk/mapserver/configure

@@ -1 +1 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-59
+61
-#
-
+
+
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
@@ -10 +11 @@
-## --------------------- ##
-
-
+
+
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
@@ -17 +19 @@
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Support unset when possible.
@@ -30 +59 @@
-
-
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""        $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
-# Work around bugs in pre-3.0 UWIN ksh.
-
+
+
+
-PS1='$ '
-PS2='> '
@@ -45 +109 @@
-    eval $as_var=C; export $as_var
-  else
-
+($as_unset $as_var) >/dev/null 2>&1 && 
-  fi
-done
-
-# Required to use basename.
-
+
+
-  as_expr=expr
-else
@@ -56 +121 @@
-fi
-
-/) >/dev/null 2>&1 && test "X`basename
+-- /) >/dev/null 2>&1 && test "X`basename --
-  as_basename=basename
-else
@@ -64 +129 @@
-
-# Name of the executable.
-
+-- 
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-         X"$0" : 'X\(//\)$' \| \
-
-
+
-echo X/"$0" |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
@@ -133 +224 @@
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-
-
+
-         /*)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-
-
-
-
+
+
+
+
+
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-
-
+
+
+
+
+
+
-    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
-      N
-
-
-
+
+
-      t loop
-
-
+
-    ' >$as_me.lineno &&
-$as_me.lineno
+"$as_me.lineno"
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
@@ -178 +457 @@
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-bl
-./$as_me.lineno
+tiv
+"./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
@@ -185 +464 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-esac
-
-
+
+
-  as_expr=expr
-else
@@ -199 +489 @@
-
-rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-
-
-
-
+
+
+
+
+
+
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
@@ -214 +509 @@
-  as_ln_s='cp -p'
-fi
-
+
+
-
-if mkdir -p . 2>/dev/null; then
@@ -223 +519 @@
-fi
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Sed expression to map a string onto a valid CPP name.
@@ -232 +549 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-# Name of the host.
@@ -247 +557 @@
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
+ac_clean_files=
-ac_config_libobj_dir=.
+LIBOBJS=
-cross_compiling=no
-subdirs=
@@ -259 +569 @@
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
@@ -273 +578 @@
-
-ac_unique_file="Makefile.in"
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+YACC
+YFLAGS
+CPP'
+
-
-# Initialize some variables set by options.
@@ -301 +784 @@
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-
+
+
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-
-
+
+
+
+
+
+
+
+
+
-
-ac_prev=
+ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-"$ac_prev=\$ac_option"
+$ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-
+
+
+
+
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-
+
+
+
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
@@ -350 +847 @@
-    cache_file=config.cache ;;
-
- | --data | --dat | --da
+
-    ac_prev=datadir ;;
-
-
+
-    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-
+.
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-
+.
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-
-
-
-
-
-
+
+
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -403 +912 @@
-    host_alias=$ac_optarg ;;
-
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
@@ -427 +942 @@
-    libexecdir=$ac_optarg ;;
-
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-
-
+
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-
-
+
-    localstatedir=$ac_optarg ;;
-
@@ -498 +1016 @@
-    program_transform_name=$ac_optarg ;;
-
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
@@ -550 +1078 @@
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-
+.
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-
-
-
-
-
-
+
+
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-
+.
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
--
-"with_$ac_package=no"
+[-.]
+with_$ac_package=no
-
-  --x)
@@ -598 +1122 @@
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-
-
+
-    export $ac_envvar ;;
-
@@ -619 +1142 @@
-fi
-
-
-
+
+
+
+
+
-do
-$`echo $ac_var`
+\$$ac_var
-  case $ac_val in
-
-
-
+
+
-  esac
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-done
-
@@ -666 +1181 @@
-
-
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-its parent
-(dirname "$0") 2>/dev/null
+the parent directory
+$as_dirname -- "$0"
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-
-
+
-echo X"$0" |
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  srcdir=$ac_confdir
-$srcdir/$ac_unique_file
+"$srcdir/$ac_unique_file"
-    srcdir=..
-  fi
@@ -689 +1225 @@
-  ac_srcdir_defaulted=no
-fi
-$srcdir/$ac_unique_file
-if test "$ac_srcdir_defaulted" = yes; then
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or ..
+"$srcdir/$ac_unique_file"
+test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir
-   { (exit 1); exit 1; }; }
-
-
+
+
+
+
-   { (exit 1); exit 1; }; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -770 +1279 @@
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -790 +1296 @@
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]