From 39c4afe129836b4a5e45c28b988de95b91021c73 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 27 Dec 2008 02:52:47 +0000 Subject: [PATCH] implemented qse_fio_chmod() for win32 and unix - on win32, it is a best effort implemention. - it gets the volume name from a handle and use SetFileAttributes(). fixed the problem of wrongly detecting objdump. - place AC_PROG_LIBTOOL after any AC_CHECK_TOOL. - otherwise, AC_PROG_LIBTOOL overrides the value of tools checked. --- qse/Makefile.in | 3 + qse/cmd/Makefile.in | 3 + qse/cmd/awk/Makefile.in | 3 + qse/cmd/lsp/Makefile.in | 3 + qse/cmd/tgp/Makefile.in | 3 + qse/configure | 1654 +++++++++++++++++++------------ qse/configure.ac | 20 +- qse/include/Makefile.in | 3 + qse/include/qse/Makefile.in | 3 + qse/include/qse/awk/Makefile.in | 3 + qse/include/qse/cmn/Makefile.in | 3 + qse/include/qse/cmn/fio.h | 62 +- qse/include/qse/lsp/Makefile.in | 3 + qse/include/qse/tgp/Makefile.in | 3 + qse/include/qse/utl/Makefile.in | 3 + qse/include/qse/utl/main.h | 4 +- qse/lib/Makefile.in | 3 + qse/lib/awk/Makefile.in | 3 + qse/lib/cmn/Makefile.am | 4 + qse/lib/cmn/Makefile.in | 6 +- qse/lib/cmn/fio.c | 196 +++- qse/lib/lsp/Makefile.in | 3 + qse/lib/tgp/Makefile.in | 3 + qse/lib/utl/Makefile.in | 3 + 24 files changed, 1322 insertions(+), 675 deletions(-) diff --git a/qse/Makefile.in b/qse/Makefile.in index bd481767..a1d1ca32 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -121,6 +121,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -131,7 +132,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index 8f0d7ba0..749187ae 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -99,6 +99,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -109,7 +110,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index 422e9b72..cca2c44b 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -132,6 +132,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -142,7 +143,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/cmd/lsp/Makefile.in b/qse/cmd/lsp/Makefile.in index ff3ba8b0..b513b148 100644 --- a/qse/cmd/lsp/Makefile.in +++ b/qse/cmd/lsp/Makefile.in @@ -114,6 +114,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -124,7 +125,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/cmd/tgp/Makefile.in b/qse/cmd/tgp/Makefile.in index 50015122..7b1c2d7d 100644 --- a/qse/cmd/tgp/Makefile.in +++ b/qse/cmd/tgp/Makefile.in @@ -113,6 +113,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -123,7 +124,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/configure b/qse/configure index a5e0b6d1..030e9df2 100755 --- a/qse/configure +++ b/qse/configure @@ -850,6 +850,15 @@ CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX +AR +RANLIB +OBJDUMP +NM +LD +GREP +RM +SED +CJ build build_cpu build_vendor @@ -858,13 +867,9 @@ host host_cpu host_vendor host_os -SED -GREP EGREP LN_S ECHO -AR -RANLIB DSYMUTIL NMEDIT CPP @@ -874,8 +879,8 @@ FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS -RM -CJ +WIN32_TRUE +WIN32_FALSE LIBM BUILD_MODE ENABLE_CXX_TRUE @@ -4051,6 +4056,968 @@ fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; 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_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +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_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; 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_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +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_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_AR" = x; then + AR="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +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_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; 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_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +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_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +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_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +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_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; 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_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +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_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; 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_prog_ac_ct_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +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_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. +set dummy ${ac_tool_prefix}nm; 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_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NM"; then + ac_cv_prog_NM="$NM" # Let the user override the test. +else +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_prog_NM="${ac_tool_prefix}nm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +NM=$ac_cv_prog_NM +if test -n "$NM"; then + { echo "$as_me:$LINENO: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NM"; then + ac_ct_NM=$NM + # Extract the first word of "nm", so it can be a program name with args. +set dummy nm; 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_prog_ac_ct_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NM"; then + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. +else +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_prog_ac_ct_NM="nm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_NM=$ac_cv_prog_ac_ct_NM +if test -n "$ac_ct_NM"; then + { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5 +echo "${ECHO_T}$ac_ct_NM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_NM" = x; then + NM="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NM=$ac_ct_NM + fi +else + NM="$ac_cv_prog_NM" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; 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_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else +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_prog_LD="${ac_tool_prefix}ld" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +LD=$ac_cv_prog_LD +if test -n "$LD"; then + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; 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_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. +else +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_prog_ac_ct_LD="ld" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 +echo "${ECHO_T}$ac_ct_LD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_LD" = x; then + LD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + LD=$ac_ct_LD + fi +else + LD="$ac_cv_prog_LD" +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}grep", so it can be a program name with args. +set dummy ${ac_tool_prefix}grep; 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_prog_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GREP"; then + ac_cv_prog_GREP="$GREP" # Let the user override the test. +else +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_prog_GREP="${ac_tool_prefix}grep" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + { echo "$as_me:$LINENO: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GREP"; then + ac_ct_GREP=$GREP + # Extract the first word of "grep", so it can be a program name with args. +set dummy grep; 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_prog_ac_ct_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_GREP"; then + ac_cv_prog_ac_ct_GREP="$ac_ct_GREP" # Let the user override the test. +else +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_prog_ac_ct_GREP="grep" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_GREP=$ac_cv_prog_ac_ct_GREP +if test -n "$ac_ct_GREP"; then + { echo "$as_me:$LINENO: result: $ac_ct_GREP" >&5 +echo "${ECHO_T}$ac_ct_GREP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_GREP" = x; then + GREP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + GREP=$ac_ct_GREP + fi +else + GREP="$ac_cv_prog_GREP" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args. +set dummy ${ac_tool_prefix}rm; 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_prog_RM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RM"; then + ac_cv_prog_RM="$RM" # Let the user override the test. +else +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_prog_RM="${ac_tool_prefix}rm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RM=$ac_cv_prog_RM +if test -n "$RM"; then + { echo "$as_me:$LINENO: result: $RM" >&5 +echo "${ECHO_T}$RM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RM"; then + ac_ct_RM=$RM + # Extract the first word of "rm", so it can be a program name with args. +set dummy rm; 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_prog_ac_ct_RM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RM"; then + ac_cv_prog_ac_ct_RM="$ac_ct_RM" # Let the user override the test. +else +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_prog_ac_ct_RM="rm" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RM=$ac_cv_prog_ac_ct_RM +if test -n "$ac_ct_RM"; then + { echo "$as_me:$LINENO: result: $ac_ct_RM" >&5 +echo "${ECHO_T}$ac_ct_RM" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_RM" = x; then + RM="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RM=$ac_ct_RM + fi +else + RM="$ac_cv_prog_RM" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}sed", so it can be a program name with args. +set dummy ${ac_tool_prefix}sed; 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_prog_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$SED"; then + ac_cv_prog_SED="$SED" # Let the user override the test. +else +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_prog_SED="${ac_tool_prefix}sed" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +SED=$ac_cv_prog_SED +if test -n "$SED"; then + { echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_SED"; then + ac_ct_SED=$SED + # Extract the first word of "sed", so it can be a program name with args. +set dummy sed; 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_prog_ac_ct_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_SED"; then + ac_cv_prog_ac_ct_SED="$ac_ct_SED" # Let the user override the test. +else +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_prog_ac_ct_SED="sed" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_SED=$ac_cv_prog_ac_ct_SED +if test -n "$ac_ct_SED"; then + { echo "$as_me:$LINENO: result: $ac_ct_SED" >&5 +echo "${ECHO_T}$ac_ct_SED" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_SED" = x; then + SED="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + SED=$ac_ct_SED + fi +else + SED="$ac_cv_prog_SED" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcj; 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_prog_CJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CJ"; then + ac_cv_prog_CJ="$CJ" # Let the user override the test. +else +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_prog_CJ="${ac_tool_prefix}gcj" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CJ=$ac_cv_prog_CJ +if test -n "$CJ"; then + { echo "$as_me:$LINENO: result: $CJ" >&5 +echo "${ECHO_T}$CJ" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CJ"; then + ac_ct_CJ=$CJ + # Extract the first word of "gcj", so it can be a program name with args. +set dummy gcj; 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_prog_ac_ct_CJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CJ"; then + ac_cv_prog_ac_ct_CJ="$ac_ct_CJ" # Let the user override the test. +else +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_prog_ac_ct_CJ="gcj" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CJ=$ac_cv_prog_ac_ct_CJ +if test -n "$ac_ct_CJ"; then + { echo "$as_me:$LINENO: result: $ac_ct_CJ" >&5 +echo "${ECHO_T}$ac_ct_CJ" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_CJ" = x; then + CJ="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CJ=$ac_ct_CJ + fi +else + CJ="$ac_cv_prog_CJ" +fi + + # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; p=${PACKAGE-default} @@ -4859,7 +5826,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4862 "configure"' > conftest.$ac_ext + echo '#line 5829 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7444,11 +8411,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8414: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7451: \$? = $ac_status" >&5 + echo "$as_me:8418: \$? = $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 other than the usual output. @@ -7734,11 +8701,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7737: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8704: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7741: \$? = $ac_status" >&5 + echo "$as_me:8708: \$? = $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 other than the usual output. @@ -7838,11 +8805,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7841: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8808: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7845: \$? = $ac_status" >&5 + echo "$as_me:8812: \$? = $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 @@ -10215,7 +11182,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13686: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12723: \$? = $ac_status" >&5 + echo "$as_me:13690: \$? = $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 other than the usual output. @@ -12820,11 +13787,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12823: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13790: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12827: \$? = $ac_status" >&5 + echo "$as_me:13794: \$? = $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 @@ -14418,11 +15385,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14421: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15388: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14425: \$? = $ac_status" >&5 + echo "$as_me:15392: \$? = $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 other than the usual output. @@ -14522,11 +15489,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14525: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15492: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14529: \$? = $ac_status" >&5 + echo "$as_me:15496: \$? = $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 @@ -16742,11 +17709,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16745: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17712: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16749: \$? = $ac_status" >&5 + echo "$as_me:17716: \$? = $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 other than the usual output. @@ -17032,11 +17999,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17035: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18002: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17039: \$? = $ac_status" >&5 + echo "$as_me:18006: \$? = $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 other than the usual output. @@ -17136,11 +18103,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17139: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18106: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17143: \$? = $ac_status" >&5 + echo "$as_me:18110: \$? = $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 @@ -19826,584 +20793,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -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_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; 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_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -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_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; 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_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -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_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; 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_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -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_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}grep", so it can be a program name with args. -set dummy ${ac_tool_prefix}grep; 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_prog_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GREP"; then - ac_cv_prog_GREP="$GREP" # Let the user override the test. -else -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_prog_GREP="${ac_tool_prefix}grep" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -GREP=$ac_cv_prog_GREP -if test -n "$GREP"; then - { echo "$as_me:$LINENO: result: $GREP" >&5 -echo "${ECHO_T}$GREP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_GREP"; then - ac_ct_GREP=$GREP - # Extract the first word of "grep", so it can be a program name with args. -set dummy grep; 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_prog_ac_ct_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_GREP"; then - ac_cv_prog_ac_ct_GREP="$ac_ct_GREP" # Let the user override the test. -else -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_prog_ac_ct_GREP="grep" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_GREP=$ac_cv_prog_ac_ct_GREP -if test -n "$ac_ct_GREP"; then - { echo "$as_me:$LINENO: result: $ac_ct_GREP" >&5 -echo "${ECHO_T}$ac_ct_GREP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_GREP" = x; then - GREP="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - GREP=$ac_ct_GREP - fi -else - GREP="$ac_cv_prog_GREP" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args. -set dummy ${ac_tool_prefix}rm; 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_prog_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RM"; then - ac_cv_prog_RM="$RM" # Let the user override the test. -else -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_prog_RM="${ac_tool_prefix}rm" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RM=$ac_cv_prog_RM -if test -n "$RM"; then - { echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RM"; then - ac_ct_RM=$RM - # Extract the first word of "rm", so it can be a program name with args. -set dummy rm; 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_prog_ac_ct_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RM"; then - ac_cv_prog_ac_ct_RM="$ac_ct_RM" # Let the user override the test. -else -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_prog_ac_ct_RM="rm" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RM=$ac_cv_prog_ac_ct_RM -if test -n "$ac_ct_RM"; then - { echo "$as_me:$LINENO: result: $ac_ct_RM" >&5 -echo "${ECHO_T}$ac_ct_RM" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RM" = x; then - RM="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RM=$ac_ct_RM - fi -else - RM="$ac_cv_prog_RM" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}sed", so it can be a program name with args. -set dummy ${ac_tool_prefix}sed; 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_prog_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$SED"; then - ac_cv_prog_SED="$SED" # Let the user override the test. -else -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_prog_SED="${ac_tool_prefix}sed" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -SED=$ac_cv_prog_SED -if test -n "$SED"; then - { echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_SED"; then - ac_ct_SED=$SED - # Extract the first word of "sed", so it can be a program name with args. -set dummy sed; 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_prog_ac_ct_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_SED"; then - ac_cv_prog_ac_ct_SED="$ac_ct_SED" # Let the user override the test. -else -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_prog_ac_ct_SED="sed" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_SED=$ac_cv_prog_ac_ct_SED -if test -n "$ac_ct_SED"; then - { echo "$as_me:$LINENO: result: $ac_ct_SED" >&5 -echo "${ECHO_T}$ac_ct_SED" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_SED" = x; then - SED="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - SED=$ac_ct_SED - fi -else - SED="$ac_cv_prog_SED" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcj; 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_prog_CJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CJ"; then - ac_cv_prog_CJ="$CJ" # Let the user override the test. -else -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_prog_CJ="${ac_tool_prefix}gcj" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CJ=$ac_cv_prog_CJ -if test -n "$CJ"; then - { echo "$as_me:$LINENO: result: $CJ" >&5 -echo "${ECHO_T}$CJ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CJ"; then - ac_ct_CJ=$CJ - # Extract the first word of "gcj", so it can be a program name with args. -set dummy gcj; 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_prog_ac_ct_CJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CJ"; then - ac_cv_prog_ac_ct_CJ="$ac_ct_CJ" # Let the user override the test. -else -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_prog_ac_ct_CJ="gcj" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CJ=$ac_cv_prog_ac_ct_CJ -if test -n "$ac_ct_CJ"; then - { echo "$as_me:$LINENO: result: $ac_ct_CJ" >&5 -echo "${ECHO_T}$ac_ct_CJ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CJ" = x; then - CJ="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CJ=$ac_ct_CJ - fi -else - CJ="$ac_cv_prog_CJ" -fi #if test "$ac_test_CFLAGS" = "set" @@ -20445,6 +20834,20 @@ fi CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" +case "$host" in +*-*-mingw*|*-*-cygwin*) + #CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0400" + platform_win32=yes +esac + if test "${platform_win32}" = "yes" ; then + WIN32_TRUE= + WIN32_FALSE='#' +else + WIN32_TRUE='#' + WIN32_FALSE= +fi + + LIBM= case $host in *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) @@ -28565,6 +28968,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ENABLE_CXX_TRUE}" && test -z "${ENABLE_CXX_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ENABLE_CXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -29203,21 +29613,21 @@ CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim HAVE_CXX!$HAVE_CXX$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +NM!$NM$ac_delim +LD!$LD$ac_delim +GREP!$GREP$ac_delim +RM!$RM$ac_delim +SED!$SED$ac_delim +CJ!$CJ$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim host!$host$ac_delim host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LN_S!$LN_S$ac_delim -ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -29259,6 +29669,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim DSYMUTIL!$DSYMUTIL$ac_delim NMEDIT!$NMEDIT$ac_delim CPP!$CPP$ac_delim @@ -29268,8 +29683,8 @@ FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim -RM!$RM$ac_delim -CJ!$CJ$ac_delim +WIN32_TRUE!$WIN32_TRUE$ac_delim +WIN32_FALSE!$WIN32_FALSE$ac_delim LIBM!$LIBM$ac_delim BUILD_MODE!$BUILD_MODE$ac_delim ENABLE_CXX_TRUE!$ENABLE_CXX_TRUE$ac_delim @@ -29286,7 +29701,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -29891,6 +30306,7 @@ echo echo "-[SUMMARY]---------------------------------------------------------------" echo "Configured for ${host}" echo " Build mode : ${BUILD_MODE}" +echo " Source directory: ${srcdir}" echo " Installation directory: ${prefix}" echo " C compiler: ${CC} ${CFLAGS}" echo " C++ compiler: ${CXX} ${CXXFLAGS}" diff --git a/qse/configure.ac b/qse/configure.ac index 7a73dde2..6b1757dc 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -18,17 +18,21 @@ AC_PROG_CXX dnl checks if the C++ compiler exists in PATH. AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) -AC_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) - -AC_CHECK_TOOL(RANLIB, ranlib) AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib) +AC_CHECK_TOOL(STRIP, strip) +AC_CHECK_TOOL(OBJDUMP, objdump) +AC_CHECK_TOOL(NM, nm) +AC_CHECK_TOOL(LD, ld) AC_CHECK_TOOL(GREP, grep) AC_CHECK_TOOL(RM, rm) AC_CHECK_TOOL(SED, sed) AC_CHECK_TOOL(CJ, gcj) +AC_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) + dnl overrides the default CFLAGS setting #if test "$ac_test_CFLAGS" = "set" #then @@ -70,6 +74,13 @@ dnl make visible the 64bit interface to the file system CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" +case "$host" in +*-*-mingw*|*-*-cygwin*) + #CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0400" + platform_win32=yes +esac +AM_CONDITIONAL(WIN32, test "${platform_win32}" = "yes" ) + dnl Checks for the math library (is -lm needed?) AC_CHECK_LIBM AC_SUBST(LIBM, $LIBM) @@ -327,6 +338,7 @@ echo echo "-[SUMMARY]---------------------------------------------------------------" echo "Configured for ${host}" echo " Build mode : ${BUILD_MODE}" +echo " Source directory: ${srcdir}" echo " Installation directory: ${prefix}" echo " C compiler: ${CC} ${CFLAGS}" echo " C++ compiler: ${CXX} ${CXXFLAGS}" diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index 36748cbe..bb08619f 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -102,6 +102,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -112,7 +113,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index 18b1b092..17dfa6b1 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -111,6 +111,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -121,7 +122,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index 27567878..40dc02e9 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -103,6 +103,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -113,7 +114,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index e178f32a..d48282c1 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -101,6 +101,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -111,7 +112,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/cmn/fio.h b/qse/include/qse/cmn/fio.h index 26b140f6..1e1dd704 100644 --- a/qse/include/qse/cmn/fio.h +++ b/qse/include/qse/cmn/fio.h @@ -11,20 +11,22 @@ enum qse_fio_open_flag_t { /* treat the file name pointer as a handle pointer */ - QSE_FIO_HANDLE = (1 << 0), + QSE_FIO_HANDLE = (1 << 0), - QSE_FIO_READ = (1 << 1), - QSE_FIO_WRITE = (1 << 2), - QSE_FIO_APPEND = (1 << 3), + QSE_FIO_READ = (1 << 1), + QSE_FIO_WRITE = (1 << 2), + QSE_FIO_APPEND = (1 << 3), - QSE_FIO_CREATE = (1 << 4), - QSE_FIO_TRUNCATE = (1 << 5), - QSE_FIO_EXCLUSIVE = (1 << 6), - QSE_FIO_SYNC = (1 << 7), + QSE_FIO_CREATE = (1 << 4), + QSE_FIO_TRUNCATE = (1 << 5), + QSE_FIO_EXCLUSIVE = (1 << 6), + QSE_FIO_SYNC = (1 << 7), - /* for ms windows only */ - QSE_FIO_NOSHRD = (1 << 16), - QSE_FIO_NOSHWR = (1 << 17) + /* for WIN32 only. harmless(no effect) when used on other platforms */ + QSE_FIO_NOSHRD = (1 << 16), + QSE_FIO_NOSHWR = (1 << 17), + QSE_FIO_RANDOM = (1 << 18), /* hint that access be random */ + QSE_FIO_SEQUENTIAL = (1 << 19) /* hint that access is sequential */ }; /* seek origin */ @@ -35,9 +37,25 @@ enum qse_fio_seek_origin_t QSE_FIO_END = 2 }; +enum qse_fio_mode_t +{ + QSE_FIO_SUID = 04000, /* set UID */ + QSE_FIO_SGID = 02000, /* set GID */ + QSE_FIO_SVTX = 01000, /* sticky bit */ + QSE_FIO_RUSR = 00400, /* can be read by owner */ + QSE_FIO_WUSR = 00200, /* can be written by owner */ + QSE_FIO_XUSR = 00100, /* can be executed by owner */ + QSE_FIO_RGRP = 00040, /* can be read by group */ + QSE_FIO_WGRP = 00020, /* can be written by group */ + QSE_FIO_XGRP = 00010, /* can be executed by group */ + QSE_FIO_ROTH = 00004, /* can be read by others */ + QSE_FIO_WOTH = 00002, /* can be written by others */ + QSE_FIO_XOTH = 00001 /* can be executed by others */ +}; + #ifdef _WIN32 -/* typedef PVOID HANDLE; */ -typedef void* qse_fio_hnd_t; +/* => typedef PVOID HANDLE; */ +typedef void* qse_fio_hnd_t; #else typedef int qse_fio_hnd_t; #endif @@ -66,9 +84,9 @@ extern "C" { * qse_fio_open - open a file * * DESCRIPTION - * To open a file, you should set the flags with at least one of + * To open a file, you should set the flags with at least one of * QSE_FIO_READ, QSE_FIO_WRITE, QSE_FIO_APPEND. - * + * * SYNOPSIS */ qse_fio_t* qse_fio_open ( @@ -83,7 +101,7 @@ qse_fio_t* qse_fio_open ( /****f* qse.fio/qse_fio_close * NAME * qse_fio_close - close a file - * + * * SYNOPSIS */ void qse_fio_close ( @@ -108,7 +126,7 @@ qse_fio_hnd_t qse_fio_gethandle ( ); /****f* qse.cmn.fio/qse_fio_sethandle - * SYNOPSIS + * NAME * qse_fio_sethandle - set the file handle * WARNING * Avoid using this function if you don't know what you are doing. @@ -145,6 +163,16 @@ qse_ssize_t qse_fio_write ( qse_size_t size ); +/****f* qse.cmn.fio/qse_fio_chmod + * NAME + * ase_fio_chmod - change the file mode + * SYNOPSIS + */ +int qse_fio_chmod ( + qse_fio_t* fio, + int mode +); + #ifdef __cplusplus } #endif diff --git a/qse/include/qse/lsp/Makefile.in b/qse/include/qse/lsp/Makefile.in index c57dfbea..0b6695e7 100644 --- a/qse/include/qse/lsp/Makefile.in +++ b/qse/include/qse/lsp/Makefile.in @@ -101,6 +101,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -111,7 +112,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/tgp/Makefile.in b/qse/include/qse/tgp/Makefile.in index bb9a17a6..c0035c44 100644 --- a/qse/include/qse/tgp/Makefile.in +++ b/qse/include/qse/tgp/Makefile.in @@ -101,6 +101,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -111,7 +112,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/utl/Makefile.in b/qse/include/qse/utl/Makefile.in index bfed0337..93826868 100644 --- a/qse/include/qse/utl/Makefile.in +++ b/qse/include/qse/utl/Makefile.in @@ -101,6 +101,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -111,7 +112,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/include/qse/utl/main.h b/qse/include/qse/utl/main.h index 3d54011f..18af440f 100644 --- a/qse/include/qse/utl/main.h +++ b/qse/include/qse/utl/main.h @@ -1,6 +1,6 @@ /* * $Id: main.h 463 2008-12-09 06:52:03Z baconevi $ - * + * * {License} */ @@ -28,7 +28,7 @@ extern "C" { #endif int qse_runmain (int argc, qse_achar_t* argv[], int(*mf) (int,qse_char_t*[])); -/* TODO - qse_runmain with env */ +/* TODO - qse_runmain with env, namely, qse_runmaine */ #ifdef __cplusplus } diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index d88b683f..52c92420 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -99,6 +99,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -109,7 +110,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index 292b1b24..4b81213c 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -138,6 +138,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -148,7 +149,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index 9c990743..5a429052 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -11,3 +11,7 @@ libqsecmn_la_SOURCES = mem.h chr.h \ misc.c libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined +if WIN32 +libqsecmn_la_LIBADD = -lpsapi +endif + diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index b8200e3a..518611c5 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -50,7 +50,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libqsecmn_la_LIBADD = +libqsecmn_la_DEPENDENCIES = am_libqsecmn_la_OBJECTS = mem.lo chr.lo chr_cnv.lo rex.lo str_bas.lo \ str_cnv.lo str_dyn.lo lda.lo map.lo sll.lo dll.lo opt.lo \ fio.lo sio.lo tio.lo tio_get.lo tio_put.lo time.lo misc.lo @@ -120,6 +120,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -130,7 +131,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -208,6 +211,7 @@ libqsecmn_la_SOURCES = mem.h chr.h \ misc.c libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined +@WIN32_TRUE@libqsecmn_la_LIBADD = -lpsapi all: all-am .SUFFIXES: diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index 1ef7bef2..e30f7d07 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -7,6 +7,8 @@ #ifdef _WIN32 #include +#include +#include #else #include #include @@ -19,7 +21,7 @@ #endif qse_fio_t* qse_fio_open ( - qse_mmgr_t* mmgr, qse_size_t ext, + qse_mmgr_t* mmgr, qse_size_t ext, const qse_char_t* path, int flags, int mode) { qse_fio_t* fio; @@ -31,7 +33,7 @@ qse_fio_t* qse_fio_open ( QSE_ASSERTX (mmgr != QSE_NULL, "Set the memory manager with QSE_MMGR_SETDFL()"); - if (mmgr == QSE_NULL) return QSE_NULL; + if (mmgr == QSE_NULL) return QSE_NULL; } fio = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_fio_t) + ext); @@ -71,11 +73,11 @@ qse_fio_t* qse_fio_init ( DWORD desired_access = 0; DWORD share_mode = FILE_SHARE_READ | FILE_SHARE_WRITE; DWORD creation_disposition = 0; - DWORD attributes = FILE_ATTRIBUTE_NORMAL; + DWORD flag_and_attr = FILE_ATTRIBUTE_NORMAL; - if (flags & QSE_FIO_APPEND) + if (flags & QSE_FIO_APPEND) { - /* this is not officialy documented for CreateFile. + /* this is not officially documented for CreateFile. * ZwCreateFile (kernel) seems to document it */ desired_access |= FILE_APPEND_DATA; } @@ -86,41 +88,52 @@ qse_fio_t* qse_fio_init ( desired_access |= GENERIC_WRITE; } if (flags & QSE_FIO_READ) desired_access |= GENERIC_READ; - - if (flags & QSE_FIO_CREATE) + + if (flags & QSE_FIO_CREATE) { - creation_disposition = + creation_disposition = (flags & QSE_FIO_EXCLUSIVE)? CREATE_NEW: (flags & QSE_FIO_TRUNCATE)? CREATE_ALWAYS: OPEN_ALWAYS; } - else if (flags & QSE_FIO_TRUNCATE) + else if (flags & QSE_FIO_TRUNCATE) { creation_disposition = TRUNCATE_EXISTING; } else creation_disposition = OPEN_EXISTING; - - if (flags & QSE_FIO_NOSHRD) share_mode &= ~FILE_SHARE_READ; - if (flags & QSE_FIO_NOSHWR) share_mode &= ~FILE_SHARE_WRITE; - if (flags & QSE_FIO_SYNC) attributes |= FILE_FLAG_WRITE_THROUGH; - /* TODO: handle mode... set attribuets */ - handle = CreateFile (path, - desired_access, share_mode, QSE_NULL, - creation_disposition, attributes, 0); + if (flags & QSE_FIO_NOSHRD) + share_mode &= ~FILE_SHARE_READ; + if (flags & QSE_FIO_NOSHWR) + share_mode &= ~FILE_SHARE_WRITE; + + if (!(mode & QSE_FIO_WUSR)) + flag_and_attr = FILE_ATTRIBUTE_READONLY; + if (flags & QSE_FIO_SYNC) + flag_and_attr |= FILE_FLAG_WRITE_THROUGH; + + /* these two are just hints to OS */ + if (flags & QSE_FIO_RANDOM) + flag_and_attr |= FILE_FLAG_RANDOM_ACCESS; + if (flags & QSE_FIO_SEQUENTIAL) + flag_and_attr |= FILE_FLAG_SEQUENTIAL_SCAN; + + handle = CreateFile (path, + desired_access, share_mode, QSE_NULL, + creation_disposition, flag_and_attr, 0); } if (handle == INVALID_HANDLE_VALUE) return QSE_NULL; { DWORD file_type = GetFileType(handle); - if (file_type == FILE_TYPE_UNKNOWN) + if (file_type == FILE_TYPE_UNKNOWN) { CloseHandle (handle); return QSE_NULL; } } - /* TODO: a lot more */ + /* TODO: support more features on WIN32 - TEMPORARY, DELETE_ON_CLOSE */ #else if (flags & QSE_FIO_HANDLE) @@ -134,7 +147,7 @@ qse_fio_t* qse_fio_init ( const qse_mchar_t* path_mb = path; #else qse_mchar_t path_mb[PATH_MAX + 1]; - if (qse_wcstombs_strict (path, + if (qse_wcstombs_strict (path, path_mb, QSE_COUNTOF(path_mb)) == -1) return QSE_NULL; #endif /* @@ -143,7 +156,7 @@ qse_fio_t* qse_fio_init ( * wa -> WRONLY | APPEND * a -> WRONLY | APPEND */ - if (flags & QSE_FIO_APPEND) + if (flags & QSE_FIO_APPEND) { if ((flags & QSE_FIO_READ)) desired_access |= O_RDWR; else desired_access |= O_WRONLY; @@ -151,7 +164,7 @@ qse_fio_t* qse_fio_init ( } else { - if ((flags & QSE_FIO_READ) && + if ((flags & QSE_FIO_READ) && (flags & QSE_FIO_WRITE)) desired_access |= O_RDWR; else if (flags & QSE_FIO_READ) desired_access |= O_RDONLY; else if (flags & QSE_FIO_WRITE) desired_access |= O_WRONLY; @@ -208,27 +221,28 @@ qse_fio_off_t qse_fio_seek ( qse_fio_t* fio, qse_fio_off_t offset, qse_fio_ori_t origin) { #ifdef _WIN32 - static int seek_map[] = + static int seek_map[] = { FILE_BEGIN, FILE_CURRENT, - FILE_END + FILE_END }; LARGE_INTEGER x, y; QSE_ASSERT (AES_SIZEOF(offset) <= AES_SIZEOF(x.QuadPart)); x.QuadPart = offset; - if (SetFilePointerEx (fio->handle, x, &y, seek_map[origin]) == FALSE) + if (SetFilePointerEx (fio->handle, x, &y, seek_map[origin]) == FALSE) { return (qse_fio_off_t)-1; } return (qse_fio_off_t)y.QuadPart; - + /* x.QuadPart = offset; - x.LowPart = SetFilePointer (fio->handle, x.LowPart, &x.HighPart, seek_map[origin]); + x.LowPart = SetFilePointer ( + fio->handle, x.LowPart, &x.HighPart, seek_map[origin]); if (x.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { return (qse_fio_off_t)-1; @@ -238,7 +252,7 @@ qse_fio_off_t qse_fio_seek ( */ #else - static int seek_map[] = + static int seek_map[] = { SEEK_SET, SEEK_CUR, @@ -248,9 +262,9 @@ qse_fio_off_t qse_fio_seek ( #if !defined(_LP64) && defined(SYS__llseek) loff_t tmp; - if (syscall (SYS__llseek, fio->handle, + if (syscall (SYS__llseek, fio->handle, (unsigned long)(offset>>32), - (unsigned long)(offset&0xFFFFFFFFlu), + (unsigned long)(offset&0xFFFFFFFFlu), &tmp, seek_map[origin]) == -1) { @@ -281,7 +295,6 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size) return 0; #else - #if !defined(_LP64) && defined(SYS_ftruncate64) return syscall (SYS_ftruncate64, fio->handle, size); #elif defined(SYS_ftruncate) @@ -303,7 +316,7 @@ qse_ssize_t qse_fio_read (qse_fio_t* fio, void* buf, qse_size_t size) return (qse_ssize_t)count; #else if (size > QSE_TYPE_MAX(size_t)) size = QSE_TYPE_MAX(size_t); - #ifdef SYS_read + #ifdef SYS_read return syscall (SYS_read, fio->handle, buf, size); #else return read (fio->handle, buf, size); @@ -327,3 +340,122 @@ qse_ssize_t qse_fio_write (qse_fio_t* fio, const void* data, qse_size_t size) #endif #endif } + +#ifdef _WIN32 + +static int get_devname_from_handle ( + HANDLE handle, qse_char_t* buf, qse_size_t len) +{ + BOOL bSuccess = FALSE; + HANDLE map = NULL; + void* mem = NULL; + DWORD olen; + + /* create a file mapping object */ + map = CreateFileMapping ( + handle, + NULL, + PAGE_READONLY, + 0, + 1, + NULL + ); + if (map == NULL) return -1; + + /* create a file mapping to get the file name. */ + mem = MapViewOfFile (map, FILE_MAP_READ, 0, 0, 1); + if (mem == NULL) + { + CloseHandle (map); + return -1; + } + + olen = GetMappedFileName (GetCurrentProcess(), mem, buf, len); + if (olen == 0) + { + UnmapViewOfFile (mem); + CloseHandle (map); + return -1; + } + + UnmapViewOfFile (mem); + CloseHandle (map); + return 0; +} + +static int get_volname_from_handle ( + HANDLE handle, qse_char_t* buf, qse_size_t len) +{ + + if (get_devname_from_handle (handle, buf, len) == -1) return -1; + + if (_tcsnicmp(QSE_T("\\Device\\LanmanRedirector\\"), buf, 25) == 0) + { + buf[0] = QSE_T('\\'); + _tcscpy (&buf[1], &buf[24]); + } + else + { + DWORD n; + qse_char_t drives[128]; + + n = GetLogicalDriveStrings (QSE_COUNTOF(drives), drives); + + if (n == 0 /* error */ || + n > QSE_COUNTOF(drives) /* buffer small */) + { + return -1; + } + + while (n > 0) + { + qse_char_t drv[3]; + qse_char_t path[MAX_PATH]; + + drv[0] = drives[--n]; + drv[1] = QSE_T(':'); + drv[2] = QSE_T('\0'); + if (QueryDosDevice (drv, path, QSE_COUNTOF(path))) + { + qse_size_t pl = _tcslen(path); + qse_size_t bl = _tcslen(buf); + if (bl > pl && buf[pl] == QSE_T('\\') && + _tcsnicmp(path, buf, pl) == 0) + { + buf[0] = drv[0]; + buf[1] = QSE_T(':'); + _tcscpy (&buf[2], &buf[pl]); + break; + } + } + } + } + + /* if the match is not found, the device name is returned + * without translation */ + return 0; +} +#endif + +int qse_fio_chmod (qse_fio_t* fio, int mode) +{ +#ifdef _WIN32 + int flags = FILE_ATTRIBUTE_NORMAL; + qse_char_t name[MAX_PATH]; + + /* it is a best effort implementation. if the file size is 0, + * it can't even get the file name from the handle and thus fails. */ + + if (get_volname_from_handle ( + fio->handle, name, QSE_COUNTOF(name)) == -1) return -1; + + if (!(mode & QSE_FIO_WUSR)) flags = FILE_ATTRIBUTE_READONLY; + return (SetFileAttributes (name, flags) == FALSE)? -1: 0; +#else + #if defined(SYS_fchmod) + return syscall (SYS_fchmod, fio->handle, mode); + #else + return fchmod (fio->handle, mode); + #endif +#endif +} diff --git a/qse/lib/lsp/Makefile.in b/qse/lib/lsp/Makefile.in index 0c3adfbd..4a0f71be 100644 --- a/qse/lib/lsp/Makefile.in +++ b/qse/lib/lsp/Makefile.in @@ -120,6 +120,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -130,7 +131,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/lib/tgp/Makefile.in b/qse/lib/tgp/Makefile.in index aff4a9e8..73363b16 100644 --- a/qse/lib/tgp/Makefile.in +++ b/qse/lib/tgp/Makefile.in @@ -118,6 +118,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -128,7 +129,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/qse/lib/utl/Makefile.in b/qse/lib/utl/Makefile.in index 850fa122..47da86cd 100644 --- a/qse/lib/utl/Makefile.in +++ b/qse/lib/utl/Makefile.in @@ -118,6 +118,7 @@ JAR = @JAR@ JAR_PATH = @JAR_PATH@ JAVAC = @JAVAC@ JAVAC_PATH = @JAVAC_PATH@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ @@ -128,7 +129,9 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@