From 62a5eb397f753968b6c136e733cc87e3346f1149 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 21 Mar 2008 12:13:13 +0000 Subject: [PATCH] Always call configure in common/{zlib,jpeg} to get "make dist" works git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2437 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 67a66bb3..12bb5588 100644 --- a/configure.ac +++ b/configure.ac @@ -111,15 +111,16 @@ AC_SEARCH_LIBS([dmICCreate], [dmedia], USE_DMEDIA=yes]) AM_CONDITIONAL([DMEDIA], [test "x$USE_DMEDIA" = xyes]) + +AC_CONFIG_SUBDIRS([common/zlib]) AC_SEARCH_LIBS([inflate], [z], [], - [AC_CONFIG_SUBDIRS([common/zlib]) - ZLIB_LIBS='$(COMMON_DIR)/zlib/libz.la' + [ZLIB_LIBS='$(COMMON_DIR)/zlib/libz.la' VNC_ZLIB=yes]) AM_CONDITIONAL([ZLIB], [test "x$VNC_ZLIB" = xyes]) AC_SUBST(ZLIB_LIBS) +dnl AC_CONFIG_SUBDIRS([common/jpeg]) AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg], [], -dnl [AC_CONFIG_SUBDIRS([common/jpeg]) [JPEG_LIBS='$(COMMON_DIR)/jpeg/libjpeg.a' VNC_JPEG=yes]) AM_CONDITIONAL([JPEG], [test "x$VNC_JPEG" = xyes]) -- 2.39.5