[GnuGk-cvs] openh323gk gnugkbuildopts.h.in, 1.14, 1.15 configure.in, 1.40, 1.41

[Jan W. <wil...@us...>]

Update of /cvsroot/openh323gk/openh323gk
In directory vz-cvs-4.sog:/tmp/cvs-serv4054

Modified Files:
	gnugkbuildopts.h.in configure.in 
Log Message:
fix Windows paths for libssh


Index: gnugkbuildopts.h.in
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/gnugkbuildopts.h.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gnugkbuildopts.h.in	6 Apr 2011 14:12:11 -0000	1.14
--- gnugkbuildopts.h.in	27 Nov 2011 14:21:44 -0000	1.15
***************
*** 29,36 ****
  #undef HAS_LIBSSH
  #if defined(_MSC_VER) && HAS_LIBSSH
!   #pragma include_alias("libssh/libssh.h", "@LIBSSH_DIR@/libssh/libssh.h")
!   #pragma include_alias("libssh/server.h", "@LIBSSH_DIR@/libssh/server.h")
!   #pragma include_alias("libssh/legacy.h", "@LIBSSH_DIR@/libssh/legacy.h") // inside libssh.h
!   #define LIBSSH_LIB	"@LIBSSH_DIR@/lib/libssh.lib"
  #endif
  
--- 29,36 ----
  #undef HAS_LIBSSH
  #if defined(_MSC_VER) && HAS_LIBSSH
!   #pragma include_alias("libssh/libssh.h", "@LIBSSH_DIR@/include/libssh/libssh.h")
!   #pragma include_alias("libssh/server.h", "@LIBSSH_DIR@/include/libssh/server.h")
!   #pragma include_alias("libssh/legacy.h", "@LIBSSH_DIR@/include/libssh/legacy.h") // inside libssh.h
!   #define LIBSSH_LIB	"@LIBSSH_DIR@/lib/ssh.lib"
  #endif
  

Index: configure.in
===================================================================
RCS file: /cvsroot/openh323gk/openh323gk/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.in	29 Sep 2011 09:12:41 -0000	1.40
--- configure.in	27 Nov 2011 14:21:44 -0000	1.41
***************
*** 790,796 ****
  
  dnl MSWIN_DISPLAY    libssh,libSSH
! dnl MSWIN_CHECK_FILE libssh,libssh\server.h,HAS_LIBSSH=1
  dnl MSWIN_DIR_SYMBOL libssh,LIBSSH_DIR
! dnl MSWIN_CHECK_DIR  libssh,\libssh\include\
  
  AC_ARG_ENABLE(libssh, 
--- 790,796 ----
  
  dnl MSWIN_DISPLAY    libssh,libSSH
! dnl MSWIN_CHECK_FILE libssh,include\libssh\server.h,HAS_LIBSSH=1
  dnl MSWIN_DIR_SYMBOL libssh,LIBSSH_DIR
! dnl MSWIN_CHECK_DIR  libssh,\libssh\
  
  AC_ARG_ENABLE(libssh,