View | Details | Raw Unified | Return to bug 27650 | Differences between
and this patch

Collapse All | Expand All

(-)configure (-1 / +36 lines)
Lines 61-66 Link Here
61
  --with-netatalk     Include experimental Netatalk support
61
  --with-netatalk     Include experimental Netatalk support
62
  --without-netatalk  Don't include experimental Netatalk support (default)"
62
  --without-netatalk  Don't include experimental Netatalk support (default)"
63
ac_help="$ac_help
63
ac_help="$ac_help
64
  --with-cups=DIR    Where the CUPS includes and libraries are located (defaults to /usr)"
65
ac_help="$ac_help
64
  --with-quotas     Include experimental disk-quota support
66
  --with-quotas     Include experimental disk-quota support
65
  --without-quotas  Don't include experimental disk-quota support (default)"
67
  --without-quotas  Don't include experimental disk-quota support (default)"
66
ac_help="$ac_help
68
ac_help="$ac_help
Lines 3252-3258 Link Here
3252
  echo $ac_n "(cached) $ac_c" 1>&6
3254
  echo $ac_n "(cached) $ac_c" 1>&6
3253
else
3255
else
3254
  ac_save_LIBS="$LIBS"
3256
  ac_save_LIBS="$LIBS"
3255
LIBS="-lcups  $LIBS"
3257
  ac_save_CFLAGS="$CFLAGS"
3258
  ac_save_LDFLAGS="$LDFLAGS"
3259
  withval="/usr"
3260
  if test "${with_cups+set}" = set; then
3261
      withval="$with_cups";
3262
      case "$withval" in
3263
      yes|no)
3264
        echo "configure: warning: --with-cups called without argument - will use default" 1>&w
3265
	CFLAGS="-I/usr/include $CFLAGS"
3266
	LIBS="-lcups $LIBS"
3267
	LDFLAGS="-L/usr/lib $LDFLAGS"
3268
      ;;
3269
      * )
3270
        CFLAGS="-I${withval}/include $CFLAGS"
3271
	LIBS="-lcups $LIBS"
3272
	LDFLAGS="-L${withval}/lib $LDFLAGS"
3273
      ;;
3274
      esac
3275
3276
  else
3277
        CFLAGS="-I/usr/include $CFLAGS"
3278
	LIBS="-lcups $LIBS"
3279
	LDFLAGS="-L/usr/lib $LDFLAGS"
3280
  fi
3281
3282
  if test ! -d ${withval}; then
3283
    echo "configure: error: called with --with-cups, but cups base directory ${withval} does not exist or is not a directory.  Aborting config" 1>&2
3284
    exit 1
3285
  fi
3286
3256
cat > conftest.$ac_ext <<EOF
3287
cat > conftest.$ac_ext <<EOF
3257
#line 3258 "configure"
3288
#line 3258 "configure"
3258
#include "confdefs.h"
3289
#include "confdefs.h"
Lines 3276-3281 Link Here
3276
fi
3307
fi
3277
rm -f conftest*
3308
rm -f conftest*
3278
LIBS="$ac_save_LIBS"
3309
LIBS="$ac_save_LIBS"
3310
CFLAGS="$ac_save_CFLAGS"
3311
LDFLAGS="$ac_save_LDFLAGS"
3279
3312
3280
fi
3313
fi
3281
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
3314
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
Lines 3286-3292 Link Here
3286
#define $ac_tr_lib 1
3319
#define $ac_tr_lib 1
3287
EOF
3320
EOF
3288
3321
3322
  CFLAGS="-I${withval}/include $CFLAGS"
3289
  LIBS="-lcups $LIBS"
3323
  LIBS="-lcups $LIBS"
3324
  LDFLAGS="-L${withval}/lib $LDFLAGS"
3290
3325
3291
else
3326
else
3292
  echo "$ac_t""no" 1>&6
3327
  echo "$ac_t""no" 1>&6

Return to bug 27650