diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 119 |
1 files changed, 28 insertions, 91 deletions
@@ -782,6 +782,7 @@ LCUPSINCLUDE LCUPSBUILDTYPE SHARELCUPSI SHARELCUPS +LIB_CUPS_DIR CUPS_DIR CUPSINSTALL CUPSDATA @@ -938,7 +939,6 @@ enable_contrib with_arch_h with_sanitizer enable_sse2 -enable_threadsafe with_large_color_index enable_threading with_tesseract @@ -1630,8 +1630,6 @@ Optional Features: --disable-contrib Do not include contributed drivers --disable-sse2 Do not use sse2 instrinsics - --enable-threadsafe enable a thread safe build - NOTE: this will exclude - non-threadsafe devices --disable-threading disable support for multithreaded rendering --disable-fontconfig Do not use fontconfig to list system fonts --disable-dbus Do not use dbus to communicate with external @@ -3089,17 +3087,6 @@ ARCH_AUTOCONF_HEADER=arch-config/arch_autoconf.h ARCH_AUTOCONF_HEADER_PROTO=arch/arch_autoconf.h.in -NTS_DEVS='opvp oprp' -NTS_DEVS="$NTS_DEVS uniprint" -NTS_DEVS="$NTS_DEVS x11 x11alpha" -NTS_DEVS="$NTS_DEVS pcl3 hpdjplus hpdjportable hpdj310 hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c hpdj510 hpdj520 hpdj540 hpdj550c hpdj560c hpdj600 hpdj660c hpdj670c hpdj680c hpdj690c hpdj850c hpdj855c hpdj870c hpdj890c hpdj1120c" - -# We use this to store a list of devices we have excluded -# and emit a warning on completion. -NTS_EXCLUDES="" - - - @@ -4648,21 +4635,21 @@ CFLAGS_LARGEFILE="" case $host in *-linux*|*-gnu) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden" fi ;; *bsd*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden" fi ;; *-darwin*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden" @@ -4670,7 +4657,7 @@ case $host in SET_DT_SONAME="" ;; *-mingw*|*-msys*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden" @@ -4684,7 +4671,7 @@ case $host in if test $GCC = no; then SET_DT_SONAME="-h " fi - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden" @@ -4693,7 +4680,7 @@ case $host in fi ;; *-aix*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG" CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0" SET_DT_SONAME="so" @@ -4705,7 +4692,7 @@ esac -if test $GCC = yes; then +if test x"$GCC" = x"yes"; then cflags_to_try="-Wall -Wstrict-prototypes -Wundef \ -Wmissing-declarations -Wmissing-prototypes -Wwrite-strings \ -fno-strict-aliasing -Werror=declaration-after-statement \ @@ -5533,15 +5520,6 @@ fi CFLAGS=$save_cflags -# Check whether --enable-threadsafe was given. -if test "${enable_threadsafe+set}" = set; then : - enableval=$enable_threadsafe; -fi - -if test x$enable_threadsafe = xyes ; then - CFLAGS="-DGS_THREADSAFE" -fi - ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do @@ -8352,14 +8330,14 @@ $as_echo "yes" >&6; } # Building on PPC with gcc, disable libpng's PPC specific # optimizations: we don't include the source file for it # and it only applies to reading, which we don't use. - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CFLAGS="$CFLAGS -DPNG_POWERPC_VSX_OPT=0" fi ;; *arm64*|*aarch64*) # Building on arm64 with gcc, disable libpng's neon # optimizations. - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then CFLAGS="$CFLAGS -DPNG_ARM_NEON_OPT=0" fi ;; @@ -8998,6 +8976,7 @@ CUPSDATA="" CUPSVERSION="0" CUPSPDFTORASTER="0" CUPS_DIR="" +LIB_CUPS_DIR="src" cups_hard_fail=0 @@ -9242,6 +9221,13 @@ done CUPSDEV="$CUPSDEV pwgraster" fi + # appleraster support arrived in cups 2.2.2, so with + # API version 2.2 we do not necessarily have it, but + # 2.3 has it for sure + if test "$CUPSAPIVERSION" ">" "2.2" ; then + CUPSDEV="$CUPSDEV appleraster urf" + fi + CUPSVERSION="`$CUPSCONFIG --version`" LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak" @@ -9309,6 +9295,7 @@ done LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak" LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak" CUPSDEV="cups pwgraster" + LIB_CUPS_DIR=$CUPS_DIR fi fi fi @@ -9334,6 +9321,7 @@ fi + # Check whether --with-ijs was given. if test "${with_ijs+set}" = set; then : withval=$with_ijs; @@ -9648,7 +9636,7 @@ done JPX_SSE_CFLAGS="" if test "x$HAVE_SSE2" = "x" ; then - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then JPX_SSE_CFLAGS="-U__SSE__" fi fi @@ -11159,7 +11147,7 @@ JPEG_DEVS='jpeg jpeggray jpegcmyk' PCX_DEVS='pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk' PBM_DEVS='pbm pbmraw pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw pkm pkmraw pksm pksmraw pam pamcmyk4 pamcmyk32 plan plang planm planc plank' -PS_DEVS='psdf psdcmyk psdrgb psdcmyk16 psdrgb16 pdfwrite ps2write eps2write bbox txtwrite inkcov ink_cov psdcmykog fpng pdfimage8 pdfimage24 pdfimage32 PCLm' +PS_DEVS='psdf psdcmyk psdrgb psdcmyk16 psdrgb16 psdcmyktags psdcmyktags16 pdfwrite ps2write eps2write bbox txtwrite inkcov ink_cov psdcmykog fpng pdfimage8 pdfimage24 pdfimage32 PCLm PCLm8' # Handle --with-extract-dir=EXTRACT_DIR - build extract library and docxwrite # device. @@ -11348,51 +11336,6 @@ $as_echo "$as_me: WARNING: Unable to include opvp/oprp driver due to missing or esac done -if test x$enable_threadsafe = xyes; then - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - P_DEVS0=`echo $P_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$F_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - F_DEVS0=`echo $F_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$CUPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$XPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$IJS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$PNG_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$X11_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - X11_DEVS0=`echo $X11_DEVS0 | sed "s/\b$ntsdev\b//g"` - done - - for ntsdev in $NTS_DEVS ; do - NTS_EXCLUDES="$(echo \"$JBIG2_DEVS{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/\b$ntsdev\b//g"` - done - - NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "` -fi # x$enable_threadsafe = xyes - noncontribmakefiles=`find $srcdir -name '*.mak' -print | grep -v '/contrib/'` # No need to include opvp/oprp driver without iconv/libiconv. @@ -11496,7 +11439,7 @@ if test "${enable_hidden_visibility+set}" = set; then : fi -if test x$hide_symbols = xyes -a $GCC = yes; then +if test x$hide_symbols = xyes -a x"$GCC" = x"yes"; then attr_default="__attribute__((visibility(\\\"default\\\")))" attr_hidden="__attribute__((visibility(\\\"hidden\\\")))" fi @@ -11509,7 +11452,7 @@ case $host in XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)" PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR)" PDF_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)" - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then # GCC high level flag DYNAMIC_LIBS="-rdynamic" else @@ -11596,7 +11539,7 @@ case $host in SO_LIB_EXT=".dylib" ;; *-sun*|*-solaris*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS" else DYNAMIC_CFLAGS="-KPIC $DYNAMIC_CFLAGS" @@ -11616,7 +11559,7 @@ case $host in SO_LIB_EXT=".so" ;; *-aix*) - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS" GCFLAGS="-Wl,-brtl -D_LARGE_FILES $GCFLAGS" GS_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC" @@ -11638,7 +11581,7 @@ case $host in esac if test x$hide_symbols = xyes ; then - if test $GCC = yes; then + if test x"$GCC" = x"yes"; then DYNAMIC_CFLAGS="$DYNAMIC_CFLAGS -fvisibility=hidden" fi DYNAMIC_CFLAGS="$DYNAMIC_CFLAGS -DGSDLLEXPORT=\"$attr_default\"" @@ -12797,7 +12740,7 @@ fi # NOTE: Strict aliasing can cause some parts # of Ghostscript to malfunction. # -------------------------------------------------- -if test $GCC = yes; then +if test x"$GCC" = x"yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly disable strict aliasing" >&5 $as_echo_n "checking whether to explicitly disable strict aliasing... " >&6; } CFLAGS_backup="$CFLAGS" @@ -13628,12 +13571,6 @@ $as_echo "$as_me: WARNING: Using \"native\" font scaler which is now deprecated $as_echo "$as_me: WARNING: Support for this will be removed in a future release" >&2;} fi -if test "x$NTS_EXCLUDES" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Due to the --enable-threadsafe option, the following devices have been excluded because they are not threadsafe:" >&5 -$as_echo "$as_me: WARNING: Due to the --enable-threadsafe option, the following devices have been excluded because they are not threadsafe:" >&2;} - echo "$NTS_EXCLUDES" -fi - if test x"$OCR_DEVS_WARNING_LINE1" != x"" ; then echo "" { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $OCR_DEVS_WARNING_LINE1" >&5 |