Updated build scripts to make the Mac OS X work around for the MySQL client library path only happen when you have Mac OS X.
This commit is contained in:
parent
a27092c873
commit
7aa1a6b7c7
@ -1,5 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
INSTALLNAMETOOL=`which install_name_tool` # Fixes Mac OS X issue with linking.
|
||||||
|
|
||||||
ZNCBUILD=`which znc-buildmod`
|
ZNCBUILD=`which znc-buildmod`
|
||||||
if [ "$ZNCBUILD" = "" ]; then
|
if [ "$ZNCBUILD" = "" ]; then
|
||||||
echo "Where is znc-buildmod:"
|
echo "Where is znc-buildmod:"
|
||||||
@ -21,6 +23,8 @@ if [ "$ZNCCONFIG" = "" ]; then
|
|||||||
ZNCCONFIG="$HOME/.znc"
|
ZNCCONFIG="$HOME/.znc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LDFLAGS="-L $MYSQL/lib -lmysqlclient -I $MYSQL/include" $ZNCBUILD logmysql.cpp
|
LDFLAGS="-L $MYSQL/lib -lmysqlclient -I $MYSQL/include" "$ZNCBUILD" logmysql.cpp
|
||||||
install_name_tool -change libmysqlclient.18.dylib "$MYSQL/libmysqlclient.dylib" logmysql.so
|
if [ "$INSTALLNAMETOOL" != "" ]; then
|
||||||
|
"$INSTALLNAMETOOL" -change libmysqlclient.18.dylib "$MYSQL/libmysqlclient.dylib" logmysql.so
|
||||||
|
fi
|
||||||
cp logmysql.so "$ZNCCONFIG/modules/logmysql.so"
|
cp logmysql.so "$ZNCCONFIG/modules/logmysql.so"
|
@ -21,5 +21,5 @@ if [ "$ZNCCONFIG" = "" ]; then
|
|||||||
ZNCCONFIG="$HOME/.znc"
|
ZNCCONFIG="$HOME/.znc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LDFLAGS="-L $SQLITE/lib -lsqlite3 -I $SQLITE/include" $ZNCBUILD logsqlite.cpp
|
LDFLAGS="-L $SQLITE/lib -lsqlite3 -I $SQLITE/include" "$ZNCBUILD" logsqlite.cpp
|
||||||
cp logsqlite.so "$ZNCCONFIG/modules/logsqlite.so"
|
cp logsqlite.so "$ZNCCONFIG/modules/logsqlite.so"
|
Loading…
Reference in New Issue
Block a user