Attachment 14777 Details for Bug 27650 – file.diff

[patch] file.diff

file.diff (text/plain), 1.88 KB, created by Joe Marcus Clarke on 2001-05-26 02:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2001-05-26 02:20:00 UTC

Size: 1.88 KB

patch

obsolete

>--- configure.orig	Fri May 25 20:34:00 2001
>+++ configure	Fri May 25 20:51:55 2001
>@@ -61,6 +61,8 @@
>   --with-netatalk     Include experimental Netatalk support
>   --without-netatalk  Don't include experimental Netatalk support (default)"
> ac_help="$ac_help
>+  --with-cups=DIR    Where the CUPS includes and libraries are located (defaults to /usr)"
>+ac_help="$ac_help
>   --with-quotas     Include experimental disk-quota support
>   --without-quotas  Don't include experimental disk-quota support (default)"
> ac_help="$ac_help
>@@ -3252,7 +3254,36 @@
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   ac_save_LIBS="$LIBS"
>-LIBS="-lcups  $LIBS"
>+  ac_save_CFLAGS="$CFLAGS"
>+  ac_save_LDFLAGS="$LDFLAGS"
>+  withval="/usr"
>+  if test "${with_cups+set}" = set; then
>+      withval="$with_cups";
>+      case "$withval" in
>+      yes|no)
>+        echo "configure: warning: --with-cups called without argument - will use default" 1>&w
>+	CFLAGS="-I/usr/include $CFLAGS"
>+	LIBS="-lcups $LIBS"
>+	LDFLAGS="-L/usr/lib $LDFLAGS"
>+      ;;
>+      * )
>+        CFLAGS="-I${withval}/include $CFLAGS"
>+	LIBS="-lcups $LIBS"
>+	LDFLAGS="-L${withval}/lib $LDFLAGS"
>+      ;;
>+      esac
>+
>+  else
>+        CFLAGS="-I/usr/include $CFLAGS"
>+	LIBS="-lcups $LIBS"
>+	LDFLAGS="-L/usr/lib $LDFLAGS"
>+  fi
>+
>+  if test ! -d ${withval}; then
>+    echo "configure: error: called with --with-cups, but cups base directory ${withval} does not exist or is not a directory.  Aborting config" 1>&2
>+    exit 1
>+  fi
>+
> cat > conftest.$ac_ext <<EOF
> #line 3258 "configure"
> #include "confdefs.h"
>@@ -3276,6 +3307,8 @@
> fi
> rm -f conftest*
> LIBS="$ac_save_LIBS"
>+CFLAGS="$ac_save_CFLAGS"
>+LDFLAGS="$ac_save_LDFLAGS"
> 
> fi
> if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
>@@ -3286,7 +3319,9 @@
> #define $ac_tr_lib 1
> EOF
> 
>+  CFLAGS="-I${withval}/include $CFLAGS"
>   LIBS="-lcups $LIBS"
>+  LDFLAGS="-L${withval}/lib $LDFLAGS"
> 
> else
>   echo "$ac_t""no" 1>&6

Actions: View | Diff

Attachments on bug 27650: 14776 | 14777