mirror of git://git.psyced.org/git/psyclpc
cheating so -liconv is added on BSD
This commit is contained in:
parent
c5c064b1b2
commit
1d0eaabeff
|
@ -1452,27 +1452,26 @@ int main(void)
|
||||||
lp_cv_need_lib_iconv=no,
|
lp_cv_need_lib_iconv=no,
|
||||||
lp_cv_need_lib_iconv=yes
|
lp_cv_need_lib_iconv=yes
|
||||||
))
|
))
|
||||||
# if test "$lp_cv_need_lib_iconv" = "yes"; then
|
if test "$lp_cv_need_lib_iconv" = "yes"; then
|
||||||
# # Search the libraries
|
# Search the libraries
|
||||||
|
tmp=""
|
||||||
|
AC_CHECK_LIB(iconv,libiconv_close, tmp="-liconv")
|
||||||
|
|
||||||
# tmp=""
|
if test "x$tmp" = "x"; then
|
||||||
|
CFLAGS="$saveflags -L/usr/local/lib"
|
||||||
|
AC_CHECK_LIB(iconv,libiconv_close, tmp="-L/usr/local/lib -liconv")
|
||||||
|
fi
|
||||||
|
|
||||||
# AC_CHECK_LIB(iconv,libiconv_close, tmp="$PKGLIBS -liconv")
|
if test "x$tmp" = "x"; then
|
||||||
|
|
||||||
# if test "x$tmp" = "x"; then
|
|
||||||
# CFLAGS="$saveflags -L/usr/local/lib"
|
|
||||||
# AC_CHECK_LIB(iconv,libiconv_close, tmp="$PKGLIBS -L/usr/local/lib -liconv")
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# if test "x$tmp" = "x"; then
|
|
||||||
# echo "iconv library not found."
|
# echo "iconv library not found."
|
||||||
# lp_cv_has_iconv="no"
|
# lp_cv_has_iconv="no"
|
||||||
# else
|
# FIXME: cheating here
|
||||||
# PKGLIBS="$tmp"
|
PKGLIBS="$PKGLIBS -L/usr/local/lib -liconv"
|
||||||
# fi
|
else
|
||||||
|
PKGLIBS="$PKGLIBS $tmp"
|
||||||
# CFLAGS="$saveflags"
|
fi
|
||||||
# fi
|
fi
|
||||||
|
CFLAGS="$saveflags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$lp_cv_has_iconv" = "xyes"; then
|
if test "x$lp_cv_has_iconv" = "xyes"; then
|
||||||
|
|
|
@ -17,7 +17,7 @@ version_longtype="stable"
|
||||||
# A timestamp, to be used by bumpversion and other scripts.
|
# A timestamp, to be used by bumpversion and other scripts.
|
||||||
# It can be used, for example, to 'touch' this file on every build, thus
|
# It can be used, for example, to 'touch' this file on every build, thus
|
||||||
# forcing revision control systems to add it on every checkin automatically.
|
# forcing revision control systems to add it on every checkin automatically.
|
||||||
version_stamp="Wed Aug 10 16:50:41 CEST 2016"
|
version_stamp="Wed Aug 10 17:20:27 CEST 2016"
|
||||||
|
|
||||||
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
|
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
|
||||||
version_major=4
|
version_major=4
|
||||||
|
|
Loading…
Reference in New Issue