[Cleanup] Detect and handle IRIX related enhancements in common/* directory only

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2889 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/configure.ac b/common/configure.ac
index a3399198aa944277e2bd5e888c0e4afdbf8eac8c..198d6640ec899b0ac4f1a4a7fd46b260cc1a1595 100644 (file)
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -14,9 +14,6 @@ case "`(uname -sr) 2>/dev/null`" in
 "SunOS 5"*)
   SOLARIS=yes
   ;;
-"Linux"*)
-  LINUX=yes
-  ;;
 "IRIX 6"*)
   LDFLAGS="-L/usr/lib32 $LDFLAGS"
   ;;
@@ -43,17 +40,16 @@ if test "$GXX" = yes; then
 fi
 
 dnl Checks for IRIX-specific Compression Library.
+AC_SEARCH_LIBS([clQuerySchemeFromName])
 AC_CHECK_LIB(cl, clQuerySchemeFromName,
   [AC_DEFINE(HAVE_CL)
-  IRIX_COMPRESS=yes
-  LIBS="$LIBS -lcl"])
+  IRIX_COMPRESS=yes])
 AM_CONDITIONAL([IRIX_COMPRESS], [ test "x$IRIX_COMPRESS" = xyes ])
 
 dnl Checks for IRIX-specific Digital Media libraries.
 AC_CHECK_LIB(dmedia, dmICCreate,
   [AC_DEFINE(HAVE_DMEDIA)
-  IRIX_MEDIA=yes
-  LIBS="$LIBS -ldmedia"])
+  IRIX_MEDIA=yes])
 AM_CONDITIONAL([IRIX_MEDIA], [ test "x$IRIX_MEDIA" = xyes ])
 
 AC_ARG_WITH([included-zlib],
@@ -62,8 +58,7 @@ AC_ARG_WITH([included-zlib],
        [], [with_included_zlib='no'])
 
 if test "x$with_included_zlib" = xno; then
-       AC_SEARCH_LIBS([inflateEnd], [z],
-               [ZLIB_LIB='-lz'],
+       AC_SEARCH_LIBS([inflateEnd], [z], [],
                [ZLIB_DIR=zlib
                 ZLIB_INCLUDE='-I$(top_srcdir)/zlib'
                 ZLIB_LIB='$(top_srcdir)/zlib/libz.la'])
@@ -85,8 +80,7 @@ AC_ARG_WITH([included-jpeg],
        [], [with_included_jpeg='no'])
 
 if test "x$with_included_jpeg" = xno; then
-  AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg],
-       [JPEG_LIB='-ljpeg'],
+  AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg], [],
        [JPEG_DIR=jpeg
         JPEG_INCLUDE='-I$(top_srcdir)/jpeg'
         JPEG_LIB='$(top_srcdir)/jpeg/libjpeg.la'])

diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 7fff7c8a19b614461bfafe30228f24af4de41a24..30c06d7dd1a6fbc170881de66ea2d564adc6ba7b 100644 (file)
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -57,3 +57,10 @@ librfb_la_CPPFLAGS = -I$(top_srcdir) @JPEG_INCLUDE@ @VSNPRINTF_DEFINE@ \
        @STRCASECMP_DEFINE@ @STRNCASECMP_DEFINE@
 
 librfb_la_LIBADD = @JPEG_LIB@
+
+if IRIX_COMPRESS
+librfb_la_LIBADD += -lcl
+endif
+if IRIX_MEDIA
+librfb_la_LIBADD += -ldmedia
+endif

diff --git a/unix/configure.ac b/unix/configure.ac
index 63e158fb6e1960161b8f3f6e8afd6db765267dba..a01a657e0ea6c0638694e3ec1e6b6d62b9125a75 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -21,10 +21,6 @@ case "`(uname -sr) 2>/dev/null`" in
   USE_MITSHM=yes
   USE_SUN_OVL=yes
   ;;
-"Linux"*)
-  LINUX=yes
-  USE_MITSHM=yes
-  ;;
 "IRIX 6"*)
   LDFLAGS="-L/usr/lib32 $LDFLAGS"
   USE_MITSHM=yes
@@ -57,18 +53,6 @@ if test "$GXX" = yes; then
   fi
 fi
 
-dnl Check for IRIX-specific Compression Library.
-AC_CHECK_LIB(cl, clQuerySchemeFromName,
-  [AC_DEFINE(HAVE_CL)
-  CL_LIB=-lcl])
-AC_SUBST(CL_LIB)
-
-dnl Check for IRIX-specific Digital Media libraries.
-AC_CHECK_LIB(dmedia, dmICCreate,
-  [AC_DEFINE(HAVE_DMEDIA)
-  DMEDIA_LIB=-ldmedia])
-AC_SUBST(DMEDIA_LIB)
-
 AC_PATH_XTRA
 
 AC_ARG_ENABLE(vncconfig,

diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index bfd31e5fb3052fea909b8cc3e1c67b2532e0e36e..e6e6c384f336b630a26eb9a04c45c5e0953bcc24 100644 (file)
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -13,5 +13,4 @@ vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
 
 vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
        $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
-       @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ \
-       @DMEDIA_LIB@ # @LIBINTL@
+       @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@

diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
index 5b22956ce698694df5ec0d45b6028b58400e0965..1c50c84dd9bb5f2a6ded596261c8f7dc24796f88 100644 (file)
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -17,4 +17,4 @@ x0vncserver_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
 x0vncserver_LDADD = $(COMMON_DIR)/rfb/librfb.la \
        $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
        $(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
-       @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ @CL_LIB@ @DMEDIA_LIB@
+       @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@