diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 06:20:34 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 06:20:34 +0000 |
| commit | 1a2b23c7988929cbb2674e40ebcba0236b208415 (patch) | |
| tree | 38bfeca820b84c31302c10b1254d68fba5546775 | |
| parent | 566208a2651b0c063ecc37413d6923ab677ad90d (diff) | |
| download | pcsxr-1a2b23c7988929cbb2674e40ebcba0236b208415.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54396 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | configure | 40 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gui/AboutDlg.c | 2 | ||||
| -rw-r--r-- | plugins/dfcdrom/cdr.h | 1 |
4 files changed, 43 insertions, 1 deletions
@@ -13642,6 +13642,46 @@ if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : LDFLAGS="$LDFLAGS -lnsl" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for umem_alloc in -lumem" >&5 +$as_echo_n "checking for umem_alloc in -lumem... " >&6; } +if test "${ac_cv_lib_umem_umem_alloc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lumem $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 umem_alloc (); +int +main () +{ +return umem_alloc (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_umem_umem_alloc=yes +else + ac_cv_lib_umem_umem_alloc=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_umem_umem_alloc" >&5 +$as_echo "$ac_cv_lib_umem_umem_alloc" >&6; } +if test "x$ac_cv_lib_umem_umem_alloc" = x""yes; then : + LDFLAGS="$LDFLAGS -lumem_alloc" +fi + if false; then SOUND_OSS_TRUE= diff --git a/configure.ac b/configure.ac index d7e959bd..7fac9986 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,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(nsl, gethostbyname, [LDFLAGS="$LDFLAGS -lnsl"], []) +AC_CHECK_LIB(umem, umem_alloc, [LDFLAGS="$LDFLAGS -lumem_alloc"], []) AM_CONDITIONAL(SOUND_OSS, false) AM_CONDITIONAL(SOUND_SDL, false) diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index 0cc1fe8c..ca001b1f 100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -40,7 +40,7 @@ void RunAboutDialog(void) { "Peter Collingbourne", "shalma", "Tristin Celestin", - "...and many others!", + "...see the included AUTHORS file for more detail.", "", "PCSX-df Team:", "Ryan Schultz <schultz.ryan@gmail.com>", diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h index 2123ce66..e127f89b 100644 --- a/plugins/dfcdrom/cdr.h +++ b/plugins/dfcdrom/cdr.h @@ -60,6 +60,7 @@ #elif defined (__sun) #include <sys/cdio.h> +#include <sys/scsi/scsi.h> #define CD_SECS 60 #define CD_FRAMES 75 |