diff --git a/qse/Makefile.in b/qse/Makefile.in index 46448d5f..cbc614cb 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -100,6 +100,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -118,6 +119,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -141,6 +145,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index 9838e9de..e8038022 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -85,6 +85,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -103,6 +104,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -126,6 +130,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/cmd/awk/Awk.cpp b/qse/cmd/awk/Awk.cpp index cc6afd0b..c6e013a7 100644 --- a/qse/cmd/awk/Awk.cpp +++ b/qse/cmd/awk/Awk.cpp @@ -14,6 +14,7 @@ #include #else #include +#include #endif #if defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) @@ -689,6 +690,49 @@ static void print_usage (const qse_char_t* argv0) } } +TestAwk* app_awk = QSE_NULL; + +#ifdef _WIN32 +static BOOL WINAPI stop_run (DWORD ctrl_type) +{ + if (ctrl_type == CTRL_C_EVENT || + ctrl_type == CTRL_CLOSE_EVENT) + { + if (app_awk) app_awk->stop (); + return TRUE; + } + + return FALSE; +} +#else +static void stop_run (int sig) +{ + signal (SIGINT, SIG_IGN); + if (app_awk) app_awk->stop (); + signal (SIGINT, stop_run); +} +#endif + +static void set_intr_run (TestAwk* awk) +{ + app_awk = awk; +#ifdef _WIN32 + SetConsoleCtrlHandler (stop_run, TRUE); +#else + signal (SIGINT, stop_run); +#endif +} + +static void unset_intr_run () +{ + app_awk = QSE_NULL; +#ifdef _WIN32 + SetConsoleCtrlHandler (stop_run, FALSE); +#else + signal (SIGINT, SIG_DFL); +#endif +} + static int awk_main (int argc, qse_char_t* argv[]) { TestAwk awk; @@ -864,7 +908,6 @@ static int awk_main (int argc, qse_char_t* argv[]) return -1; } - if (awk.parse (srcin, srcout) == -1) { qse_fprintf (stderr, QSE_T("cannot parse: LINE[%d] %s\n"), @@ -875,6 +918,8 @@ static int awk_main (int argc, qse_char_t* argv[]) awk.enableRunCallback (); + + set_intr_run (&awk); if (awk.run (mainfn, args, nargs) == -1) { qse_fprintf (stderr, QSE_T("cannot run: LINE[%d] %s\n"), @@ -882,8 +927,10 @@ static int awk_main (int argc, qse_char_t* argv[]) awk.close (); return -1; } + unset_intr_run (); awk.close (); + return 0; } diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index 1717318e..97cc3ece 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -118,6 +118,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -136,6 +137,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -159,6 +163,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/cmd/lsp/Makefile.in b/qse/cmd/lsp/Makefile.in index 4a878436..9588e031 100644 --- a/qse/cmd/lsp/Makefile.in +++ b/qse/cmd/lsp/Makefile.in @@ -100,6 +100,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -118,6 +119,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -141,6 +145,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/cmd/tgp/Makefile.in b/qse/cmd/tgp/Makefile.in index ac708600..9b3a5ea0 100644 --- a/qse/cmd/tgp/Makefile.in +++ b/qse/cmd/tgp/Makefile.in @@ -99,6 +99,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -117,6 +118,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -140,6 +144,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/configure b/qse/configure index e4b225b1..995d6ce1 100755 --- a/qse/configure +++ b/qse/configure @@ -849,6 +849,13 @@ ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE +OBJC +OBJCFLAGS +ac_ct_OBJC +OBJCDEPMODE +am__fastdepOBJC_TRUE +am__fastdepOBJC_FALSE +HAVE_OBJC HAVE_CXX AR RANLIB @@ -882,6 +889,8 @@ WIN32_TRUE WIN32_FALSE LIBM BUILD_MODE +ENABLE_OBJC_TRUE +ENABLE_OBJC_FALSE ENABLE_CXX_TRUE ENABLE_CXX_FALSE LIBOBJS @@ -898,6 +907,8 @@ CPPFLAGS CXX CXXFLAGS CCC +OBJC +OBJCFLAGS CPP CXXCPP F77 @@ -1493,6 +1504,8 @@ Optional Features: --enable-syscall use the syscall() function to call system calls (default. no) --enable-debug build the library in the debug mode (default. no) + --enable-objc build the library for Objective-C if an Objective-C + compiler is available (default. yes) --enable-cxx build the library for C++ if a C++ compiler is available (default. yes) --enable-reentrant define _REENTRANT (default. yes) @@ -1515,6 +1528,8 @@ Some influential environment variables: you have headers in a nonstandard directory CXX C++ compiler command CXXFLAGS C++ compiler flags + OBJC Objective C compiler command + OBJCFLAGS Objective C compiler flags CPP C preprocessor CXXCPP C++ preprocessor F77 Fortran 77 compiler command @@ -4008,6 +4023,512 @@ fi +ac_ext=m +ac_cpp='$OBJCPP $CPPFLAGS' +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objc_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in gcc objcc objc cc CC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; 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_OBJC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$OBJC"; then + ac_cv_prog_OBJC="$OBJC" # 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_OBJC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +OBJC=$ac_cv_prog_OBJC +if test -n "$OBJC"; then + { echo "$as_me:$LINENO: result: $OBJC" >&5 +echo "${ECHO_T}$OBJC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$OBJC" && break + done +fi +if test -z "$OBJC"; then + ac_ct_OBJC=$OBJC + for ac_prog in gcc objcc objc cc CC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_OBJC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_OBJC"; then + ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # 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_OBJC="$ac_prog" + 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_OBJC=$ac_cv_prog_ac_ct_OBJC +if test -n "$ac_ct_OBJC"; then + { echo "$as_me:$LINENO: result: $ac_ct_OBJC" >&5 +echo "${ECHO_T}$ac_ct_OBJC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_OBJC" && break +done + + if test "x$ac_ct_OBJC" = x; then + OBJC="gcc" + 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 + OBJC=$ac_ct_OBJC + fi +fi + +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for Objective C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ echo "$as_me:$LINENO: checking whether we are using the GNU Objective C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Objective C compiler... $ECHO_C" >&6; } +if test "${ac_cv_objc_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_objc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_objc_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_objc_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_objc_compiler_gnu" >&6; } +GOBJC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_OBJCFLAGS=${OBJCFLAGS+set} +ac_save_OBJCFLAGS=$OBJCFLAGS +{ echo "$as_me:$LINENO: checking whether $OBJC accepts -g" >&5 +echo $ECHO_N "checking whether $OBJC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_objc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_objc_werror_flag=$ac_objc_werror_flag + ac_objc_werror_flag=yes + ac_cv_prog_objc_g=no + OBJCFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_objc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_objc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + OBJCFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_objc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_objc_werror_flag=$ac_save_objc_werror_flag + OBJCFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_objc_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_objc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_objc_werror_flag=$ac_save_objc_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_objc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_objc_g" >&6; } +if test "$ac_test_OBJCFLAGS" = set; then + OBJCFLAGS=$ac_save_OBJCFLAGS +elif test $ac_cv_prog_objc_g = yes; then + if test "$GOBJC" = yes; then + OBJCFLAGS="-g -O2" + else + OBJCFLAGS="-g" + fi +else + if test "$GOBJC" = yes; then + OBJCFLAGS="-O2" + else + OBJCFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$OBJC" am_compiler_list='gcc3 gcc' + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_OBJC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_OBJC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_OBJC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_OBJC_dependencies_compiler_type=none +fi + +fi +{ echo "$as_me:$LINENO: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_OBJC_dependencies_compiler_type" >&6; } +OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then + am__fastdepOBJC_TRUE= + am__fastdepOBJC_FALSE='#' +else + am__fastdepOBJC_TRUE='#' + am__fastdepOBJC_FALSE= +fi + + + +# Extract the first word of "$OBJC", so it can be a program name with args. +set dummy $OBJC; 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_HAVE_OBJC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$HAVE_OBJC"; then + ac_cv_prog_HAVE_OBJC="$HAVE_OBJC" # 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_HAVE_OBJC="yes" + 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_prog_HAVE_OBJC" && ac_cv_prog_HAVE_OBJC="no" +fi +fi +HAVE_OBJC=$ac_cv_prog_HAVE_OBJC +if test -n "$HAVE_OBJC"; then + { echo "$as_me:$LINENO: result: $HAVE_OBJC" >&5 +echo "${ECHO_T}$HAVE_OBJC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + # Extract the first word of "$CXX", so it can be a program name with args. set dummy $CXX; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -5720,7 +6241,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5723 "configure"' > conftest.$ac_ext + echo '#line 6244 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8305,11 +8826,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:8308: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8829: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8312: \$? = $ac_status" >&5 + echo "$as_me:8833: \$? = $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. @@ -8595,11 +9116,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:8598: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9119: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8602: \$? = $ac_status" >&5 + echo "$as_me:9123: \$? = $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. @@ -8699,11 +9220,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:8702: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9223: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8706: \$? = $ac_status" >&5 + echo "$as_me:9227: \$? = $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 @@ -11076,7 +11597,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:14101: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13584: \$? = $ac_status" >&5 + echo "$as_me:14105: \$? = $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. @@ -13681,11 +14202,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:13684: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14205: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13688: \$? = $ac_status" >&5 + echo "$as_me:14209: \$? = $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 @@ -15279,11 +15800,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:15282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15803: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15286: \$? = $ac_status" >&5 + echo "$as_me:15807: \$? = $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. @@ -15383,11 +15904,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:15386: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15907: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15390: \$? = $ac_status" >&5 + echo "$as_me:15911: \$? = $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 @@ -17603,11 +18124,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:17606: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18127: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17610: \$? = $ac_status" >&5 + echo "$as_me:18131: \$? = $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. @@ -17893,11 +18414,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:17896: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18417: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17900: \$? = $ac_status" >&5 + echo "$as_me:18421: \$? = $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. @@ -17997,11 +18518,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:18000: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18521: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18004: \$? = $ac_status" >&5 + echo "$as_me:18525: \$? = $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 @@ -20715,6 +21236,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' #fi CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" +OBJCFLAGS="$OBJCFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" case "$host" in @@ -28584,18 +29106,35 @@ fi if test "$enable_debug_is" = "yes" then CFLAGS="$CFLAGS -g -D_DEBUG -UNDEBUG" + OBJCFLAGS="$OBJCFLAGS -g -D_DEBUG -UNDEBUG" CXXFLAGS="$CXXFLAGS -g -D_DEBUG -UNDEBUG" - CJFLAGS="$CJFLAGS -g" BUILD_MODE="debug" else CFLAGS="$CFLAGS -DNDEBUG -U_DEBUG" + OBJCFLAGS="$OBJCFLAGS -DNDEBUG -U_DEBUG" CXXFLAGS="$CXXFLAGS -DNDEBUG -U_DEBUG" - CJFLAGS="$CJFLAGS" BUILD_MODE="release" fi +# Check whether --enable-objc was given. +if test "${enable_objc+set}" = set; then + enableval=$enable_objc; enable_objc_is=$enableval +else + enable_objc_is=yes +fi + +test "${HAVE_OBJC}" = "yes" || enable_objc_is="no" + if test "${enable_objc_is}" = "yes" ; then + ENABLE_OBJC_TRUE= + ENABLE_OBJC_FALSE='#' +else + ENABLE_OBJC_TRUE='#' + ENABLE_OBJC_FALSE= +fi + + # Check whether --enable-cxx was given. if test "${enable_cxx+set}" = set; then enableval=$enable_cxx; enable_cxx_is=$enableval @@ -28624,6 +29163,7 @@ fi if test "$enable_reentrant_is" = "yes" then CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE" + OBJCFLAGS="$OBJCFLAGS -D_REENTRANT -D_THREAD_SAFE" CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE" fi @@ -28746,6 +29286,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 "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepOBJC\" 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 @@ -28753,6 +29300,13 @@ 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_OBJC_TRUE}" && test -z "${ENABLE_OBJC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_OBJC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_OBJC\" 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 @@ -29392,6 +29946,13 @@ ac_ct_CXX!$ac_ct_CXX$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +OBJC!$OBJC$ac_delim +OBJCFLAGS!$OBJCFLAGS$ac_delim +ac_ct_OBJC!$ac_ct_OBJC$ac_delim +OBJCDEPMODE!$OBJCDEPMODE$ac_delim +am__fastdepOBJC_TRUE!$am__fastdepOBJC_TRUE$ac_delim +am__fastdepOBJC_FALSE!$am__fastdepOBJC_FALSE$ac_delim +HAVE_OBJC!$HAVE_OBJC$ac_delim HAVE_CXX!$HAVE_CXX$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim @@ -29401,13 +29962,6 @@ LD!$LD$ac_delim GREP!$GREP$ac_delim RM!$RM$ac_delim SED!$SED$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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -29449,6 +30003,13 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim @@ -29466,13 +30027,15 @@ WIN32_TRUE!$WIN32_TRUE$ac_delim WIN32_FALSE!$WIN32_FALSE$ac_delim LIBM!$LIBM$ac_delim BUILD_MODE!$BUILD_MODE$ac_delim +ENABLE_OBJC_TRUE!$ENABLE_OBJC_TRUE$ac_delim +ENABLE_OBJC_FALSE!$ENABLE_OBJC_FALSE$ac_delim ENABLE_CXX_TRUE!$ENABLE_CXX_TRUE$ac_delim ENABLE_CXX_FALSE!$ENABLE_CXX_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; 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 @@ -30080,6 +30643,7 @@ echo " Build mode : ${BUILD_MODE}" echo " Source directory: ${srcdir}" echo " Installation directory: ${prefix}" echo " C compiler: ${CC} ${CFLAGS}" +echo " Objective-C compiler: ${OBJC} ${OBJCFLAGS}" echo " C++ compiler: ${CXX} ${CXXFLAGS}" echo " C++ support: ${enable_cxx_is}" echo " Wide character: ${enable_wchar_is}" diff --git a/qse/configure.ac b/qse/configure.ac index 7a8aedf7..14cb3b8e 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -15,6 +15,12 @@ AC_PROG_CC dnl determine a C++ compiler to use AC_PROG_CXX +dnl determine an Objective-C compiler to use +AC_PROG_OBJC + +dnl check if the Objective-C compiler exists in PATH. +AC_CHECK_PROG(HAVE_OBJC, $OBJC, yes, no) + dnl check if the C++ compiler exists in PATH. AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) @@ -60,6 +66,7 @@ AC_SUBST(LIBTOOL_DEPS) dnl make visible the 64-bit interface to the file system CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" +OBJCFLAGS="$OBJCFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" dnl define the WIN32 conditional if necessary @@ -170,16 +177,22 @@ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug], if test "$enable_debug_is" = "yes" then [CFLAGS="$CFLAGS -g -D_DEBUG -UNDEBUG"] + [OBJCFLAGS="$OBJCFLAGS -g -D_DEBUG -UNDEBUG"] [CXXFLAGS="$CXXFLAGS -g -D_DEBUG -UNDEBUG"] - [CJFLAGS="$CJFLAGS -g"] AC_SUBST(BUILD_MODE, "debug") else [CFLAGS="$CFLAGS -DNDEBUG -U_DEBUG"] + [OBJCFLAGS="$OBJCFLAGS -DNDEBUG -U_DEBUG"] [CXXFLAGS="$CXXFLAGS -DNDEBUG -U_DEBUG"] - [CJFLAGS="$CJFLAGS"] AC_SUBST(BUILD_MODE, "release") fi +AC_ARG_ENABLE([objc], [AC_HELP_STRING([--enable-objc], + [build the library for Objective-C if an Objective-C compiler is available (default. yes)])], + enable_objc_is=$enableval,enable_objc_is=yes) +[test "${HAVE_OBJC}" = "yes" || enable_objc_is="no"] +AM_CONDITIONAL(ENABLE_OBJC, test "${enable_objc_is}" = "yes" ) + AC_ARG_ENABLE([cxx], [AC_HELP_STRING([--enable-cxx], [build the library for C++ if a C++ compiler is available (default. yes)])], enable_cxx_is=$enableval,enable_cxx_is=yes) @@ -193,6 +206,7 @@ AC_ARG_ENABLE([reentrant], [AC_HELP_STRING([--enable-reentrant], if test "$enable_reentrant_is" = "yes" then [CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"] + [OBJCFLAGS="$OBJCFLAGS -D_REENTRANT -D_THREAD_SAFE"] [CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE"] fi @@ -228,6 +242,7 @@ echo " Build mode : ${BUILD_MODE}" echo " Source directory: ${srcdir}" echo " Installation directory: ${prefix}" echo " C compiler: ${CC} ${CFLAGS}" +echo " Objective-C compiler: ${OBJC} ${OBJCFLAGS}" echo " C++ compiler: ${CXX} ${CXXFLAGS}" echo " C++ support: ${enable_cxx_is}" echo " Wide character: ${enable_wchar_is}" diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index 4a345373..80db8b83 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -88,6 +88,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -106,6 +107,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -129,6 +133,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index bf117810..2b3c1bec 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -97,6 +97,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -115,6 +116,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -138,6 +142,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/awk/Awk.hpp b/qse/include/qse/awk/Awk.hpp index 53189725..25bcda3c 100644 --- a/qse/include/qse/awk/Awk.hpp +++ b/qse/include/qse/awk/Awk.hpp @@ -226,20 +226,10 @@ public: const void* getHandle () const; void setHandle (void* handle); - Awk* getAwk (); - const Awk* getAwk() const; - - /** - * Returns the underlying extio_t handle - */ - const extio_t* getRawExtio () const; - - /** - * Returns the underlying run_t handle associated - * with the underlying extio_t handle - */ - const run_t* getRawRun () const; - const awk_t* getRawAwk () const; + operator Awk* () const; + operator awk_t* () const; + operator extio_t* () const; + operator run_t* () const; protected: extio_t* extio; @@ -384,11 +374,7 @@ public: qse_long_t inum; qse_real_t rnum; - mutable struct - { - char_t* ptr; - size_t len; - } str; + mutable qse_str_t str; }; /** @@ -745,14 +731,13 @@ public: */ int getGlobal (int id, Argument& global) const; - /** - * Sets a value into the data data area + * Sets a value into the data field */ void setData (void* data); /** - * Gets the value stored in the data data area + * Gets the value stored in the data field */ void* getData () const; @@ -793,7 +778,7 @@ public: return qse_awk_getmmgr (awk); } - ccls_t* getCcls() + ccls_t* getCcls() { return qse_awk_getccls (awk); } diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index e0719d0f..e41de781 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -89,6 +89,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -107,6 +108,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -130,6 +134,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index 84aace72..288ac71d 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -87,6 +87,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -105,6 +106,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -128,6 +132,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/lsp/Makefile.in b/qse/include/qse/lsp/Makefile.in index 1dd7ff53..e3aef317 100644 --- a/qse/include/qse/lsp/Makefile.in +++ b/qse/include/qse/lsp/Makefile.in @@ -87,6 +87,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -105,6 +106,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -128,6 +132,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/tgp/Makefile.in b/qse/include/qse/tgp/Makefile.in index 4124fa92..4fdfd070 100644 --- a/qse/include/qse/tgp/Makefile.in +++ b/qse/include/qse/tgp/Makefile.in @@ -87,6 +87,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -105,6 +106,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -128,6 +132,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/include/qse/utl/Makefile.in b/qse/include/qse/utl/Makefile.in index 80127163..72236959 100644 --- a/qse/include/qse/utl/Makefile.in +++ b/qse/include/qse/utl/Makefile.in @@ -87,6 +87,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -105,6 +106,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -128,6 +132,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index fd346ef1..a3620549 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -85,6 +85,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -103,6 +104,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -126,6 +130,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/awk/Awk.cpp b/qse/lib/awk/Awk.cpp index a7147557..e65b8ede 100644 --- a/qse/lib/awk/Awk.cpp +++ b/qse/lib/awk/Awk.cpp @@ -71,31 +71,30 @@ void Awk::Extio::setHandle (void* handle) extio->handle = handle; } -Awk::Awk* Awk::Extio::getAwk () +Awk::Extio::operator Awk::Awk* () const { + // it assumes that the Awk object is set to the data field. + // make sure that it happens in Awk::run () - runios.data = this; return (Awk::Awk*)extio->data; } -const Awk::Awk* Awk::Extio::getAwk () const +Awk::Extio::operator Awk::awk_t* () const { - return (const Awk::Awk*)extio->data; + // it assumes that the Awk object is set to the data field. + // make sure that it happens in Awk::run () - runios.data = this; + return (Awk::awk_t*)(Awk::Awk*)extio->data; } -const Awk::extio_t* Awk::Extio::getRawExtio () const +Awk::Extio::operator Awk::extio_t* () const { return extio; } -const Awk::run_t* Awk::Extio::getRawRun () const +Awk::Extio::operator Awk::run_t* () const { return extio->run; } -const Awk::awk_t* Awk::Extio::getRawAwk () const -{ - return qse_awk_getrunawk (extio->run); -} - ////////////////////////////////////////////////////////////////// // Awk::Pipe ////////////////////////////////////////////////////////////////// @@ -134,7 +133,7 @@ Awk::Console::~Console () { if (filename != QSE_NULL) { - qse_awk_free ((qse_awk_t*)getRawAwk(), filename); + qse_awk_free ((awk_t*)this, filename); } } @@ -1071,13 +1070,13 @@ Awk::Awk (): awk (QSE_NULL), functionMap (QSE_NULL), mmgr.free = freeMem; mmgr.data = this; - ccls.is = isType; - ccls.to = transCase; + ccls.is = isType; + ccls.to = transCase; ccls.data = this; - prmfns.pow = pow; - prmfns.sprintf = sprintf; - prmfns.data = this; + prmfns.pow = pow; + prmfns.sprintf = sprintf; + prmfns.data = this; } Awk::~Awk () diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index dd0d6629..7747e1cb 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -124,6 +124,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -142,6 +143,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -165,6 +169,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/awk/StdAwk.cpp b/qse/lib/awk/StdAwk.cpp index cbb07834..ce47ff36 100644 --- a/qse/lib/awk/StdAwk.cpp +++ b/qse/lib/awk/StdAwk.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -303,7 +304,7 @@ int StdAwk::openPipe (Pipe& io) } pcp = qse_pcp_open ( - io.getAwk()->getMmgr(), + ((Awk*)io)->getMmgr(), 0, io.getName(), flags|QSE_PCP_TEXT|QSE_PCP_SHELL @@ -339,81 +340,56 @@ int StdAwk::flushPipe (Pipe& io) int StdAwk::openFile (File& io) { Awk::File::Mode mode = io.getMode(); - FILE* fp = NULL; + qse_sio_t* sio = QSE_NULL; + int flags; switch (mode) { case Awk::File::READ: - fp = qse_fopen (io.getName(), QSE_T("r")); + flags = QSE_SIO_READ; break; case Awk::File::WRITE: - fp = qse_fopen (io.getName(), QSE_T("w")); + flags = QSE_SIO_WRITE | + QSE_SIO_CREATE | + QSE_SIO_TRUNCATE; break; case Awk::File::APPEND: - fp = qse_fopen (io.getName(), QSE_T("a")); + flags = QSE_SIO_APPEND | + QSE_SIO_CREATE; break; } - if (fp == NULL) return -1; + sio = qse_sio_open ( + ((Awk*)io)->getMmgr(), + 0, + io.getName(), + flags + ); + if (sio == NULL) return -1; - io.setHandle (fp); + io.setHandle (sio); return 1; } int StdAwk::closeFile (File& io) { - fclose ((FILE*)io.getHandle()); + qse_sio_close ((qse_sio_t*)io.getHandle()); return 0; } StdAwk::ssize_t StdAwk::readFile (File& io, char_t* buf, size_t len) { - FILE* fp = (FILE*)io.getHandle(); - ssize_t n = 0; - - while (n < (ssize_t)len) - { - qse_cint_t c = qse_fgetc (fp); - if (c == QSE_CHAR_EOF) - { - if (qse_ferror(fp)) n = -1; - break; - } - - buf[n++] = c; - if (c == QSE_T('\n')) break; - } - - return n; + return qse_sio_getsx ((qse_sio_t*)io.getHandle(), buf, len); } StdAwk::ssize_t StdAwk::writeFile (File& io, const char_t* buf, size_t len) { - FILE* fp = (FILE*)io.getHandle(); - size_t left = len; - - while (left > 0) - { - if (*buf == QSE_T('\0')) - { - if (qse_fputc (*buf, fp) == QSE_CHAR_EOF) return -1; - left -= 1; buf += 1; - } - else - { - int chunk = (left > QSE_TYPE_MAX(int))? QSE_TYPE_MAX(int): (int)left; - int n = qse_fprintf (fp, QSE_T("%.*s"), chunk, buf); - if (n < 0 || n > chunk) return -1; - left -= n; buf += n; - } - } - - return len; + return qse_sio_putsx ((qse_sio_t*)io.getHandle(), buf, len); } int StdAwk::flushFile (File& io) { - return ::fflush ((FILE*)io.getHandle()); + return qse_sio_flush ((qse_sio_t*)io.getHandle()); } // memory allocation primitives diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 694904b0..89890378 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -107,6 +107,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -125,6 +126,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -148,6 +152,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/cmn/sio.c b/qse/lib/cmn/sio.c index 265c7701..07d879eb 100644 --- a/qse/lib/cmn/sio.c +++ b/qse/lib/cmn/sio.c @@ -168,10 +168,15 @@ void qse_sio_close (qse_sio_t* sio) qse_sio_t* qse_sio_init ( qse_sio_t* sio, qse_mmgr_t* mmgr, const qse_char_t* file, int flags) { + int mode; + QSE_MEMSET (sio, 0, QSE_SIZEOF(*sio)); sio->mmgr = mmgr; - if (qse_fio_init (&sio->fio, mmgr, file, flags, 0644) == QSE_NULL) + mode = QSE_FIO_RUSR | QSE_FIO_WUSR | + QSE_FIO_RGRP | QSE_FIO_ROTH; + + if (qse_fio_init (&sio->fio, mmgr, file, flags, mode) == QSE_NULL) { return QSE_NULL; } diff --git a/qse/lib/lsp/Makefile.in b/qse/lib/lsp/Makefile.in index a22a3d96..3c1d4af3 100644 --- a/qse/lib/lsp/Makefile.in +++ b/qse/lib/lsp/Makefile.in @@ -106,6 +106,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -124,6 +125,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -147,6 +151,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/tgp/Makefile.in b/qse/lib/tgp/Makefile.in index c761de05..cc3e18d9 100644 --- a/qse/lib/tgp/Makefile.in +++ b/qse/lib/tgp/Makefile.in @@ -104,6 +104,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -122,6 +123,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -145,6 +149,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/lib/utl/Makefile.in b/qse/lib/utl/Makefile.in index 1150cdac..3f901b15 100644 --- a/qse/lib/utl/Makefile.in +++ b/qse/lib/utl/Makefile.in @@ -104,6 +104,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -122,6 +123,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -145,6 +149,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/test/Makefile.in b/qse/test/Makefile.in index fd9063d6..3c6ff570 100644 --- a/qse/test/Makefile.in +++ b/qse/test/Makefile.in @@ -86,6 +86,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -104,6 +105,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -127,6 +131,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff --git a/qse/test/cmn/Makefile.in b/qse/test/cmn/Makefile.in index 217ec422..1f669741 100644 --- a/qse/test/cmn/Makefile.in +++ b/qse/test/cmn/Makefile.in @@ -135,6 +135,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAVE_CXX = @HAVE_CXX@ +HAVE_OBJC = @HAVE_OBJC@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -153,6 +154,9 @@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ +OBJCFLAGS = @OBJCFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -176,6 +180,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_OBJC = @ac_ct_OBJC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@