Mercurial Mercurial > upstream > spec-files-extra / 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/multisync-gui-01-waf.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 61 433f6dce8ed1
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
61
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     1
 
--- multisync-gui-0.91.0/configure.orig	2006-11-14 19:35:21.862882000 +0800
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     2
 
+++ multisync-gui-0.91.0/configure	2006-11-14 19:35:37.890088000 +0800
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     3
 
@@ -1,4 +1,4 @@
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     4
 
-#! /bin/sh
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     5
 
+#! /bin/bash
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     6
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     7
 
 # waf configure wrapper
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     8
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
     9
 
@@ -59,9 +59,6 @@
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    10
 
 {
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    11
 
 	echo -n "Checking for WAF                :  "
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    12
 
 	#global installed waf with waf->waf.py link
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    13
 
-	if [ -z "$WAF" ]; then
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    14
 
-	  WAF=`which waf 2>/dev/null`
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    15
 
-	fi
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    16
 
 	#installed miniwaf in sourcedir
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    17
 
 	if [ -z "$WAF" ]; then
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    18
 
 	    if [ -e "$WORKINGDIR/waf" ] ; then
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    19
 
--- multisync-gui-0.91.0/wscript.orig	2006-11-14 19:35:44.438494000 +0800
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    20
 
+++ multisync-gui-0.91.0/wscript	2006-11-14 19:36:02.978031000 +0800
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    21
 
@@ -21,7 +21,7 @@
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    22
 
 	conf.check_tool('gcc misc')
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    23
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    24
 
 	# pkg-config example - look in src/wscript_build, obj.uselib ..
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    25
 
-	if not conf.check_pkg('glib-2.0', destvar='GLIB'):
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    26
 
+	if not conf.check_pkg('glib-2.0 gthread-2.0', destvar='GLIB'):
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    27
 
 		print "you need glib-2.0 (libglib2.0-dev)"
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    28
 
 		sys.exit(1)
433f6dce8ed1 * SFEsqlite.spec, SFEsqlite3.spec: Rename and bump to 3.3.8
nonsea
parents:
diff changeset 
    29
upstream/spec-files-extra