aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavilla <davilla@4pi.com>2011-08-30 00:36:37 -0400
committerdavilla <davilla@4pi.com>2011-08-30 00:36:37 -0400
commit51df69b91153444b88d345c19642422a6b0f10f9 (patch)
tree728917a9927920cc9a87bf0c67059de6109f7653
parent0e9be918ed8e95590936806c12039a1370bc2ea6 (diff)
[osx] fix configure.in for building RSXS, we do not use pkg-config checks for X11, RSXS knows and will build correctly for darwin osx.
-rw-r--r--configure.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index 871a432b0d..3df4d5876b 100644
--- a/configure.in
+++ b/configure.in
@@ -831,12 +831,15 @@ if test "$use_rsxs" = "no" || test "$use_gl" == "no"; then
else
AC_MSG_NOTICE($rsxs_enabled)
DISABLE_RSXS=0
- PKG_CHECK_MODULES([XT], [xt],
- [INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
- AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([XMU], [xmu],
- [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
- AC_MSG_ERROR($missing_library))
+ # darwin osx can do rsxs but does not use x11, so do not pkg-config check for them
+ if test "$host_vendor" != "apple" ; then
+ PKG_CHECK_MODULES([XT], [xt],
+ [INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
+ AC_MSG_ERROR($missing_library))
+ PKG_CHECK_MODULES([XMU], [xmu],
+ [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
+ AC_MSG_ERROR($missing_library))
+ fi
fi
# libRTMP