summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authordscho <dscho>2003-02-09 17:55:10 +0000
committerdscho <dscho>2003-02-09 17:55:10 +0000
commit28a84b63fe186a443704ade90a3e6370f127a2ec (patch)
treea635f7b098105a26bfd47d92dad10ea7ce0ae822 /configure.ac
parentfd96c5e835cfb64e454e189e4b481b0a7292f5e3 (diff)
downloadlibtdevnc-28a84b63fe186a443704ade90a3e6370f127a2ec.tar.gz
libtdevnc-28a84b63fe186a443704ade90a3e6370f127a2ec.zip
moved the OSXvnc-server to examples; IRIX fixes (not really IRIX, but shows there)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac31
1 files changed, 17 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 6f186b7..ddc63ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,30 +35,33 @@ AC_SUBST(X_LIBS)
AM_CONDITIONAL(HAVE_X, test $HAVE_X != "false")
# Checks for libraries.
-AC_CHECK_HEADERS(jpeglib.h pthread.h zlib.h)
-if test ! -z "$HAVE_JPEGLIB.H"; then
+AC_CHECK_HEADER(jpeglib.h, HAVE_JPEGLIB_H="true")
+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)
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, HAVE_LIBPTHREAD="true")
fi
-#AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_PTHREAD.H")
AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_LIBPTHREAD")
-if test ! -z "$HAVE_ZLIB.H"; then
- AC_CHECK_LIB(z, deflate)
- # 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)
- AH_TEMPLATE(HAVE_ZRLE, [Use zrle compression; needs a c++ compiler])
- if test x$CXX != xnone; then
- AC_DEFINE(HAVE_ZRLE)
- AC_PROG_CXX
- CCLD="\$(CXX)"
+if test ! -z "$HAVE_ZLIB_H"; then
+ 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
+ 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])
+ if test x$CXX != xnone; then
+ AC_DEFINE(HAVE_ZRLE)
+ AC_PROG_CXX
+ CCLD="\$(CXX)"
+ fi
fi
else
CXX=none
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)
# Checks for header files.