haiwen/libsearpc
1
0
Fork 0
mirror of https://github.com/haiwen/libsearpc.git synced 2025-07-19 15:56:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #16 from Chilledheart/patch-2

Browse Source 
[build] detect darwin platform correctly
This commit is contained in:
Daniel Pan 2014-07-23 16:59:56 +08:00
commit 22b4c467ce
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autogen.sh
View File

@ -5,8 +5,13 @@
: ${AUTOHEADER=autoheader} : ${AUTOHEADER=autoheader}
: ${AUTOMAKE=automake} : ${AUTOMAKE=automake}
: ${ACLOCAL=aclocal} : ${ACLOCAL=aclocal}
: ${LIBTOOLIZE=libtoolize} if test "$(uname -s)" != "Darwin"; then
: ${LIBTOOL=libtool} : ${LIBTOOLIZE=libtoolize}
: ${LIBTOOL=libtool}
else
: ${LIBTOOLIZE=glibtoolize}
: ${LIBTOOL=glibtool}
fi
srcdir=`dirname $0` srcdir=`dirname $0`
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
@ -36,7 +41,7 @@ DIE=0
DIE=1 DIE=1
} }
if test "${TERM_PROGRAM}" != "Apple_Terminal" ; then if test "$(uname -s)" != "Darwin"; then
(grep "^AC_PROG_LIBTOOL" $CONFIGURE >/dev/null) && { (grep "^AC_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo echo
@ -54,7 +59,7 @@ fi
if test x"$MSYSTEM" = x"MINGW32"; then if test x"$MSYSTEM" = x"MINGW32"; then
autoreconf --install -I/local/share/aclocal autoreconf --install -I/local/share/aclocal
elif test "${TERM_PROGRAM}" = "Apple_Terminal" ; then elif test "$(uname -s)" = "Darwin"; then
autoreconf --install -I/opt/local/share/aclocal autoreconf --install -I/opt/local/share/aclocal
else else
autoreconf --install autoreconf --install

2
configure.ac
View File

@ -56,7 +56,7 @@ AC_SUBST(WIN32)
AC_MSG_CHECKING(for Mac) AC_MSG_CHECKING(for Mac)
if test ${TERM_PROGRAM} = "Apple_Terminal" ; then if test "$(uname -s)" = "Darwin"; then
bmac=yes bmac=yes
fi fi