Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/glib-06-ac-canonical-host.diff
author dcarbery
Wed, 30 Jan 2008 17:20:10 +0000
changeset 11564 e3de076741b0
permissions -rw-r--r--
2008-01-30 Damien Carbery <[email protected]> * base-specs/glib2.spec: Add patch 06-ac-canonical-host because the upstream fix for #385132 was reverted because of breakages. * patches/glib-06-ac-canonical-host.diff: Added.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11564
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     1
 
--- glib-2.15.4/m4macros/glib-gettext.m4	2008-01-28 15:03:26.000000000 +0000
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     2
 
+++ glib-2.15.3/m4macros/glib-gettext.m4	2008-01-21 15:14:11.000000000 +0000
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     3
 
@@ -101,7 +101,8 @@
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     4
 
 #-----------------
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     5
 
 glib_DEFUN([GLIB_WITH_NLS],
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     6
 
   dnl NLS is obligatory
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     7
 
-  [USE_NLS=yes
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     8
 
+  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
     9
 
+    USE_NLS=yes
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    10
 
     AC_SUBST(USE_NLS)
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    11
e3de076741b0 2008-01-30 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset 
    12
 
     gt_cv_have_gettext=no
upstream/oracle/spec-files