X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=5b8e1a933c99c0dec9e00149df042cd0e9a36ea8;hb=d8dfafee045cf6ef58db3cc6647922ddc74abe1a;hp=4fa093d71f8ce57133bf453fd0da87811fb12b9b;hpb=c13375ebe886fc3ed5ce70a260bb2b01cebb4b1f;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 4fa093d7..5b8e1a93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ gl_EARLY
 AM_PROG_CC_C_O
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
 
@@ -49,7 +50,7 @@ AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 dnl Checks needed for gnumeric reader
 gnm_support=yes;
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0,,
-			   [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no]);
+			   [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no;]);
 AC_SEARCH_LIBS(gzopen,z,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
 AC_CHECK_HEADERS(zlib.h,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
 
@@ -57,6 +58,7 @@ if test x"$gnm_support" = x"yes" ; then
    AC_DEFINE([GNM_SUPPORT], 1,
    [Define to 1 if building in support for reading Gnumeric files.])
 fi
+AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes")
 
 AC_ARG_WITH(
   gui_tools,
@@ -82,11 +84,7 @@ gl_INIT
 
 AC_C_INLINE
 
-dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
-AC_CHECK_TYPES(off_t) 
-AC_CHECK_SIZEOF(float)
 AC_CHECK_SIZEOF(double)
-AC_CHECK_SIZEOF(long double)
 
 AC_C_BIGENDIAN
 
@@ -94,9 +92,6 @@ AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexc
 
 AC_PROG_LN_S
 
-dnl This is needed otherwise --with-included-gettext fails
-AH_BOTTOM([#include <locale.h>])
-
 AC_ARG_ENABLE(
   debug, 
   [AS_HELP_STRING([--enable-debug],