Commit | Line | Data |
---|---|---|
9bca348f FF |
1 | diff -u -r ../fish-2.2.0/configure.ac ./configure.ac |
2 | --- ../fish-2.2.0/configure.ac 2015-07-03 15:46:59.000000000 -0400 | |
3dd3d87b | 3 | +++ ./configure.ac 2015-07-16 08:54:32.825023137 -0400 |
9bca348f FF |
4 | @@ -249,6 +249,7 @@ |
5 | ) | |
6 | ], | |
7 | [glibc=yes], | |
8 | + [glibc=no], | |
9 | [glibc=no] | |
10 | ) | |
11 | ||
12 | @@ -319,14 +320,6 @@ | |
13 | ||
14 | ||
15 | # | |
16 | -# See if Linux procfs is present. This is used to get extra | |
17 | -# information about running processes. | |
18 | -# | |
19 | - | |
20 | -AC_CHECK_FILES([/proc/self/stat]) | |
21 | - | |
22 | - | |
23 | -# | |
24 | # This is ued to tell the wgetopt library to translate strings. This | |
25 | # way wgetopt can be dropped into any project without requiring i18n. | |
26 | # | |
27 | @@ -350,8 +343,6 @@ | |
28 | ||
29 | # Check for os dependant libraries for all binaries. | |
30 | AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) | |
31 | -AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) | |
32 | -AC_SEARCH_LIBS( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) | |
33 | AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] ) | |
34 | AC_SEARCH_LIBS( setupterm, [ncurses tinfo curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish. If this is Linux, try running 'sudo apt-get install libncurses5-dev' or 'sudo yum install ncurses-devel'])] ) | |
35 | AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] ) | |
3dd3d87b FF |
36 | @@ -503,6 +494,7 @@ |
37 | # | |
38 | # Detect nanoseconds fields in struct stat | |
39 | # | |
40 | +AC_CHECK_MEMBERS([struct stat.st_ctime_nsec]) | |
41 | AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec]) | |
42 | AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec]) | |
43 | ||
44 | @@ -559,7 +551,8 @@ | |
9bca348f FF |
45 | ) |
46 | ], | |
47 | [have_realpath_null=yes], | |
48 | - [have_realpath_null=no] | |
49 | + [have_realpath_null=no], | |
50 | + [have_realpath_null=yes] | |
51 | ) | |
52 | ||
53 | if test "$have_realpath_null" = yes; then | |
3dd3d87b | 54 | @@ -636,6 +629,9 @@ |
9bca348f FF |
55 | [ |
56 | AC_MSG_RESULT([yes]) | |
57 | AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken]) | |
58 | + ], | |
59 | + [ | |
60 | + AC_MSG_RESULT(no) | |
61 | ] | |
62 | ) | |
59f0d218 | 63 |