Bug 412923: Remove gfx/gfx-config.h.in, r=ted.mielczarek, a=beltzner
authormozilla@weilbacher.org
Mon, 28 Jan 2008 14:05:47 -0800
changeset 10848 9da860638de9d4204aab20f9d9e14b544c0c92f7
parent 10847 83d5064b9f24ad8826d7f74000329818180fa75f
child 10849 1a81923fc72fe29b489b706722a6b6360dae33b5
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, beltzner
bugs412923
milestone1.9b3pre
Bug 412923: Remove gfx/gfx-config.h.in, r=ted.mielczarek, a=beltzner
Makefile.in
configure.in
gfx/gfx-config.h.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,17 +69,17 @@ TIERS += testharness
 ifdef ENABLE_TESTS
 tier_testharness_dirs += tools/test-harness
 endif
 
 GARBAGE_DIRS += dist
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
    unallmakefiles mozilla-config.h \
-   gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
+   netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
 # Build pseudo-external modules first when export is explicitly called
 export::
 	$(RM) -rf $(DIST)/sdk
 	$(MAKE) -C config export
 	$(MAKE) tier_nspr
 
--- a/configure.in
+++ b/configure.in
@@ -7765,17 +7765,16 @@ HAVE_ICONV_WITH_CONST_INPUT
 HAVE_MBRTOWC
 HAVE_SYS_MOUNT_H
 HAVE_SYS_VFS_H
 HAVE_WCRTOMB
 MOZ_V1_STRING_ABI
 "
 
 AC_CONFIG_HEADER(
-gfx/gfx-config.h
 netwerk/necko-config.h
 xpcom/xpcom-config.h
 xpcom/xpcom-private.h
 )
 
 # Save the defines header file before autoconf removes it.
 # (Do not add AC_DEFINE calls after this line.)
   _CONFIG_TMP=confdefs-tmp.h
deleted file mode 100644
--- a/gfx/gfx-config.h.in
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _GFX_CONFIG_H_
-#define _GFX_CONFIG_H_
-
-/* Define if freetype support is enabled */
-#undef MOZ_ENABLE_FREETYPE2
-
-#endif /* _GFX_CONFIG_H_ */
-