Commit 28a84b63 authored by dscho's avatar dscho

moved the OSXvnc-server to examples; IRIX fixes (not really IRIX, but shows there)

parent fd96c5e8
Makefile Makefile
Makefile.in Makefile.in
configure configure
configure.lineno
config.status config.status
config.log config.log
libvncserver.spec libvncserver.spec
......
...@@ -35,18 +35,20 @@ AC_SUBST(X_LIBS) ...@@ -35,18 +35,20 @@ AC_SUBST(X_LIBS)
AM_CONDITIONAL(HAVE_X, test $HAVE_X != "false") AM_CONDITIONAL(HAVE_X, test $HAVE_X != "false")
# Checks for libraries. # Checks for libraries.
AC_CHECK_HEADERS(jpeglib.h pthread.h zlib.h) AC_CHECK_HEADER(jpeglib.h, HAVE_JPEGLIB_H="true")
if test ! -z "$HAVE_JPEGLIB.H"; then AC_CHECK_HEADER(pthread.h, HAVE_PTHREAD_H="true")
AC_CHECK_HEADER(zlib.h, HAVE_ZLIB_H="true")
if test ! -z "$HAVE_JPEGLIB_H"; then
AC_CHECK_LIB(jpeg, jpeg_CreateCompress) AC_CHECK_LIB(jpeg, jpeg_CreateCompress)
fi fi
if test ! -z "$HAVE_PTHREAD.H"; then if test ! -z "$HAVE_PTHREAD_H"; then
AC_CHECK_LIB(pthread, pthread_mutex_lock) AC_CHECK_LIB(pthread, pthread_mutex_lock)
AC_CHECK_LIB(pthread, pthread_mutex_lock, HAVE_LIBPTHREAD="true") AC_CHECK_LIB(pthread, pthread_mutex_lock, HAVE_LIBPTHREAD="true")
fi fi
#AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_PTHREAD.H")
AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_LIBPTHREAD") AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_LIBPTHREAD")
if test ! -z "$HAVE_ZLIB.H"; then if test ! -z "$HAVE_ZLIB_H"; then
AC_CHECK_LIB(z, deflate) AC_CHECK_LIB(z, deflate, , HAVE_ZLIB_H="")
if test ! -z "$HAVE_ZLIB_H"; then
# check for c++, but don't fail if not found # check for c++, but don't fail if not found
AC_CHECK_PROGS(CXX,[g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],none) AC_CHECK_PROGS(CXX,[g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],none)
AH_TEMPLATE(HAVE_ZRLE, [Use zrle compression; needs a c++ compiler]) AH_TEMPLATE(HAVE_ZRLE, [Use zrle compression; needs a c++ compiler])
...@@ -55,10 +57,11 @@ if test ! -z "$HAVE_ZLIB.H"; then ...@@ -55,10 +57,11 @@ if test ! -z "$HAVE_ZLIB.H"; then
AC_PROG_CXX AC_PROG_CXX
CCLD="\$(CXX)" CCLD="\$(CXX)"
fi fi
fi
else else
CXX=none CXX=none
fi fi
AM_CONDITIONAL(HAVE_CXX, test x$CXX != xnone) AM_CONDITIONAL(HAVE_CXX, test x$CXX != xnone -a ! -z "$HAVE_ZLIB_H")
AC_SUBST(CCLD) AC_SUBST(CCLD)
# Checks for header files. # Checks for header files.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment