psyc-mirrors/psyclpc
1
0
Fork 0
mirror of git://git.psyced.org/git/psyclpc synced 2024-08-15 03:20:16 +00:00
Code Issues Releases Wiki Activity

stupid question, we use #if

Browse source
This commit is contained in:
The TorPSYC Team 2013-09-27 22:14:33 +02:00
parent 373fb8ac83
commit 727399dbcf
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/autoconf/configure.in
View file

@ -1316,9 +1316,11 @@ for TESTPATH in "" "/usr/local/include"; do
if test "x$TESTPATH" != "x"; then
CFLAGS="-I$TESTPATH $saveflags"
fi
# it's sys/iconv.h for BSD.. how do we support both paths?
AC_TRY_COMPILE([
#if defined(__linux__)
#include <iconv.h>
#else
#include <sys/iconv.h>
#endif
iconv_t * foo(void)
@ -1350,7 +1352,11 @@ if test "x$lp_cv_has_iconv" = "xyes"; then
tcomp2='${CC-cc} ${CFLAGS} -o conftest.o -c conftest.c 2>&1'
cat > conftest.c <<EOF
#include <stdlib.h>
#if defined(__linux__)
#include <iconv.h>
#else
#include <sys/iconv.h>
#endif
int foo(void)
{
@ -1378,7 +1384,12 @@ EOF
AC_CACHE_CHECK(if -liconv is needed, lp_cv_need_lib_iconv,
AC_TRY_RUN([
#include <stdlib.h>
#if defined(__linux__)
#include <iconv.h>
#else
#include <sys/iconv.h>
#endif
int t (void)
{
return iconv(NULL, NULL, NULL, NULL, NULL);

6
src/strfuns.c
View file

@ -37,7 +37,13 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
/* if this check is stupid, please fix it also in configure.in */
#if defined(__linux__)
#include <iconv.h>
#else
#include <sys/iconv.h>
#endif
#include "strfuns.h"

2
src/version.sh
View file

@ -17,7 +17,7 @@ version_longtype="stable"
# A timestamp, to be used by bumpversion and other scripts.
# 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.
version_stamp="Mon Aug 29 16:41:20 CEST 2011"
version_stamp="Fri Sep 27 22:12:45 CEST 2013"
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
version_major=4