ivtools-0.7.5-0.7.6.diffs Vectaport Inc. April 16th 1999 This file, when applied with patch, transforms an ivtools source tree with all the changes made to Vectaport's copy between 0.7.5 and 0.7.6. See the diff to the ivtools-0.7/CHANGES file below for details of what's new. To apply this patch, cd to the top directory of the ivtools-0.7 source tree (the directory with "config" and "src" sub-directories), and pipe the file to patch, i.e.: patch Path to ACE source ! --with-ace-libs= Path to ACE libraries ! --with-clippoly= Path to clippoly source ! --with-clippoly-libs= Path to clippoly libraries ! --with-iue= Path to IUE source ! --with-iue-libs= Path to IUE libraries ! If the arguments for ACE, clippoly, or IUE are not supplied, the ! configure script prints a reminder, then proceeds to set up to build ! ivtools without these libraries. The configure script is usually able ! to automatically determine --x-includes and --x-libraries (except on ! Dec Alpha for some reason). (=0 or =1 can be substituted for ! =ARG. Default is =1 when not specified.) Here is an example of using the configure script with ACE and clippoly libraries: ! ./configure --with-clippoly=/proj/clippoly --with-clippoly-libs=/proj/clippoly\--with-ace=/proj/ACE_wrappers --with-ace-libs=/proj/ACE_wrappers/ace Running the configure script generates two files, a config/config.mk that gets included into each Makefile when used, and a config/config--gcc.defs that gets used by "make Makefiles" ! described below. is something like linux.The last line of output ! from the configure script shows this pathname. Verify that this is ! the same as the file included at the end of the config/site.def.'CPU' ! file. Change the site.def.'CPU' file if necessary. Also you may want to review the rest of the entries in the site.def.'CPU' file to see if they are good defaults for your system. --- 94,139 ---- between the two OS'es by checking for SVR4'ness. 1.b Run the configure script in the top-level directory, by entering ! "./configure" followed by any of the following arguments(--with ! arguments are recognized with --enable as well): ! ! --with-ace= Path to ACE source ! --with-ace-libs= Path to ACE libraries ! --with-clippoly= Path to clippoly source ! --with-clippoly-libs= Path to clippoly libraries ! --with-iue= Path to IUE source ! --with-iue-libs= Path to IUE libraries --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR --enable-install-relative[=ARG] install relative to source tree --prefix=DIR to use when install-relative false (default is /usr/local) ! --enable-use-rpath[=ARG] use -rpath when linking ! ARG can be 0 or 1, default is 1 when not specified. The configure ! script is usually able to automatically determine --x-includes and ! --x-libraries (except on DEC Alpha). If the arguments for ACE, ! clippoly, or IUE are not supplied, the configure script prints a ! reminder, then proceeds to set up to build ivtools without these ! libraries. Here is an example of using the configure script with ACE and clippoly libraries: ! ./configure --with-clippoly=/proj/clippoly --with-clippoly-libs=/proj/clippoly\ ! --with-ace=/proj/ACE_wrappers --with-ace-libs=/proj/ACE_wrappers/ace Running the configure script generates two files, a config/config.mk that gets included into each Makefile when used, and a config/config--gcc.defs that gets used by "make Makefiles" ! described below. is something like linux. The last line of ! output from the configure script shows this pathname. Verify that ! this is the same as the file included at the end of the ! config/site.def.'CPU' file. Change the site.def.'CPU' file if ! necessary. Also you may want to review the rest of the entries in the site.def.'CPU' file to see if they are good defaults for your system. *************** *** 167,173 **** http://www.vectaport.com/ivtools/faq.html#SourceBuild ! ** The "make World" should no longer needs any other command line ** options, since these are generated by the configure script and ** pulled in by the top-level Makefile. If you have problems and you ** suspect this evolution, verify that the definition of XCONFIGDIR --- 167,173 ---- http://www.vectaport.com/ivtools/faq.html#SourceBuild ! ** The "make World" should no longer need any other command line ** options, since these are generated by the configure script and ** pulled in by the top-level Makefile. If you have problems and you ** suspect this evolution, verify that the definition of XCONFIGDIR *************** *** 200,217 **** programs (idraw, iclass, idemo, and dclock), the four idraw derived programs (drawtool, netdraw, flipbook, and comdraw) and the two comterp programs (comterp and glyphterp). In addition the scripts in ! src/scripts and utilities in src/utils get installed. ! ! When relative install is disabled (the default for the configure ! script) the binaries are installed as stripped executables in `prefix`/bin ! the libraries are installed in `prefix`/lib, and the run-time X resource and ! config files are installed in `prefix`/lib/ivtools. When relative install is enabled (--enable-install-relative for the configure script), the binaries are installed in ivtools-0.7/bin/'CPU', the libraries are installed in ivtools-0.7/lib/'CPU', and the run-time X resource and config files are installed in ivtools-0.7/lib/ivtools. note: idemo, comterp, glyphterp, and comdraw have config files that must be installed (either relative or non-relative) for the program to --- 200,218 ---- programs (idraw, iclass, idemo, and dclock), the four idraw derived programs (drawtool, netdraw, flipbook, and comdraw) and the two comterp programs (comterp and glyphterp). In addition the scripts in ! src/scripts and utilities in src/utils get installed. "make ! uninstall" is supported as well. When relative install is enabled (--enable-install-relative for the configure script), the binaries are installed in ivtools-0.7/bin/'CPU', the libraries are installed in ivtools-0.7/lib/'CPU', and the run-time X resource and config files are installed in ivtools-0.7/lib/ivtools. + + When relative install is disabled (the default for the configure + script) the binaries are installed as stripped executables in `prefix`/bin + the libraries are installed in `prefix`/lib, and the run-time X resource and + config files are installed in `prefix`/lib/ivtools. note: idemo, comterp, glyphterp, and comdraw have config files that must be installed (either relative or non-relative) for the program to Index: top_ivtools/MANIFEST diff -c top_ivtools/MANIFEST:1.16 top_ivtools/MANIFEST:1.18 *** top_ivtools/MANIFEST:1.16 Fri Mar 19 15:15:19 1999 --- ./MANIFEST Wed Apr 7 14:33:53 1999 *************** *** 13,18 **** --- 13,19 ---- ivtools-0.7/README ivtools-0.7/README.ivmkcm ivtools-0.7/VERSION + ivtools-0.7/aclocal.m4 ivtools-0.7/comtop.tgz ivtools-0.7/config/Imakefile ivtools-0.7/config/InterViews/Imakefile *************** *** 628,633 **** --- 629,636 ---- ivtools-0.7/src/OverlayUnidraw/ovshowhide.h ivtools-0.7/src/OverlayUnidraw/ovspline.c ivtools-0.7/src/OverlayUnidraw/ovspline.h + ivtools-0.7/src/OverlayUnidraw/ovstates.c + ivtools-0.7/src/OverlayUnidraw/ovstates.h ivtools-0.7/src/OverlayUnidraw/ovstencil.c ivtools-0.7/src/OverlayUnidraw/ovstencil.h ivtools-0.7/src/OverlayUnidraw/ovtext.c Index: top_ivtools/MANIFEST.perceps diff -c top_ivtools/MANIFEST.perceps:1.4 top_ivtools/MANIFEST.perceps:1.5 *** top_ivtools/MANIFEST.perceps:1.4 Thu Mar 11 17:00:21 1999 --- ./MANIFEST.perceps Wed Apr 7 14:33:53 1999 *************** *** 168,173 **** --- 168,174 ---- OverlayUnidraw/ovselection.h OverlayUnidraw/ovshowhide.h OverlayUnidraw/ovspline.h + OverlayUnidraw/ovstates.h OverlayUnidraw/ovstencil.h OverlayUnidraw/ovtext.h OverlayUnidraw/ovunidraw.h Index: top_ivtools/README diff -c top_ivtools/README:1.8 top_ivtools/README:1.9 *** top_ivtools/README:1.8 Fri Mar 19 15:15:19 1999 --- ./README Fri Apr 16 14:16:00 1999 *************** *** 2,8 **** README for ivtools 0.7 ! This directory contains a release of ivtools 0.7.5 from Vectaport Inc.. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. It is known to build with many versions of gcc (<= gcc-2.7.2, >= --- 2,8 ---- README for ivtools 0.7 ! This directory contains a release of ivtools 0.7.6 from Vectaport Inc.. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. It is known to build with many versions of gcc (<= gcc-2.7.2, >= *************** *** 33,39 **** Read about finding and generating inline documentation below. A copy of the ivtools html documentation is available for download as well: ! http://www.vectaport.com/pub/src/ivtools-0.7.4-html.tgz * What is ivtools?: --- 33,39 ---- Read about finding and generating inline documentation below. A copy of the ivtools html documentation is available for download as well: ! http://www.vectaport.com/pub/src/ivtools-0.7.5-html.tgz * What is ivtools?: Index: top_ivtools/VERSION diff -c top_ivtools/VERSION:1.4 top_ivtools/VERSION:1.5 *** top_ivtools/VERSION:1.4 Fri Mar 19 15:15:19 1999 --- ./VERSION Fri Apr 16 14:16:00 1999 *************** *** 1 **** ! Release 0.7.5 --- 1 ---- ! Release 0.7.6 Index: top_ivtools/configure diff -c top_ivtools/configure:1.4 top_ivtools/configure:1.8 *** top_ivtools/configure:1.4 Thu Mar 11 17:00:21 1999 --- ./configure Fri Apr 16 14:16:03 1999 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 1,7 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 69,74 **** --- 69,75 ---- # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 *************** *** 325,331 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) --- 326,332 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) *************** *** 495,503 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 496,506 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross + ac_exeext= + ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 533,558 **** # set the canonical host vars # Make sure we can run config.sub. ! if $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:571: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`$ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`$ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --- 536,561 ---- # set the canonical host vars # Make sure we can run config.sub. ! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 ! echo "configure:574: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) ! if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac ! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` *************** *** 583,593 **** withval="$with_ace" ACE=$withval if test -f $ACE/ace/ACE.h ; then ! echo "$ac_t""Found ace/ACE.h in $ACE/ace " 1>&6 else ! { echo "configure: error: Can not find ACE.h in $ACE/ace given with option --with-ace=$ACE " 1>&2; exit 1; } fi - ACE_LIBS=$IV/ace fi --- 586,595 ---- withval="$with_ace" ACE=$withval if test -f $ACE/ace/ACE.h ; then ! echo "$ac_t""Found ace/ACE.h in $ACE " 1>&6 else ! { echo "configure: error: Can not find ace/ACE.h in $ACE given with option --with-ace=$ACE " 1>&2; exit 1; } fi fi *************** *** 603,609 **** ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified!" echo "Use --with-ace= to point to ACE installed directory." echo "" else --- 605,611 ---- ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified." echo "Use --with-ace= to point to ACE installed directory." echo "" else *************** *** 612,619 **** echo "$ac_t""Found libACE.* in $ACE_LIBS " 1>&6 ACE_ENABLED=1 else ! { echo "configure: error: Can not find libACE.a or libACE.so in $ACE_LIBS. ! Use --with-ace-libs to specifiy location of ACE " 1>&2; exit 1; } fi fi --- 614,628 ---- echo "$ac_t""Found libACE.* in $ACE_LIBS " 1>&6 ACE_ENABLED=1 else ! if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so ; then ! echo "$ac_t""Found libACE.* in $ACE/ace " 1>&6 ! ACE_ENABLED=1 ! ACE_LIBS=$ACE/ace ! else ! { echo "configure: error: Can not find libACE.a or libACE.so in $ACE_LIBS ($ACE). ! Use --with-ace-libs to specify location of ACE " 1>&2; exit 1; } ! fi ! fi fi *************** *** 628,634 **** { echo "configure: error: Can not find poly.h in $CLIPPOLY given with option --with-clippoly=$CLIPPOLY " 1>&2; exit 1; } fi ! CLIPPOLY_LIBS=$IV/clippoly fi --- 637,643 ---- { echo "configure: error: Can not find poly.h in $CLIPPOLY given with option --with-clippoly=$CLIPPOLY " 1>&2; exit 1; } fi ! fi *************** *** 644,650 **** CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified!" echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else --- 653,659 ---- CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified." echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else *************** *** 653,660 **** echo "$ac_t""Found libclippoly.* in $CLIPPOLY_LIBS " 1>&6 CLIPPOLY_ENABLED=1 else { echo "configure: error: Can not find libclippoly.a or libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS) ! Use --with-clippoly-libs to specifiy location of clippoly libraries" 1>&2; exit 1; } fi fi --- 662,676 ---- echo "$ac_t""Found libclippoly.* in $CLIPPOLY_LIBS " 1>&6 CLIPPOLY_ENABLED=1 else + if test -f $CLIPPOLY/libclippoly.a -o -f $CLIPPOLY/libclippoly.so ; then + echo "$ac_t""Found libclippoly.* in $CLIPPOLY " 1>&6 + CLIPPOLY_ENABLED=1 + CLIPPOLY_LIBS=$CLIPPOLY + else + { echo "configure: error: Can not find libclippoly.a or libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS) ! Use --with-clippoly-libs to specify location of clippoly libraries" 1>&2; exit 1; } ! fi fi fi *************** *** 693,699 **** if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified!" echo "Use --with-fresco= to point to Fresco installed directory." else if test ! -f "$FRESCO"/Fresco/X11/X11Display.h --- 709,715 ---- if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified." echo "Use --with-fresco= to point to Fresco installed directory." else if test ! -f "$FRESCO"/Fresco/X11/X11Display.h *************** *** 754,760 **** if test x"$IUE" = x then echo "" ! echo "No IUE path specified!" echo "Use --with-iue= to point to IUE installed directory." else if test ! -f "$IUE"/Image/ImageClasses/Image.h --- 770,776 ---- if test x"$IUE" = x then echo "" ! echo "No IUE path specified." echo "Use --with-iue= to point to IUE installed directory." else if test ! -f "$IUE"/Image/ImageClasses/Image.h *************** *** 783,802 **** # check of the c++ compiler ! for ac_prog in $CCC c++ g++ gcc CC cxx 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CXX="$ac_prog" --- 799,819 ---- # check of the c++ compiler ! for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CXX="$ac_prog" *************** *** 819,839 **** echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:852: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 836,858 ---- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:869: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross ! cat > conftest.$ac_ext << EOF ! ! #line 880 "configure" #include "confdefs.h" ! ! int main(){return(0);} EOF ! if { (eval echo configure:885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 851,857 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 --- 870,876 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 *************** *** 859,870 **** { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:892: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:897: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 878,889 ---- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:911: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 ! echo "configure:916: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 873,879 **** yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no --- 892,898 ---- yes; #endif EOF ! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no *************** *** 884,894 **** if test $ac_cv_prog_gxx = yes; then GXX=yes ! ac_test_CXXFLAGS="${CXXFLAGS+set}" ! ac_save_CXXFLAGS="$CXXFLAGS" ! CXXFLAGS= ! echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:921: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 903,917 ---- if test $ac_cv_prog_gxx = yes; then GXX=yes ! else ! GXX= ! fi ! ! ac_test_CXXFLAGS="${CXXFLAGS+set}" ! ac_save_CXXFLAGS="$CXXFLAGS" ! CXXFLAGS= ! echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 ! echo "configure:944: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 903,933 **** fi echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 ! if test "$ac_test_CXXFLAGS" = set; then ! CXXFLAGS="$ac_save_CXXFLAGS" ! elif test $ac_cv_prog_cxx_g = yes; then CXXFLAGS="-g -O2" else ! CXXFLAGS="-O2" fi else ! GXX= ! test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" fi # check for the c compiler # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:952: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 926,961 ---- fi echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 ! if test "$ac_test_CXXFLAGS" = set; then ! CXXFLAGS="$ac_save_CXXFLAGS" ! elif test $ac_cv_prog_cxx_g = yes; then ! if test "$GXX" = yes; then CXXFLAGS="-g -O2" else ! CXXFLAGS="-g" fi else ! if test "$GXX" = yes; then ! CXXFLAGS="-O2" ! else ! CXXFLAGS= ! fi fi # check for the c compiler # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:979: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 948,963 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:981: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 976,992 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1009: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 992,1016 **** echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1029: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 1021,1081 ---- echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:1060: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" + fi + fi + CC="$ac_cv_prog_CC" + if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:1092: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 1103 "configure" #include "confdefs.h" + main(){return(0);} EOF ! if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 1024,1041 **** ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1063: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1068: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1089,1112 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:1134: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:1139: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1044,1050 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 1115,1121 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 1055,1065 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1092: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1126,1140 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:1167: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1074,1094 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else ! CFLAGS="-O2" fi else ! GCC= ! test "${CFLAGS+set}" = set || CFLAGS="-g" fi # check for CPP echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:1121: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1149,1173 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else ! CFLAGS="-g" fi else ! if test "$GCC" = yes; then ! CFLAGS="-O2" ! else ! CFLAGS= ! fi fi # check for CPP echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:1200: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1097,1113 **** # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else --- 1176,1192 ---- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else *************** *** 1123,1129 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross fi fi --- 1202,1208 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross fi fi *************** *** 1134,1148 **** # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1167: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" --- 1213,1228 ---- # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1246: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" *************** *** 1162,1168 **** # check for X paths echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1195: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 1242,1248 ---- # check for X paths echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:1275: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 1177,1190 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else --- 1257,1270 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else *************** *** 1194,1207 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else --- 1274,1304 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else *************** *** 1214,1219 **** --- 1311,1318 ---- rm -f conftest* fi rm -f conftest* + fi + rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" *************** *** 1227,1233 **** # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 ! echo "configure:1260: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then --- 1326,1332 ---- # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 ! echo "configure:1359: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then *************** *** 1289,1301 **** # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* # We can compile using X headers with no special include directory. --- 1388,1400 ---- # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* # We can compile using X headers with no special include directory. *************** *** 1363,1376 **** ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. --- 1462,1475 ---- ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. *************** *** 1459,1523 **** # check for bool support in c++ #AC_CXX_BOOL # check for c++ standard headers ! echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 ! echo "configure:1796: checking how to run the C++ preprocessor" >&5 ! if test -z "$CXXCPP"; then ! if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! ac_ext=C ! # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CXXCPP $CPPFLAGS' ! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cxx_cross ! CXXCPP="${CXX-g++} -E" ! cat > conftest.$ac_ext < EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CXXCPP=/lib/cpp fi ! rm -f conftest* ! ac_cv_prog_CXXCPP="$CXXCPP" ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='$CPP $CPPFLAGS' ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ! cross_compiling=$ac_cv_prog_cc_cross fi fi - CXXCPP="$ac_cv_prog_CXXCPP" - echo "$ac_t""$CXXCPP" 1>&6 ! echo $ac_n "checking standard C++ headers ""... $ac_c" 1>&6 ! echo "configure:1839: checking standard C++ headers " >&5 ! CXX_HDRDIR=""; export CXX_HDRDIR ! cat > conftest.cc < ! ! ! CXX_HDRDIR=`$CXXCPP conftest.cc | egrep '^#[ \t]*[0-9]+[ \t].*iostream' | \ ! sed -e 's/\/iostream.*$//g' | sed -e 's/^.*\"//g'` ! for i in $CXX_HDRDIR ! do ! CXX_HDRDIR=$i ! break; ! done ! rm -f conftest.cc ! echo "$ac_t""$CXX_HDRDIR " 1>&6 # check for EGCS or gcc 2.8.x #AC_CXX_EGCS --- 1558,1601 ---- # check for bool support in c++ #AC_CXX_BOOL # check for c++ standard headers + #AC_CXX_HEADERS ! echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6 ! echo "configure:1594: checking for directory to install c++ include files" >&5 ! if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! ! cat > conftest.cc << EOF ! #include EOF ! $CXXCPP $DEFS conftest.cc > conftest.ii 2>&5 ! if test $? != 0; then ! { echo "configure: error: ${CXXCPP} could not find iostream.h" 1>&2; exit 1; } ! else ! ice_file=`grep '^# 1' conftest.ii | grep iostream.h | \ ! head -1 | sed 's/^.*"\(.*\)".*$/\1/'` ! ice_cv_cxx_include_dir=`echo $ice_file | sed 's%/[^/][^/]*$%%'` ! fi ! if test "$ice_cv_cxx_include_dir" = ""; then ! ice_cv_cxx_include_dir="$prefix/include" ! for pfx in "$prefix" "$exec_prefix"; do ! for dir in "$pfx/lib/g++-include" "$pfx/include/CC" \ ! "$pfx/include" /usr/include; do ! if test -d "$dir"; then ! ice_cv_cxx_include_dir="$dir" ! break fi ! done ! done fi + rm -f conftest.cc conftest.ii + fi ! CXX_INCLUDE_DIR=$ice_cv_cxx_include_dir ! echo "$ac_t""${CXX_INCLUDE_DIR}" 1>&6 ! # check for EGCS or gcc 2.8.x #AC_CXX_EGCS *************** *** 1607,1612 **** --- 1685,1691 ---- #AC_SUBST(OPENGL) #AC_SUBST(XGL) #AC_SUBST(TCL) + #AC_SUBST(CXX_HDRDIR) *************** *** 1625,1630 **** --- 1704,1711 ---- + + #AC_SUBST(no_x) *************** *** 1632,1638 **** #output to config-$host_fragd ! export PWD=`pwd` trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure --- 1713,1719 ---- #output to config-$host_fragd ! PWD=`pwd`; export PWD trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure *************** *** 1656,1662 **** # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 1737,1743 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 1735,1741 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 1816,1822 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 1754,1762 **** --- 1835,1845 ---- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub + s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g + s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g *************** *** 1785,1796 **** s%@CXXCPP@%$CXXCPP%g s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g ! s%@CXX_HDRDIR@%$CXX_HDRDIR%g s%@x_includes@%$x_includes%g s%@x_libraries@%$x_libraries%g s%@ACE@%$ACE%g s%@ACE_ENABLED@%$ACE_ENABLED%g s%@CLIPPOLY@%$CLIPPOLY%g s%@CLIPPOLY_ENABLED@%$CLIPPOLY_ENABLED%g s%@FRESCOLIBS@%$FRESCOLIBS%g s%@FRESCOINCS@%$FRESCOINCS%g --- 1868,1881 ---- s%@CXXCPP@%$CXXCPP%g s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g ! s%@CXX_INCLUDE_DIR@%$CXX_INCLUDE_DIR%g s%@x_includes@%$x_includes%g s%@x_libraries@%$x_libraries%g s%@ACE@%$ACE%g + s%@ACE_LIBS@%$ACE_LIBS%g s%@ACE_ENABLED@%$ACE_ENABLED%g s%@CLIPPOLY@%$CLIPPOLY%g + s%@CLIPPOLY_LIBS@%$CLIPPOLY_LIBS%g s%@CLIPPOLY_ENABLED@%$CLIPPOLY_ENABLED%g s%@FRESCOLIBS@%$FRESCOLIBS%g s%@FRESCOINCS@%$FRESCOINCS%g Index: top_ivtools/configure.in diff -c top_ivtools/configure.in:1.3 top_ivtools/configure.in:1.7 *** top_ivtools/configure.in:1.3 Wed Mar 10 10:28:04 1999 --- ./configure.in Thu Apr 8 16:10:39 1999 *************** *** 1,4 **** ! # initialize autoconf (borrowed and modified from Target Jr 3.1) AC_INIT(configure.in) AC_CONFIG_AUX_DIR(src/scripts) # set the canonical host vars --- 1,6 ---- ! # ivtools configure.in (borrowed and modified from Target Jr) ! ! # initialize autoconf AC_INIT(configure.in) AC_CONFIG_AUX_DIR(src/scripts) # set the canonical host vars *************** *** 26,36 **** AC_ARG_WITH(ace,[ --with-ace= Path to ACE include files], ACE=$withval if test -f $ACE/ace/ACE.h ; then ! AC_MSG_RESULT( Found ace/ACE.h in $ACE/ace ) else ! AC_MSG_ERROR( Can not find ACE.h in $ACE/ace given with option --with-ace=$ACE ) fi - ACE_LIBS=$IV/ace ) AC_ARG_WITH(ace-libs,[ --with-ace-libs= Path to ACE libraries], --- 28,37 ---- AC_ARG_WITH(ace,[ --with-ace= Path to ACE include files], ACE=$withval if test -f $ACE/ace/ACE.h ; then ! AC_MSG_RESULT( Found ace/ACE.h in $ACE ) else ! AC_MSG_ERROR( Can not find ace/ACE.h in $ACE given with option --with-ace=$ACE ) fi ) AC_ARG_WITH(ace-libs,[ --with-ace-libs= Path to ACE libraries], *************** *** 40,46 **** ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified!" echo "Use --with-ace= to point to ACE installed directory." echo "" else --- 41,47 ---- ACE_ENABLED=0 if test x"$ACE" = x; then echo "" ! echo "No ACE path specified." echo "Use --with-ace= to point to ACE installed directory." echo "" else *************** *** 49,56 **** AC_MSG_RESULT( Found libACE.* in $ACE_LIBS ) ACE_ENABLED=1 else ! AC_MSG_ERROR( Can not find libACE.a or libACE.so in $ACE_LIBS. ! Use --with-ace-libs to specifiy location of ACE ) fi fi --- 50,64 ---- AC_MSG_RESULT( Found libACE.* in $ACE_LIBS ) ACE_ENABLED=1 else ! if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so ; then ! AC_MSG_RESULT( Found libACE.* in $ACE/ace ) ! ACE_ENABLED=1 ! ACE_LIBS=$ACE/ace ! else ! AC_MSG_ERROR( Can not find libACE.a or libACE.so in $ACE_LIBS ($ACE). ! Use --with-ace-libs to specify location of ACE ) ! fi ! fi fi *************** *** 63,69 **** AC_MSG_ERROR( Can not find poly.h in $CLIPPOLY given with option --with-clippoly=$CLIPPOLY ) fi ! CLIPPOLY_LIBS=$IV/clippoly ) AC_ARG_WITH(clippoly-libs,[ --with-clippoly-libs= Path to clippoly libraries], --- 71,77 ---- AC_MSG_ERROR( Can not find poly.h in $CLIPPOLY given with option --with-clippoly=$CLIPPOLY ) fi ! ) AC_ARG_WITH(clippoly-libs,[ --with-clippoly-libs= Path to clippoly libraries], *************** *** 73,79 **** CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified!" echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else --- 81,87 ---- CLIPPOLY_ENABLED=0 if test x"$CLIPPOLY" = x; then echo "" ! echo "No clippoly path specified." echo "Use --with-clippoly= to point to clippoly installed directory." echo "" else *************** *** 82,89 **** AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY_LIBS ) CLIPPOLY_ENABLED=1 else AC_MSG_ERROR( Can not find libclippoly.a or libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS) ! Use --with-clippoly-libs to specifiy location of clippoly libraries) fi fi --- 90,104 ---- AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY_LIBS ) CLIPPOLY_ENABLED=1 else + if test -f $CLIPPOLY/libclippoly.a -o -f $CLIPPOLY/libclippoly.so ; then + AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY ) + CLIPPOLY_ENABLED=1 + CLIPPOLY_LIBS=$CLIPPOLY + else + AC_MSG_ERROR( Can not find libclippoly.a or libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS) ! Use --with-clippoly-libs to specify location of clippoly libraries) ! fi fi fi *************** *** 114,120 **** if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified!" echo "Use --with-fresco= to point to Fresco installed directory." else if test ! -f "$FRESCO"/Fresco/X11/X11Display.h --- 129,135 ---- if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified." echo "Use --with-fresco= to point to Fresco installed directory." else if test ! -f "$FRESCO"/Fresco/X11/X11Display.h *************** *** 167,173 **** if test x"$IUE" = x then echo "" ! echo "No IUE path specified!" echo "Use --with-iue= to point to IUE installed directory." else if test ! -f "$IUE"/Image/ImageClasses/Image.h --- 182,188 ---- if test x"$IUE" = x then echo "" ! echo "No IUE path specified." echo "Use --with-iue= to point to IUE installed directory." else if test ! -f "$IUE"/Image/ImageClasses/Image.h *************** *** 209,214 **** --- 224,230 ---- #AC_CXX_BOOL # check for c++ standard headers #AC_CXX_HEADERS + ICE_CXX_INCLUDE_DIR # check for EGCS or gcc 2.8.x #AC_CXX_EGCS # check for gettimeofday *************** *** 283,296 **** #AC_SUBST(OPENGL) #AC_SUBST(XGL) #AC_SUBST(TCL) ! AC_SUBST(CXX_HDRDIR) AC_SUBST(x_includes) AC_SUBST(x_libraries) #AC_SUBST(BUILD_TREE) AC_SUBST(DEFS) AC_SUBST(ACE) AC_SUBST(ACE_ENABLED) AC_SUBST(CLIPPOLY) AC_SUBST(CLIPPOLY_ENABLED) AC_SUBST(FRESCOLIBS) AC_SUBST(FRESCOINCS) --- 299,315 ---- #AC_SUBST(OPENGL) #AC_SUBST(XGL) #AC_SUBST(TCL) ! #AC_SUBST(CXX_HDRDIR) ! AC_SUBST(CXX_INCLUDE_DIR) AC_SUBST(x_includes) AC_SUBST(x_libraries) #AC_SUBST(BUILD_TREE) AC_SUBST(DEFS) AC_SUBST(ACE) + AC_SUBST(ACE_LIBS) AC_SUBST(ACE_ENABLED) AC_SUBST(CLIPPOLY) + AC_SUBST(CLIPPOLY_LIBS) AC_SUBST(CLIPPOLY_ENABLED) AC_SUBST(FRESCOLIBS) AC_SUBST(FRESCOINCS) *************** *** 308,314 **** AC_SUBST(USERPATH) #output to config-$host_fragd ! export PWD=`pwd` AC_OUTPUT(config/config-$host_fragd:config/config.defs.in) --- 327,333 ---- AC_SUBST(USERPATH) #output to config-$host_fragd ! PWD=`pwd`; export PWD AC_OUTPUT(config/config-$host_fragd:config/config.defs.in) Index: top_ivtools/configure.notes diff -c top_ivtools/configure.notes:1.1 top_ivtools/configure.notes:1.2 *** top_ivtools/configure.notes:1.1 Thu Mar 11 17:00:21 1999 --- ./configure.notes Wed Mar 24 15:28:35 1999 *************** *** 1,10 **** The configure script is generated from configure.in using autoconf, then ! manually modified in three ways: 1) the --with-x command line option is removed. 2) the --help output for everything from --exec-prefix to --target is removed, because no use is made of these. ! 3) the body of the AC_CXX_HEADERS macro is manually inserted, ! copied from another configure script that must have had this ! macro defined in its autoconf environment. --- 1,10 ---- The configure script is generated from configure.in using autoconf, then ! manually modified in two ways: 1) the --with-x command line option is removed. 2) the --help output for everything from --exec-prefix to --target is removed, because no use is made of these. ! ! aclocal.m4 contains an autoconf macro for locating the g++ include ! directory (the include files from libstdc++). Index: ComUnidraw/unifunc.c diff -c ComUnidraw/unifunc.c:1.3 ComUnidraw/unifunc.c:1.4 *** ComUnidraw/unifunc.c:1.3 Fri Mar 5 15:07:38 1999 --- src/ComUnidraw/unifunc.c Tue Mar 30 16:51:57 1999 *************** *** 193,200 **** --- 193,205 ---- OvImportCmd* cmd = new OvImportCmd(editor()); cmd->pathname(path); execute_log(cmd); + if (cmd->component()) { + ((OverlayComp*)cmd->component())->SetPathName(path); + ((OverlayComp*)cmd->component())->SetByPathnameFlag(true); + } return cmd; } + void ImportFunc::execute() { ComValue pathnamev(stack_arg(0)); reset_stack(); Index: FrameUnidraw/framecomps.c diff -c FrameUnidraw/framecomps.c:1.3 FrameUnidraw/framecomps.c:1.4 *** FrameUnidraw/framecomps.c:1.3 Tue Feb 23 11:49:11 1999 --- src/FrameUnidraw/framecomps.c Fri Apr 16 14:18:37 1999 *************** *** 647,653 **** cmd->IsA(UNGROUP_CMD) || cmd->IsA(FRONT_CMD) || cmd->IsA(BACK_CMD)) ! ed->GetFrame()->GetGraphicComp()->Uninterpret(cmd); else if (cmd->IsA(CREATEFRAME_CMD)) { boolean after = ((CreateFrameCmd*)cmd)->After(); Iterator frame; --- 647,657 ---- cmd->IsA(UNGROUP_CMD) || cmd->IsA(FRONT_CMD) || cmd->IsA(BACK_CMD)) ! if (OverlaysView* frameview = ed->GetFrame()) ! frameview->GetGraphicComp()->Uninterpret(cmd); ! else ! OverlaysComp::Uninterpret(cmd); ! else if (cmd->IsA(CREATEFRAME_CMD)) { boolean after = ((CreateFrameCmd*)cmd)->After(); Iterator frame; Index: FrameUnidraw/framekit.c diff -c FrameUnidraw/framekit.c:1.1 FrameUnidraw/framekit.c:1.2 *** FrameUnidraw/framekit.c:1.1 Fri Jan 15 09:32:33 1999 --- src/FrameUnidraw/framekit.c Wed Mar 24 15:29:21 1999 *************** *** 39,44 **** --- 39,45 ---- #include #include #include + #include #include #include #include *************** *** 402,407 **** --- 403,411 ---- return mbi; } + // upgrade to copy of OverlayKit::MakeViewMenu 3/24/99 + #if 0 + MenuItem* FrameKit::MakeViewMenu() { LayoutKit& lk = *LayoutKit::instance(); WidgetKit& kit = *WidgetKit::instance(); *************** *** 489,494 **** --- 493,653 ---- return mbi; } + + #else + + MenuItem* FrameKit::MakeViewMenu() { + LayoutKit& lk = *LayoutKit::instance(); + WidgetKit& kit = *WidgetKit::instance(); + + MenuItem* mbi = kit.menubar_item(kit.label("View")); + mbi->menu(kit.pulldown()); + + #if 0 + OvNewViewCmd::default_instance + (new OvNewViewCmd + (new ControlInfo("New View", KLBL_NEWVIEW, CODE_NEWVIEW), + "localhost:0.0")); + MakeMenu(mbi, OvNewViewCmd::default_instance(), "New View "); + + MakeMenu(mbi, new OvCloseEditorCmd(new ControlInfo("Close View", + KLBL_CLOSEEDITOR, + CODE_CLOSEEDITOR)), + "Close View "); + #endif + #if 0 + MenuItem* menu_item; + menu_item = kit.menu_item(kit.label("New Display")); + menu_item->action + (new ActionCallback(OvNewViewCmd) + (OvNewViewCmd::default_instance(), &OvNewViewCmd::set_display)); + mbi->menu()->append_item(menu_item); + mbi->menu()->append_item(kit.menu_item_separator()); + #endif + + MakeMenu(mbi, new PageCmd(new ControlInfo("Page on/off", + "p", "p")), + "Page on/off "); + MakeMenu(mbi, new OvPrecisePageCmd(new ControlInfo("Precise Page", + "^P", "\020")), + "Precise Page "); + MakeMenu(mbi, new NormSizeCmd(new ControlInfo("Normal Size", + KLBL_NORMSIZE, CODE_NORMSIZE)), + "Normal Size "); + MakeMenu(mbi, new RedToFitCmd(new ControlInfo("Reduce to Fit", + KLBL_REDTOFIT, CODE_REDTOFIT)), + "Reduce to Fit "); + MakeMenu(mbi, new CenterCmd(new ControlInfo("Center Page", + KLBL_CENTER, CODE_CENTER)), + "Center Page "); + MakeMenu(mbi, new OrientationCmd(new ControlInfo("Orientation", + KLBL_ORIENTATION, + CODE_ORIENTATION)), + "Orientation "); + + mbi->menu()->append_item(kit.menu_item_separator()); + MakeMenu(mbi, new GridCmd(new ControlInfo("Grid on/off", + KLBL_GRID, CODE_GRID)), + "Grid on/off "); + MakeMenu(mbi, new GridSpacingCmd(new ControlInfo("Grid Spacing...", + KLBL_GRIDSPC, CODE_GRIDSPC)), + "Grid Spacing... "); + MakeMenu(mbi, new GravityCmd(new ControlInfo("Gravity on/off", + KLBL_GRAVITY, CODE_GRAVITY)), + "Gravity on/off "); + MakeMenu(mbi, new ScribblePointerCmd(new ControlInfo("Scribble pointer on/off", + "", "")), + "Scribble pointer on/off "); + mbi->menu()->append_item(kit.menu_item_separator()); + + MenuItem* zoomi = kit.menu_item(kit.label("Zoom ")); + Menu* zoom = kit.pullright(); + zoomi->menu(zoom); + MakeMenu(zoomi, new ZoomCmd(new ControlInfo("Zoom In"), 2.0), + "Zoom In "); + MakeMenu(zoomi, new ZoomCmd(new ControlInfo("Zoom Out"), 0.5), + "Zoom Out "); + MakeMenu(zoomi, new PreciseZoomCmd(new ControlInfo("Precise Zoom")), + "Precise Zoom "); + mbi->menu()->append_item(zoomi); + + MenuItem* spani = kit.menu_item(kit.label("Small Pan ")); + Menu* span = kit.pullright(); + spani->menu(span); + MakeMenu(spani, new FixedPanCmd(new ControlInfo("Small Pan Up"), NO_PAN, PLUS_SMALL_PAN), + "Small Pan Up "); + MakeMenu(spani, new FixedPanCmd(new ControlInfo("Small Pan Down"), NO_PAN, MINUS_SMALL_PAN), + "Small Pan Down "); + MakeMenu(spani, new FixedPanCmd(new ControlInfo("Small Pan Left"), MINUS_SMALL_PAN, NO_PAN), + "Small Pan Left "); + MakeMenu(spani, new FixedPanCmd(new ControlInfo("Small Pan Right"), PLUS_SMALL_PAN, NO_PAN), + "Small Pan Right "); + mbi->menu()->append_item(spani); + + MenuItem* lpani = kit.menu_item(kit.label("Large Pan ")); + Menu* lpan = kit.pullright(); + lpani->menu(lpan); + MakeMenu(lpani, new FixedPanCmd(new ControlInfo("Large Pan Up"), NO_PAN, PLUS_LARGE_PAN), + "Large Pan Up "); + MakeMenu(lpani, new FixedPanCmd(new ControlInfo("Large Pan Down"), NO_PAN, MINUS_LARGE_PAN), + "Large Pan Down "); + MakeMenu(lpani, new FixedPanCmd(new ControlInfo("Large Pan Left"), MINUS_LARGE_PAN, NO_PAN), + "Large Pan Left "); + MakeMenu(lpani, new FixedPanCmd(new ControlInfo("Large Pan Right"), PLUS_LARGE_PAN, NO_PAN), + "Large Pan Right "); + mbi->menu()->append_item(lpani); + + MakeMenu(mbi, new PrecisePanCmd(new ControlInfo("Precise Pan")), + "Precise Pan "); + + mbi->menu()->append_item(kit.menu_item_separator()); + + #if 0 + MenuItem* grmenu = kit.menu_item(kit.label("Hide/Show Graphics ")); + grmenu->menu(kit.pullright()); + mbi->menu()->append_item(grmenu); + + MakeMenu(grmenu, new HideViewCmd(_ed->GetViewer(), new ControlInfo("Hide Graphic Here", "H", "H")), + "Hide Graphic Here"); + MakeMenu(grmenu, new UnhideViewsCmd(new ControlInfo("Unhide Graphics There", "^H", "\010")), + "Unhide Graphics There"); + MakeMenu(grmenu, new DesensitizeViewCmd(_ed->GetViewer(), new ControlInfo("Desensitize Graphic Here", "", "")), + "Desensitize Graphic Here"); + MakeMenu(grmenu, new SensitizeViewsCmd(new ControlInfo("Sensitize Graphics There", "", "")), + "Sensitize Graphics There"); + #endif + + MenuItem* fixmenu = kit.menu_item(kit.label("Fix/Unfix Graphics ")); + fixmenu->menu(kit.pullright()); + mbi->menu()->append_item(fixmenu); + + MakeMenu(fixmenu, new FixViewCmd(new ControlInfo("Fix Size", " ", " "), true, false), + "Fix Size"); + MakeMenu(fixmenu, new UnfixViewCmd(new ControlInfo("Unfix Size", " ", " "), true, false), + "Unfix Size"); + MakeMenu(fixmenu, new FixViewCmd(new ControlInfo("Fix Location", " ", " "), false, true), + "Fix Location"); + MakeMenu(fixmenu, new UnfixViewCmd(new ControlInfo("Unfix Location", " ", " "), false, true), + "Unfix Location"); + + #if 0 + MenuItem* chainmenu = kit.menu_item(kit.label("Chain/Unchain Viewers ")); + chainmenu->menu(kit.pullright()); + mbi->menu()->append_item(chainmenu); + + MakeMenu(chainmenu, new ChainViewersCmd(_ed->GetViewer(), new ControlInfo("Chain Panning", " ", " "), true, false), + "Chain Panning"); + MakeMenu(chainmenu, new UnchainViewersCmd(_ed->GetViewer(), new ControlInfo("Unchain Panning", " ", " "), true, false), + "Unchain Panning"); + MakeMenu(chainmenu, new ChainViewersCmd(_ed->GetViewer(), new ControlInfo("Chain Zooming", " ", " "), false, true), + "Chain Zooming"); + MakeMenu(chainmenu, new UnchainViewersCmd(_ed->GetViewer(), new ControlInfo("Unchain Zooming", " ", " "), false, true), + "Unchain Zooming"); + #endif + return mbi; + } + + #endif Glyph* FrameKit::MakeStates() { Index: OverlayUnidraw/Imakefile diff -c OverlayUnidraw/Imakefile:1.3 OverlayUnidraw/Imakefile:1.4 *** OverlayUnidraw/Imakefile:1.3 Thu Mar 11 17:00:58 1999 --- src/OverlayUnidraw/Imakefile Wed Apr 7 14:34:39 1999 *************** *** 50,55 **** --- 50,56 ---- Obj26(ovselect) Obj26(ovselection) Obj26(ovspline) + Obj26(ovstates) Obj26(ovstencil) Obj26(ovtext) Obj26(ovunidraw) Index: OverlayUnidraw/ovcomps.c diff -c OverlayUnidraw/ovcomps.c:1.5 OverlayUnidraw/ovcomps.c:1.6 *** OverlayUnidraw/ovcomps.c:1.5 Mon Feb 8 16:13:02 1999 --- src/OverlayUnidraw/ovcomps.c Fri Apr 16 14:17:53 1999 *************** *** 252,258 **** const char* OverlayComp::GetPathName() { return nil;} Component* OverlayComp::GetParent () { ! return _parent ? _parent : GraphicComp::GetParent(); } void OverlayComp::SetParent (Component* child, Component* parent) { --- 252,266 ---- const char* OverlayComp::GetPathName() { return nil;} Component* OverlayComp::GetParent () { ! if (_parent) ! return _parent; ! else { ! if (GetGraphic()) { ! Graphic* parent = GetGraphic()->Parent(); ! return !parent ? nil : GetGraphicComp(parent); ! } else ! return nil; ! } } void OverlayComp::SetParent (Component* child, Component* parent) { Index: OverlayUnidraw/oved.h diff -c OverlayUnidraw/oved.h:1.2 OverlayUnidraw/oved.h:1.3 *** OverlayUnidraw/oved.h:1.2 Wed Mar 17 15:55:42 1999 --- src/OverlayUnidraw/oved.h Wed Apr 7 14:34:39 1999 *************** *** 43,48 **** --- 43,49 ---- class OverlayPanner; class OverlayViewer; class OverlaysView; + class PtrLocState; class UPage; class TextObserver; class Viewer; *************** *** 146,151 **** --- 147,158 ---- static boolean opaque_flag(); // return global flag indicating whether opaque tranformations are enabled. + PtrLocState* ptrlocstate() { return _ptrlocstate; } + // state variable for displaying pointer location within document. + + void ptrlocstate(PtrLocState* ptrlocstate) { _ptrlocstate = ptrlocstate; } + // set state variable for displaying pointer location within document. + protected: void Init(OverlayComp* = nil, const char* = "OverlayEditor"); // construct empty component tree if necessary, and pass to *************** *** 164,169 **** --- 171,177 ---- OverlayKit* _overlay_kit; Tool* _curtool; ObservableText* _mousedoc; + PtrLocState* _ptrlocstate; static AttributeList* _edlauncherlist; static AttributeList* _comterplist; Index: OverlayUnidraw/ovimport.c diff -c OverlayUnidraw/ovimport.c:1.10 OverlayUnidraw/ovimport.c:1.11 *** OverlayUnidraw/ovimport.c:1.10 Fri Mar 19 15:15:55 1999 --- src/OverlayUnidraw/ovimport.c Wed Mar 24 15:29:12 1999 *************** *** 1247,1253 **** comp = rcomp; rr->GetOverlayRaster()->initialize(); ! rcomp->SetByPathnameFlag(false); helper_->add_pipe(fptr); new ReadImageHandler( --- 1247,1253 ---- comp = rcomp; rr->GetOverlayRaster()->initialize(); ! rcomp->SetByPathnameFlag(chooser_ ? chooser_->by_pathname() : true); helper_->add_pipe(fptr); new ReadImageHandler( Index: OverlayUnidraw/ovkit.c diff -c OverlayUnidraw/ovkit.c:1.3 OverlayUnidraw/ovkit.c:1.4 *** OverlayUnidraw/ovkit.c:1.3 Fri Feb 19 16:49:33 1999 --- src/OverlayUnidraw/ovkit.c Wed Apr 7 14:34:39 1999 *************** *** 58,64 **** --- 58,66 ---- #include #include #include + #include #include + #include #include #include #include *************** *** 76,82 **** #include #include #include - #include #include #include --- 78,83 ---- *************** *** 117,122 **** --- 118,124 ---- #include #include #include + #include #include #include #include *************** *** 306,311 **** --- 308,332 ---- } Glyph* OverlayKit::MakeStates() { + Catalog* catalog = unidraw->GetCatalog(); + const char* ptrlocstr = catalog->GetAttribute("ptrloc"); + if (ptrlocstr && strcmp(ptrlocstr, "true")==0) { + if (Event::event_tracker() != OverlayUnidraw::pointer_tracker_func) + Event::event_tracker(OverlayUnidraw::pointer_tracker_func); + + _ed->_ptrlocstate = new PtrLocState(0,0, _ed); + NameView* ptrlocview = new NameView(_ed->ptrlocstate()); + + LayoutKit& lk = *LayoutKit::instance(); + WidgetKit& kit = *WidgetKit::instance(); + return kit.inset_frame( + lk.margin( + lk.hbox(lk.hglue(), ptrlocview), + 4, 2 + ) + ); + + } else return nil; } Index: OverlayUnidraw/ovstates.c diff -c /dev/null OverlayUnidraw/ovstates.c:1.1 *** /dev/null Fri Apr 16 14:45:14 1999 --- src/OverlayUnidraw/ovstates.c Wed Apr 7 14:34:39 1999 *************** *** 0 **** --- 1,55 ---- + /* + * Copyright 1994, 1995, 1999 Vectaport Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the names of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. The copyright holders make + * no representations about the suitability of this software for any purpose. + * It is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. + * IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + + #include + #include + #include + #include + + /*****************************************************************************/ + + PtrLocState::PtrLocState(PixelCoord x, PixelCoord y, OverlayEditor* ed) :NameState(nil) + { + init(ed); + ptrcoords(x, y); + } + + PtrLocState::PtrLocState() : NameState(nil) { + _buf = nil; + _ed = nil; + } + + void PtrLocState::init(OverlayEditor* ed) { + _buf = (char*) new char[256]; + _ed = ed; + } + + PtrLocState::~PtrLocState() { + delete _buf; + } + + void PtrLocState::ptrcoords(PixelCoord x, PixelCoord y) { + ((OverlayViewer*)_ed->GetViewer())->ScreenToDrawing(x, y, _x, _y); + sprintf(_buf, "%.2f %.2f", _x, _y); + name(_buf, true); + } Index: OverlayUnidraw/ovstates.h diff -c /dev/null OverlayUnidraw/ovstates.h:1.1 *** /dev/null Fri Apr 16 14:45:14 1999 --- src/OverlayUnidraw/ovstates.h Wed Apr 7 14:34:39 1999 *************** *** 0 **** --- 1,50 ---- + /* + * Copyright 1999 Vectaport Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the names of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. The copyright holders make + * no representations about the suitability of this software for any purpose. + * It is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. + * IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + + #ifndef ovstates_h + #define ovstates_h + + #include + #include + + class OverlayEditor; + + //: state variable to display pointer location in drawing coordinates. + class PtrLocState : public NameState { + public: + PtrLocState(PixelCoord x, PixelCoord y, OverlayEditor*); + virtual ~PtrLocState(); + virtual void ptrcoords(PixelCoord x, PixelCoord y); + // set current pointer coordinates. + + protected: + PtrLocState(); // empty constructor for use of derived class + void init(OverlayEditor*); + + float _x; + float _y; + char* _buf; + OverlayEditor* _ed; + }; + + #endif Index: OverlayUnidraw/ovunidraw.c diff -c OverlayUnidraw/ovunidraw.c:1.2 OverlayUnidraw/ovunidraw.c:1.3 *** OverlayUnidraw/ovunidraw.c:1.2 Fri Feb 26 10:56:18 1999 --- src/OverlayUnidraw/ovunidraw.c Wed Apr 7 14:34:39 1999 *************** *** 28,35 **** #include #include ! #include #include #include #include --- 28,38 ---- #include #include ! #include #include + #include + #include + #include #include #include *************** *** 46,52 **** --- 49,60 ---- #include #include #include + #include #include + #include + #include + + #include /*****************************************************************************/ *************** *** 140,142 **** --- 148,191 ---- } } + /* static */ void OverlayUnidraw::pointer_tracker_func(Event& e) { + if (e.type() != Event::motion || !e.window()) return; + PixelCoord x = e.rep()->xevent_.xmotion.x; + PixelCoord y = e.rep()->xevent_.xmotion.y; + WindowRep& ewr = *e.window()->rep(); + Iterator i; + for (unidraw->First(i); !unidraw->Done(i); unidraw->Next(i)) { + OverlayEditor* ed = (OverlayEditor*) unidraw->GetEditor(i); + Viewer* v; if (!(v = ed->GetViewer())) continue; + Canvas* c; if (!(c = v->GetCanvas())) continue; + Window* cw; if (!(cw = c->window())) continue; + + /* if event is associated with the ApplicationWindow */ + if (ed->GetWindow() == e.window()) { + + /* adjust for delta between application window and Unidraw canvas */ + PixelCoord deltax, deltay; + WindowRep& cwr = *cw->rep(); + if (cwr.xpos_) // this test requires a window setup where xpos_ is zero after Window::bind + { + deltax = cwr.xpos_ - ewr.xpos_; + deltay = cwr.ypos_ - ewr.ypos_; + } else { + cw->offset_from_toplevel(deltax, deltay); + } + x -= deltax; + y -= deltay; + ed->ptrlocstate()->ptrcoords(x, cwr.canvas_->pheight() - y - 1); + break; + } + + /* else if event is associated with the Unidraw canvas */ + else if (cw == e.window()) { + + /* coordinates will already be in the canvas coordinate system */ + ed->ptrlocstate()->ptrcoords(x, ewr.canvas_->pheight() - y - 1); + break; + + } + } + } Index: OverlayUnidraw/ovunidraw.h diff -c OverlayUnidraw/ovunidraw.h:1.2 OverlayUnidraw/ovunidraw.h:1.3 *** OverlayUnidraw/ovunidraw.h:1.2 Mon Jan 25 14:50:17 1999 --- src/OverlayUnidraw/ovunidraw.h Wed Apr 7 14:34:40 1999 *************** *** 31,36 **** --- 31,37 ---- #include class Command; + class Event; class MacroCmd; //: derived Unidraw object with extra mechanisms. *************** *** 52,57 **** --- 53,59 ---- static boolean unidraw_updated(); static boolean unidraw_updated_or_command_pushed(); + static void pointer_tracker_func(Event&); protected: static MacroCmd* _cmdq; static boolean* _updated_ptr; Index: OverlayUnidraw/ovviewer.c diff -c OverlayUnidraw/ovviewer.c:1.1 OverlayUnidraw/ovviewer.c:1.3 *** OverlayUnidraw/ovviewer.c:1.1 Fri Jan 15 09:31:51 1999 --- src/OverlayUnidraw/ovviewer.c Fri Apr 16 14:18:02 1999 *************** *** 53,61 **** --- 53,63 ---- #include #include #include + #include #include #include #include + #include /*****************************************************************************/ *************** *** 336,341 **** --- 338,357 ---- GetCanvas()->window()->grab_pointer(); do { Read(e); + + /* correct for motion events that arrive before the */ + /* GetCanvas()->window()->grab_pointer() takes affect */ + /* this also has the pleasant side effect of fixing a */ + /* bug in computing x,y location when the mouse rolls */ + /* off the canvas */ + if (e.type() == Event::motion && e.window() && + e.window() != GetCanvas()->window()) { + WindowRep& ew = *e.window()->rep(); + WindowRep& cw = *GetCanvas()->window()->rep(); + e.x -= cw.xpos_-ew.xpos_; + e.y += cw.ypos_-ew.ypos_; + } + b = m->Manipulating(e); } while (b); GetCanvas()->window()->ungrab_pointer(); Index: config_ivtools/config.defs.in diff -c config_ivtools/config.defs.in:1.2 config_ivtools/config.defs.in:1.3 *** config_ivtools/config.defs.in:1.2 Thu Mar 11 17:01:28 1999 --- config/config.defs.in Wed Mar 24 15:29:40 1999 *************** *** 15,24 **** --- 15,26 ---- #if @ACE_ENABLED@ #define AceDir @ACE@ + #define AceLibDir @ACE_LIBS@ #endif #if @CLIPPOLY_ENABLED@ #define ClipPolyDir @CLIPPOLY@ + #define ClipPolyLibDir @CLIPPOLY_LIBS@ #endif #if @IUE_ENABLED@ *************** *** 33,39 **** #define CDriver @CC@ #undef GPlusPlusIncludeDir ! #define GPlusPlusIncludeDir @CXX_HDRDIR@ #undef InstallRelative #define InstallRelative @INSTALLRELATIVE@ --- 35,41 ---- #define CDriver @CC@ #undef GPlusPlusIncludeDir ! #define GPlusPlusIncludeDir @CXX_INCLUDE_DIR@ #undef InstallRelative #define InstallRelative @INSTALLRELATIVE@ Index: config_ivtools/local.def diff -c config_ivtools/local.def:1.6 config_ivtools/local.def:1.7 *** config_ivtools/local.def:1.6 Thu Mar 11 17:01:28 1999 --- config/local.def Thu Apr 8 16:11:27 1999 *************** *** 1,12 **** XCOMM ------------------------------------------------------------------------- XCOMM from : ! /* ! * Assume the use of gcc-2.3.3 or greater ! */ ! #undef LanguageCCDefines ! #define LanguageCCDefines -Dcplusplus_2_1 ! #include /* * Default customization of kits. --- 1,8 ---- XCOMM ------------------------------------------------------------------------- XCOMM from : ! /*********************************************************/ ! /* start of things you might want to change in this file */ /* * Default customization of kits. *************** *** 40,45 **** --- 36,51 ---- */ #undef RemoveAfterInstall #define RemoveAfterInstall NO + + /* end of things you might want to change in this file */ + /*******************************************************/ + + /* + * Assume the use of gcc-2.3.3 or greater + */ + #undef LanguageCCDefines + #define LanguageCCDefines -Dcplusplus_2_1 + #include /* * Where to look for config files. Index: config_ivtools/params.def diff -c config_ivtools/params.def:1.6 config_ivtools/params.def:1.9 *** config_ivtools/params.def:1.6 Fri Mar 19 15:16:20 1999 --- config/params.def Fri Apr 16 14:19:02 1999 *************** *** 36,42 **** * VersionNumber */ #ifndef Version ! #define Version 0.7.5 #endif VERSION = Version --- 36,42 ---- * VersionNumber */ #ifndef Version ! #define Version 0.7.6 #endif VERSION = Version *************** *** 50,56 **** README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \ *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci site.def.SUN4 \ site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1 *.3 \ ! config.guess config.sub configure configure.in MANIFEST.perceps *.mk config.mk.in *.tmpl *.flt #endif REPOSITORY_FILES = RepositoryFiles --- 50,56 ---- README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \ *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci site.def.SUN4 \ site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1 *.3 \ ! config.guess config.sub configure configure.in MANIFEST.perceps *.mk config.mk.in *.tmpl *.flt *.m4 #endif REPOSITORY_FILES = RepositoryFiles *************** *** 249,255 **** #ifdef InObjectCodeDir #define ArchOrCPU ArchitectureName #else ! #define ArchOrCPU $$CPU #endif #endif --- 249,255 ---- #ifdef InObjectCodeDir #define ArchOrCPU ArchitectureName #else ! #define ArchOrCPU $(CPU) #endif #endif Index: config_ivtools/rules.def diff -c config_ivtools/rules.def:1.6 config_ivtools/rules.def:1.8 *** config_ivtools/rules.def:1.6 Tue Mar 9 16:15:12 1999 --- config/rules.def Wed Apr 7 14:35:13 1999 *************** *** 650,656 **** SharedLibraryCmd(ldobjs,-Wl\,-soname=Concat(lib\,libname.so.rev))@@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ ! $(LN) $@ Concat(lib,libname.so) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) --- 650,656 ---- SharedLibraryCmd(ldobjs,-Wl\,-soname=Concat(lib\,libname.so.rev))@@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ ! $(LN) $@ Concat(lib,libname.so) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) *************** *** 1009,1020 **** #if InstallRelative #define InstallSymLink(dir, file) /**/ #else #define InstallSymLink(dir, file) @@\ install:: @@\ MakeDir(dir) @@\ ! cp -d file dir @@\ @@\ uninstall:: @@\ $(RM) dir/file #endif #endif --- 1009,1030 ---- #if InstallRelative #define InstallSymLink(dir, file) /**/ #else + #if !defined(SVR4) #define InstallSymLink(dir, file) @@\ install:: @@\ MakeDir(dir) @@\ ! cp -fd file dir @@\ @@\ uninstall:: @@\ $(RM) dir/file + #else + #define InstallSymLink(dir, file) @@\ + install:: @@\ + MakeDir(dir) @@\ + tar cf - file | (cd dir; tar xfp -) @@\ + @@\ + uninstall:: @@\ + $(RM) dir/file + #endif #endif #endif Index: config_ivtools/site.def.LINUX diff -c config_ivtools/site.def.LINUX:1.3 config_ivtools/site.def.LINUX:1.4 *** config_ivtools/site.def.LINUX:1.3 Tue Mar 9 16:15:13 1999 --- config/site.def.LINUX Wed Mar 24 15:29:40 1999 *************** *** 49,59 **** #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! pushd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); popd; fi@@\ @@\ uninstall:: @@\ $(RM) dest/Concat(lib,libname.so.rev) @@\ --- 49,59 ---- #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@$(RM) dest/Concat(lib,libname.so) @@\ ! -@$(LN) dest/Concat(lib,libname.so.rev) \ @@\ ! dest/Concat(lib,libname.so) @@\ @@\ uninstall:: @@\ $(RM) dest/Concat(lib,libname.so.rev) @@\ Index: config_ivtools/site.def.SUN4 diff -c config_ivtools/site.def.SUN4:1.5 config_ivtools/site.def.SUN4:1.7 *** config_ivtools/site.def.SUN4:1.5 Tue Mar 9 16:15:13 1999 --- config/site.def.SUN4 Thu Apr 8 16:11:28 1999 *************** *** 9,14 **** --- 9,15 ---- #define SVR4Architecture YES #define HasGcc2 YES #define HasGcc HasGcc2 + #define ManSuffix 1x #endif /* gcc command line with -V for version and -O for optimize */ *************** *** 80,90 **** #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! cd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); fi @@\ @@\ uninstall:: @@\ $(RM) dest/Concat(lib,libname.so.rev) @@\ --- 81,91 ---- #ifndef InstallDynamicSharedLibrary #define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ ! MakeDir(dest) @@\ ! $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\ ! -@if [ -f dest/Concat(lib,libname.so) ]; then exit 0; else \ @@\ ! cd dest; \ @@\ ! $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so); fi @@\ @@\ uninstall:: @@\ $(RM) dest/Concat(lib,libname.so.rev) @@\ Index: config_ivtools/template diff -c config_ivtools/template:1.3 config_ivtools/template:1.6 *** config_ivtools/template:1.3 Tue Mar 9 16:15:13 1999 --- config/template Fri Apr 16 14:19:02 1999 *************** *** 7,12 **** --- 7,13 ---- * ArchitectureName taken from CPU environment variable. * Supported platforms listed in arch.def * Initialize with value returned from `make CPU` + * (now automatically set in config.mk by configure script) */ #include SiteDefCpu *************** *** 26,39 **** #include /* ! * Override with things from the configure script */ ! include $(RELTOP)/config/config.mk /* ! * Define common rules. */ ! #include /* * Define default actions for common targets. --- 27,40 ---- #include /* ! * Define common rules. */ ! #include /* ! * Override with things from the configure script */ ! include $(RELTOP)/config/config.mk /* * Define default actions for common targets. Index: drawtool/main.c diff -c drawtool/main.c:1.4 drawtool/main.c:1.5 *** drawtool/main.c:1.4 Wed Mar 17 15:55:48 1999 --- src/drawtool/main.c Wed Apr 7 14:34:45 1999 *************** *** 37,42 **** --- 37,43 ---- #include #include + #include #ifdef HAVE_ACE #include *************** *** 167,172 **** --- 168,174 ---- { "*twidth", "512" }, { "*zoomer_off", "false" }, { "*opaque_off", "false" }, + { "*ptrloc", "false" }, #ifdef HAVE_ACE { "*import", "20001" }, #endif *************** *** 200,205 **** --- 202,208 ---- { "-zoff", "*zoomer_off", OptionValueImplicit, "true" }, { "-opaque_off", "*opaque_off", OptionValueImplicit, "true" }, { "-opoff", "*opaque_off", OptionValueImplicit, "true" }, + { "-ptrloc", "*ptrloc", OptionValueImplicit, "true" }, #ifdef HAVE_ACE { "-import", "*import", OptionValueNext }, #endif *************** *** 211,219 **** static char* usage = "Usage: drawtool [any idraw parameter] [-color5] [-gray5] [-gray6] [-gray7] \n\ [-nocolor6] [-opaque_off|-opoff] [-pagecols|-ncols] [-pagerows|-nrows] \n\ ! [-panner_off|-poff] [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\ ! [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-toolbarloc|-tbl r|l ] \n\ ! [-zoomer_off|-zoff] [file]"; /*****************************************************************************/ --- 214,222 ---- static char* usage = "Usage: drawtool [any idraw parameter] [-color5] [-gray5] [-gray6] [-gray7] \n\ [-nocolor6] [-opaque_off|-opoff] [-pagecols|-ncols] [-pagerows|-nrows] \n\ ! [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\ ! [-panner_off|-poff] [-ptrloc] [-scribble_pointer|-scrpt ] \n\ ! [-slider_off|-soff] [-toolbarloc|-tbl r|l ] [-zoomer_off|-zoff] [file]"; /*****************************************************************************/ Index: include_interviews/_defines.h diff -c include_interviews/_defines.h:1.1 include_interviews/_defines.h:1.2 *** include_interviews/_defines.h:1.1 Fri Jan 15 09:34:15 1999 --- src/include/InterViews/_defines.h Wed Apr 7 14:34:57 1999 *************** *** 8,13 **** --- 8,14 ---- #define GlyphIndex _lib_iv(GlyphIndex) #define IntCoord _lib_iv(IntCoord) #define PixelCoord _lib_iv(PixelCoord) + #define FloatCoord _lib_iv(FloatCoord) #define Selection _lib_iv(Selection) #define Action _lib_iv(Action) #define ActiveHandler _lib_iv(ActiveHandler) Index: include_interviews/coord.h diff -c include_interviews/coord.h:1.1 include_interviews/coord.h:1.2 *** include_interviews/coord.h:1.1 Fri Jan 15 09:34:16 1999 --- src/include/InterViews/coord.h Wed Apr 7 14:34:57 1999 *************** *** 32,37 **** --- 32,38 ---- #include typedef float _lib_iv(Coord); + typedef float _lib_iv(FloatCoord); typedef int _lib_iv(IntCoord); typedef int _lib_iv(PixelCoord); Index: include_interviews/display.h diff -c include_interviews/display.h:1.1 include_interviews/display.h:1.2 *** include_interviews/display.h:1.1 Fri Jan 15 09:34:16 1999 --- src/include/InterViews/display.h Tue Mar 30 16:52:07 1999 *************** *** 41,47 **** class Style; class Window; ! // X window display object. // in reference manual. class Display { public: --- 41,47 ---- class Style; class Window; ! //: X window display object. // in reference manual. class Display { public: Index: include_interviews/event.h diff -c include_interviews/event.h:1.4 include_interviews/event.h:1.5 *** include_interviews/event.h:1.4 Fri Feb 19 16:50:00 1999 --- src/include/InterViews/event.h Wed Apr 7 14:34:57 1999 *************** *** 34,39 **** --- 34,40 ---- #include class Display; + class Event; class EventRep; class Interactor; class Handler; *************** *** 42,47 **** --- 43,49 ---- typedef unsigned int EventType; typedef unsigned int EventButton; + typedef void (*event_tracker_ptr)(Event&); /* anachronism */ enum { *************** *** 112,117 **** --- 114,124 ---- virtual unsigned int mapkey(char*, unsigned int len) const; EventRep* rep() const; + + static event_tracker_ptr event_tracker() { return _event_tracker; } + static void event_tracker(event_tracker_ptr ptr) { _event_tracker = ptr; } + protected: + static event_tracker_ptr _event_tracker; private: EventRep* rep_; char free_store_[200]; Index: include_interviews/window.h diff -c include_interviews/window.h:1.1 include_interviews/window.h:1.3 *** include_interviews/window.h:1.1 Fri Jan 15 09:34:19 1999 --- src/include/InterViews/window.h Wed Apr 7 14:34:57 1999 *************** *** 46,52 **** class Style; class WindowRep; ! // object that can be mapped onto a screen. // in reference manual. class Window { protected: --- 46,52 ---- class Style; class WindowRep; ! //: object that can be mapped onto a screen. // in reference manual. class Window { protected: *************** *** 97,102 **** --- 97,104 ---- virtual void ungrab_pointer() const; virtual void repair(); + + virtual void offset_from_toplevel(PixelCoord& dx, PixelCoord& dy); WindowRep* rep() const; protected: Index: scripts_ivtools/bsdinst.sh diff -c scripts_ivtools/bsdinst.sh:1.1 scripts_ivtools/bsdinst.sh:1.2 *** scripts_ivtools/bsdinst.sh:1.1 Fri Jan 15 09:35:10 1999 --- src/scripts/bsdinst.sh Wed Apr 7 14:35:05 1999 *************** *** 8,13 **** --- 8,14 ---- flags="" dst="" src="" + srclist="" dostrip="" owner="" mode="" *************** *** 38,47 **** shift continue;; ! *) if [ x$src = x ] then ! src=$1 else dst=$1 fi shift --- 39,49 ---- shift continue;; ! *) if [ "x$srclist" = "x" ] then ! srclist=$1 else + srclist="$srclist $dst " dst=$1 fi shift *************** *** 61,66 **** --- 63,70 ---- ;; esac + for src in $srclist ; do + if [ x$src = x ] then echo "bsdinst: no input file specified" *************** *** 138,140 **** --- 142,145 ---- $rmcmd + done Index: src_interviews/session.c diff -c src_interviews/session.c:1.2 src_interviews/session.c:1.3 *** src_interviews/session.c:1.2 Wed Jan 20 16:55:47 1999 --- src/InterViews/session.c Wed Apr 7 14:34:01 1999 *************** *** 661,667 **** char* buf = new char[h.length() + t.length() + 1]; sprintf(buf, "%s%s", h.string(), t.string()); s->load_file(String(buf), priority); ! delete buf; } const char* SessionRep::home() { --- 661,667 ---- char* buf = new char[h.length() + t.length() + 1]; sprintf(buf, "%s%s", h.string(), t.string()); s->load_file(String(buf), priority); ! delete[] buf; } const char* SessionRep::home() { *************** *** 682,688 **** char* buf = new char[h.length() + m.length() + t.length() + 1]; sprintf(buf, "%s%s%s", h.string(), m.string(), t.string()); s->load_file(String(buf), priority); ! delete buf; } /* --- 682,688 ---- char* buf = new char[h.length() + m.length() + t.length() + 1]; sprintf(buf, "%s%s%s", h.string(), m.string(), t.string()); s->load_file(String(buf), priority); ! delete[] buf; } /* Index: src_interviews/style.c diff -c src_interviews/style.c:1.1 src_interviews/style.c:1.2 *** src_interviews/style.c:1.1 Fri Jan 15 09:29:16 1999 --- src/InterViews/style.c Wed Apr 7 14:34:01 1999 *************** *** 267,273 **** delete a; } } ! delete e->entries_; delete e; } delete t; --- 267,273 ---- delete a; } } ! delete[] e->entries_; delete e; } delete t; Index: src_iv-2_6/interactor.c diff -c src_iv-2_6/interactor.c:1.1 src_iv-2_6/interactor.c:1.3 *** src_iv-2_6/interactor.c:1.1 Fri Jan 15 09:29:25 1999 --- src/IV-2_6/interactor.c Wed Apr 7 14:34:05 1999 *************** *** 152,157 **** --- 152,159 ---- Handler* h = nil; while (!world->done()) { e.read(); + if (Event::event_tracker()) + (*Event::event_tracker())(e); h = e.handler(); Resource::ref(h); if (e.target != nil) { *************** *** 161,166 **** --- 163,169 ---- if (h != nil && !e.is_grabbing(h)) { e.GetInfo(); e.target = InteractorHelper::instance(h); + e.y = ymax - e.y; break; } Resource::unref(h); *************** *** 171,176 **** --- 174,181 ---- e.display(world->display()); e.target = nil; while (!world->done() && e.read(sec, usec)) { + if (Event::event_tracker()) + (*Event::event_tracker())(e); Handler* h = e.handler(); if (e.target != nil) { return true; *************** *** 178,183 **** --- 183,189 ---- if (h != nil && !e.is_grabbing(h)) { e.GetInfo(); e.target = InteractorHelper::instance(h); + e.y = ymax - e.y; return true; } } Index: src_iv-2_6/textdisplay.c diff -c src_iv-2_6/textdisplay.c:1.1 src_iv-2_6/textdisplay.c:1.2 *** src_iv-2_6/textdisplay.c:1.1 Fri Jan 15 09:29:27 1999 --- src/IV-2_6/textdisplay.c Wed Apr 7 14:34:05 1999 *************** *** 204,210 **** TextLine** newlines = new TextLine* [newmaxlines]; Memory::zero(newlines, newmaxlines * sizeof(TextLine*)); Memory::copy(lines, newlines, maxlines * sizeof(TextLine*)); ! delete lines; lines = newlines; maxlines = newmaxlines; } --- 204,210 ---- TextLine** newlines = new TextLine* [newmaxlines]; Memory::zero(newlines, newmaxlines * sizeof(TextLine*)); Memory::copy(lines, newlines, maxlines * sizeof(TextLine*)); ! delete[] lines; lines = newlines; maxlines = newmaxlines; } *************** *** 779,787 **** void TextLine::Replace ( TextDisplay* display, int line, const char* t, int c ) { ! delete text; text = nil; ! delete attr; attr = nil; size = 0; Size(c); --- 779,787 ---- void TextLine::Replace ( TextDisplay* display, int line, const char* t, int c ) { ! delete[] text; text = nil; ! delete[] attr; attr = nil; size = 0; Size(c); Index: src_os/file.c diff -c src_os/file.c:1.1 src_os/file.c:1.2 *** src_os/file.c:1.1 Fri Jan 15 09:29:39 1999 --- src/OS/file.c Wed Apr 7 14:34:11 1999 *************** *** 118,124 **** #endif } if (i->buf_ != nil) { ! delete i->buf_; } ::close(i->fd_); i->fd_ = -1; --- 118,124 ---- #endif } if (i->buf_ != nil) { ! delete[] i->buf_; } ::close(i->fd_); i->fd_ = -1; Index: src_os/string.c diff -c src_os/string.c:1.4 src_os/string.c:1.5 *** src_os/string.c:1.4 Mon Mar 8 16:10:35 1999 --- src/OS/string.c Wed Apr 7 14:34:11 1999 *************** *** 384,390 **** void CopyString::free() { char* s = (char*)(string()); ! delete s; } /* --- 384,390 ---- void CopyString::free() { char* s = (char*)(string()); ! delete[] s; } /* *************** *** 441,447 **** void NullTerminatedString::free() { if (allocated_) { char* s = (char*)(string()); ! delete s; allocated_ = false; } } --- 441,447 ---- void NullTerminatedString::free() { if (allocated_) { char* s = (char*)(string()); ! delete[] s; allocated_ = false; } } Index: src_x11/xevent.c diff -c src_x11/xevent.c:1.3 src_x11/xevent.c:1.4 *** src_x11/xevent.c:1.3 Fri Feb 19 16:47:53 1999 --- src/IV-X11/xevent.c Wed Apr 7 14:34:08 1999 *************** *** 42,47 **** --- 42,49 ---- #include #include + event_tracker_ptr Event::_event_tracker = nil; + Event::Event() { if (sizeof(EventRep) <= sizeof(free_store_)) { rep_ = (EventRep*)free_store_; *************** *** 184,189 **** --- 186,193 ---- } void Event::handle() { + if (event_tracker()) + (*event_tracker())(*this); Handler* h = nil; if (rep()->xevent_.type != KeyPress) { h = grabber(); Index: src_x11/xwindow.c diff -c src_x11/xwindow.c:1.1 src_x11/xwindow.c:1.2 *** src_x11/xwindow.c:1.1 Fri Jan 15 09:29:34 1999 --- src/IV-X11/xwindow.c Wed Apr 7 14:34:08 1999 *************** *** 606,611 **** --- 606,635 ---- w.needs_resize_ = true; } + void Window::offset_from_toplevel(PixelCoord& dx, PixelCoord& dy) { + WindowRep& w = *rep(); + XWindow xtoplevel = w.xtoplevel_; + dx = 0; + dy = 0; + XWindow curwin = w.xwindow_; + XWindowAttributes attributes; + while (1) { + XGetWindowAttributes(w.dpy(), curwin, &attributes); + dx += attributes.x; + dy += attributes.y; + + XWindow root; + XWindow parent; + XWindow* children; + unsigned int nchildren; + if(!XQueryTree(w.dpy(), curwin, &root, &parent, &children, &nchildren)) break; + XFree(children); + if (parent == xtoplevel) return; + curwin = parent; + } + cerr << "unexpected failure in traversing up X window tree\n"; + } + /** class ManagedWindow **/ ManagedWindow::ManagedWindow(Glyph* g) : Window(g) { Index: utils_ivtools/Imakefile diff -c utils_ivtools/Imakefile:1.5 utils_ivtools/Imakefile:1.6 *** utils_ivtools/Imakefile:1.5 Wed Feb 24 13:30:59 1999 --- src/utils/Imakefile Wed Apr 7 14:35:07 1999 *************** *** 13,19 **** BuildProgram(stdcmapppm,NullParameter,stdcmapppm.o,,) InstallProgram(stdcmapppm,$(BINDIR),stdcmapppm) #if defined(SVR4Architecture) && defined(SunArchitecture) ! BuildProgram(ivdl,NullParameter,ivdl.o downloader.o ftp.o http.o sockets.o thrower.o -lsocket -lnsl,$(DEPIVCOMMON),$(LIBIVCOMMON))) #else BuildProgram(ivdl,NullParameter,ivdl.o downloader.o ftp.o http.o sockets.o thrower.o,$(DEPIVCOMMON),$(LIBIVCOMMON)) #endif --- 13,19 ---- BuildProgram(stdcmapppm,NullParameter,stdcmapppm.o,,) InstallProgram(stdcmapppm,$(BINDIR),stdcmapppm) #if defined(SVR4Architecture) && defined(SunArchitecture) ! BuildProgram(ivdl,NullParameter,ivdl.o downloader.o ftp.o http.o sockets.o thrower.o -lsocket -lnsl,$(DEPIVCOMMON),$(LIBIVCOMMON)) #else BuildProgram(ivdl,NullParameter,ivdl.o downloader.o ftp.o http.o sockets.o thrower.o,$(DEPIVCOMMON),$(LIBIVCOMMON)) #endif