ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

automake

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-01-14 17:27:44 +00:00
parent bfd58a04ff
commit 98a4bbd4d8
7 changed files with 442 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,6 +1 @@
if OCC
echo "OCC is enabled"
endif
SUBDIRS = libsrc ng tutorials SUBDIRS = libsrc ng tutorials

2
Makefile.in
View File

@ -637,8 +637,6 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am tags tags-recursive uninstall uninstall-am
@OCC_TRUE@ echo "OCC is enabled"
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

4
config.h.in
View File

@ -6,8 +6,8 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the `pthread' library (-lpthread). */ /* Define to 1 if you have the `pthread_create' library (-lpthread_create). */
#undef HAVE_LIBPTHREAD #undef HAVE_LIBPTHREAD_CREATE
/* Define to 1 if you have the <memory.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H

485
configure vendored
View File

@ -787,8 +787,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
OCCLIBS OCCLIBS
OCCFLAGS OCCFLAGS
OCC_FALSE
OCC_TRUE
CXXCPP CXXCPP
CPP CPP
OTOOL64 OTOOL64
@ -2525,7 +2523,9 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
# Check whether --enable-occ was given. # Check whether --enable-occ was given.
if test "${enable_occ+set}" = set; then if test "${enable_occ+set}" = set; then
enableval=$enable_occ; occon=true occfl='-DOCCGEOMETRY -I/usr/local/inc' enableval=$enable_occ; occon=true
OCCFLAGS='-DOCCGEOMETRY -I/usr/local/inc'
occfl='-DOCCGEOMETRY -I/usr/local/inc'
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL'
else else
occon=false occon=false
@ -15163,39 +15163,45 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:$LINENO: checking POSIX termios" >&5 # AC_SYS_POSIX_TERMIOS
$as_echo_n "checking POSIX termios... " >&6; }
if test "${ac_cv_sys_posix_termios+set}" = set; then # AM_CONDITIONAL([OCC], [test x$occon = xtrue])
OCCFLAGS=$occfl
OCCLIBS=$occlfl
if test "${ac_cv_header_pthread_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
$as_echo_n "checking for pthread.h... " >&6; }
if test "${ac_cv_header_pthread_h+set}" = set; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
$as_echo "$ac_cv_header_pthread_h" >&6; }
else else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
$as_echo_n "checking pthread.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/types.h> $ac_includes_default
#include <unistd.h> #include <pthread.h>
#include <termios.h>
int
main ()
{
/* SunOS 4.0.3 has termios.h but not the library calls. */
tcgetattr(0, 0);
;
return 0;
}
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext
if { (ac_try="$ac_link" if { (ac_try="$ac_compile"
case "(($ac_try" in case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;; *) ac_try_echo=$ac_try;;
esac esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5 $as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1 (eval "$ac_compile") 2>conftest.er1
ac_status=$? ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
@ -15204,40 +15210,226 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && { (exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" || test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err test ! -s conftest.err
} && test -s conftest$ac_exeext && { } && test -s conftest.$ac_objext; then
test "$cross_compiling" = yes || ac_header_compiler=yes
$as_test_x conftest$ac_exeext
}; then
ac_cv_sys_posix_termios=yes
else else
$as_echo "$as_me: failed program was:" >&5 $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_sys_posix_termios=no ac_header_compiler=no
fi fi
rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ { $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
conftest$ac_exeext conftest.$ac_ext $as_echo "$ac_header_compiler" >&6; }
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_posix_termios" >&5
$as_echo "$ac_cv_sys_posix_termios" >&6; }
# Is the header present?
if test x$occon = xtrue; then { $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
OCC_TRUE= $as_echo_n "checking pthread.h presence... " >&6; }
OCC_FALSE='#' cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <pthread.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
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_cpp conftest.$ac_ext") 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); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else else
OCC_TRUE='#' $as_echo "$as_me: failed program was:" >&5
OCC_FALSE= sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi fi
OCCFLAGS=$occfl rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
OCCLIBS=$occlfl # So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
;;
esac
{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
$as_echo_n "checking for pthread.h... " >&6; }
if test "${ac_cv_header_pthread_h+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_header_pthread_h=$ac_header_preproc
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
$as_echo "$ac_cv_header_pthread_h" >&6; }
fi
if test "${ac_cv_header_togl_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for togl.h" >&5
$as_echo_n "checking for togl.h... " >&6; }
if test "${ac_cv_header_togl_h+set}" = set; then
$as_echo_n "(cached) " >&6
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_togl_h" >&5
$as_echo "$ac_cv_header_togl_h" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking togl.h usability" >&5
$as_echo_n "checking togl.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <togl.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$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_objext; then
ac_header_compiler=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking togl.h presence" >&5
$as_echo_n "checking togl.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <togl.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
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_cpp conftest.$ac_ext") 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); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: togl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: togl.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: togl.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: togl.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: togl.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: togl.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: togl.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: togl.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: togl.h: in the future, the compiler will take precedence" >&2;}
;;
esac
{ $as_echo "$as_me:$LINENO: checking for togl.h" >&5
$as_echo_n "checking for togl.h... " >&6; }
if test "${ac_cv_header_togl_h+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_header_togl_h=$ac_header_preproc
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_togl_h" >&5
$as_echo "$ac_cv_header_togl_h" >&6; }
fi
# AC_CHECK_HEADER([pthread])
if test "${ac_cv_header_iostream+set}" = set; then if test "${ac_cv_header_iostream+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for iostream" >&5 { $as_echo "$as_me:$LINENO: checking for iostream" >&5
@ -15769,13 +15961,13 @@ fi
{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 { $as_echo "$as_me:$LINENO: checking for pthread in -lpthread_create" >&5
$as_echo_n "checking for pthread_create in -lpthread... " >&6; } $as_echo_n "checking for pthread in -lpthread_create... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then if test "${ac_cv_lib_pthread_create_pthread+set}" = set; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS" LIBS="-lpthread_create $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -15789,11 +15981,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char pthread_create (); char pthread ();
int int
main () main ()
{ {
return pthread_create (); return pthread ();
; ;
return 0; return 0;
} }
@ -15819,12 +16011,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes || test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext $as_test_x conftest$ac_exeext
}; then }; then
ac_cv_lib_pthread_pthread_create=yes ac_cv_lib_pthread_create_pthread=yes
else else
$as_echo "$as_me: failed program was:" >&5 $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_pthread_pthread_create=no ac_cv_lib_pthread_create_pthread=no
fi fi
rm -rf conftest.dSYM rm -rf conftest.dSYM
@ -15832,17 +16024,193 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_create_pthread" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } $as_echo "$ac_cv_lib_pthread_create_pthread" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then if test "x$ac_cv_lib_pthread_create_pthread" = x""yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREAD 1 #define HAVE_LIBPTHREAD_CREATE 1
_ACEOF _ACEOF
LIBS="-lpthread $LIBS" LIBS="-lpthread_create $LIBS"
fi fi
{ $as_echo "$as_me:$LINENO: checking for library containing Tcl_Init" >&5
$as_echo_n "checking for library containing Tcl_Init... " >&6; }
if test "${ac_cv_search_Tcl_Init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* 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 Tcl_Init ();
int
main ()
{
return Tcl_Init ();
;
return 0;
}
_ACEOF
for ac_lib in '' tcl8.5 tcl8.4; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
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
ac_cv_search_Tcl_Init=$ac_res
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_Tcl_Init+set}" = set; then
break
fi
done
if test "${ac_cv_search_Tcl_Init+set}" = set; then
:
else
ac_cv_search_Tcl_Init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_Tcl_Init" >&5
$as_echo "$ac_cv_search_Tcl_Init" >&6; }
ac_res=$ac_cv_search_Tcl_Init
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
{ $as_echo "$as_me:$LINENO: checking for library containing Tk_Init" >&5
$as_echo_n "checking for library containing Tk_Init... " >&6; }
if test "${ac_cv_search_Tk_Init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* 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 Tk_Init ();
int
main ()
{
return Tk_Init ();
;
return 0;
}
_ACEOF
for ac_lib in '' tk8.5 tk8.4; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
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
ac_cv_search_Tk_Init=$ac_res
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_Tk_Init+set}" = set; then
break
fi
done
if test "${ac_cv_search_Tk_Init+set}" = set; then
:
else
ac_cv_search_Tk_Init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_Tk_Init" >&5
$as_echo "$ac_cv_search_Tk_Init" >&6; }
ac_res=$ac_cv_search_Tk_Init
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
# AC_SEARCH_LIBS(Togl_Init, Toglstub2.0 )
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" 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"
@ -15972,13 +16340,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${OCC_TRUE}" && test -z "${OCC_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"OCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"OCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
ac_write_fail=0 ac_write_fail=0

18
configure.ac
View File

@ -4,7 +4,9 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_ARG_ENABLE([occ], AC_ARG_ENABLE([occ],
[ --enable-occ Compile with OpenCascade geometry kernel], [ --enable-occ Compile with OpenCascade geometry kernel],
[occon=true occfl='-DOCCGEOMETRY -I/usr/local/inc' [occon=true
OCCFLAGS='-DOCCGEOMETRY -I/usr/local/inc'
occfl='-DOCCGEOMETRY -I/usr/local/inc'
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' ], occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' ],
[occon=false] ) [occon=false] )
@ -16,19 +18,25 @@ AC_LANG_CPLUSPLUS
AC_PROG_CXX AC_PROG_CXX
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AC_SYS_POSIX_TERMIOS # AC_SYS_POSIX_TERMIOS
AM_CONDITIONAL([OCC], [test x$occon = xtrue]) # AM_CONDITIONAL([OCC], [test x$occon = xtrue])
AC_SUBST([OCCFLAGS], [$occfl]) AC_SUBST([OCCFLAGS], [$occfl])
AC_SUBST([OCCLIBS], [$occlfl]) AC_SUBST([OCCLIBS], [$occlfl])
# AC_CHECK_HEADER([pthread]) AC_CHECK_HEADER(pthread.h)
AC_CHECK_HEADER([togl.h])
AC_CHECK_HEADER([iostream],[OCCFLAGS="$OCCFLAGS -DHAVE_IOSTREAM"]) AC_CHECK_HEADER([iostream],[OCCFLAGS="$OCCFLAGS -DHAVE_IOSTREAM"])
AC_CHECK_HEADER([iostream.h],[OCC_FLAGS="$OCCFLAGS -DHAVE_IOSTREAM_H"]) AC_CHECK_HEADER([iostream.h],[OCC_FLAGS="$OCCFLAGS -DHAVE_IOSTREAM_H"])
AC_CHECK_HEADER([limits],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS"]) AC_CHECK_HEADER([limits],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS"])
AC_CHECK_HEADER([limits.h],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS_H"]) AC_CHECK_HEADER([limits.h],[OCCFLAGS="$OCCFLAGS -DHAVE_LIMITS_H"])
AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_LIB(pthread_create, pthread)
AC_SEARCH_LIBS(Tcl_Init, [tcl8.5 tcl8.4])
AC_SEARCH_LIBS(Tk_Init, [tk8.5 tk8.4])
# AC_SEARCH_LIBS(Togl_Init, Toglstub2.0 )
AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile \ 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/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile \

3
ng/Makefile.am
View File

@ -11,7 +11,8 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \ $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \
-lGLU $(OCCLIBS) -lTogl1.7 -ltcl8.5 -ltk8.5 -lGLU $(OCCLIBS) -lTogl1.7

2
ng/Makefile.in
View File

@ -204,7 +204,7 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \
$(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \ $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \
-lGLU $(OCCLIBS) -lTogl1.7 -ltcl8.5 -ltk8.5 -lGLU $(OCCLIBS) -lTogl1.7
all: all-am all: all-am