callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dectect if cups allows access to the http_t authstring field.

Browse Source 
2007-07-23  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Dectect if cups allows access to the http_t
        authstring field.

        * modules/printbackends/cups/gtkcupsutils.c: Rely on the
        HAVE_HTTP_AUTHSTRING define done by configure.


svn path=/trunk/; revision=18527
This commit is contained in:
Matthias Clasen
2007-07-23 17:02:04 +00:00
committed by Matthias Clasen
parent cb388e4df8
commit ab5a9520df
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-07-23 Matthias Clasen <mclasen@redhat.com>
* configure.in: Dectect if cups allows access to the http_t
authstring field.
* modules/printbackends/cups/gtkcupsutils.c: Rely on the
HAVE_HTTP_AUTHSTRING define done by configure.
2007-07-23 Emmanuele Bassi <ebassi@gnome.org> 2007-07-23 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchooserdefault.c: Port the GtkRecentChooser default * gtk/gtkrecentchooserdefault.c: Port the GtkRecentChooser default

9
configure.in
View File

@ -1572,6 +1572,15 @@ if test "x$CUPS_CONFIG" != "xno"; then
fi fi
AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
gtk_save_cflags="$CFLAGS"
CFLAGS="$CUPS_CFLAGS"
AC_TRY_COMPILE([#include <cups/http.h>],
[http_t http; char *s = http.authstring;],
[AC_DEFINE(HAVE_HTTP_AUTHSTRING,[],[Define if cups http_t authstring field is accessible])],)
CFLAGS="$gtk_save_cflags"
AC_SUBST(HAVE_HTTP_AUTHSTRING)
gtk_save_cppflags="$CPPFLAGS" gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"

4
modules/printbackends/cups/gtkcupsutils.c
View File

@ -30,10 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 20)
#define HAVE_HTTP_AUTHSTRING 1
#endif
typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request); typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request);
static void _connect (GtkCupsRequest *request); static void _connect (GtkCupsRequest *request);