]>
Commit | Line | Data |
---|---|---|
6e461909 JB |
1 | --- ZThread-2.3.2/share/pthread.m4.orig 2005-03-13 02:47:28.000000000 +0100 |
2 | +++ ZThread-2.3.2/share/pthread.m4 2008-09-10 18:38:26.872979766 +0200 | |
3 | @@ -36,7 +36,7 @@ | |
4 | GNU Pth can also be used if it was configured with --enable-pthread. | |
5 | EOF | |
6 | ||
7 | -AC_DEFUN(AM_DETECT_PTHREAD, | |
8 | +AC_DEFUN([AM_DETECT_PTHREAD], | |
9 | [ | |
10 | ||
11 | pthread_explicit="no" | |
12 | --- ZThread-2.3.2/share/zthread.m4.orig 2005-03-13 02:47:52.000000000 +0100 | |
13 | +++ ZThread-2.3.2/share/zthread.m4 2008-09-10 18:39:05.148994851 +0200 | |
14 | @@ -31,7 +31,7 @@ | |
15 | dnl ZTHREAD_CXXFLAGS | |
16 | dnl ZTHREAD_LIBS | |
17 | dnl | |
18 | -AC_DEFUN(AM_PATH_ZTHREAD, | |
19 | +AC_DEFUN([AM_PATH_ZTHREAD], | |
20 | [ | |
21 | ||
22 | ||
23 | --- ZThread-2.3.2/share/ftime.m4.orig 2005-03-13 02:47:24.000000000 +0100 | |
24 | +++ ZThread-2.3.2/share/ftime.m4 2008-09-10 18:46:25.680989823 +0200 | |
25 | @@ -35,7 +35,7 @@ | |
26 | ||
27 | have_ftime="detect" | |
28 | ||
29 | -AC_DEFUN(AM_DETECT_FTIME, | |
30 | +AC_DEFUN([AM_DETECT_FTIME], | |
31 | [ | |
32 | ||
33 | AC_ARG_WITH(ftime, | |
34 | --- ZThread-2.3.2/share/zthread-config.in.orig 2002-06-29 16:31:16.000000000 +0200 | |
35 | +++ ZThread-2.3.2/share/zthread-config.in 2008-09-10 18:39:58.180982280 +0200 | |
36 | @@ -215,7 +215,7 @@ | |
37 | ## | |
38 | ||
39 | includes="-I@prefix@/include" | |
40 | -libs="-L@prefix@/lib" | |
41 | +libs="-L@libdir@" | |
42 | ||
43 | af_cflags="$af_cflags $includes -DREENTRANT -DZT_POSIX" | |
44 | af_libs="$libs -l$LIB_NAME $af_libs @LINKER_OPTIONS@" | |
eabc6afe JB |
45 | --- ZThread-2.3.2/src/Makefile.am.orig 2005-03-13 04:51:32.000000000 +0100 |
46 | +++ ZThread-2.3.2/src/Makefile.am 2013-11-04 21:05:46.362568360 +0100 | |
47 | @@ -21,8 +21,6 @@ | |
48 | INCLUDES = -I$(top_srcdir)/include | |
49 | SUBDIRS=. | |
50 | ||
51 | -libdir=$(prefix)/lib | |
52 | - | |
53 | lib_LTLIBRARIES = libZThread.la | |
54 | ||
55 | libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@ |