From 398ce1d3d47fd954405cab5fff42d11de404c007 Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 6 Apr 2000 18:00:14 +0000 Subject: [PATCH] Removed some mat3.h dependencies and other tweaks. --- config.cache | 89 ------- config.log | 90 ------- config.status | 441 --------------------------------- configure.in | 5 +- src/BuildTiles/Main/main.cxx | 10 +- src/BuildTiles/Main/master.cxx | 1 - 6 files changed, 7 insertions(+), 629 deletions(-) delete mode 100644 config.cache delete mode 100644 config.log delete mode 100755 config.status diff --git a/config.cache b/config.cache deleted file mode 100644 index cc80f8ba..00000000 --- a/config.cache +++ /dev/null @@ -1,89 +0,0 @@ -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -ac_cv_c_const=${ac_cv_c_const=yes} -ac_cv_func_GetLocalTime=${ac_cv_func_GetLocalTime=no} -ac_cv_func_bcopy=${ac_cv_func_bcopy=yes} -ac_cv_func_connect=${ac_cv_func_connect=yes} -ac_cv_func_ftime=${ac_cv_func_ftime=yes} -ac_cv_func_gethostbyname=${ac_cv_func_gethostbyname=yes} -ac_cv_func_getitimer=${ac_cv_func_getitimer=yes} -ac_cv_func_getrusage=${ac_cv_func_getrusage=yes} -ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=yes} -ac_cv_func_memcpy=${ac_cv_func_memcpy=yes} -ac_cv_func_mktime=${ac_cv_func_mktime=yes} -ac_cv_func_rand=${ac_cv_func_rand=yes} -ac_cv_func_random=${ac_cv_func_random=yes} -ac_cv_func_remove=${ac_cv_func_remove=yes} -ac_cv_func_rint=${ac_cv_func_rint=yes} -ac_cv_func_setitimer=${ac_cv_func_setitimer=yes} -ac_cv_func_shmat=${ac_cv_func_shmat=yes} -ac_cv_func_signal=${ac_cv_func_signal=yes} -ac_cv_func_strstr=${ac_cv_func_strstr=yes} -ac_cv_func_timegm=${ac_cv_func_timegm=yes} -ac_cv_func_vprintf=${ac_cv_func_vprintf=yes} -ac_cv_have_x=${ac_cv_have_x='have_x=yes ac_x_includes=/usr/X11R6/include ac_x_libraries=/usr/X11R6/lib'} -ac_cv_header_fcntl_h=${ac_cv_header_fcntl_h=yes} -ac_cv_header_getopt_h=${ac_cv_header_getopt_h=yes} -ac_cv_header_gpc_h=${ac_cv_header_gpc_h=yes} -ac_cv_header_malloc_h=${ac_cv_header_malloc_h=yes} -ac_cv_header_memory_h=${ac_cv_header_memory_h=yes} -ac_cv_header_plib_pu_h=${ac_cv_header_plib_pu_h=yes} -ac_cv_header_stdc=${ac_cv_header_stdc=yes} -ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h=yes} -ac_cv_header_sys_param_h=${ac_cv_header_sys_param_h=yes} -ac_cv_header_sys_stat_h=${ac_cv_header_sys_stat_h=yes} -ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes} -ac_cv_header_sys_timeb_h=${ac_cv_header_sys_timeb_h=yes} -ac_cv_header_time=${ac_cv_header_time=yes} -ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes} -ac_cv_header_values_h=${ac_cv_header_values_h=yes} -ac_cv_header_winbase_h=${ac_cv_header_winbase_h=no} -ac_cv_header_windows_h=${ac_cv_header_windows_h=no} -ac_cv_lib_GLU_gluLookAt=${ac_cv_lib_GLU_gluLookAt=no} -ac_cv_lib_GL_glNewList=${ac_cv_lib_GL_glNewList=yes} -ac_cv_lib_GLcore_glNewList=${ac_cv_lib_GLcore_glNewList=no} -ac_cv_lib_ICE_IceConnectionNumber=${ac_cv_lib_ICE_IceConnectionNumber=yes} -ac_cv_lib_ICE_IceOpenConnection=${ac_cv_lib_ICE_IceOpenConnection=yes} -ac_cv_lib_MesaGLU_gluLookAt=${ac_cv_lib_MesaGLU_gluLookAt=yes} -ac_cv_lib_SM_SmcOpenConnection=${ac_cv_lib_SM_SmcOpenConnection=yes} -ac_cv_lib_X11_XCreateWindow=${ac_cv_lib_X11_XCreateWindow=yes} -ac_cv_lib_Xext_XShmCreateImage=${ac_cv_lib_Xext_XShmCreateImage=yes} -ac_cv_lib_Xi_XGetExtensionVersion=${ac_cv_lib_Xi_XGetExtensionVersion=yes} -ac_cv_lib_Xmu_XmuLookupStandardColormap=${ac_cv_lib_Xmu_XmuLookupStandardColormap=yes} -ac_cv_lib_Xt_XtMalloc=${ac_cv_lib_Xt_XtMalloc=yes} -ac_cv_lib_dnet_dnet_ntoa=${ac_cv_lib_dnet_dnet_ntoa=no} -ac_cv_lib_dnet_stub_dnet_ntoa=${ac_cv_lib_dnet_stub_dnet_ntoa=no} -ac_cv_lib_glut_glutGameModeString=${ac_cv_lib_glut_glutGameModeString=yes} -ac_cv_lib_glut_glutGetModifiers=${ac_cv_lib_glut_glutGetModifiers=yes} -ac_cv_lib_m_cos=${ac_cv_lib_m_cos=yes} -ac_cv_lib_socket_socket=${ac_cv_lib_socket_socket=no} -ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'} -ac_cv_prog_CC=${ac_cv_prog_CC=gcc} -ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'} -ac_cv_prog_CXX=${ac_cv_prog_CXX=c++} -ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'} -ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib} -ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no} -ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes} -ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes} -ac_cv_prog_cxx_cross=${ac_cv_prog_cxx_cross=no} -ac_cv_prog_cxx_g=${ac_cv_prog_cxx_g=yes} -ac_cv_prog_cxx_works=${ac_cv_prog_cxx_works=yes} -ac_cv_prog_gcc=${ac_cv_prog_gcc=yes} -ac_cv_prog_gxx=${ac_cv_prog_gxx=yes} -ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes} -ac_cv_struct_tm=${ac_cv_struct_tm=time.h} -ac_cv_type_signal=${ac_cv_type_signal=void} -ac_cv_type_size_t=${ac_cv_type_size_t=yes} diff --git a/config.log b/config.log deleted file mode 100644 index 0fc0fb9c..00000000 --- a/config.log +++ /dev/null @@ -1,90 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -configure:561: checking for a BSD compatible install -configure:614: checking whether build environment is sane -configure:671: checking whether make sets ${MAKE} -configure:717: checking for working aclocal -configure:730: checking for working autoconf -configure:743: checking for working automake -configure:756: checking for working autoheader -configure:769: checking for working makeinfo -configure:784: checking whether make sets ${MAKE} -configure:813: checking for gcc -configure:890: checking whether the C compiler (gcc -Wall -O2 ) works -configure:904: gcc -o conftest -Wall -O2 conftest.c 1>&5 -configure:901: warning: return-type defaults to `int' -configure:924: checking whether the C compiler (gcc -Wall -O2 ) is a cross-compiler -configure:929: checking whether we are using GNU C -configure:953: checking whether gcc accepts -g -configure:985: checking for c++ -configure:1016: checking whether the C++ compiler (c++ -Wall -O2 ) works -configure:1030: c++ -o conftest -Wall -O2 conftest.C 1>&5 -configure:1056: checking whether the C++ compiler (c++ -Wall -O2 ) is a cross-compiler -configure:1061: checking whether we are using GNU C++ -configure:1085: checking whether c++ accepts -g -configure:1115: checking for ranlib -configure:1152: checking for a BSD compatible install -configure:1202: checking whether ln -s works -configure:1261: checking how to run the C preprocessor -configure:1323: checking for windows.h -configure:1452: checking for X -configure:1766: checking for dnet_ntoa in -ldnet -configure:1807: checking for dnet_ntoa in -ldnet_stub -configure:1855: checking for gethostbyname -configure:1953: checking for connect -configure:2045: checking for remove -configure:2137: checking for shmat -configure:2238: checking for IceConnectionNumber in -lICE -configure:2286: checking for cos in -lm -configure:2336: checking for socket in -lsocket -configure:2383: checking for XCreateWindow in -lX11 -configure:2430: checking for XShmCreateImage in -lXext -configure:2477: checking for XGetExtensionVersion in -lXi -configure:2524: checking for IceOpenConnection in -lICE -configure:2571: checking for SmcOpenConnection in -lSM -configure:2618: checking for XtMalloc in -lXt -configure:2665: checking for XmuLookupStandardColormap in -lXmu -configure:2716: checking for glNewList in -lGLcore -configure:2764: checking for glNewList in -lGL -configure:2956: checking for gluLookAt in -lGLU -configure:3004: checking for gluLookAt in -lMesaGLU -configure:3053: checking for glutGetModifiers in -lglut -configure:3102: checking for glutGameModeString in -lglut -configure:3221: checking for plib/pu.h -configure:3267: checking for gpc.h -configure:3317: checking for ANSI C header files -configure:3426: checking for fcntl.h -configure:3426: checking for getopt.h -configure:3426: checking for malloc.h -configure:3426: checking for memory.h -configure:3426: checking for stdlib.h -configure:3426: checking for sys/param.h -configure:3426: checking for sys/stat.h -configure:3426: checking for sys/time.h -configure:3426: checking for sys/timeb.h -configure:3426: checking for unistd.h -configure:3426: checking for windows.h -configure:3426: checking for winbase.h -configure:3426: checking for values.h -configure:3464: checking for working const -configure:3539: checking for size_t -configure:3572: checking whether time.h and sys/time.h may both be included -configure:3607: checking whether struct tm is in sys/time.h or time.h -configure:3642: checking return type of signal handlers -configure:3683: checking for vprintf -configure:3791: checking for ftime -configure:3791: checking for gettimeofday -configure:3791: checking for timegm -configure:3791: checking for memcpy -configure:3791: checking for bcopy -configure:3791: checking for mktime -configure:3791: checking for strstr -configure:3791: checking for rand -configure:3791: checking for random -configure:3791: checking for setitimer -configure:3791: checking for getitimer -configure:3791: checking for signal -configure:3791: checking for GetLocalTime -configure:3791: checking for rint -configure:3791: checking for getrusage diff --git a/config.status b/config.status deleted file mode 100755 index 4fe235a8..00000000 --- a/config.status +++ /dev/null @@ -1,441 +0,0 @@ -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host kenai: -# -# ./configure -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]" -for ac_option -do - case "$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --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 ;; - *) echo "$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=. -ac_given_INSTALL="/usr/bin/install -c" - -trap 'rm -fr VERSION Makefile src/Makefile src/Construct/Makefile src/Construct/Clipper/Makefile src/Construct/Combine/Makefile src/Construct/GenOutput/Makefile src/Construct/Match/Makefile src/Construct/Triangulate/Makefile src/Construct/Main/Makefile src/Construct/Parallel/Makefile src/Lib/Makefile src/Lib/Array/Makefile src/Lib/Build/Makefile src/Lib/DEM/Makefile src/Lib/Polygon/Makefile src/Lib/poly2tri/Makefile src/Lib/shapelib/Makefile src/Lib/Triangle/Makefile src/Prep/Makefile src/Prep/DemChop/Makefile src/Prep/DemInfo/Makefile src/Prep/DemRaw2ascii/Makefile src/Prep/GenAirports/Makefile src/Prep/GSHHS/Makefile src/Prep/MergerClipper/Makefile src/Prep/ShapeFile/Makefile src/Utils/Makefile src/Include/config.h conftest*; exit 1' 1 2 15 - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF -/^[ ]*VPATH[ ]*=[^:]*$/d - -s%@CFLAGS@%-Wall -O2%g -s%@CPPFLAGS@%-I/usr/local/include -I/usr/X11R6/include%g -s%@CXXFLAGS@%-Wall -O2%g -s%@DEFS@%-DHAVE_CONFIG_H%g -s%@LDFLAGS@%-L/usr/local/lib -L/usr/X11R6/lib%g -s%@LIBS@%-lm %g -s%@exec_prefix@%${prefix}%g -s%@prefix@%/usr/local%g -s%@program_transform_name@%s,x,x,%g -s%@bindir@%${exec_prefix}/bin%g -s%@sbindir@%${exec_prefix}/sbin%g -s%@libexecdir@%${exec_prefix}/libexec%g -s%@datadir@%${prefix}/share%g -s%@sysconfdir@%${prefix}/etc%g -s%@sharedstatedir@%${prefix}/com%g -s%@localstatedir@%${prefix}/var%g -s%@libdir@%${exec_prefix}/lib%g -s%@includedir@%${prefix}/include%g -s%@oldincludedir@%/usr/include%g -s%@infodir@%${prefix}/info%g -s%@mandir@%${prefix}/man%g -s%@INSTALL_PROGRAM@%${INSTALL}%g -s%@INSTALL_DATA@%${INSTALL} -m 644%g -s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g -s%@PACKAGE@%TerraGear%g -s%@VERSION@%0.0.1%g -s%@ACLOCAL@%aclocal%g -s%@AUTOCONF@%autoconf%g -s%@AUTOMAKE@%automake%g -s%@AUTOHEADER@%autoheader%g -s%@MAKEINFO@%/h/curt/projects/TerraGear-0.0/TerraGear/missing makeinfo%g -s%@SET_MAKE@%%g -s%@CC@%gcc%g -s%@CXX@%c++%g -s%@RANLIB@%ranlib%g -s%@LN_S@%ln -s%g -s%@CPP@%gcc -E%g -s%@X_CFLAGS@% -I/usr/X11R6/include%g -s%@X_PRE_LIBS@% -lSM -lICE%g -s%@X_LIBS@% -L/usr/X11R6/lib%g -s%@X_EXTRA_LIBS@%%g -s%@ENABLE_XMESA_FX_TRUE@%%g -s%@ENABLE_XMESA_FX_FALSE@%%g -s%@base_LIBS@%-lm %g -s%@opengl_LIBS@%-lglut -lMesaGLU -lGL -lXmu -lXt -lSM -lICE -lXi -lXext -lX11 -lm %g -s%@HAVE_XWINDOWS_TRUE@%%g -s%@HAVE_XWINDOWS_FALSE@%#%g - -CEOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi - -CONFIG_FILES=${CONFIG_FILES-" VERSION Makefile src/Makefile src/Construct/Makefile src/Construct/Clipper/Makefile src/Construct/Combine/Makefile src/Construct/GenOutput/Makefile src/Construct/Match/Makefile src/Construct/Triangulate/Makefile src/Construct/Main/Makefile src/Construct/Parallel/Makefile src/Lib/Makefile src/Lib/Array/Makefile src/Lib/Build/Makefile src/Lib/DEM/Makefile src/Lib/Polygon/Makefile src/Lib/poly2tri/Makefile src/Lib/shapelib/Makefile src/Lib/Triangle/Makefile src/Prep/Makefile src/Prep/DemChop/Makefile src/Prep/DemInfo/Makefile src/Prep/DemRaw2ascii/Makefile src/Prep/GenAirports/Makefile src/Prep/GSHHS/Makefile src/Prep/MergerClipper/Makefile src/Prep/ShapeFile/Makefile src/Utils/Makefile "} -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then - CONFIG_HEADERS="src/Include/config.h" -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - cat > conftest.frag < conftest.out - rm -f conftest.in - mv conftest.out conftest.in - - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - - - -test -z "$CONFIG_HEADERS" || echo timestamp > src/Include/stamp-h - -exit 0 diff --git a/configure.in b/configure.in index 6f27e433..3c66820e 100644 --- a/configure.in +++ b/configure.in @@ -201,9 +201,8 @@ if test "x$ac_cv_header_gpc_h" != "xyes"; then echo echo "Please see README.gpc for more details." echo - echo "(pausing 5 seconds)" - sleep 5 - echo + echo "configure aborted." + exit fi dnl Checks for header files. diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index e174b507..e700736e 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -28,10 +28,11 @@ #include // set mem allocation limit #include // set mem allocation limit +#include + #include #include #include -#include #include #include @@ -384,8 +385,7 @@ static belongs_to_list gen_node_ele_lookup_table( FGConstruct& c ) { // caclulate the normal for the specified triangle face static Point3D calc_normal( FGConstruct& c, int i ) { - double v1[3], v2[3], normal[3]; - double temp; + sgVec3 v1, v2, normal; point_list wgs84_nodes = c.get_wgs84_nodes(); triele_list tri_elements = c.get_tri_elements(); @@ -397,8 +397,8 @@ static Point3D calc_normal( FGConstruct& c, int i ) { v1[0] = p2.x() - p1.x(); v1[1] = p2.y() - p1.y(); v1[2] = p2.z() - p1.z(); v2[0] = p3.x() - p1.x(); v2[1] = p3.y() - p1.y(); v2[2] = p3.z() - p1.z(); - MAT3cross_product(normal, v1, v2); - MAT3_NORMALIZE_VEC(normal,temp); + sgVectorProduct( normal, v1, v2 ); + sgNormalizeVec3( normal ); return Point3D( normal[0], normal[1], normal[2] ); } diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx index 2ed7f533..69841421 100644 --- a/src/BuildTiles/Main/master.cxx +++ b/src/BuildTiles/Main/master.cxx @@ -30,7 +30,6 @@ #include // #include -// #include // #include // #include