Software / code / prosody
Comparison
configure @ 5641:92ffddd02c96
configure: Fix poor layout
| author | James Callahan <james@chatid.com> |
|---|---|
| date | Mon, 03 Jun 2013 12:50:37 -0400 |
| parent | 5422:396072d62695 |
| child | 5935:a367bae38385 |
comparison
equal
deleted
inserted
replaced
| 5640:4f1889672063 | 5641:92ffddd02c96 |
|---|---|
| 92 SYSCONFDIR_SET=yes | 92 SYSCONFDIR_SET=yes |
| 93 ;; | 93 ;; |
| 94 --ostype=*) | 94 --ostype=*) |
| 95 OSTYPE="$value" | 95 OSTYPE="$value" |
| 96 OSTYPE_SET=yes | 96 OSTYPE_SET=yes |
| 97 if [ "$OSTYPE" = "debian" ] | 97 if [ "$OSTYPE" = "debian" ]; then |
| 98 then LUA_SUFFIX="5.1"; | 98 LUA_SUFFIX="5.1"; |
| 99 LUA_SUFFIX_SET=yes | 99 LUA_SUFFIX_SET=yes |
| 100 RUNWITH="lua5.1" | 100 RUNWITH="lua5.1" |
| 101 LUA_INCDIR=/usr/include/lua5.1; | 101 LUA_INCDIR=/usr/include/lua5.1; |
| 102 LUA_INCDIR_SET=yes | 102 LUA_INCDIR_SET=yes |
| 103 CFLAGS="$CFLAGS -D_GNU_SOURCE" | 103 CFLAGS="$CFLAGS -D_GNU_SOURCE" |
| 104 fi | 104 fi |
| 105 if [ "$OSTYPE" = "macosx" ] | 105 if [ "$OSTYPE" = "macosx" ]; then |
| 106 then LUA_INCDIR=/usr/local/include; | 106 LUA_INCDIR=/usr/local/include; |
| 107 LUA_INCDIR_SET=yes | 107 LUA_INCDIR_SET=yes |
| 108 LUA_LIBDIR=/usr/local/lib | 108 LUA_LIBDIR=/usr/local/lib |
| 109 LUA_LIBDIR_SET=yes | 109 LUA_LIBDIR_SET=yes |
| 110 LDFLAGS="-bundle -undefined dynamic_lookup" | 110 LDFLAGS="-bundle -undefined dynamic_lookup" |
| 111 fi | 111 fi |
| 112 if [ "$OSTYPE" = "linux" ] | 112 if [ "$OSTYPE" = "linux" ]; then |
| 113 then LUA_INCDIR=/usr/local/include; | 113 LUA_INCDIR=/usr/local/include; |
| 114 LUA_INCDIR_SET=yes | 114 LUA_INCDIR_SET=yes |
| 115 LUA_LIBDIR=/usr/local/lib | 115 LUA_LIBDIR=/usr/local/lib |
| 116 LUA_LIBDIR_SET=yes | 116 LUA_LIBDIR_SET=yes |
| 117 CFLAGS="-Wall -fPIC" | 117 CFLAGS="-Wall -fPIC -D_GNU_SOURCE" |
| 118 CFLAGS="$CFLAGS -D_GNU_SOURCE" | |
| 119 LDFLAGS="-shared" | 118 LDFLAGS="-shared" |
| 120 fi | 119 fi |
| 121 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ] | 120 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]; then |
| 122 then LUA_INCDIR="/usr/local/include/lua51" | 121 LUA_INCDIR="/usr/local/include/lua51" |
| 123 LUA_INCDIR_SET=yes | 122 LUA_INCDIR_SET=yes |
| 124 CFLAGS="-Wall -fPIC -I/usr/local/include" | 123 CFLAGS="-Wall -fPIC -I/usr/local/include" |
| 125 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" | 124 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" |
| 126 LUA_SUFFIX="-5.1" | 125 LUA_SUFFIX="-5.1" |
| 127 LUA_SUFFIX_SET=yes | 126 LUA_SUFFIX_SET=yes |
| 128 LUA_DIR=/usr/local | 127 LUA_DIR=/usr/local |
| 129 LUA_DIR_SET=yes | 128 LUA_DIR_SET=yes |
| 130 fi | 129 fi |
| 131 if [ "$OSTYPE" = "openbsd" ] | 130 if [ "$OSTYPE" = "openbsd" ]; then |
| 132 then LUA_INCDIR="/usr/local/include"; | 131 LUA_INCDIR="/usr/local/include"; |
| 133 fi | 132 fi |
| 134 ;; | 133 ;; |
| 135 --datadir=*) | 134 --datadir=*) |
| 136 DATADIR="$value" | 135 DATADIR="$value" |
| 137 DATADIR_SET=yes | 136 DATADIR_SET=yes |
| 138 ;; | 137 ;; |
| 284 if [ "$IDN_LIBRARY" = "icu" ] | 283 if [ "$IDN_LIBRARY" = "icu" ] |
| 285 then | 284 then |
| 286 IDNA_LIBS="$ICU_FLAGS" | 285 IDNA_LIBS="$ICU_FLAGS" |
| 287 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" | 286 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" |
| 288 fi | 287 fi |
| 289 if [ "$IDN_LIBRARY" = "idn" ] | 288 if [ "$IDN_LIBRARY" = "idn" ] |
| 290 then | 289 then |
| 291 IDNA_LIBS="-l$IDN_LIB" | 290 IDNA_LIBS="-l$IDN_LIB" |
| 292 fi | 291 fi |
| 293 | 292 |
| 294 echo -n "Checking Lua includes... " | 293 echo -n "Checking Lua includes... " |