[commit] r2100 - check for libutil and unix98 ptys independently

 
Author: piumarta
Date: 2009-08-26 18:00:38 -0700 (Wed, 26 Aug 2009)
New Revision: 2100

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake
   trunk/platforms/unix/vm-sound-Sun/config.cmake
Log:
check for libutil and unix98 ptys independently

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-27 00:40:17 UTC (rev 2099)
+++ trunk/platforms/unix/ChangeLog 2009-08-27 01:00:38 UTC (rev 2100)
@@ -1,3 +1,11 @@
+2009-08-26    <[hidden email]>
+
+ * plugins/PseudoTTYPlugin/config.cmake: Check for libutil and
+ unix98 ptys independently.
+
+ * vm-sound-Sun/config.cmake: Fail if head missing in both
+ potential locations.
+
 2009-08-27  Ian Piumarta  <[hidden email]>
 
  * plugins/GStreamerPlugin/config.cmake: Configure gstreamer via pkg-config.

Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-27 00:40:17 UTC (rev 2099)
+++ trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-27 01:00:38 UTC (rev 2100)
@@ -6,21 +6,25 @@
 
 CHECK_FUNCTION_EXISTS (openpty OPENPTY)
 
-IF (NOT OPENPTY AND HAVE_LIBUTIL)
+IF (OPENPTY)
+  SET (HAVE_OPENPTY 1)
+ENDIF ()
+
+IF (NOT HAVE_OPENPTY AND HAVE_LIBUTIL)
   CHECK_LIBRARY_EXISTS (util openpty "" UTIL_OPENPTY)
   IF (UTIL_OPENPTY)
     PLUGIN_LINK_LIBRARIES (util)
     SET (HAVE_OPENPTY 1)
-  ELSE ()
-    IF (EXISTS /dev/ptmx)
-      CHECK_FUNCTION_EXISTS (grantpt HAVE_UNIX98_PTYS)
-      IF (NOT HAVE_UNIX98_PTYS)
-        PLUGIN_DISABLE ()
-      ENDIF (NOT HAVE_UNIX98_PTYS)
-    ENDIF (EXISTS /dev/ptmx)
-  ENDIF (UTIL_OPENPTY)
-ENDIF (NOT OPENPTY AND HAVE_LIBUTIL)
+  ENDIF ()
+ENDIF ()
 
+IF (NOT HAVE_OPENPTY AND EXISTS /dev/ptmx)
+  CHECK_FUNCTION_EXISTS (grantpt HAVE_UNIX98_PTYS)
+  IF (NOT HAVE_UNIX98_PTYS)
+    PLUGIN_DISABLE ()
+  ENDIF (NOT HAVE_UNIX98_PTYS)
+ENDIF (NOT HAVE_OPENPTY AND EXISTS /dev/ptmx)
+
 PLUGIN_INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin)
 
 CONFIG_DEFINE (HAVE_UTIL_H)

Modified: trunk/platforms/unix/vm-sound-Sun/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-27 00:40:17 UTC (rev 2099)
+++ trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-27 01:00:38 UTC (rev 2100)
@@ -1,6 +1,8 @@
-CHECK_INCLUDE_FILE (sys/audioio.h HAVE_SYS_AUDIOIO_H)
-CHECK_INCLUDE_FILE (sun/audioio.h HAVE_SUN_AUDIOIO_H)
+PLUGIN_FIND_INCLUDE (SYS_AUDIOIO sys/audioio.h)
+PLUGIN_FIND_INCLUDE (SUN_AUDIOIO sun/audioio.h)
 
-IF (NOT HAVE_SYS_AUDIOIO_H OR NOT HAVE_SUN_AUDIOIO_H)
-    PLUGIN_DISABLE ()
+IF (NOT HAVE_SYS_AUDIOIO_H AND NOT HAVE_SUN_AUDIOIO_H)
+  PLUGIN_DISABLE ()
 ENDIF ()
+
+CONFIG_DEFINE (HAVE_SYS_AUDIOIO_H)