Fix incorrect version number as tag (again) (again)

[prosody.git] / configure

diff --git a/configure b/configure
index dda98cd7b399ba04be5cf33a349009bb2d2abcdf..8eb7b36747b53d67e7352634259b3bef67f13909 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,6 +13,9 @@ LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
 OPENSSL_LIB=crypto
 
+CFLAGS="-fPIC"
+LFLAGS="-shared"
+
 # Help
 
 show_help() {
@@ -20,6 +23,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
 --prefix=DIR                Prefix where Prosody should be installed.
                             Default is $PREFIX
 --sysconfdir=DIR            Location where the config file should be installed.
@@ -38,7 +43,9 @@ Configure Prosody prior to building.
                             Default is $IDN_LIB
 --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
+--require-config            Will cause Prosody to refuse to run when
                             it fails to find a configuration file
 EOF
 }
@@ -63,6 +70,10 @@ do
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
+   --ostype=*)
+      OSTYPE="$value"
+      OSTYPE_SET=yes
+      ;;
    --data-dir=*)
        DATADIR="$value"
        DATADIR_SET=yes
@@ -91,6 +102,9 @@ do
    --with-ssl=*)
       OPENSSL_LIB="$value"
       ;;      
+   --cflags=*)
+      CFLAGS="$value"
+      ;;      
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -99,6 +113,24 @@ do
    shift
 done
 
+if [ "$OSTYPE_SET" = "yes" ]
+then
+       if [ "$OSTYPE" = "debian" ]
+       then LUA_SUFFIX="5.1";
+       LUA_SUFFIX_SET=yes
+       LUA_INCDIR=/usr/include/lua5.1;
+       LUA_INCDIR_SET=yes
+       fi
+       if [ "$OSTYPE" = "macosx" ]
+       then LUA_INCDIR=/usr/local/include;
+       LUA_INCDIR_SET=yes      
+       LUA_LIBDIR=/usr/local/lib
+       LUA_LIBDIR_SET=yes
+       CFLAGS=""
+       LFLAGS="-bundle -undefined dynamic_lookup"
+       fi      
+fi
+
 if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
 then
    if [ "$PREFIX" = "/usr" ]
@@ -245,6 +277,8 @@ LUA_BINDIR=$LUA_BINDIR
 REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
+CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
 
 EOF