Commits

camlspotter committed caaf9f7 Merge

ported OMakefile updates

Comments (0)

Files changed (2)

   # GIF
   CFLAGS_gif=
   LDFLAGS_gif=
+  SUPPORT_GIF=false 
   if $(true_if_not_defined ARG_WANT_GIF)
     if $(not $(pkg_config gif, libgif))
       HAVE_GIF = $(Check_header_library gif, gif_lib.h, DGifOpenFileName)
   # PNG
   CFLAGS_png=
   LDFLAGS_png=
+  SUPPORT_PNG=false 
   if $(true_if_not_defined ARG_WANT_PNG)
     res=$(pkg_config png, libpng) # we need a separate statement to get the vars defined in pkg_config reflected.
     if $(not $(res))
   # JPEG
   CFLAGS_jpeg=
   LDFLAGS_jpeg=
+  SUPPORT_JPEG=false 
   if $(true_if_not_defined ARG_WANT_JPEG)
     res=$(pkg_config jpeg, libjpeg)
     if $(not $(res))
   # EXIF
   CFLAGS_exif=
   LDFLAGS_exif=
+  SUPPORT_EXIF=false 
   if $(true_if_not_defined ARG_WANT_EXIF)
     res=$(pkg_config exif, libexif)
     if $(not $(res))
   # TIFF
   CFLAGS_tiff=
   LDFLAGS_tiff=
+  SUPPORT_TIFF=false 
   if $(true_if_not_defined ARG_WANT_TIFF)
     res=$(pkg_config tiff, libtiff-4)
     if $(not $(res))
   # XPM
   CFLAGS_xpm=
   LDFLAGS_xpm=
+  SUPPORT_XPM=false 
   if $(true_if_not_defined ARG_WANT_XPM)
     res=$(pkg_config xpm, xpm)
     if $(not $(res))
   # PS
   CFLAGS_ps=
   LDFLAGS_ps=
+  SUPPORT_PS=false 
   if $(true_if_not_defined ARG_WANT_GS)
     if $(defined ARG_PATH_GS):
         PATH_GS = $(ARG_PATH_GS)
   # LABLGTK2
   CFLAGS_lablgtk2=
   LDFLAGS_lablgtk2=
+  SUPPORT_LABLGTK2=false 
   if $(true_if_not_defined ARG_WANT_LABLGTK2)
     SUPPORT_LABLGTK2 = $(Check_ocamlfind_package lablgtk2)
     if $(SUPPORT_LABLGTK2)
   # GRAPHICS
   CFLAGS_graphics=
   LDFLAGS_graphics=
+  SUPPORT_GRAPHICS=false 
   if $(true_if_not_defined ARG_WANT_GRAPHICS)
     # CR: ocamlfind registers graphics even if not available
     SUPPORT_GRAPHICS = $(Check_ocamlfind_package_compilation graphics, Graphics)
   # FREETYPE
   CFLAGS_freetype=
   LDFLAGS_freetype=
+  SUPPORT_FREETYPE=false 
   if $(true_if_not_defined ARG_WANT_FREETYPE)
     PATH_FREETYPE_CONFIG=
     if $(defined ARG_PATH_FREETYPE_CONFIG):
 ###############################################################################
 
 pkg_config(name, libname) =
+  ConfMsgChecking(for $(libname) by pkg-config)
   if $(and $(defined this.PATH_PKG_CONFIG), $(equal 0, $(shell-code $(PATH_PKG_CONFIG) $(libname))))
-    println(Found pkg-config $(libname))
     # this is required since it is called in .STATIC
     setvar(this.LDFLAGS_$(name), $(shell $(PATH_PKG_CONFIG) --libs $(libname)))
     setvar(this.CFLAGS_$(name), $(shell $(PATH_PKG_CONFIG) --cflags $(libname)))
     setvar(this.SUPPORT_$(uppercase $(name)), true)
     setvar(this.HAVE_$(uppercase $(name)), true)
+    ConfMsgResult(found)
     export
     value true
   else 
-    println(Not found $(PATH_PKG_CONFIG) $(libname))
+    ConfMsgResult(failed ($(PATH_PKG_CONFIG) $(libname)))
     value false
   export