You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

63 lines
2.0 KiB

diff -u -r ../fish-2.2.0/configure.ac ./configure.ac
--- ../fish-2.2.0/configure.ac 2015-07-03 15:46:59.000000000 -0400
+++ ./configure.ac 2015-07-16 08:54:32.825023137 -0400
@@ -249,6 +249,7 @@
)
],
[glibc=yes],
+ [glibc=no],
[glibc=no]
)
@@ -319,14 +320,6 @@
#
-# See if Linux procfs is present. This is used to get extra
-# information about running processes.
-#
-
-AC_CHECK_FILES([/proc/self/stat])
-
-
-#
# This is ued to tell the wgetopt library to translate strings. This
# way wgetopt can be dropped into any project without requiring i18n.
#
@@ -350,8 +343,6 @@
# Check for os dependant libraries for all binaries.
AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
-AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
-AC_SEARCH_LIBS( shm_open, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
AC_SEARCH_LIBS( pthread_create, pthread, , [AC_MSG_ERROR([Cannot find the pthread library, needed to build this package.] )] )
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'])] )
AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
@@ -503,6 +494,7 @@
#
# Detect nanoseconds fields in struct stat
#
+AC_CHECK_MEMBERS([struct stat.st_ctime_nsec])
AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec])
AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec])
@@ -559,7 +551,8 @@
)
],
[have_realpath_null=yes],
- [have_realpath_null=no]
+ [have_realpath_null=no],
+ [have_realpath_null=yes]
)
if test "$have_realpath_null" = yes; then
@@ -636,6 +629,9 @@
[
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
+ ],
+ [
+ AC_MSG_RESULT(no)
]
)