From 0b65707807778e41693629ffac92a95fcedddb66 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 23 May 2011 17:36:09 +0000 Subject: [PATCH] Undo the change to allow configuring GSL. It wasn't used anywhere anyway. git-svn-id: https://svn.dealii.org/trunk@23738 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 10 ---- deal.II/configure | 61 +----------------------- deal.II/configure.in | 3 +- deal.II/doc/news/changes.h | 7 +++ deal.II/include/deal.II/base/config.h.in | 9 ---- 5 files changed, 9 insertions(+), 81 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 0ce13205aa..044c550f42 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -7144,16 +7144,6 @@ AC_DEFUN(DEAL_II_WITH_BOOST, dnl dnl -------------------------------------------------- dnl Include the GSL library dnl -------------------------------------------------- -AC_DEFUN(DEAL_II_CONFIGURE_GSL, dnl -[ -dnl Finde header files - AC_CHECK_HEADERS([gsl_sf.h]) - AC_CHECK_LIB(gsl, gsl_bessel_J0) -]) - -dnl -------------------------------------------------- -dnl Include the libz library -dnl -------------------------------------------------- AC_DEFUN(DEAL_II_WITH_ZLIB, dnl [ if test "x$1" != "xyes" ; then diff --git a/deal.II/configure b/deal.II/configure index 2da741e27b..dff235ea70 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 23704 . +# From configure.in Revision: 23709 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.1.pre. # @@ -11882,65 +11882,6 @@ fi - for ac_header in gsl_sf.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "gsl_sf.h" "ac_cv_header_gsl_sf_h" "$ac_includes_default" -if test "x$ac_cv_header_gsl_sf_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GSL_SF_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsl_bessel_J0 in -lgsl" >&5 -$as_echo_n "checking for gsl_bessel_J0 in -lgsl... " >&6; } -if ${ac_cv_lib_gsl_gsl_bessel_J0+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgsl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* 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 gsl_bessel_J0 (); -int -main () -{ -return gsl_bessel_J0 (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_gsl_gsl_bessel_J0=yes -else - ac_cv_lib_gsl_gsl_bessel_J0=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsl_gsl_bessel_J0" >&5 -$as_echo "$ac_cv_lib_gsl_gsl_bessel_J0" >&6; } -if test "x$ac_cv_lib_gsl_gsl_bessel_J0" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGSL 1 -_ACEOF - - LIBS="-lgsl $LIBS" - -fi - - - diff --git a/deal.II/configure.in b/deal.II/configure.in index 9721a3a9c3..804ec10f2e 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -617,7 +617,6 @@ DEAL_II_CONFIGURE_TECPLOT AC_SUBST(TECPLOT_INCLUDE_DIR) DEAL_II_CONFIGURE_NETCDF -DEAL_II_CONFIGURE_GSL DEAL_II_CONFIGURE_METIS AC_SUBST(USE_CONTRIB_METIS) @@ -658,7 +657,7 @@ AC_CHECK_FUNCS([dgeqrf_ sgeqrf_ dormqr_ sormqr_ dorgqr_ sorgqr_ dtrtrs_ strtrs_] AC_CHECK_FUNCS([dgetrs_ sgetrs_ dstev_ sstev_ dsygv_ ssygv_]) dnl Singular value decomposition AC_CHECK_FUNCS([dgesvd_ sgesvd_ dgesdd_ sgesdd_ dgelsd_ sgelsd_]) -dnl Check Bessel functions in GNU libc and GSL +dnl Check Bessel functions in GNU libc AC_CHECK_FUNCS([jn]) dnl ------------------------------------------------------------- diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index e8b0a535c1..5921af27c5 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -29,6 +29,13 @@ inconvenience this causes.

General

    +
  1. Removed: The ./configure script allowed configuring +for the GNU Scientific Library (GSL) in version 7.0 but didn't actually +use any of the GSL functions. The corresponding code has therefore been +removed again. +
    +(WB, 2011/05/22) +
  2. Changed: Traditionally, include directories were set through the -I flag in make files in such a way that one would do diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 3b97263b7a..b17b7f69c1 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -382,9 +382,6 @@ information that can be printed out in the exception class */ #undef HAVE_GLIBC_STACKTRACE -/* Define to 1 if you have the header file. */ -#undef HAVE_GSL_SF_H - /* Availability of the MA27 algorithm from HSL */ #undef HAVE_HSL_MA27 @@ -397,15 +394,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `jn' function. */ -#undef HAVE_JN - /* Defined if deal.II was configured with BLAS support */ #undef HAVE_LIBBLAS -/* Define to 1 if you have the `gsl' library (-lgsl). */ -#undef HAVE_LIBGSL - /* Defined if deal.II was configured with LAPACK support */ #undef HAVE_LIBLAPACK -- 2.39.5