prosody
7a5ddbaf758d
configure

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

configure @ 6054:7a5ddbaf758d

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Apr 2014 17:41:38 +0100
parent 5935:a367bae38385
child 6576:b7796a46aec2
comparison
equal deleted inserted replaced
6053:2f93a04564b2 6054:7a5ddbaf758d
94 SYSCONFDIR_SET=yes 94 SYSCONFDIR_SET=yes
95 ;; 95 ;;
96 --ostype=*) 96 --ostype=*)
97 OSTYPE="$value" 97 OSTYPE="$value"
98 OSTYPE_SET=yes 98 OSTYPE_SET=yes
99 if [ "$OSTYPE" = "debian" ] 99 if [ "$OSTYPE" = "debian" ]; then
100 then LUA_SUFFIX="5.1"; 100 LUA_SUFFIX="5.1";
101 LUA_SUFFIX_SET=yes 101 LUA_SUFFIX_SET=yes
102 RUNWITH="lua5.1" 102 RUNWITH="lua5.1"
103 LUA_INCDIR=/usr/include/lua5.1; 103 LUA_INCDIR=/usr/include/lua5.1;
104 LUA_INCDIR_SET=yes 104 LUA_INCDIR_SET=yes
105 CFLAGS="$CFLAGS -D_GNU_SOURCE" 105 CFLAGS="$CFLAGS -D_GNU_SOURCE"
106 fi 106 fi
107 if [ "$OSTYPE" = "macosx" ] 107 if [ "$OSTYPE" = "macosx" ]; then
108 then LUA_INCDIR=/usr/local/include; 108 LUA_INCDIR=/usr/local/include;
109 LUA_INCDIR_SET=yes 109 LUA_INCDIR_SET=yes
110 LUA_LIBDIR=/usr/local/lib 110 LUA_LIBDIR=/usr/local/lib
111 LUA_LIBDIR_SET=yes 111 LUA_LIBDIR_SET=yes
112 LDFLAGS="-bundle -undefined dynamic_lookup" 112 LDFLAGS="-bundle -undefined dynamic_lookup"
113 fi 113 fi
114 if [ "$OSTYPE" = "linux" ] 114 if [ "$OSTYPE" = "linux" ]; then
115 then LUA_INCDIR=/usr/local/include; 115 LUA_INCDIR=/usr/local/include;
116 LUA_INCDIR_SET=yes 116 LUA_INCDIR_SET=yes
117 LUA_LIBDIR=/usr/local/lib 117 LUA_LIBDIR=/usr/local/lib
118 LUA_LIBDIR_SET=yes 118 LUA_LIBDIR_SET=yes
119 CFLAGS="-Wall -fPIC" 119 CFLAGS="-Wall -fPIC -D_GNU_SOURCE"
120 CFLAGS="$CFLAGS -D_GNU_SOURCE"
121 LDFLAGS="-shared" 120 LDFLAGS="-shared"
122 fi 121 fi
123 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ] 122 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]; then
124 then LUA_INCDIR="/usr/local/include/lua51" 123 LUA_INCDIR="/usr/local/include/lua51"
125 LUA_INCDIR_SET=yes 124 LUA_INCDIR_SET=yes
126 CFLAGS="-Wall -fPIC -I/usr/local/include" 125 CFLAGS="-Wall -fPIC -I/usr/local/include"
127 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" 126 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
128 LUA_SUFFIX="-5.1" 127 LUA_SUFFIX="-5.1"
129 LUA_SUFFIX_SET=yes 128 LUA_SUFFIX_SET=yes
130 LUA_DIR=/usr/local 129 LUA_DIR=/usr/local
131 LUA_DIR_SET=yes 130 LUA_DIR_SET=yes
132 fi 131 fi
133 if [ "$OSTYPE" = "openbsd" ] 132 if [ "$OSTYPE" = "openbsd" ]; then
134 then LUA_INCDIR="/usr/local/include"; 133 LUA_INCDIR="/usr/local/include";
135 fi 134 fi
136 ;; 135 ;;
137 --datadir=*) 136 --datadir=*)
138 DATADIR="$value" 137 DATADIR="$value"
139 DATADIR_SET=yes 138 DATADIR_SET=yes
140 ;; 139 ;;
289 if [ "$IDN_LIBRARY" = "icu" ] 288 if [ "$IDN_LIBRARY" = "icu" ]
290 then 289 then
291 IDNA_LIBS="$ICU_FLAGS" 290 IDNA_LIBS="$ICU_FLAGS"
292 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" 291 CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
293 fi 292 fi
294 if [ "$IDN_LIBRARY" = "idn" ] 293 if [ "$IDN_LIBRARY" = "idn" ]
295 then 294 then
296 IDNA_LIBS="-l$IDN_LIB" 295 IDNA_LIBS="-l$IDN_LIB"
297 fi 296 fi
298 297
299 echo -n "Checking Lua includes... " 298 echo -n "Checking Lua includes... "