Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Sleuthkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IRT
Sleuthkit
Commits
2ea7975a
Commit
2ea7975a
authored
7 years ago
by
Brian Carrier
Browse files
Options
Downloads
Patches
Plain Diff
reverting change from #921 since it has been hard to get working on other platforms
parent
bc8e9d6d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure.ac
+3
-5
3 additions, 5 deletions
configure.ac
with
3 additions
and
5 deletions
configure.ac
+
3
−
5
View file @
2ea7975a
...
@@ -18,6 +18,8 @@ AC_CONFIG_SRCDIR([tsk/base/tsk_base.h])
...
@@ -18,6 +18,8 @@ AC_CONFIG_SRCDIR([tsk/base/tsk_base.h])
AC_CONFIG_HEADERS([tsk/tsk_config.h])
AC_CONFIG_HEADERS([tsk/tsk_config.h])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([foreign])
AM_INIT_AUTOMAKE([foreign])
AM_PATH_CPPUNIT(1.12.1)
AM_CONDITIONAL([CPPUNIT],[test "x$no_cppunit" = x])
AM_PROG_LIBTOOL
AM_PROG_LIBTOOL
AM_MAINTAINER_MODE
AM_MAINTAINER_MODE
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
...
@@ -29,9 +31,9 @@ AC_PROG_CPP
...
@@ -29,9 +31,9 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_MAKE_SET
AC_PATH_PROG(PKGCONFIG,[pkg-config])
AC_PATH_PROG(PERL, perl)
AC_PATH_PROG(PERL, perl)
dnl Checks for header files.
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_STDC
dnl AC_HEADER_MAJOR
dnl AC_HEADER_MAJOR
...
@@ -82,9 +84,6 @@ AX_PTHREAD([
...
@@ -82,9 +84,6 @@ AX_PTHREAD([
LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"],[])
CC="$PTHREAD_CC"],[])
PKG_CHECK_MODULES([CPPUNIT],[cppunit >= 1.12.1],[ac_cv_cppunit=yes],[ac_cv_cppunit=no])
AM_CONDITIONAL([CPPUNIT],[test "x$ac_cv_cppunit" = xyes])
dnl Permit single-threaded builds
dnl Permit single-threaded builds
AC_ARG_ENABLE([multithreading],
AC_ARG_ENABLE([multithreading],
[AS_HELP_STRING([--disable-multithreading], [Build without multithreading support])])
[AS_HELP_STRING([--disable-multithreading], [Build without multithreading support])])
...
@@ -353,7 +352,6 @@ Building:
...
@@ -353,7 +352,6 @@ Building:
zlib support: $ax_zlib
zlib support: $ax_zlib
Features:
Features:
cppunit support: $ac_cv_cppunit
Java/JNI support: $ax_java_support
Java/JNI support: $ax_java_support
Multithreading: $ax_multithread
Multithreading: $ax_multithread
]);
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment