[Opalvoip-svn] SF.net SVN: opalvoip:[20782] ptlib/trunk

[<ms3...@us...>]

Revision: 20782
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20782&view=rev
Author:   ms30002000
Date:     2008-08-30 19:39:28 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
Make SHM_VIDEO variables consistent.

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/include/ptbuildopts.h.in
    ptlib/trunk/make/ptbuildopts.mak.in
    ptlib/trunk/src/ptlib/common/osutils.cxx
    ptlib/trunk/src/ptlib/unix/Makefile

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/configure	2008-08-30 19:39:28 UTC (rev 20782)
@@ -743,7 +743,7 @@
 HAS_VIDFILE
 HAS_APPSHARE
 HAS_VIDEO_CAPTURE
-USE_SHM_VIDEO_DEVICES
+HAS_SHM_VIDEO
 HAS_OSS
 HAS_ALSA
 HAS_ODBC
@@ -6649,7 +6649,7 @@
 HAS_SOCKAGG=1
 HAS_VIDFILE=1
 HAS_APPSHARE=
-default_shmvideo=yes
+HAS_SHM_VIDEO=1
 HAS_VXML=1
 
 if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then
@@ -6690,8 +6690,8 @@
   HAS_SOCKAGG=1
   HAS_VIDFILE=1
   HAS_APPSHARE=
-  default_shmvideo=no
   HAS_VXML=1
+  HAS_SHM_VIDEO=
 elif test "${enable_minsize}x" = "yesx" ; then
   default_resolver=no
   default_openldap=no
@@ -6730,8 +6730,8 @@
   HAS_SOCKAGG=1
   HAS_VIDFILE=1
   HAS_APPSHARE=
-  default_shmvideo=no
   HAS_VXML=
+  HAS_SHM_VIDEO=
 fi
 
 
@@ -13760,28 +13760,58 @@
 
 
 
-# Check whether --enable-shm_video was given.
-if test "${enable_shm_video+set}" = set; then
-  enableval=$enable_shm_video; shm_video=$enableval
+          { echo "$as_me:$LINENO: checking enable shared memory video devices" >&5
+echo $ECHO_N "checking enable shared memory video devices... $ECHO_C" >&6; }
+          # Check whether --enable-shmvideo was given.
+if test "${enable_shmvideo+set}" = set; then
+  enableval=$enable_shmvideo;
+                         if test "x$enableval" = "xyes"; then
+                           HAS_SHM_VIDEO=1
+                         else
+                           HAS_SHM_VIDEO=
+                         fi
+
 fi
 
 
-if test "${enable_shmvideo}z" = "z" ; then
-  shm_video=$default_shmvideo
-fi
+          if test "x" != "x"; then
+            if test "x$" != "x1"; then
+              { echo "$as_me:$LINENO: shmvideo support disabled due to disabled dependency " >&5
+echo "$as_me: shmvideo support disabled due to disabled dependency " >&6;}
+	      HAS_SHM_VIDEO=
+	    fi
+	  fi
 
-USE_SHM_VIDEO_DEVICES=
-if test "$shm_video" = "yes" ; then
-  USE_SHM_VIDEO_DEVICES=1
-  { echo "$as_me:$LINENO: Shared memory video devices enabled" >&5
-echo "$as_me: Shared memory video devices enabled" >&6;}
-else
-  { echo "$as_me:$LINENO: Shared memory video devices disabled" >&5
-echo "$as_me: Shared memory video devices disabled" >&6;}
-fi
+          if test "x" != "x"; then
+            if test "x$" != "x1"; then
+              { echo "$as_me:$LINENO: shmvideo support disabled due to disabled dependency " >&5
+echo "$as_me: shmvideo support disabled due to disabled dependency " >&6;}
+	      HAS_SHM_VIDEO=
+	    fi
+	  fi
 
 
+          if test "x${HAS_SHM_VIDEO}" = "x1"; then
 
+cat >>confdefs.h <<\_ACEOF
+#define P_SHM_VIDEO 1
+_ACEOF
+
+            HAS_SHM_VIDEO=1
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+          else
+            HAS_SHM_VIDEO=
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+          fi
+
+
+
+
+
+
+
 HAS_ALSA=
 HAS_OSS=
 if test "x${HAS_AUDIO}" = "x1" ; then
@@ -15327,7 +15357,7 @@
 HAS_VIDFILE!$HAS_VIDFILE$ac_delim
 HAS_APPSHARE!$HAS_APPSHARE$ac_delim
 HAS_VIDEO_CAPTURE!$HAS_VIDEO_CAPTURE$ac_delim
