Comparison

configure @ 4541:05f5ec99da77

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parent 4451:70275ab52ab2
child 5048:e02161ba20e0
comparison
equal deleted inserted replaced
4530:40905e7bf680 4541:05f5ec99da77
110 LUA_LIBDIR=/usr/local/lib 110 LUA_LIBDIR=/usr/local/lib
111 LUA_LIBDIR_SET=yes 111 LUA_LIBDIR_SET=yes
112 CFLAGS="-Wall -fPIC" 112 CFLAGS="-Wall -fPIC"
113 LDFLAGS="-shared" 113 LDFLAGS="-shared"
114 fi 114 fi
115 if [ "$OSTYPE" = "freebsd" ] 115 if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]
116 then LUA_INCDIR="/usr/local/include/lua51" 116 then LUA_INCDIR="/usr/local/include/lua51"
117 LUA_INCDIR_SET=yes 117 LUA_INCDIR_SET=yes
118 CFLAGS="-Wall -fPIC -I/usr/local/include" 118 CFLAGS="-Wall -fPIC -I/usr/local/include"
119 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" 119 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
120 LUA_SUFFIX="-5.1" 120 LUA_SUFFIX="-5.1"
121 LUA_SUFFIX_SET=yes 121 LUA_SUFFIX_SET=yes
122 LUA_DIR=/usr/local 122 LUA_DIR=/usr/local
123 LUA_DIR_SET=yes 123 LUA_DIR_SET=yes
124 fi
125 if [ "$OSTYPE" = "openbsd" ]
126 then LUA_INCDIR="/usr/local/include";
124 fi 127 fi
125 ;; 128 ;;
126 --datadir=*) 129 --datadir=*)
127 DATADIR="$value" 130 DATADIR="$value"
128 DATADIR_SET=yes 131 DATADIR_SET=yes