[Kst] extragear/graphics/kst

Ted Kisner tskisner.public at gmail.com
Fri Jun 17 02:48:45 CEST 2005


SVN commit 426328 by tskisner:

Begin integrating hpic datasource as previously discussed.  It will only be compiled if the hpic library is installed

 M  +30 -0     configure.in.in  
 M  +5 -1      kst/datasources/Makefile.am  
 A             kst/datasources/hpic (directory)  
 A             kst/datasources/hpic/Makefile.am  
 A             kst/datasources/hpic/hpic.cpp   [License: GPL (v2+)]
 A             kst/datasources/hpic/hpic_source.h   [License: GPL (v2+)]
 A             kst/datasources/hpic/kstdata_hpic.desktop  


--- trunk/extragear/graphics/kst/configure.in.in #426327:426328
@@ -186,6 +186,36 @@
 KDE_CHECK_LIB(cfitsio, fftopn, ,[FITSIO_SUBDIR=""], -lm )
 AM_CONDITIONAL(include_fitsio_datasource, test -n "$FITSIO_SUBDIR")
 
+# HPIC Test
+ac_hpic_includes=""
+ac_hpic_libraries=""
+AC_ARG_WITH(hpic,
+    AC_HELP_STRING([--with-hpic=DIR],[where the root of HPIC is installed ]),
+    [  ac_hpic_includes="-I$withval/include"
+       ac_hpic_libraries="-L$withval/lib"
+    ])
+
+all_includes_save="$all_includes"
+all_includes="$all_includes $ac_hpic_includes"
+KDE_CHECK_HEADER(hpic.h, AC_DEFINE(HAVE_HPIC_H, 1, [If we have HPIC headers]) have_hpic_h=yes CDFINCLUDES="$ac_hpic_includes", , )
+all_includes="$all_includes_save"
+
+ldflags_save="$LDFLAGS"
+LDFLAGS="$LDFLAGS $ac_hpic_libraries"
+KDE_CHECK_LIB(hpic, nside2npix, HPICLIBS="$ac_hpic_libraries -lcfitsio -lhpic $HPICLIBS", , )
+LDFLAGS="$ldflags_save"
+
+if test $ac_cv_lib_hpic_nside2npix = yes; then
+  if test $have_hpic_h = yes; then
+    AC_SUBST(HPICLIBS)
+    AC_SUBST(HPICINCLUDES)
+    AC_DEFINE(KST_HAVE_HPIC, 1, [If we have the HPIC library.])
+  fi
+fi
+
+AM_CONDITIONAL(include_hpic, test -n "$HPICLIBS")
+
+
 AC_DEFUN([KST_CHECK_MDI],
 [
   AC_MSG_CHECKING(whether to use kmdi lib from kdelibs)
--- trunk/extragear/graphics/kst/kst/datasources/Makefile.am #426327:426328
@@ -14,5 +14,9 @@
 NETCDF_SUBDIR=netcdf
 endif
 
-SUBDIRS=ascii dirfile frame indirect $(PIOLIB_SUBDIR) $(FITSIO_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR)
+if include_hpic
+HPIC_SUBDIR=hpic
+endif
 
+SUBDIRS=ascii dirfile frame indirect $(PIOLIB_SUBDIR) $(FITSIO_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR) $(HPIC_SUBDIR)
+


More information about the Kst mailing list