diff --git a/configure b/configure index 206bd6ca..47af2748 100755 --- a/configure +++ b/configure @@ -2524,7 +2524,6 @@ 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 - OCCFLAGS='-DOCCGEOMETRY -I/usr/local/inc' occfl='-DOCCGEOMETRY -I/usr/local/inc' occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' else @@ -4828,13 +4827,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:4831: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4830: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4834: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4833: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4837: output\"" >&5) + (eval echo "\"\$as_me:4836: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6040,7 +6039,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6043 "configure"' > conftest.$ac_ext + echo '#line 6042 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8612,11 +8611,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:8615: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8614: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8619: \$? = $ac_status" >&5 + echo "$as_me:8618: \$? = $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. @@ -8951,11 +8950,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:8954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8953: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8958: \$? = $ac_status" >&5 + echo "$as_me:8957: \$? = $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. @@ -9056,11 +9055,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:9059: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9058: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9063: \$? = $ac_status" >&5 + echo "$as_me:9062: \$? = $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 @@ -9111,11 +9110,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:9114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9113: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9118: \$? = $ac_status" >&5 + echo "$as_me:9117: \$? = $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 @@ -11911,7 +11910,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11914 "configure" +#line 11913 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12007,7 +12006,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12010 "configure" +#line 12009 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14027,11 +14026,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:14030: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14029: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14034: \$? = $ac_status" >&5 + echo "$as_me:14033: \$? = $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. @@ -14126,11 +14125,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:14129: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14128: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14133: \$? = $ac_status" >&5 + echo "$as_me:14132: \$? = $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 @@ -14178,11 +14177,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:14181: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14180: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14185: \$? = $ac_status" >&5 + echo "$as_me:14184: \$? = $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 @@ -18840,6 +18839,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - - diff --git a/configure.ac b/configure.ac index 351e6f6d..4cf74095 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_ARG_ENABLE([occ], [ --enable-occ Compile with OpenCascade geometry kernel], [occon=true - OCCFLAGS='-DOCCGEOMETRY -I/usr/local/inc' occfl='-DOCCGEOMETRY -I/usr/local/inc' occlfl='-lTKIGES -lTKBRep -lTKSTEP -lTKSTL' ], [occon=false] ) @@ -45,6 +44,3 @@ libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile n tutorials/Makefile) AC_OUTPUT - - - diff --git a/tutorials/Makefile.am b/tutorials/Makefile.am index 1a7f97d1..d45a25e6 100644 --- a/tutorials/Makefile.am +++ b/tutorials/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = METASOURCES = AUTO -pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo \ +dist_pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo \ cubeandring.geo cubeandspheres.geo cubemcyl.geo cubemsphere.geo cylinder.geo \ cylsphere.geo ellipsoid.geo ellipticcyl.geo extrusion.geo fichera.geo lshape3d.geo \ manyholes.geo manyholes2.geo matrix.geo ortho.geo period.geo revolution.geo \ diff --git a/tutorials/Makefile.in b/tutorials/Makefile.in index 2d0ca884..e63743d9 100644 --- a/tutorials/Makefile.in +++ b/tutorials/Makefile.in @@ -33,7 +33,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tutorials -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -50,8 +51,8 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgdatadir)" -pkgdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgdata_DATA) +dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -172,7 +173,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = METASOURCES = AUTO -pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo \ +dist_pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo \ cubeandring.geo cubeandspheres.geo cubemcyl.geo cubemsphere.geo cylinder.geo \ cylsphere.geo ellipsoid.geo ellipticcyl.geo extrusion.geo fichera.geo lshape3d.geo \ manyholes.geo manyholes2.geo matrix.geo ortho.geo period.geo revolution.geo \ @@ -217,19 +218,19 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pkgdataDATA: $(pkgdata_DATA) +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_DATA)'; for p in $$list; do \ + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ - $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ + echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done -uninstall-pkgdataDATA: +uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; for p in $$list; do \ + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ @@ -316,7 +317,7 @@ info: info-am info-am: -install-data-am: install-pkgdataDATA +install-data-am: install-dist_pkgdataDATA install-dvi: install-dvi-am @@ -350,21 +351,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-pkgdataDATA +uninstall-am: uninstall-dist_pkgdataDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgdataDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-pkgdataDATA + install-data install-data-am install-dist_pkgdataDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_pkgdataDATA # 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.