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

autotools

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-01-15 17:37:07 +00:00
parent 357cea9ba0
commit 57446b6a76
20 changed files with 118 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -134,6 +134,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

99
configure vendored
View File

@ -785,8 +785,11 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
TOGLLIBDIR
OCCLIBS
OCCFLAGS
OCC_FALSE
OCC_TRUE
CXXCPP
CPP
OTOOL64
@ -902,6 +905,8 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_occ
with_occ
with_togl
enable_dependency_tracking
enable_shared
enable_static
@ -1553,7 +1558,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-occ Compile with OpenCascade geometry kernel
--enable-occ compile with OpenCascade geometry kernel
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-shared[=PKGS] build shared libraries [default=yes]
@ -1565,6 +1570,8 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-occ=dir use OpenCascade installed in directory dir
--with-togl=dir directory containing libTogl1.7
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
@ -2524,14 +2531,35 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
# Check whether --enable-occ was given.
if test "${enable_occ+set}" = set; then
enableval=$enable_occ; occon=true
occfl='-DOCCGEOMETRY -I/usr/local/inc'
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL'
occfl="-DOCCGEOMETRY"
occlfl="-lTKIGES -lTKBRep -lTKSTEP -lTKSTL"
else
occon=false
fi
# Check whether --with-occ was given.
if test "${with_occ+set}" = set; then
withval=$with_occ; occdir=$withval
occincfl="-I$withval/inc"
occlibfl="-L$withval/lib"
fi
# Check whether --with-togl was given.
if test "${with_togl+set}" = set; then
withval=$with_togl; togldir=$withval
togllibfl="-L$withval$"
else
togllibfl="-L/usr/local/lib/Togl1.7"
fi
# AC_HEADER_STDC
ac_config_headers="$ac_config_headers config.h"
@ -4827,13 +4855,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:4830: $ac_compile\"" >&5)
(eval echo "\"\$as_me:4858: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
(eval echo "\"\$as_me:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval echo "\"\$as_me:4861: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
(eval echo "\"\$as_me:4836: output\"" >&5)
(eval echo "\"\$as_me:4864: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@ -6039,7 +6067,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6042 "configure"' > conftest.$ac_ext
echo '#line 6070 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -8611,11 +8639,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8614: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8642: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8618: \$? = $ac_status" >&5
echo "$as_me:8646: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -8950,11 +8978,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8953: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8957: \$? = $ac_status" >&5
echo "$as_me:8985: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -9055,11 +9083,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9058: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9086: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9062: \$? = $ac_status" >&5
echo "$as_me:9090: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -9110,11 +9138,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9113: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9141: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9117: \$? = $ac_status" >&5
echo "$as_me:9145: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -11910,7 +11938,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11913 "configure"
#line 11941 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12006,7 +12034,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12009 "configure"
#line 12037 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14026,11 +14054,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14029: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14057: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14033: \$? = $ac_status" >&5
echo "$as_me:14061: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14125,11 +14153,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14128: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14156: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14132: \$? = $ac_status" >&5
echo "$as_me:14160: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -14177,11 +14205,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14180: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14208: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14184: \$? = $ac_status" >&5
echo "$as_me:14212: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -15162,12 +15190,22 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# AC_SYS_POSIX_TERMIOS
# AM_CONDITIONAL([OCC], [test x$occon = xtrue])
OCCFLAGS=$occfl
if test x$occon = xtrue; then
OCC_TRUE=
OCC_FALSE='#'
else
OCC_TRUE='#'
OCC_FALSE=
fi
OCCLIBS=$occlfl
# AC_SUBST([OCCFLAGS], [$occfl])
OCCFLAGS="$occfl $occincfl"
OCCLIBS="$occlfl $occlibfl"
TOGLLIBDIR="$togllibfl"
@ -16339,6 +16377,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${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}
ac_write_fail=0

31
configure.ac
View File

@ -3,12 +3,27 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
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'
occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' ],
occfl="-DOCCGEOMETRY"
occlfl="-lTKIGES -lTKBRep -lTKSTEP -lTKSTL" ],
[occon=false] )
AC_ARG_WITH([occ],
[ --with-occ=dir use OpenCascade installed in directory dir],
[occdir=$withval]
[occincfl="-I$withval/inc"]
[occlibfl="-L$withval/lib"],
)
AC_ARG_WITH([togl],
[ --with-togl=dir directory containing libTogl1.7],
[togldir=$withval]
[togllibfl="-L$withval$"],
[togllibfl="-L/usr/local/lib/Togl1.7"]
)
# AC_HEADER_STDC
AC_CONFIG_HEADERS(config.h)
@ -17,11 +32,13 @@ AC_LANG_CPLUSPLUS
AC_PROG_CXX
AM_PROG_LIBTOOL
# AC_SYS_POSIX_TERMIOS
# AM_CONDITIONAL([OCC], [test x$occon = xtrue])
AC_SUBST([OCCFLAGS], [$occfl])
AC_SUBST([OCCLIBS], [$occlfl])
AM_CONDITIONAL([OCC], [test x$occon = xtrue])
# AC_SUBST([OCCFLAGS], [$occfl])
AC_SUBST([OCCFLAGS], ["$occfl $occincfl"])
AC_SUBST([OCCLIBS], ["$occlfl $occlibfl"])
AC_SUBST([TOGLLIBDIR], ["$togllibfl"])
AC_CHECK_HEADER(pthread.h)
AC_CHECK_HEADER([togl.h])

1
libsrc/Makefile.in
View File

@ -118,6 +118,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/csg/Makefile.in
View File

@ -137,6 +137,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/general/Makefile.in
View File

@ -135,6 +135,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/geom2d/Makefile.in
View File

@ -131,6 +131,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/gprim/Makefile.in
View File

@ -132,6 +132,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/include/Makefile.in
View File

@ -111,6 +111,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/interface/Makefile.in
View File

@ -147,6 +147,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/linalg/Makefile.in
View File

@ -131,6 +131,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/meshing/Makefile.in
View File

@ -145,6 +145,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/occ/Makefile.in
View File

@ -134,6 +134,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/opti/Makefile.in
View File

@ -131,6 +131,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/parallel/Makefile.in
View File

@ -111,6 +111,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/stlgeom/Makefile.in
View File

@ -132,6 +132,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

1
libsrc/visualization/Makefile.in
View File

@ -132,6 +132,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

4
ng/Makefile.am
View File

@ -12,5 +12,5 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/occ/libocc.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/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \
-lGLU $(OCCLIBS) -lTogl1.7
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \
-lGLU $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7

7
ng/Makefile.in
View File

@ -62,7 +62,7 @@ netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/opti/libopti.a \
$(top_builddir)/libsrc/linalg/libla.a \
$(top_builddir)/libsrc/general/libgeneral.a \
$(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -144,6 +144,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@ -207,8 +208,8 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \
$(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/occ/libocc.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/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a -L/usr/local/lib/Togl1.7 \
-lGLU $(OCCLIBS) -lTogl1.7
$(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \
-lGLU $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7
all: all-am

1
tutorials/Makefile.in
View File

@ -117,6 +117,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TOGLLIBDIR = @TOGLLIBDIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@