[Kst] extragear/graphics/kst

[Ted Kisner]

SVN commit 457842 by tskisner:

Update configure.in.in and the datasource Makefile.am to use the healpix datasource

 M  +35 -18    configure.in.in  
 M  +3 -3      kst/datasources/Makefile.am  


--- trunk/extragear/graphics/kst/configure.in.in #457841:457842
@@ -193,36 +193,53 @@
 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"
+# Healpix Test
+# check for chealpix or hpic
+#
+ac_healpix_includes=""
+ac_healpix_libraries=""
+AC_ARG_WITH(healpix,
+    AC_HELP_STRING([--with-healpix=DIR],[where the root of chealpix or HPIC is installed ]),
+    [  ac_healpix_includes="-I$withval/include"
+       ac_healpix_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 HPICINCLUDES="$ac_hpic_includes", , )
+all_includes="$all_includes $ac_healpix_includes"
+have_chealpix_h=no
+have_hpic_h=no
+KDE_CHECK_HEADER([chealpix.h], [AC_DEFINE(HAVE_CHEALPIX_H, 1, [If we have chealpix header]) have_chealpix_h=yes HEALPIXINCLUDES="$ac_healpix_includes"], [], [])
+if test $have_chealpix_h = no; then
+  KDE_CHECK_HEADER([hpic.h], [AC_DEFINE(HAVE_HPIC_H, 1, [If we have HPIC header]) have_hpic_h=yes HEALPIXINCLUDES="$ac_healpix_includes"], [], [])
+fi
 all_includes="$all_includes_save"
 
 ldflags_save="$LDFLAGS"
-LDFLAGS="$LDFLAGS $ac_hpic_libraries"
-KDE_CHECK_LIB(hpic, nside2npix, HPICLIBS="$ac_hpic_libraries -lm -lcfitsio -lhpic $HPICLIBS", , )
+LDFLAGS="$LDFLAGS $ac_healpix_libraries"
+KDE_CHECK_LIB([chealpix], [nside2npix], [HEALPIXLIBS="$ac_healpix_libraries -lm -lcfitsio -lchealpix $HEALPIXLIBS"], [], [])
+if test $ac_cv_lib_chealpix_nside2npix = no; then
+  KDE_CHECK_LIB([hpic], [nside2npix], [HEALPIXLIBS="$ac_healpix_libraries -lm -lcfitsio -lhpic $HEALPIXLIBS"], [], [])
+fi
 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.])
+if test $ac_cv_lib_chealpix_nside2npix = yes; then
+  if test $have_chealpix_h = yes; then
+    AC_SUBST(HEALPIXLIBS)
+    AC_SUBST(HEALPIXINCLUDES)
+    AC_DEFINE(KST_HAVE_CHEALPIX, 1, [If we have the chealpix library.])
   fi
+else 
+  if test $ac_cv_lib_hpic_nside2npix = yes; then
+    if test $have_hpic_h = yes; then
+      AC_SUBST(HEALPIXLIBS)
+      AC_SUBST(HEALPIXINCLUDES)
+      AC_DEFINE(KST_HAVE_HPIC, 1, [If we have the HPIC library.])
+    fi
+  fi
 fi
+AM_CONDITIONAL(include_healpix, test -n "$HEALPIXLIBS")
 
-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 #457841:457842
@@ -15,9 +15,9 @@
 NETCDF_SUBDIR=netcdf
 endif
 
-if include_hpic
-HPIC_SUBDIR=hpic
+if include_healpix
+HEALPIX_SUBDIR=healpix
 endif
 
-SUBDIRS=ascii qimagesource $(FITSIMAGE_SUBDIR) dirfile frame indirect $(PIOLIB_SUBDIR) $(FITSIO_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR) $(HPIC_SUBDIR)
+SUBDIRS=ascii qimagesource $(FITSIMAGE_SUBDIR) dirfile frame indirect $(PIOLIB_SUBDIR) $(FITSIO_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR) $(HEALPIX_SUBDIR)