projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reractor
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 13ce651c9d0d994f5a5d37a300d0daeaef710236..7e2fedec0c45bc15cc82be51db5d6373d1a97fe6 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,26
+18,24
@@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
AC_PREREQ(2.64)
dnl Initialize.
AC_PREREQ(2.64)
-AC_INIT([GNU PSPP], [1.
5.5
], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.
6.2
], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE([tar-ustar info-in-builddir])
dnl Checks for programs.
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE([tar-ustar info-in-builddir])
dnl Checks for programs.
-AC_
GNU_SOURCE
+AC_
USE_SYSTEM_EXTENSIONS
AC_PROG_CC
gl_EARLY
if test x"$cross_compiling" = x"yes"; then
if test x"$srcdir" = x"."; then
AC_PROG_CC
gl_EARLY
if test x"$cross_compiling" = x"yes"; then
if test x"$srcdir" = x"."; then
- AC_ERROR([Cross compiling must be done out of source.])
+ AC_
MSG_
ERROR([Cross compiling must be done out of source.])
fi
fi
AM_PROG_CC_C_O
fi
fi
AM_PROG_CC_C_O
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
+LT_INIT([dlopen win32-dll])
AC_HEADER_TIOCGWINSZ
AC_CHECK_SIZEOF([ptrdiff_t])
AC_HEADER_TIOCGWINSZ
AC_CHECK_SIZEOF([ptrdiff_t])
@@
-154,6
+152,10
@@
if test "$with_gui" != "no"; then
PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
fi
PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
fi
+ dnl g_memdup2 has been introduced in glib 2.67.3. Older versions need
+ dnl a workaround
+ AC_CHECK_LIB(glib-2.0, g_memdup2, [AC_DEFINE([HAVE_G_MEMDUP2], [1], [g_memdup2 check])])
+
fi
gl_NEXT_HEADERS([gtk/gtk.h])
fi
gl_NEXT_HEADERS([gtk/gtk.h])