[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

link to libtransfunc.  requires the very latest version from CVS-HEAD

CCMAIL: Claude Mercier <claude.mercier at ias.u-psud.fr>
CCMAIL: delouis at iap.fr


  M +32 -0     configure.in.in   1.50
  M +2 -2      kst/datasources/planck/Makefile.am   1.7


--- kdeextragear-2/kst/configure.in.in  #1.49:1.50
@@ -38,4 +38,36 @@
 
 
+# Transfer function test
+ac_transfunc_includes=""
+ac_transfunc_libraries=""
+AC_ARG_WITH(transfunc,
+    AC_HELP_STRING([--with-transfunc=DIR],[where the root of libtransfunc is installed ]),
+    [  ac_transfunc_includes="-I$withval"
+       ac_transfunc_libraries="-L$withval"
+    ])
+
+if test "x$ac_cv_lib_piolib_PIOGetObjectList" = "xyes"; then
+  if test "x$have_piolib_h" = "xyes"; then
+    all_includes_save="$all_includes"
+    all_includes="$all_includes $ac_transfunc_includes $PIOINCLUDES"
+    KDE_CHECK_HEADER(HL2_TransfertFunction/FT.h, AC_DEFINE(HAVE_FT_H, 1, [If we have transfunc headers]) have_FT_h=yes TFINCLUDES="$ac_transfunc_includes", , )
+    all_includes="$all_includes_save"
+
+    ldflags_save="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $ac_transfunc_libraries"
+    KDE_CHECK_LIB(transfunc, HCTtransf1, TRANSFUNCS="$ac_transfunc_libraries -ltransfunc $TRANSFUNCS", , -lm -ldl -lpthread $PIOLIBS)
+    LDFLAGS="$ldflags_save"
+
+    if test "x$ac_cv_lib_transfunc_HCTtransf1" = "xyes"; then
+      if test "x$have_FT_h" = "xyes"; then
+        AC_SUBST(TRANSFUNCS)
+        AC_SUBST(TFINCLUDES)
+        AC_DEFINE(KST_HAVE_TRANSFUNCS, 1, [If we have the transfunc library.])
+      fi
+    fi
+  fi
+fi
+
+
 # CDF Test
 ac_cdf_includes=""

--- kdeextragear-2/kst/kst/datasources/planck/Makefile.am  #1.6:1.7
@@ -1,7 +1,7 @@
-INCLUDES=-I$(srcdir)/../.. $(PIOINCLUDES) $(all_includes)
+INCLUDES=-I$(srcdir)/../.. $(PIOINCLUDES) $(TFINCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES=kstdata_planck.la
 
-kstdata_planck_la_LIBADD=$(PIOLIBS)
+kstdata_planck_la_LIBADD=$(PIOLIBS) $(TRANSFUNCS)
 kstdata_planck_la_LDFLAGS=$(all_libraries) -module -avoid-version
 kstdata_planck_la_SOURCES=planck.cpp planckdata.cpp planckobj.cpp