Make the use of Pango optional

9 files changed, 160 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 6a81a78c..ab85a6af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,8 +71,10 @@ src_partialator_SOURCES = src/partialator.c src/post-refinement.c \
                           src/hrs-scaling.c
 
 if HAVE_CAIRO
+if HAVE_PANGO
 src_partialator_SOURCES += src/scaling-report.c
 endif
+endif
 
 tests_list_check_SOURCES = tests/list_check.c
 
diff --git a/Makefile.in b/Makefile.in
index 32034377..79ccb5fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ TESTS = tests/list_check$(EXEEXT) tests/first_merge_check \
 @HAVE_OPENCL_TRUE@am__append_3 = src/cl-utils.c src/diffraction-gpu.c
 @HAVE_OPENCL_TRUE@am__append_4 = tests/gpu_sim_check
 @HAVE_OPENCL_TRUE@am__append_5 = tests/gpu_sim_check
-@HAVE_CAIRO_TRUE@am__append_6 = src/scaling-report.c
+@HAVE_CAIRO_TRUE@@HAVE_PANGO_TRUE@am__append_6 = src/scaling-report.c
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -137,7 +137,7 @@ src_partial_sim_DEPENDENCIES = $(top_builddir)/lib/libgnu.a \
 	$(top_builddir)/libcrystfel/libcrystfel.la
 am__src_partialator_SOURCES_DIST = src/partialator.c \
 	src/post-refinement.c src/hrs-scaling.c src/scaling-report.c
-@HAVE_CAIRO_TRUE@am__objects_1 = src/scaling-report.$(OBJEXT)
+@HAVE_CAIRO_TRUE@@HAVE_PANGO_TRUE@am__objects_1 = src/scaling-report.$(OBJEXT)
 am_src_partialator_OBJECTS = src/partialator.$(OBJEXT) \
 	src/post-refinement.$(OBJEXT) src/hrs-scaling.$(OBJEXT) \
 	$(am__objects_1)
@@ -475,6 +475,8 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+Pango_CFLAGS = @Pango_CFLAGS@
+Pango_LIBS = @Pango_LIBS@
 RANLIB = @RANLIB@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
diff --git a/config.h.in b/config.h.in
index 02855bcd..e7824e51 100644
--- a/config.h.in
+++ b/config.h.in
@@ -85,6 +85,9 @@
 /* Define to 1 if OpenCL is available */
 #undef HAVE_OPENCL
 
+/* Define to 1 if Pango is available */
+#undef HAVE_PANGO
+
 /* Define to 1 if memmem is declared even after undefining macros. */
 #undef HAVE_RAW_DECL_MEMMEM
 
diff --git a/configure b/configure
index cec514dc..97ac6896 100755
--- a/configure
+++ b/configure
@@ -632,6 +632,8 @@ LIBCRYSTFEL_CFLAGS
 MAIN_CFLAGS
 HAVE_FFTW_FALSE
 HAVE_FFTW_TRUE
+HAVE_PANGO_FALSE
+HAVE_PANGO_TRUE
 HAVE_CAIRO_FALSE
 HAVE_CAIRO_TRUE
 BUILD_HDFSEE_FALSE
@@ -644,6 +646,8 @@ GDK_pixbuf_2_LIBS
 GDK_pixbuf_2_CFLAGS
 GDK_pixbuf_LIBS
 GDK_pixbuf_CFLAGS
+Pango_LIBS
+Pango_CFLAGS
 Cairo_LIBS
 Cairo_CFLAGS
 libPNG_LIBS
@@ -868,6 +872,7 @@ enable_png
 enable_tiff
 with_libtiff
 enable_cairo
+enable_pango
 enable_gdk_pixbuf
 with_html_dir
 enable_gtk_doc
@@ -892,6 +897,8 @@ libPNG_CFLAGS
 libPNG_LIBS
 Cairo_CFLAGS
 Cairo_LIBS
+Pango_CFLAGS
+Pango_LIBS
 GDK_pixbuf_CFLAGS
 GDK_pixbuf_LIBS
 GDK_pixbuf_2_CFLAGS
@@ -1533,6 +1540,7 @@ Optional Features:
   --disable-png           Disable the use of libPNG
   --disable-tiff          Disable the use of libTIFF
   --disable-cairo         Disable the use of Cairo
+  --disable-pango         Disable the use of Pango
   --disable-gdk-pixbuf    Disable the use of gtk-pixbuf
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
@@ -1573,6 +1581,9 @@ Some influential environment variables:
   Cairo_CFLAGS
               C compiler flags for Cairo, overriding pkg-config
   Cairo_LIBS  linker flags for Cairo, overriding pkg-config
+  Pango_CFLAGS
+              C compiler flags for Pango, overriding pkg-config
+  Pango_LIBS  linker flags for Pango, overriding pkg-config
   GDK_pixbuf_CFLAGS
               C compiler flags for GDK_pixbuf, overriding pkg-config
   GDK_pixbuf_LIBS
