[mapserver-commits] r7459 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Mon Mar 17 16:03:10 EDT 2008
Author: dmorissette
Date: 2008-03-17 16:03:10 -0400 (Mon, 17 Mar 2008)
New Revision: 7459
Modified:
trunk/mapserver/configure
trunk/mapserver/configure.in
Log:
Moved --with-fribidi-config block to better fit in configure --help order
Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure 2008-03-17 20:00:23 UTC (rev 7458)
+++ trunk/mapserver/configure 2008-03-17 20:03:10 UTC (rev 7459)
@@ -742,16 +742,16 @@
LIBCURL_CONFIG
CURL_INC
CURL_LIB
-FRIBIDI_CONFIG
-FRIBIDI_ENABLED
-FRIBIDI_INC
-FRIBIDI_LIB
LIBXML2_CONFIG
XML2_INC
XML2_LIB
WMS_LYR_ENABLED
WFS_LYR_ENABLED
SOS_SVR_ENABLED
+FRIBIDI_CONFIG
+FRIBIDI_ENABLED
+FRIBIDI_INC
+FRIBIDI_LIB
FASTCGI_ENABLED
FASTCGI_INC
FASTCGI_LIB
@@ -1432,9 +1432,9 @@
--with-sos Enable OGC SOS Server Support (libxml2 and PROJ4 and
OGR required).
--with-curl-config=PATH Specify path to curl-config.
+ --with-xml2-config=PATH Specify path to xml2-config.
--with-fribidi-config[=ARG] Include FriBidi Support (ARG=yes/path to
fribidi-config)
- --with-xml2-config=PATH Specify path to xml2-config.
--with-fastcgi=path Enable FastCGI, point to installed tree.
--with-httpd Specify path to 'httpd' executable.
--with-warnings[=flags] Enable strict warnings (or user defined warnings)
@@ -11480,92 +11480,6 @@
-{ echo "$as_me:$LINENO: checking if FriBidi support requested" >&5
-echo $ECHO_N "checking if FriBidi support requested... $ECHO_C" >&6; }
-
-
-# Check whether --with-fribidi-config was given.
-if test "${with_fribidi_config+set}" = set; then
- withval=$with_fribidi_config;
-fi
-
-
-if test "$with_fribidi_config" = "no" -o "$with_fribidi_config" = "" ; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- FRIBIDI_CONFIG="no"
-elif test "$with_fribidi_config" = "yes" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- # Extract the first word of "fribidi-config", so it can be a program name with args.
-set dummy fribidi-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_FRIBIDI_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $FRIBIDI_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FRIBIDI_CONFIG="$FRIBIDI_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_FRIBIDI_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_FRIBIDI_CONFIG" && ac_cv_path_FRIBIDI_CONFIG="no"
- ;;
-esac
-fi
-FRIBIDI_CONFIG=$ac_cv_path_FRIBIDI_CONFIG
-if test -n "$FRIBIDI_CONFIG"; then
- { echo "$as_me:$LINENO: result: $FRIBIDI_CONFIG" >&5
-echo "${ECHO_T}$FRIBIDI_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-else
- FRIBIDI_CONFIG=$with_fribidi_config
-fi
-
-if test "$FRIBIDI_CONFIG" = "no" ; then
- FRIBIDI_ENABLED=
- FRIBIDI_INC=
- FRIBIDI_LIB=
-else
- { echo "$as_me:$LINENO: result: yes, user supplied fribidi-config" >&5
-echo "${ECHO_T}yes, user supplied fribidi-config" >&6; }
- FRIBIDI_ENABLED=-DUSE_FRIBIDI
- FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
- FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
-fi
-
-FRIBIDI_ENABLED=$FRIBIDI_ENABLED
-
-FRIBIDI_INC=$FRIBIDI_INC
-
-FRIBIDI_LIB=$FRIBIDI_LIB
-
-
-ALL_ENABLED="$FRIBIDI_ENABLED $ALL_ENABLED"
-ALL_INC="$FRIBIDI_INC $ALL_INC"
-ALL_LIB="$FRIBIDI_LIB $ALL_LIB"
-
-
{ echo "$as_me:$LINENO: checking for libxml2" >&5
echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
@@ -11688,6 +11602,94 @@
ALL_ENABLED="$WMS_LYR_ENABLED $WFS_LYR_ENABLED $SOS_SVR_ENABLED $XML2_ENABLED $CURL_ENABLED $ALL_ENABLED"
+
+
+{ echo "$as_me:$LINENO: checking if FriBidi support requested" >&5
+echo $ECHO_N "checking if FriBidi support requested... $ECHO_C" >&6; }
+
+
+# Check whether --with-fribidi-config was given.
+if test "${with_fribidi_config+set}" = set; then
+ withval=$with_fribidi_config;
+fi
+
+
+if test "$with_fribidi_config" = "no" -o "$with_fribidi_config" = "" ; then
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ FRIBIDI_CONFIG="no"
+elif test "$with_fribidi_config" = "yes" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ # Extract the first word of "fribidi-config", so it can be a program name with args.
+set dummy fribidi-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_FRIBIDI_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $FRIBIDI_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FRIBIDI_CONFIG="$FRIBIDI_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_FRIBIDI_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_FRIBIDI_CONFIG" && ac_cv_path_FRIBIDI_CONFIG="no"
+ ;;
+esac
+fi
+FRIBIDI_CONFIG=$ac_cv_path_FRIBIDI_CONFIG
+if test -n "$FRIBIDI_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $FRIBIDI_CONFIG" >&5
+echo "${ECHO_T}$FRIBIDI_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+else
+ FRIBIDI_CONFIG=$with_fribidi_config
+fi
+
+if test "$FRIBIDI_CONFIG" = "no" ; then
+ FRIBIDI_ENABLED=
+ FRIBIDI_INC=
+ FRIBIDI_LIB=
+else
+ { echo "$as_me:$LINENO: result: yes, user supplied fribidi-config" >&5
+echo "${ECHO_T}yes, user supplied fribidi-config" >&6; }
+ FRIBIDI_ENABLED=-DUSE_FRIBIDI
+ FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
+ FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
+fi
+
+FRIBIDI_ENABLED=$FRIBIDI_ENABLED
+
+FRIBIDI_INC=$FRIBIDI_INC
+
+FRIBIDI_LIB=$FRIBIDI_LIB
+
+
+ALL_ENABLED="$FRIBIDI_ENABLED $ALL_ENABLED"
+ALL_INC="$FRIBIDI_INC $ALL_INC"
+ALL_LIB="$FRIBIDI_LIB $ALL_LIB"
+
+
{ echo "$as_me:$LINENO: checking FastCGI support" >&5
echo $ECHO_N "checking FastCGI support... $ECHO_C" >&6; }
@@ -13578,16 +13580,16 @@
LIBCURL_CONFIG!$LIBCURL_CONFIG$ac_delim
CURL_INC!$CURL_INC$ac_delim
CURL_LIB!$CURL_LIB$ac_delim
-FRIBIDI_CONFIG!$FRIBIDI_CONFIG$ac_delim
-FRIBIDI_ENABLED!$FRIBIDI_ENABLED$ac_delim
-FRIBIDI_INC!$FRIBIDI_INC$ac_delim
-FRIBIDI_LIB!$FRIBIDI_LIB$ac_delim
LIBXML2_CONFIG!$LIBXML2_CONFIG$ac_delim
XML2_INC!$XML2_INC$ac_delim
XML2_LIB!$XML2_LIB$ac_delim
WMS_LYR_ENABLED!$WMS_LYR_ENABLED$ac_delim
WFS_LYR_ENABLED!$WFS_LYR_ENABLED$ac_delim
SOS_SVR_ENABLED!$SOS_SVR_ENABLED$ac_delim
+FRIBIDI_CONFIG!$FRIBIDI_CONFIG$ac_delim
+FRIBIDI_ENABLED!$FRIBIDI_ENABLED$ac_delim
+FRIBIDI_INC!$FRIBIDI_INC$ac_delim
+FRIBIDI_LIB!$FRIBIDI_LIB$ac_delim
FASTCGI_ENABLED!$FASTCGI_ENABLED$ac_delim
FASTCGI_INC!$FASTCGI_INC$ac_delim
FASTCGI_LIB!$FASTCGI_LIB$ac_delim
Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in 2008-03-17 20:00:23 UTC (rev 7458)
+++ trunk/mapserver/configure.in 2008-03-17 20:03:10 UTC (rev 7459)
@@ -1787,45 +1787,6 @@
ALL_LIB="$CURL_LIB $ALL_LIB"
-dnl ---------------------------------------------------------------------------
-dnl Try to find FriBidi if FriBidi support requested.
-dnl ---------------------------------------------------------------------------
-
-AC_MSG_CHECKING(if FriBidi support requested)
-
-AC_ARG_WITH(fribidi-config,
-[ --with-fribidi-config[[=ARG]] Include FriBidi Support (ARG=yes/path to
- fribidi-config)],,)
-
-if test "$with_fribidi_config" = "no" -o "$with_fribidi_config" = "" ; then
- AC_MSG_RESULT(no)
- FRIBIDI_CONFIG="no"
-elif test "$with_fribidi_config" = "yes" ; then
- AC_MSG_RESULT(yes)
- AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
-else
- FRIBIDI_CONFIG=$with_fribidi_config
-fi
-
-if test "$FRIBIDI_CONFIG" = "no" ; then
- FRIBIDI_ENABLED=
- FRIBIDI_INC=
- FRIBIDI_LIB=
-else
- AC_MSG_RESULT([yes, user supplied fribidi-config])
- FRIBIDI_ENABLED=-DUSE_FRIBIDI
- FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
- FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
-fi
-
-AC_SUBST(FRIBIDI_ENABLED,$FRIBIDI_ENABLED)
-AC_SUBST(FRIBIDI_INC,$FRIBIDI_INC)
-AC_SUBST(FRIBIDI_LIB,$FRIBIDI_LIB)
-
-ALL_ENABLED="$FRIBIDI_ENABLED $ALL_ENABLED"
-ALL_INC="$FRIBIDI_INC $ALL_INC"
-ALL_LIB="$FRIBIDI_LIB $ALL_LIB"
-
dnl ---------------------------------------------------------------------
dnl Look for libxml2 if SOS Server requested
dnl ---------------------------------------------------------------------
@@ -1899,6 +1860,47 @@
ALL_ENABLED="$WMS_LYR_ENABLED $WFS_LYR_ENABLED $SOS_SVR_ENABLED $XML2_ENABLED $CURL_ENABLED $ALL_ENABLED"
+
+dnl ---------------------------------------------------------------------------
+dnl Look for FriBidi if requested.
+dnl ---------------------------------------------------------------------------
+
+AC_MSG_CHECKING(if FriBidi support requested)
+
+AC_ARG_WITH(fribidi-config,
+[ --with-fribidi-config[[=ARG]] Include FriBidi Support (ARG=yes/path to
+ fribidi-config)],,)
+
+if test "$with_fribidi_config" = "no" -o "$with_fribidi_config" = "" ; then
+ AC_MSG_RESULT(no)
+ FRIBIDI_CONFIG="no"
+elif test "$with_fribidi_config" = "yes" ; then
+ AC_MSG_RESULT(yes)
+ AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
+else
+ FRIBIDI_CONFIG=$with_fribidi_config
+fi
+
+if test "$FRIBIDI_CONFIG" = "no" ; then
+ FRIBIDI_ENABLED=
+ FRIBIDI_INC=
+ FRIBIDI_LIB=
+else
+ AC_MSG_RESULT([yes, user supplied fribidi-config])
+ FRIBIDI_ENABLED=-DUSE_FRIBIDI
+ FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
+ FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
+fi
+
+AC_SUBST(FRIBIDI_ENABLED,$FRIBIDI_ENABLED)
+AC_SUBST(FRIBIDI_INC,$FRIBIDI_INC)
+AC_SUBST(FRIBIDI_LIB,$FRIBIDI_LIB)
+
+ALL_ENABLED="$FRIBIDI_ENABLED $ALL_ENABLED"
+ALL_INC="$FRIBIDI_INC $ALL_INC"
+ALL_LIB="$FRIBIDI_LIB $ALL_LIB"
+
+
dnl ---------------------------------------------------------------------
dnl Support for FastCGI enabled builds.
dnl ---------------------------------------------------------------------
More information about the mapserver-commits
mailing list