← Back to branch summary

~ubuntu-branches/debian/squeeze/openttd/squeeze

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach, Matthijs Kooijman, Jordi Mallach
  • Date: 2009-04-15 18:22:10 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090415182210-22ktb8kdbp2tf3bm
[ Matthijs Kooijman ]
* New upstream release.
* Remove Debian specific desktop file, upstream provides one now. 
* Add debian/watch file.

[ Jordi Mallach ]
* Bump Standards-Version to 3.8.1, with no changes required.
* Move to debhelper compat 7. Bump Build-Depends accordingly.
* Use dh_prep.
* Add "set -e" to config script.
* Remove a few extra doc files that get installed by upstream Makefile.
* Add more complete copyright information.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure
37
37
                exit 1
38
38
        fi
39
39
        # Make sure we don't lock config.cache
40
 
        cat config.cache | sed 's/\\ /\\\\ /g' > cache.tmp
 
40
        cat config.cache | sed 's~\\ ~\\\\ ~g' > cache.tmp
41
41
        sh cache.tmp
42
42
        rm -f cache.tmp
43
43
        exit $?
50
50
make_cflags_and_ldflags
51
51
 
52
52
EXE=""
53
 
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "WINCE" ]; then
 
53
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ] || [ "$os" = "WINCE" ]; then
54
54
        EXE=".exe"
55
55
fi
56
56
 
59
59
ENDIAN_CHECK="endian_check$EXE"
60
60
 
61
61
if [ -z "$sort" ]; then
62
 
        PIPE_SORT="sed s/a/a/"
 
62
        PIPE_SORT="sed s~a~a~"
63
63
else
64
64
        PIPE_SORT="$sort"
65
65
fi
82
82
 
83
83
                deep += 1;
84
84
 
 
85
                if ($0 == "ALLEGRO"     && "'$allegro_config'" == "")      { next; }
85
86
                if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
86
87
                if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
87
88
                if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
89
90
                if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
90
91
                if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
91
92
                if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 
93
                if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
92
94
                if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
93
95
                if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
94
96
                                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 
97
                if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
95
98
                if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
96
99
                if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
97
100
                if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
98
101
                if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
99
 
                if ($0 == "NO_THREADS"  && "'$with_threads'" == "0")       { next; }
 
102
                if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
100
103
 
101
104
                skip += 1;
102
105
 
122
125
 
123
126
# In makefiles, we always use -u for sort
124
127
if [ -z "$sort" ]; then
125
 
        sort="sed s/a/a/"
 
128
        sort="sed s~a~a~"
126
129
else
127
130
        sort="$sort -u"
128
131
fi
129
132
 
130
 
CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in"
 
133
CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in $ROOT_DIR/Makefile.bundle.in"
131
134
 
132
135
generate_main
133
136
generate_lang