summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-07-09 04:54:36 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-07-09 04:54:36 +0000
commitca0ab2632f3416ff509e52fc9a9b712c1e55317f (patch)
tree504687842a81084518bc358e2ae25475a48f0ee8
parentcaa1da3d923ce50ecb0dacd77f4b8a3944cba8cf (diff)
downloadpcsxr-ca0ab2632f3416ff509e52fc9a9b712c1e55317f.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54392 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
2 files changed, 12 insertions, 12 deletions
diff --git a/configure b/configure
index 8d15b281..00b42384 100755
--- a/configure
+++ b/configure
@@ -13602,13 +13602,13 @@ 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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgethostbyname $LIBS"
+LIBS="-lnsl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13618,27 +13618,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char nsl ();
+char gethostbyname ();
int
main ()
{
-return nsl ();
+return gethostbyname ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gethostbyname_nsl=yes
+ ac_cv_lib_nsl_gethostbyname=yes
else
- ac_cv_lib_gethostbyname_nsl=no
+ ac_cv_lib_nsl_gethostbyname=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 :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
LDFLAGS="$LDFLAGS -lnsl"
fi
diff --git a/configure.ac b/configure.ac
index b860fe8b..d7e959bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +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"], [])
+AC_CHECK_LIB(nsl, gethostbyname, [LDFLAGS="$LDFLAGS -lnsl"], [])
AM_CONDITIONAL(SOUND_OSS, false)
AM_CONDITIONAL(SOUND_SDL, false)