|
Lines 1-5
Link Here
|
| 1 |
--- configure.sh 2010-10-12 19:06:42.000000000 +0800 |
1 |
--- configure.sh.orig 2010-10-12 19:06:42.000000000 +0800 |
| 2 |
+++ configure.sh 2010-12-24 02:55:29.000000000 +0700 |
2 |
+++ configure.sh 2011-01-04 12:04:35.000000000 +0700 |
| 3 |
@@ -1,4 +1,4 @@ |
3 |
@@ -1,4 +1,4 @@ |
| 4 |
-#!/bin/bash |
4 |
-#!/bin/bash |
| 5 |
+#!/bin/sh |
5 |
+#!/bin/sh |
|
Lines 35-41
Link Here
|
| 35 |
fi |
35 |
fi |
| 36 |
|
36 |
|
| 37 |
|
37 |
|
| 38 |
@@ -140,20 +140,20 @@ |
38 |
@@ -109,30 +109,8 @@ |
|
|
39 |
echo "ok" |
| 40 |
rm -f /tmp/sdl-test.c /tmp/sdl-test |
| 41 |
|
| 42 |
-cat << EOF >/tmp/iconv-test.c |
| 43 |
-#include <iconv.h> |
| 44 |
-int main(int argc, char **argv) |
| 45 |
-{ |
| 46 |
- iconv_open("",""); |
| 47 |
-} |
| 48 |
-EOF |
| 49 |
-echo $cc |
| 50 |
-echo -n "Checking iconv...(" |
| 51 |
-echo -n "$cc /tmp/iconv-test.c -o iconv-test)..." |
| 52 |
-if ! $cc /tmp/iconv-test.c -o /tmp/iconv-test; then |
| 53 |
- if ! $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test; then |
| 54 |
- echo -n "failed. Build without iconv.". |
| 55 |
- else |
| 56 |
- CFLAGS="$CFLAGS -D_HAVE_ICONV" |
| 57 |
- LDFLAGS="$LDFLAGS -liconv" |
| 58 |
- echo "ok, with -liconv" |
| 59 |
- fi |
| 60 |
-else |
| 61 |
- CFLAGS="$CFLAGS -D_HAVE_ICONV" |
| 62 |
- echo "ok" |
| 63 |
-fi |
| 64 |
- |
| 65 |
-rm -f /tmp/iconv-test.c /tmp/iconv-test |
| 66 |
+#build with iconv |
| 67 |
+CFLAGS="$CFLAGS -D_HAVE_ICONV" |
| 68 |
|
| 69 |
if ! make clean >/dev/null 2>&1; then |
| 70 |
echo " * Warning!!! Can not do make clean..." |
| 71 |
@@ -140,20 +118,20 @@ |
| 39 |
echo -n "Generating config.make..." |
72 |
echo -n "Generating config.make..." |
| 40 |
echo "# autamatically generated by configure.sh" >config.make |
73 |
echo "# autamatically generated by configure.sh" >config.make |
| 41 |
|
74 |
|
|
Lines 60-66
Link Here
|
| 60 |
echo "SUBDIRS=src/zlib" >> config.make |
93 |
echo "SUBDIRS=src/zlib" >> config.make |
| 61 |
echo "ZLIB_CFLAGS=-I../zlib" >> config.make |
94 |
echo "ZLIB_CFLAGS=-I../zlib" >> config.make |
| 62 |
echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make |
95 |
echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make |
| 63 |
@@ -169,26 +169,7 @@ |
96 |
@@ -169,26 +147,7 @@ |
| 64 |
echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make |
97 |
echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make |
| 65 |
echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make |
98 |
echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make |
| 66 |
echo "ok" |
99 |
echo "ok" |
|
Lines 88-94
Link Here
|
| 88 |
|
121 |
|
| 89 |
rm -f Rules.make |
122 |
rm -f Rules.make |
| 90 |
ln -s Rules.make.system Rules.make |
123 |
ln -s Rules.make.system Rules.make |
| 91 |
@@ -204,16 +185,12 @@ |
124 |
@@ -204,16 +163,12 @@ |
| 92 |
echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make |
125 |
echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make |
| 93 |
echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make |
126 |
echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make |
| 94 |
echo "LANGPATH=\$(DATAPATH)/languages" >> config.make |
127 |
echo "LANGPATH=\$(DATAPATH)/languages" >> config.make |