Skip to content

Commit

Permalink
Update to look for pappl2.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Jan 12, 2024
1 parent f627907 commit 6d6a9d7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3825,19 +3825,19 @@ fi

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PAPPL library v2.0 or later" >&5
printf %s "checking for PAPPL library v2.0 or later... " >&6; }
if $PKGCONFIG --exists pappl --atleast-version=2.0
if $PKGCONFIG --exists pappl2 --atleast-version=2.0
then :

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
CPPFLAGS="$CFLAGS $($PKGCONFIG --cflags pappl)"
LIBS="$($PKGCONFIG --libs pappl) $LIBS"
CPPFLAGS="$CFLAGS $($PKGCONFIG --cflags pappl2)"
LIBS="$($PKGCONFIG --libs pappl2) $LIBS"

else $as_nop

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
$PKGCONFIG --debug --exists pappl
$PKGCONFIG --debug --exists pappl2
as_fn_error $? "PAPPL v2.0 or later is required." "$LINENO" 5

fi
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ AS_IF([$PKGCONFIG --exists cups3], [

dnl PAPPL library...
AC_MSG_CHECKING([for PAPPL library v2.0 or later])
AS_IF([$PKGCONFIG --exists pappl --atleast-version=2.0], [
AS_IF([$PKGCONFIG --exists pappl2 --atleast-version=2.0], [
AC_MSG_RESULT([yes])
CPPFLAGS="$CFLAGS $($PKGCONFIG --cflags pappl)"
LIBS="$($PKGCONFIG --libs pappl) $LIBS"
CPPFLAGS="$CFLAGS $($PKGCONFIG --cflags pappl2)"
LIBS="$($PKGCONFIG --libs pappl2) $LIBS"
], [
AC_MSG_RESULT([no])
$PKGCONFIG --debug --exists pappl
$PKGCONFIG --debug --exists pappl2
AC_MSG_ERROR([PAPPL v2.0 or later is required.])
])

Expand Down

0 comments on commit 6d6a9d7

Please sign in to comment.