[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 a339919..198d664 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -14,9 +14,6 @@
"SunOS 5"*)
SOLARIS=yes
;;
-"Linux"*)
- LINUX=yes
- ;;
"IRIX 6"*)
LDFLAGS="-L/usr/lib32 $LDFLAGS"
;;
@@ -43,17 +40,16 @@
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 @@
[], [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 @@
[], [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 7fff7c8..30c06d7 100644
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -57,3 +57,10 @@
@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 63e158f..a01a657 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -21,10 +21,6 @@
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 @@
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 bfd31e5..e6e6c38 100644
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -13,5 +13,4 @@
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 5b22956..1c50c84 100644
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -17,4 +17,4 @@
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@