diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-12-08 23:07:00 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:55 -0500 |
| commit | 07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4 (patch) | |
| tree | 1b90702b472ced7ca391f34df2c110f8d0e6aaa7 /gtk/gtksearchengine.c | |
| parent | ae146a281750926eee6c5fafb88414999ffa6821 (diff) | |
| download | gtk+-07d49ee56a4ce86d9d6154e00ff6b10bd3bdc2a4.tar.gz | |
Merge libgdk and libgtk
This commit does a number of things:
- remove some dead wchar configury from configure.ac and gdkconfig.h
- repurpose gdkconfig.h as header that contains GDK_WINDOWING_foo
macros for each included backend, include it in gdk.h and install
it in $includedir instead of below $libdir
- drop the backend from the library names
- build libgdk-3.0.la as a convenience lib and include it in libgtk-3.0.la
It does not yet enable building multiple backends at the same time.
Diffstat (limited to 'gtk/gtksearchengine.c')
| -rw-r--r-- | gtk/gtksearchengine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c index 2b2274e655..eac7eb628c 100644 --- a/gtk/gtksearchengine.c +++ b/gtk/gtksearchengine.c @@ -27,13 +27,13 @@ #include "gtksearchenginetracker.h" #include "gtksearchenginequartz.h" -#include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */ +#include <gdk/gdk.h> /* for GDK_WINDOWING_QUARTZ */ #ifndef G_OS_WIN32 /* Beagle and tracker are not ported * to Windows, as far as I know. */ -#define HAVE_BEAGLE 1 +#define HAVE_BEAGLE 1 #define HAVE_TRACKER 1 #endif |