forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] GSettings support adds annoying warnings on systems with older glib versions
https://bugs.webkit.org/show_bug.cgi?id=44056
Add file containing GLIB_GSETTINGS macro so that
configure doesn't spit warnings in older systems.
* autotools/gsettings.m4: Added.
* .gitignore: Ignore files that are generated inside autotools
explicitely, because we have some that are kept in version
control.
WebKit/gtk
2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] GSettings support adds annoying warnings on systems with older glib versions
https://bugs.webkit.org/show_bug.cgi?id=44056
Use #ifdef instead of #if for HAVE_GSETTINGS to avoid warnings
when it is not defined.
* WebCoreSupport/InspectorClientGtk.cpp:
* webkit/webkitprivate.cpp:
(webkit_init):
* webkit/webkitprivate.h:
git-svn-id: svn://svn.chromium.org/blink/trunk@65498 bbb929c8-8fbe-4397-9dbb-9b2b20218538- Loading branch information
kov@webkit.org
committed
Aug 17, 2010
1 parent
ac104b3
commit 091de43
Showing
7 changed files
with
140 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| dnl GLIB_GSETTINGS | ||
| dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether | ||
| dnl the schema should be compiled | ||
| dnl | ||
|
|
||
| AC_DEFUN([GLIB_GSETTINGS], | ||
| [ | ||
| m4_pattern_allow([AM_V_GEN]) | ||
| AC_ARG_ENABLE(schemas-compile, | ||
| AC_HELP_STRING([--disable-schemas-compile], | ||
| [Disable regeneration of gschemas.compiled on install]), | ||
| [case ${enableval} in | ||
| yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; | ||
| no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; | ||
| *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; | ||
| esac]) | ||
| AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) | ||
| PKG_PROG_PKG_CONFIG([0.16]) | ||
| AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) | ||
| if test x$cross_compiling != xyes; then | ||
| GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` | ||
| else | ||
| AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) | ||
| fi | ||
| AC_SUBST(GLIB_COMPILE_SCHEMAS) | ||
| if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then | ||
| ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) | ||
| else | ||
| ifelse([$1],,[:],[$1]) | ||
| fi | ||
| GSETTINGS_RULES=' | ||
| .PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas | ||
| mostlyclean-am: clean-gsettings-schemas | ||
| gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) | ||
| %.gschema.valid: %.gschema.xml $(gsettings__enum_file) | ||
| $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ | ||
| all-am: $(gsettings_SCHEMAS:.xml=.valid) | ||
| uninstall-am: uninstall-gsettings-schemas | ||
| install-data-am: install-gsettings-schemas | ||
| .SECONDARY: $(gsettings_SCHEMAS) | ||
| gsettings__base_list = \ | ||
| sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ | ||
| sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | ||
| install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) | ||
| @$(NORMAL_INSTALL) | ||
| test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" | ||
| @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ | ||
| for p in $$list; do \ | ||
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
| echo "$$d$$p"; \ | ||
| done | $(gsettings__base_list) | \ | ||
| while read files; do \ | ||
| echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ | ||
| $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ | ||
| done | ||
| test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) | ||
| uninstall-gsettings-schemas: | ||
| @$(NORMAL_UNINSTALL) | ||
| @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ | ||
| files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ | ||
| test -n "$$files" || exit 0; \ | ||
| echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ | ||
| cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files | ||
| test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) | ||
| clean-gsettings-schemas: | ||
| rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) | ||
| ifdef gsettings_ENUM_NAMESPACE | ||
| $(gsettings__enum_file): $(gsettings_ENUM_FILES) | ||
| $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@ | ||
| endif | ||
| ' | ||
| _GSETTINGS_SUBST(GSETTINGS_RULES) | ||
| ]) | ||
|
|
||
| dnl _GSETTINGS_SUBST(VARIABLE) | ||
| dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST | ||
| AC_DEFUN([_GSETTINGS_SUBST], | ||
| [ | ||
| AC_SUBST([$1]) | ||
| m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) | ||
| ] | ||
| ) |