From fff08c269e0ec136eaec69ab0a747309eadc20cf Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 20 Oct 2005 22:07:26 +0000 Subject: [PATCH] Regenerate configure git-svn-id: https://svn.dealii.org/trunk@11641 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index cbfbb6f7ef..2be5f15db8 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.212 . +# From configure.in Revision: 1.213 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # @@ -275,7 +275,7 @@ PACKAGE_STRING='deal.II 5.3.pre' PACKAGE_BUGREPORT='dealii@dealii.org' ac_subdirs_all="$ac_subdirs_all contrib tests" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR NETCDF_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD SHLIBFLAGS CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR NETCDF_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3707,6 +3707,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$GCC" = "yes" ; then CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` if test "x$CC_VERSION_STRING" = "x" ; then @@ -8902,7 +8903,7 @@ shared_lib_suffix=".so" static_lib_suffix=".a" case "$target" in - *-aix4* | alpha*-linux* | alpha*-osf45* | powerpc-apple-darwin* | hppa64-unknown-linux-gnu ) + *-aix4* | alpha*-linux* | alpha*-osf45* | hppa64-unknown-linux-gnu ) { echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} enableshared=no @@ -8916,12 +8917,29 @@ case "$target" in ;; esac + +case "$target" in + powerpc-apple-darwin* ) + shared_lib_suffix=".dylib" + darwin_shared_lib="yes" + ;; +esac + + if test "x$enableshared" = "xyes" ; then CFLAGS="$CFLAGS $CFLAGSPIC" CXXFLAGSG="$CXXFLAGSG $CXXFLAGSPIC" CXXFLAGSO="$CXXFLAGSO $CXXFLAGSPIC" F77FLAGSG="$F77FLAGSG $F77FLAGSPIC" F77FLAGSO="$F77FLAGSO $F77FLAGSPIC" + SHLIBFLAGS="-shared" + + case "$target" in + powerpc-apple-darwin* ) + SHLIBFLAGS="-dynamiclib" + ;; + esac + else LDFLAGSSTATIC="-static" case "$target" in @@ -11186,6 +11204,7 @@ s,@CXXFLAGSG@,$CXXFLAGSG,;t t s,@CXXFLAGSO@,$CXXFLAGSO,;t t s,@CXXFLAGSPIC@,$CXXFLAGSPIC,;t t s,@SHLIBLD@,$SHLIBLD,;t t +s,@SHLIBFLAGS@,$SHLIBFLAGS,;t t s,@CC_VERSION@,$CC_VERSION,;t t s,@CFLAGSPIC@,$CFLAGSPIC,;t t s,@enablemultithreading@,$enablemultithreading,;t t @@ -11914,6 +11933,14 @@ if test "x$cygwin_shared_lib" = "xyes" ; then echo " executing your programs." fi +if test "x$darwin_shared_lib" = "xyes" ; then + echo " Please add the line" + echo " export DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:$DEAL2_DIR/lib" + echo " to your .bash_profile file so that OSX will be" + echo " able to find the deal.II shared libraries when" + echo " executing your programs." +fi + if test "x$doxygen_not_found" = "xyes" ; then echo " WARNING: During configuration, no version of the doxygen" echo " WARNING: documentation generation program could be found." -- 2.39.5