diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 04:50:33 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 04:50:33 +0000 |
| commit | caa1da3d923ce50ecb0dacd77f4b8a3944cba8cf (patch) | |
| tree | 70f18a27169f50959ec41af72941296c00e379e8 | |
| parent | 6a5c515101e3fe9a80e13136cc0faef5529d9d3c (diff) | |
| download | pcsxr-caa1da3d923ce50ecb0dacd77f4b8a3944cba8cf.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54391 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | configure | 40 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/dfcdrom/cdr-solaris.c | 2 |
3 files changed, 42 insertions, 1 deletions
@@ -13602,6 +13602,46 @@ if test "x$ac_cv_lib_socket_socket" = x""yes; then : LDFLAGS="$LDFLAGS -lsocket" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nsl in -lgethostbyname" >&5 +$as_echo_n "checking for nsl in -lgethostbyname... " >&6; } +if test "${ac_cv_lib_gethostbyname_nsl+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgethostbyname $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nsl (); +int +main () +{ +return nsl (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gethostbyname_nsl=yes +else + ac_cv_lib_gethostbyname_nsl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gethostbyname_nsl" >&5 +$as_echo "$ac_cv_lib_gethostbyname_nsl" >&6; } +if test "x$ac_cv_lib_gethostbyname_nsl" = x""yes; then : + LDFLAGS="$LDFLAGS -lnsl" +fi + if false; then SOUND_OSS_TRUE= diff --git a/configure.ac b/configure.ac index fd2844c4..b860fe8b 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,7 @@ AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Ma AC_CHECK_LIB(dl, dlsym, [LDFLAGS="$LDFLAGS -ldl"], []) AC_CHECK_LIB(socket, socket, [LDFLAGS="$LDFLAGS -lsocket"], []) +AC_CHECK_LIB(gethostbyname, nsl, [LDFLAGS="$LDFLAGS -lnsl"], []) AM_CONDITIONAL(SOUND_OSS, false) AM_CONDITIONAL(SOUND_SDL, false) diff --git a/plugins/dfcdrom/cdr-solaris.c b/plugins/dfcdrom/cdr-solaris.c index 435c76f4..29024322 100644 --- a/plugins/dfcdrom/cdr-solaris.c +++ b/plugins/dfcdrom/cdr-solaris.c @@ -32,7 +32,7 @@ int OpenCdHandle(const char *dev) { void CloseCdHandle() { } -int IsCdHandleOpen () { +int IsCdHandleOpen() { return 0; } |
