fgrep: warning: fgrep is obsolescent; using grep -F
parent
65aeeb28cc
commit
0a9fef1339
6
make.sh
6
make.sh
|
|
@ -22,9 +22,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f /usr/include/fastcommon/_os_define.h ]; then
|
if [ -f /usr/include/fastcommon/_os_define.h ]; then
|
||||||
OS_BITS=$(fgrep OS_BITS /usr/include/fastcommon/_os_define.h | awk '{print $NF;}')
|
OS_BITS=$(grep -F OS_BITS /usr/include/fastcommon/_os_define.h | awk '{print $NF;}')
|
||||||
elif [ -f /usr/local/include/fastcommon/_os_define.h ]; then
|
elif [ -f /usr/local/include/fastcommon/_os_define.h ]; then
|
||||||
OS_BITS=$(fgrep OS_BITS /usr/local/include/fastcommon/_os_define.h | awk '{print $NF;}')
|
OS_BITS=$(grep -F OS_BITS /usr/local/include/fastcommon/_os_define.h | awk '{print $NF;}')
|
||||||
else
|
else
|
||||||
OS_BITS=64
|
OS_BITS=64
|
||||||
fi
|
fi
|
||||||
|
|
@ -105,7 +105,7 @@ elif [ "$uname" = "FreeBSD" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $have_pthread -eq 0 ] && [ "$uname" != "Darwin" ]; then
|
if [ $have_pthread -eq 0 ] && [ "$uname" != "Darwin" ]; then
|
||||||
/sbin/ldconfig -p | fgrep libpthread.so > /dev/null
|
/sbin/ldconfig -p | grep -F libpthread.so > /dev/null
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
LIBS="$LIBS -lpthread"
|
LIBS="$LIBS -lpthread"
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue