X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=configure;h=df62cc05b80a094c9281bac2fc40a0111bdf17f9;hb=b2d412effa52846c3ea515f302f7e7298703e00a;hp=dda98cd7b399ba04be5cf33a349009bb2d2abcdf;hpb=a5ca3fd7067edda6dde3835e8e289a0c6e926107;p=prosody.git

diff --git a/configure b/configure
index dda98cd7..df62cc05 100755
--- a/configure
+++ b/configure
@@ -11,8 +11,17 @@ LUA_BINDIR="/usr/bin"
 LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
+ICU_FLAGS="-licui18n -licudata -licuuc"
 OPENSSL_LIB=crypto
+CC=gcc
+CXX=g++
+LD=gcc
+RUNWITH=lua
 
+CFLAGS="-fPIC -Wall"
+LDFLAGS="-shared"
+
+IDN_LIBRARY=idn
 # Help
 
 show_help() {
@@ -20,6 +29,8 @@ cat <<EOF
 Configure Prosody prior to building.
 
 --help                      This help.
+--ostype=OS                 Use one of the OS presets.
+                            May be one of: debian, macosx, linux, freebsd
 --prefix=DIR                Prefix where Prosody should be installed.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
@@ -36,9 +47,20 @@ Configure Prosody prior to building.
                             Default is \$LUA_DIR/lib
 --with-idn=LIB              The name of the IDN library to link with.
                             Default is $IDN_LIB
+--idn-library=(idn|icu)		 Select library to use for IDNA functionality.
+									 idn: use GNU libidn (default)
+									 icu: use ICU from IBM
 --with-ssl=LIB              The name of the SSL to link with.
                             Default is $OPENSSL_LIB
---require-config              Will cause Prosody to refuse to run when
+--cflags=FLAGS              Flags to pass to the compiler
+                            Default is $CFLAGS
+--ldflags=FLAGS             Flags to pass to the linker
+                            Default is $LDFLAGS
+--c-compiler=CC             The C compiler to use when building modules.
+                            Default is $CC
+--linker=CC                 The linker to use when building modules.
+                            Default is $LD
+--require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
 EOF
 }
@@ -46,7 +68,7 @@ EOF
 
 while [ "$1" ]
 do
-   value="`echo $1 | sed 's/.*=\(.*\)/\1/'`"
+   value="`echo $1 | sed 's/[^=]*=\(.*\)/\1/'`"
    if echo "$value" | grep -q "~"
    then
       echo
@@ -63,7 +85,51 @@ do
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
-   --data-dir=*)
+   --sysconfdir=*)
+      SYSCONFDIR="$value"
+      SYSCONFDIR_SET=yes
+      ;;
+   --ostype=*)
+      OSTYPE="$value"
+      OSTYPE_SET=yes
+      if [ "$OSTYPE" = "debian" ]
+      then LUA_SUFFIX="5.1";
+	LUA_SUFFIX_SET=yes
+	LUA_INCDIR=/usr/include/lua5.1;
+	LUA_INCDIR_SET=yes
+	CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	fi
+	if [ "$OSTYPE" = "macosx" ]
+	then LUA_INCDIR=/usr/local/include;
+	LUA_INCDIR_SET=yes
+	LUA_LIBDIR=/usr/local/lib
+	LUA_LIBDIR_SET=yes
+	LDFLAGS="-bundle -undefined dynamic_lookup"
+	fi
+        if [ "$OSTYPE" = "linux" ]
+        then LUA_INCDIR=/usr/local/include;
+        LUA_INCDIR_SET=yes
+        LUA_LIBDIR=/usr/local/lib
+        LUA_LIBDIR_SET=yes
+        CFLAGS="-Wall -fPIC"
+        CFLAGS="$CFLAGS -D_GNU_SOURCE"
+        LDFLAGS="-shared"
+        fi
+        if [ "$OSTYPE" = "freebsd" -o "$OSTYPE" = "openbsd" ]
+        then LUA_INCDIR="/usr/local/include/lua51"
+        LUA_INCDIR_SET=yes
+        CFLAGS="-Wall -fPIC -I/usr/local/include"
+        LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
+        LUA_SUFFIX="-5.1"
+        LUA_SUFFIX_SET=yes
+        LUA_DIR=/usr/local
+        LUA_DIR_SET=yes
+        fi
+        if [ "$OSTYPE" = "openbsd" ]
+        then LUA_INCDIR="/usr/local/include";
+        fi
+      ;;
+   --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
@@ -84,13 +150,31 @@ do
       ;;
    --with-lua-lib=*)
       LUA_LIBDIR="$value" LUA_LIBDIR_SET=yes
-      ;;      
+      ;;
    --with-idn=*)
       IDN_LIB="$value"
-      ;;      
+      ;;
+	--idn-library=*)
+		IDN_LIBRARY="$value"
+		;;
    --with-ssl=*)
       OPENSSL_LIB="$value"
-      ;;      
+      ;;
+   --cflags=*)
+      CFLAGS="$value"
+      ;;
+   --ldflags=*)
+      LDFLAGS="$value"
+      ;;
+   --c-compiler=*)
+      CC="$value"
+      ;;
+   --linker=*)
+      LD="$value"
+      ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -194,6 +278,16 @@ then
    LUA_BINDIR="$LUA_DIR/bin"
 fi
 
+if [ "$IDN_LIBRARY" = "icu" ]
+then
+	IDNA_LIBS="$ICU_FLAGS"
+	CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU"
+fi
+if [ "$IDN_LIBRARY" = "idn" ] 
+then
+	IDNA_LIBS="-l$IDN_LIB"
+fi
+
 echo -n "Checking Lua includes... "
 lua_h="$LUA_INCDIR/lua.h"
 if [ -e "$lua_h" ]
@@ -244,7 +338,14 @@ LUA_LIBDIR=$LUA_LIBDIR
 LUA_BINDIR=$LUA_BINDIR
 REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
+IDNA_LIBS=$IDNA_LIBS
 OPENSSL_LIB=$OPENSSL_LIB
+CFLAGS=$CFLAGS
+LDFLAGS=$LDFLAGS
+CC=$CC
+CXX=$CXX
+LD=$LD
+RUNWITH=$RUNWITH
 
 EOF