prosody
74946f050209
configure

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

Software / code / prosody

Comparison

configure @ 6580:74946f050209

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Feb 2015 15:22:09 +0000
parent 6576:b7796a46aec2
parent 6579:5a82ee60e07e
child 6634:3e226e387a67
comparison
equal deleted inserted replaced
6577:1e749832ed3b 6580:74946f050209
136 LUA_INCDIR="/usr/local/include"; 136 LUA_INCDIR="/usr/local/include";
137 fi 137 fi
138 ;; 138 ;;
139 --libdir=*) 139 --libdir=*)
140 LIBDIR="$value" 140 LIBDIR="$value"
141 LIBDIR_SET=yes
141 ;; 142 ;;
142 --datadir=*) 143 --datadir=*)
143 DATADIR="$value" 144 DATADIR="$value"
144 DATADIR_SET=yes 145 DATADIR_SET=yes
145 ;; 146 ;;
208 then 209 then
209 if [ "$PREFIX" = "/usr" ] 210 if [ "$PREFIX" = "/usr" ]
210 then DATADIR=/var/lib/prosody 211 then DATADIR=/var/lib/prosody
211 else DATADIR=$PREFIX/var/lib/prosody 212 else DATADIR=$PREFIX/var/lib/prosody
212 fi 213 fi
214 fi
215
216 if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
217 then
218 LIBDIR=$PREFIX/lib
213 fi 219 fi
214 220
215 find_program() { 221 find_program() {
216 path="$PATH" 222 path="$PATH"
217 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" 223 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"