-USE_SHM_VIDEO_DEVICES!$USE_SHM_VIDEO_DEVICES$ac_delim
+HAS_SHM_VIDEO!$HAS_SHM_VIDEO$ac_delim
 HAS_OSS!$HAS_OSS$ac_delim
 HAS_ALSA!$HAS_ALSA$ac_delim
 HAS_ODBC!$HAS_ODBC$ac_delim

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/configure.ac	2008-08-30 19:39:28 UTC (rev 20782)
@@ -521,7 +521,7 @@
 HAS_SOCKAGG=1
 HAS_VIDFILE=1
 HAS_APPSHARE=
-default_shmvideo=yes
+HAS_SHM_VIDEO=1
 HAS_VXML=1
 
 if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then
@@ -562,8 +562,8 @@
   HAS_SOCKAGG=1
   HAS_VIDFILE=1
   HAS_APPSHARE=
-  default_shmvideo=no
   HAS_VXML=1
+  HAS_SHM_VIDEO=
 elif test "${enable_minsize}x" = "yesx" ; then
   default_resolver=no
   default_openldap=no
@@ -602,8 +602,8 @@
   HAS_SOCKAGG=1
   HAS_VIDFILE=1
   HAS_APPSHARE=
-  default_shmvideo=no
   HAS_VXML=
+  HAS_SHM_VIDEO=
 fi
 
 
@@ -1551,24 +1551,9 @@
 dnl ########################################################################
 dnl enable shared memory video devices (static video plugin)
 
+PTLIB_SIMPLE_OPTION([shmvideo], [SHM_VIDEO], [enable shared memory video devices])
 
-AC_ARG_ENABLE(shm_video,
-		[  --enable-shmvideo       enable shared memory video devices],
-		shm_video=$enableval)
 
-if test "${enable_shmvideo}z" = "z" ; then
-  shm_video=$default_shmvideo
-fi
-
-USE_SHM_VIDEO_DEVICES=
-if test "$shm_video" = "yes" ; then
-  USE_SHM_VIDEO_DEVICES=1
-  AC_MSG_NOTICE(Shared memory video devices enabled)
-else
-  AC_MSG_NOTICE(Shared memory video devices disabled)
-fi
-AC_SUBST(USE_SHM_VIDEO_DEVICES)
-
 dnl ########################################################################
 dnl check for for audio drivers
 

Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/include/ptbuildopts.h.in	2008-08-30 19:39:28 UTC (rev 20782)
@@ -562,7 +562,7 @@
 #undef P_SOCKAGG
 #undef P_VIDFILE
 #undef P_ODBC
-#undef P_SHMVIDEO
+#undef P_SHM_VIDEO
 
 /////////////////////////////////////////////////
 //

Modified: ptlib/trunk/make/ptbuildopts.mak.in
===================================================================
--- ptlib/trunk/make/ptbuildopts.mak.in	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/make/ptbuildopts.mak.in	2008-08-30 19:39:28 UTC (rev 20782)
@@ -62,7 +62,7 @@
 HAS_POP3SMTP	= @HAS_POP3SMTP@
 HAS_AUDIO	= @HAS_AUDIO@
 HAS_VIDEO	= @HAS_VIDEO@
-USE_SHM_VIDEO_DEVICES = @USE_SHM_VIDEO_DEVICES@
+HAS_SHM_VIDEO   = @HAS_SHM_VIDEO@
 
 HAS_VXML	= @HAS_VXML@
 HAS_JABBER	= @HAS_JABBER@

Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx	2008-08-30 19:39:28 UTC (rev 20782)
@@ -1501,16 +1501,16 @@
 
 #ifdef __MACOSX__
   
-#ifdef HAS_VIDEO
+#ifdef P_VIDEO
   PWLibStupidOSXHacks::loadFakeVideoStuff = 1;
-#ifdef USE_SHM_VIDEO_DEVICES
+#ifdef P_SHM_VIDEO
   PWLibStupidOSXHacks::loadShmVideoStuff = 1;
-#endif // USE_SHM_VIDEO_DEVICES
-#endif // HAS_VIDEO
+#endif // P_SHM_VIDEO
+#endif // P_VIDEO
   
-#ifdef HAS_AUDIO
+#ifdef P_AUDIO
   PWLibStupidOSXHacks::loadCoreAudioStuff = 1;
-#endif // HAS_AUDIO
+#endif // P_AUDIO
   
 #endif // __MACOSX__
 

Modified: ptlib/trunk/src/ptlib/unix/Makefile
===================================================================
--- ptlib/trunk/src/ptlib/unix/Makefile	2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/src/ptlib/unix/Makefile	2008-08-30 19:39:28 UTC (rev 20782)
@@ -550,7 +550,7 @@
 	    $(COMMON_SRC_DIR)/tinyjpeg.c \
 	    $(COMMON_SRC_DIR)/jidctflt.c
 	        
-ifdef USE_SHM_VIDEO_DEVICES
+ifdef HAS_SHM_VIDEO
 SOURCES	+= shmvideo.cxx
 endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.