[Kst] kdeextragear-2/kst

[Andrew Walker]

CVS commit by arwalker: 

Modified to allow for conditional building of gsl dependent plugins


  M +9 -12     configure.in.in   1.7


--- kdeextragear-2/kst/configure.in.in  #1.6:1.7
@@ -15,15 +15,12 @@
 fi
 
-KDE_CHECK_LIB(gsl, gsl_fit_linear, GSLLIBS="-lgsl $GSLLIBS", , )
-AC_SUBST(GSLLIBS)
-
-if test $ac_cv_lib_gsl_gsl_fit_linear = yes; then
-  KDE_CHECK_HEADER(gsl/gsl_fit.h, AC_DEFINE(HAVE_GSL, 1, [If we have gsl headers]) have_gsl=yes, , )
-
-  if test $have_gsl = yes; then
-    AC_DEFINE(KST_HAVE_GSL, 1, [If we have GSL libraries.])
-  fi
-fi
-
-AM_CONDITIONAL(include_fits_plugins, test x$have_gsl = xyes)
+GSL_LIBS="-lgsl -lgslcblas -lm"
+GSL_FITS_SUBDIR="gsl"
+GSL_INTERPOLATIONS_SUBDIR="gsl"
+KDE_CHECK_HEADER(gsl/gsl_fit.h, ,[GSL_FITS_SUBDIR=""] )
+KDE_CHECK_LIB(gsl, gsl_fit_linear, ,[GSL_FITS_SUBDIR=""], -lgslcblas, -lm )
+KDE_CHECK_HEADER(gsl/gsl_spline.h, ,[GSL_INTERPOLATIONS_SUBDIR=""] )
+KDE_CHECK_LIB(gsl, gsl_interp_init, ,[GSL_INTERPOLATIONS_SUBDIR=""], -lgslcblas, -lm )
 
+AM_CONDITIONAL(include_fits_plugins, test -n "$GSL_FITS_SUBDIR")
+AM_CONDITIONAL(include_interpolations_plugins, test -n "$GSL_INTERPOLATIONS_SUBDIR")