@@ -13553,6 +13564,104 @@ $as_echo "no" >&6; }
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Pango" >&5
+$as_echo_n "checking whether to use Pango... " >&6; }
+# Check whether --enable-pango was given.
+if test "${enable_pango+set}" = set; then :
+  enableval=$enable_pango;
+fi
+
+if test "x$enable_pango" != "xno"; then :
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pango" >&5
+$as_echo_n "checking for Pango... " >&6; }
+
+if test -n "$Pango_CFLAGS"; then
+    pkg_cv_Pango_CFLAGS="$Pango_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pango >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Pango_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$Pango_LIBS"; then
+    pkg_cv_Pango_LIBS="$Pango_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pango >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Pango_LIBS=`$PKG_CONFIG --libs "pango >= 1.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        Pango_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= 1.0.0" 2>&1`
+        else
+	        Pango_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= 1.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$Pango_PKG_ERRORS" >&5
+
+
+      have_pango=false
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      have_pango=false
+
+else
+	Pango_CFLAGS=$pkg_cv_Pango_CFLAGS
+	Pango_LIBS=$pkg_cv_Pango_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      have_pango=true
+
+$as_echo "#define HAVE_PANGO 1" >>confdefs.h
+
+
+fi
+
+else
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GDK-pixbuf" >&5
 $as_echo_n "checking whether to use GDK-pixbuf... " >&6; }
 # Check whether --enable-gdk-pixbuf was given.
@@ -14012,6 +14121,15 @@ else
 fi
 
 
+ if test x$have_pango = xtrue; then
+  HAVE_PANGO_TRUE=
+  HAVE_PANGO_FALSE='#'
+else
+  HAVE_PANGO_TRUE='#'
+  HAVE_PANGO_FALSE=
+fi
+
+
  if test x$have_fftw = xtrue; then
   HAVE_FFTW_TRUE=
   HAVE_FFTW_FALSE='#'
@@ -14491,6 +14609,10 @@ if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_PANGO_TRUE}" && test -z "${HAVE_PANGO_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PANGO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_FFTW_TRUE}" && test -z "${HAVE_FFTW_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_FFTW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index e9384f1e..05d4f15d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,24 @@ AS_IF([test "x$enable_cairo" != "xno"],
 ])
 
 
+AC_MSG_CHECKING([whether to use Pango])
+AC_ARG_ENABLE([pango],
+              AS_HELP_STRING([--disable-pango], [Disable the use of Pango]))
+AS_IF([test "x$enable_pango" != "xno"],
+[
+   AC_MSG_RESULT([yes])
+   PKG_CHECK_MODULES([Pango], [pango >= 1.0.0],
+   [
+      have_pango=true
+      AC_DEFINE([HAVE_PANGO], [1], [Define to 1 if Pango is available])
+   ], [
+      have_pango=false
+   ])
+], [
+   AC_MSG_RESULT([no])
+])
+
+
 AC_MSG_CHECKING([whether to use GDK-pixbuf])
 AC_ARG_ENABLE([gdk-pixbuf], AS_HELP_STRING([--disable-gdk-pixbuf],
                                            [Disable the use of gtk-pixbuf]))
@@ -248,6 +266,8 @@ AM_CONDITIONAL([BUILD_HDFSEE], test x$have_gdk_pixbuf = xtrue \
 
 AM_CONDITIONAL([HAVE_CAIRO], test x$have_cairo = xtrue)
 
+AM_CONDITIONAL([HAVE_PANGO], test x$have_pango = xtrue)
+
 AM_CONDITIONAL([HAVE_FFTW], test x$have_fftw = xtrue)
 
 gl_IGNORE_UNUSED_LIBRARIES
diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index e8ed6f66..96411ecb 100644
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -214,6 +214,8 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+Pango_CFLAGS = @Pango_CFLAGS@
+Pango_LIBS = @Pango_LIBS@
 RANLIB = @RANLIB@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4214d8b9..f345d548 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -296,6 +296,8 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+Pango_CFLAGS = @Pango_CFLAGS@
+Pango_LIBS = @Pango_LIBS@
 RANLIB = @RANLIB@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
diff --git a/libcrystfel/Makefile.in b/libcrystfel/Makefile.in
index 21ef4cb5..62696f8b 100644
--- a/libcrystfel/Makefile.in
+++ b/libcrystfel/Makefile.in
@@ -269,6 +269,8 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
+Pango_CFLAGS = @Pango_CFLAGS@
+Pango_LIBS = @Pango_LIBS@
 RANLIB = @RANLIB@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
diff --git a/libtool b/libtool
index 10548d94..8b1cc393 100755
--- a/libtool
+++ b/libtool
@@ -2,7 +2,7 @@
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (crystfel) 0.2.0
-# Libtool was configured on host cfeld204tw.desy.de:
+# Libtool was configured on host sarabi.localdomain:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -240,7 +240,7 @@ hardcode_into_libs=yes
 sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.5.1 /usr/lib64 /lib64 "
 
 # Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/local/cuda/lib64 /usr/local/cuda/lib /usr/lib64/tcl8.5 /usr/lib64/xulrunner-1.9.2 "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib64/root /usr/lib64/tcl8.5 /usr/lib64/xulrunner-1.9.2 /usr/local/lib /usr/local/lib64 "
 
 # Whether dlopen is supported.
 dlopen_support=unknown
@@ -282,7 +282,7 @@ wl="-Wl,"
 pic_flag=" -fPIC -DPIC"
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag=""
+link_static_flag="-static"
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"