git.annexia.org
/
hivex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.2.2.
[hivex.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8d24848
..
1efc7c1
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,7
+18,7
@@
# major/minor/release must be numbers
m4_define([hivex_major], [1])
m4_define([hivex_minor], [2])
# major/minor/release must be numbers
m4_define([hivex_major], [1])
m4_define([hivex_minor], [2])
-m4_define([hivex_release], [
0
])
+m4_define([hivex_release], [
2
])
# extra can be any string
m4_define([hivex_extra], [])
# extra can be any string
m4_define([hivex_extra], [])
@@
-116,6
+116,12
@@
test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
AM_PROG_CC_C_O
AM_PROG_CC_C_O
+dnl Work out how to specify the linker script to the linker.
+VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+AC_SUBST(VERSION_SCRIPT_FLAGS)
+
dnl Check support for 64 bit file offsets.
AC_SYS_LARGEFILE
dnl Check support for 64 bit file offsets.
AC_SYS_LARGEFILE
@@
-143,7
+149,7
@@
AC_ARG_WITH([readline],
LIBREADLINE=
AS_IF([test "x$with_readline" != xno],
[AC_CHECK_LIB([readline], [main],
LIBREADLINE=
AS_IF([test "x$with_readline" != xno],
[AC_CHECK_LIB([readline], [main],
- [AC_SUBST([LIBREADLINE], ["-lreadline
-lncurses
"])
+ [AC_SUBST([LIBREADLINE], ["-lreadline"])
AC_DEFINE([HAVE_LIBREADLINE], [1],
[Define if you have libreadline])
],
AC_DEFINE([HAVE_LIBREADLINE], [1],
[Define if you have libreadline])
],
@@
-151,7
+157,7
@@
AS_IF([test "x$with_readline" != xno],
AC_MSG_FAILURE(
[--with-readline was given, but test for readline failed])
fi
AC_MSG_FAILURE(
[--with-readline was given, but test for readline failed])
fi
- ]
, -lncurses
)])
+ ])])
dnl For i18n.
AM_GNU_GETTEXT([external])
dnl For i18n.
AM_GNU_GETTEXT([external])
@@
-203,7
+209,7
@@
AC_CHECK_PROG([PERL],[perl],[perl],[no])
dnl Check for Perl modules that must be present to compile and
dnl test the Perl bindings.
missing_perl_modules=no
dnl Check for Perl modules that must be present to compile and
dnl test the Perl bindings.
missing_perl_modules=no
-for pm in Test::More
Test::Pod Test::Pod::Coverage
ExtUtils::MakeMaker IO::Stringy; do
+for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
AC_MSG_CHECKING([for $pm])
if ! perl -M$pm -e1 >/dev/null 2>&1; then
AC_MSG_RESULT([no])
AC_MSG_CHECKING([for $pm])
if ! perl -M$pm -e1 >/dev/null 2>&1; then
AC_MSG_RESULT([no])