From beef3c5b40d56eafd5f6a8d728d8bb26420229a0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 30 Jul 2010 15:00:32 -0600 Subject: [PATCH] Linux build system: Remove search for poppler-qt4 libs as they are no longer used --- setup/build_environment.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup/build_environment.py b/setup/build_environment.py index f4989d5d55..4bce54b35f 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -115,7 +115,6 @@ if iswindows: poppler_lib_dirs = consolidate('POPPLER_LIB_DIR', sw_lib_dir) popplerqt4_lib_dirs = poppler_lib_dirs poppler_libs = ['poppler'] - popplerqt4_libs = poppler_libs + ['QtCore4', 'QtGui4'] magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.5.6')] magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')] magick_libs = ['CORE_RL_wand_', 'CORE_RL_magick_'] @@ -130,7 +129,6 @@ elif isosx: poppler_lib_dirs = consolidate('POPPLER_LIB_DIR', '/sw/lib') popplerqt4_lib_dirs = poppler_lib_dirs - poppler_libs = popplerqt4_libs = ['poppler'] podofo_inc = '/sw/podofo' podofo_lib = '/sw/lib' magick_inc_dirs = consolidate('MAGICK_INC', @@ -162,9 +160,6 @@ else: poppler_libs = pkgconfig_libs('poppler', '', '') if not poppler_libs: poppler_libs = ['poppler'] - popplerqt4_libs = pkgconfig_libs('poppler-qt4', '', '') - if not popplerqt4_libs: - popplerqt4_libs = ['poppler-qt4', 'poppler'] magick_libs = pkgconfig_libs('MagickWand', '', '') if not magick_libs: magick_libs = ['MagickWand', 'MagickCore']