[Mplayer-cvslog] CVS: main configure,1.314,1.315

Alex Beregszaszi alex at mplayer.dev.hu
Mon Dec 3 16:18:02 CET 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv16144

Modified Files:
	configure 
Log Message:
detect termios.h if no sys/termios.h (qnx getch2 support working)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- configure	3 Dec 2001 01:12:30 -0000	1.314
+++ configure	3 Dec 2001 15:17:58 -0000	1.315
@@ -1216,13 +1216,34 @@
 EOF
   _termios=no
   cc_check && _termios=yes
+  _def_termios_h_name='sys/termios.h'
 fi
+# second test:
+if test "$_termios" = no ; then
+  cat > $TMPC <<EOF
+#include <termios.h>
+int main(void) { return 0; }
+EOF
+  _termios=no
+  cc_check && _termios=yes
+  _def_termios_h_name='termios.h'
+fi
+
 if test "$_termios" = yes ; then
   _def_termios='#define HAVE_TERMIOS 1'
- else
+  _def_termios_h='#undef HAVE_TERMIOS_H'
+  _def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H'
+
+  if test "$_def_termios_h_name" = 'sys/termios.h' ; then
+    _def_termios_sys_h='#define HAVE_SYS_TERMIOS_H 1'
+  elif test "$_def_termios_h_name" = 'termios.h' ; then
+    _def_termios_h='#define HAVE_TERMIOS_H 1'
+  fi
+else
   _def_termios='#undef HAVE_TERMIOS'
+  _def_termios_h_name=''
 fi
-echores "$_termios"
+echores "$_termios (using: $_def_termios_h_name)"
 
 
 echocheck "shm"
@@ -2855,6 +2876,8 @@
 
 /* termios flag for getch2.c */
 $_def_termios
+$_def_termios_h
+$_def_termios_sys_h
 
 /* enable PNG support */
 $_def_png




More information about the MPlayer-cvslog mailing list