ac

4 files changed, 66 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 0191ae4..da08620 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -754,9 +754,9 @@ uninstall-am:
 
 install-exec-local:
 	install -d -m755 '$(prefix)/lib/cryptsetup'
-	install -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass'
-	install -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell'
-	install -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check'
+	install -m755 -c src/naskpass '$(prefix)/lib/cryptsetup/naskpass'
+	install -m755 -c src/naskshell '$(prefix)/lib/cryptsetup/naskshell'
+	install -m755 -c src/naskpass_check '$(prefix)/lib/cryptsetup/naskpass_check'
 	rm '$(prefix)/bin/naskpass'
 	rm '$(prefix)/bin/naskshell'
 	rm '$(prefix)/bin/naskpass_check'
diff --git a/configure b/configure
index c6c7802..6769887 100755
--- a/configure
+++ b/configure
@@ -7639,7 +7639,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_TIMESPEC 1
+#define HAVE_STRUCTSTAT 1
 _ACEOF
 
 
@@ -7649,7 +7649,44 @@ else
 $as_echo "no" >&6; }
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_TIMESPEC 0
+#define HAVE_STRUCTSTAT 0
+_ACEOF
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread/mutex/cond" >&5
+$as_echo_n "checking for pthread/mutex/cond... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_t thrd;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREADS 1
+_ACEOF
+
+
+else
+
+                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREADS 0
 _ACEOF
 
 
diff --git a/configure.ac b/configure.ac
index f612c1f..2d079ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,11 +80,26 @@ AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <sys/stat.h>]],
                                     [[struct stat st;]])],
                    [
                       AC_MSG_RESULT([yes])
-                      AC_DEFINE_UNQUOTED([HAVE_TIMESPEC], 1, [Define to 1 if you have struct stat.])
+                      AC_DEFINE_UNQUOTED([HAVE_STRUCTSTAT], 1, [Define to 1 if you have struct stat.])
                     ],
                     [
                       AC_MSG_RESULT([no])
-                      AC_DEFINE_UNQUOTED([HAVE_TIMESPEC], 0, [Define to 1 if you have struct stat.])
+                      AC_DEFINE_UNQUOTED([HAVE_STRUCTSTAT], 0, [Define to 1 if you have struct stat.])
+                    ]
+                 )
+
+AC_MSG_CHECKING([for pthread/mutex/cond])
+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                    [[pthread_t thrd;]],
+                                    [[pthread_cond_t cnd = PTHREAD_COND_INITIALIZER;]],
+                                    [[pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;]])],
+                   [
+                      AC_MSG_RESULT([yes])
+                      AC_DEFINE_UNQUOTED([HAVE_PTHREADS], 1, [Define to 1 if you have posix threads.])
+                    ],
+                    [
+                      AC_MSG_RESULT([no])
+                      AC_DEFINE_UNQUOTED([HAVE_PTHREADS], 0, [Define to 1 if you have posix threads.])
                     ]
                  )
 
diff --git a/src/aconfig.h.in b/src/aconfig.h.in
index 7cb63b7..333f005 100644
--- a/src/aconfig.h.in
+++ b/src/aconfig.h.in
@@ -80,6 +80,9 @@
 /* Define to 1 if you have the `printf' function. */
 #undef HAVE_PRINTF
 
+/* Define to 1 if you have posix threads. */
+#undef HAVE_PTHREADS
+
 /* Define to 1 if your system has a GNU libc compatible `realloc' function,
    and to 0 otherwise. */
 #undef HAVE_REALLOC
@@ -133,6 +136,9 @@
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
+/* Define to 1 if you have struct stat. */
+#undef HAVE_STRUCTSTAT
+
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
@@ -162,7 +168,7 @@
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define to 1 if you have struct stat. */
+/* Define to 1 if you have struct timespec. */
 #undef HAVE_TIMESPEC
 
 /* Define to 1 if you have the <time.h> header file. */