strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

systemlibc: rename new SYSTEM_* variables to better names )SYSTEM_LIBC,HAVE_{GETOPT,READDIR_R). Unconditionally set to NO if $_os = WINNT

Browse source
This commit is contained in:
Rene Engelhard 2010-05-25 11:56:39 +02:00
parent 769873c622
commit 1214da3e1c
3 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
configure vendored
View file

@ -694,9 +694,9 @@ DIRECTXSDK_LIB
DIRECTXSDK_HOME
WINDOWS_VISTA_PSDK
PSDK_HOME
SYSTEM_GLIBC
SYSTEM_READDIR_R
SYSTEM_GETOPT
SYSTEM_LIBC
HAVE_READDIR_R
HAVE_GETOPT
SYSTEM_LPSOLVE
SYSTEM_MYTHES
HYPHEN_LIB
@ -18521,34 +18521,40 @@ $as_echo "yes" >&6; }
fi
fi
for ac_func in getopt
if "$_os" != "WNT"; then
for ac_func in getopt
do :
ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
if test "x$ac_cv_func_getopt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETOPT 1
_ACEOF
SYSTEM_GETOPT=YES
HAVE_GETOPT=YES
else
SYSTEM_GETOPT=NO
HAVE_GETOPT=NO
fi
done
for ac_func in readdir_r
for ac_func in readdir_r
do :
ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r"
if test "x$ac_cv_func_readdir_r" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_READDIR_R 1
_ACEOF
SYSTEM_READDIR_R=YES
HAVE_READDIR_R=YES
else
SYSTEM_READDIR_R=NO
HAVE_READDIR_R=NO
fi
done
if test "$SYSTEM_GETOPT" = "YES" -a "$SYSTEM_READDIR_R" = "YES"; then
SYSTEM_GLIBC=YES
if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
SYSTEM_LIBC=YES
fi
else
HAVE_GETOPT=NO
HAVE_READDIR_R=NO
SYSTEM_LIBC=YES
fi

20
configure.in
View file

@ -5134,14 +5134,20 @@ if test "$_os" = "Linux"; then
fi
fi
AC_CHECK_FUNCS(getopt, SYSTEM_GETOPT=YES, [SYSTEM_GETOPT=NO])
AC_CHECK_FUNCS(readdir_r, SYSTEM_READDIR_R=YES, [SYSTEM_READDIR_R=NO])
if test "$SYSTEM_GETOPT" = "YES" -a "$SYSTEM_READDIR_R" = "YES"; then
SYSTEM_GLIBC=YES
if "$_os" != "WNT"; then
AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
SYSTEM_LIBC=YES
fi
else
HAVE_GETOPT=NO
HAVE_READDIR_R=NO
SYSTEM_LIBC=YES
fi
AC_SUBST(SYSTEM_GETOPT)
AC_SUBST(SYSTEM_READDIR_R)
AC_SUBST(SYSTEM_GLIBC)
AC_SUBST(HAVE_GETOPT)
AC_SUBST(HAVE_READDIR_R)
AC_SUBST(SYSTEM_LIBC)
dnl =========================================
dnl Check for the Microsoft Platform SDK.

6
set_soenv.in
View file

@ -1875,9 +1875,9 @@ ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
ToFile( "SYSTEM_GETOPT", "@SYSTEM_GETOPT@", "e" );
ToFile( "SYSTEM_READDIR_R", "@SYSTEM_READDIR_R@", "e" );
ToFile( "SYSTEM_GLIBC", "@SYSTEM_GLIBC@", "e" );
ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );
ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );