< prev index next >

common/autoconf/lib-cups.m4

Print this page
rev 1848 : 8146639: Fix detection of Cups headers during configuration

@@ -46,16 +46,28 @@
     if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
       AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
     fi
 
     if test "x${with_cups}" != x; then
+      AC_MSG_CHECKING([for cups headers])
+      if test -s "${with_cups}/include/cups/cups.h"; then
       CUPS_CFLAGS="-I${with_cups}/include"
       CUPS_FOUND=yes
+        AC_MSG_RESULT([$CUPS_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option.])
+      fi
     fi
     if test "x${with_cups_include}" != x; then
+      AC_MSG_CHECKING([for cups headers])
+      if test -s "${with_cups}/cups/cups.h"; then
       CUPS_CFLAGS="-I${with_cups_include}"
       CUPS_FOUND=yes
+        AC_MSG_RESULT([$CUPS_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option.])
+      fi
     fi
     if test "x$CUPS_FOUND" = xno; then
       # Are the cups headers installed in the default /usr/include location?
       AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
           CUPS_FOUND=yes
< prev index next >