From d9e642fef5b6bf200eaaf3a42f68f5b6c1276e45 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Sun, 18 Jan 2009 00:25:35 +0000 Subject: [PATCH] add for min/max --- config.h.in | 3 ++ configure | 101 ++++++++++++++++++++++++++++++++++++++ configure.ac | 3 +- libsrc/include/mystdlib.h | 1 + ng/ngappinit.cpp | 4 +- 5 files changed, 109 insertions(+), 3 deletions(-) diff --git a/config.h.in b/config.h.in index d02434b5..381dfa34 100644 --- a/config.h.in +++ b/config.h.in @@ -18,6 +18,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `minabc' function. */ +#undef HAVE_MINABC + /* Define to 1 if you have the `pow' function. */ #undef HAVE_POW diff --git a/configure b/configure index e899aa57..09134843 100755 --- a/configure +++ b/configure @@ -17211,6 +17211,107 @@ fi done +for ac_func in minabc +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + ac_config_files="$ac_config_files Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile tutorials/Makefile" diff --git a/configure.ac b/configure.ac index 98380cd9..071a7605 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ TEA_PATH_TCLCONFIG TEA_LOAD_TCLCONFIG TEA_PATH_TKCONFIG -TEA_LOAD_TKCONFIG +TEA_LOAD_TKCONFIG TEA_PUBLIC_TCL_HEADERS @@ -88,6 +88,7 @@ AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_FUNCS([pow]) AC_CHECK_FUNCS([floor]) AC_CHECK_HEADERS([limits.h]) +AC_CHECK_FUNCS([minabc]) AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile \ diff --git a/libsrc/include/mystdlib.h b/libsrc/include/mystdlib.h index e475cc12..450c9420 100644 --- a/libsrc/include/mystdlib.h +++ b/libsrc/include/mystdlib.h @@ -19,6 +19,7 @@ #include #include #include +#include #include diff --git a/ng/ngappinit.cpp b/ng/ngappinit.cpp index d636db54..2a4fed7c 100644 --- a/ng/ngappinit.cpp +++ b/ng/ngappinit.cpp @@ -348,9 +348,11 @@ int main(int argc, char ** argv) +/* extern "C" int Tix_Init (Tcl_Interp * interp); extern "C" int Itcl_Init (Tcl_Interp * interp); extern "C" int Itk_Init (Tcl_Interp * interp); +*/ extern "C" int Ng_Init (Tcl_Interp * interp); extern "C" int Ng_Vis_Init (Tcl_Interp * interp); @@ -380,7 +382,6 @@ int Tcl_AppInit(Tcl_Interp * interp) // return TCL_ERROR; } - // if ITcl and ITk are installed on the system, then // they must also be initialized /* @@ -528,6 +529,5 @@ int Tcl_AppInit(Tcl_Interp * interp) Tcl_StaticPackage(interp, "Tk", Tk_Init, 0); - return TCL_OK; }