diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2024-05-30 06:43:30 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2024-05-30 06:43:30 (GMT) |
| commit | a97acf75dc4c780879d03ab520b22a2b526fb9e0 (patch) | |
| tree | a6af81404e4f85b48be2947c37ee05b090c21b3b /unix/configure | |
| parent | 51f53701105669b9ef67816509c84c9ca0412a81 (diff) | |
| download | tk-a97acf75dc4c780879d03ab520b22a2b526fb9e0.zip tk-a97acf75dc4c780879d03ab520b22a2b526fb9e0.tar.gz tk-a97acf75dc4c780879d03ab520b22a2b526fb9e0.tar.bz2 | |
Additional build support for linking to libcups
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/unix/configure b/unix/configure index 5b00509..94f9309 100755 --- a/unix/configure +++ b/unix/configure @@ -8405,16 +8405,16 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cups" >&5 printf "%s\n" "$enable_cups" >&6; } else - found_cups="yes" - CUPS_CFLAGS=`cups-config --cflags 2>/dev/null` || found_cups="no" - CUPS_LIBS=`cups-config --libs 2>/dev/null` || found_cups="no" - if test "$found_cups" = "no" ; then + found_cups=`cups-config 2>/dev/null` + if test "$found_cups" = ""; then + found_cups=no + else found_cups=yes - CUPS_CFLAGS=`pkg-config --cflags cups 2>/dev/null` || found_cups="no" - XFT_LIBS=`pkg-config --libs cups 2>/dev/null` || found_cups="no" + CUPS_CFLAGS="-DHAVE_CUPS" + CUPS_LIBS="-lcups" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5 -printf "%s\n" "$found_xft" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $found_cups" >&5 +printf "%s\n" "$found_cups" >&6; } if test "$found_cups" = "yes" ; then tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS $XINCLUDES $CUPS_CFLAGS" @@ -8434,11 +8434,12 @@ fi CFLAGS=$tk_oldCFlags LIBS=$tk_oldLibs fi -fi + fi fi + #-------------------------------------------------------------------- # XXX Do this last. # It might modify XLIBSW which could affect other tests. |