diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/configure.in b/configure.in index b0556ed63..05c90255b 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Contact us at dev@anope.org dnl This program is free but copyrighted software; see the file COPYING for dnl details. - + dnl Based heavily on the Unreal configure.in script, and extra thanks to dnl codemastr from UnrealIRCD. @@ -15,7 +15,7 @@ AC_INIT CFLAGS="-g" # If no bindir, we tell him to run ./Config. -if test "${with_bindir+set}" != set || test "${with_datadir+set}" != set; then +if test "${with_instdir+set}" != set; then echo "You might want to run ./Config or provide some parameters to this script." echo "./configure --help for information about this script" exit 0 @@ -68,7 +68,7 @@ AC_CACHE_VAL(ac_cv_valistisarray, } int main() { foo(0, 123); return(0); }]])],[ac_cv_valistisarray=false],[ac_cv_valistisarray=true],[ac_cv_valistisarray=false])]) - + if test "$ac_cv_valistisarray" = true ; then AC_DEFINE(HAVE_VA_LIST_AS_ARRAY,[1],[va_list as array]) AC_MSG_RESULT(yes) @@ -109,7 +109,7 @@ AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL or attempt to fin int main() { MYSQL *mysql = mysql_init(0); - + return 0; } ], ac_cv_mysql_valid=yes, ac_cv_mysql_valid=no) @@ -130,12 +130,12 @@ int main() short s = 1; short* ptr = &s; unsigned char c = *((char*)ptr); - return c; + return c; } ] , AC_DEFINE(BIG_ENDIAN) AC_MSG_RESULT(big) -, AC_DEFINE(LITTLE_ENDIAN) +, AC_DEFINE(LITTLE_ENDIAN) AC_MSG_RESULT(little) ) @@ -239,7 +239,7 @@ AC_CHECK_FUNCS(gethostbyname_r,AC_DEFINE(HAVE_GETHOSTBYNAME_R,1)) AC_CHECK_FUNCS(strlcpy,AC_DEFINE(HAVE_STRLCPY,1)) AC_CHECK_FUNCS(strlcat,AC_DEFINE(HAVE_STRLCAT,1)) -AC_ARG_WITH(rungroup, [ --with-rungroup=group Specify the rungroup for anope], [ +AC_ARG_WITH(rungroup, [ --with-rungroup=group Specify the rungroup for anope], [ AC_DEFINE_UNQUOTED(RUNGROUP,"$withval","Run group") RUNGROUP=$withval ]) @@ -250,31 +250,18 @@ dnl AC_DEFINE_UNQUOTED(MYOSNAME,"`uname -a`","uname") AC_ARG_WITH(permissions, [ --with-permissions=permissions Specify the default permissions for anope], AC_DEFINE_UNQUOTED(DEFUMASK,$withval,"Default umask permissions"), AC_DEFINE(DEFUMASK, 007,"Default umask Permissions")) -AC_ARG_WITH(bindir, [ --with-bindir=bindir Specify the default binary dir for anope], [ - AC_DEFINE_UNQUOTED(SERVICES_BIN,"${withval}/services","Binary Dir") - BINDEST=$withval - DATDEST=$withval - MODULE_PATH=${withval}/modules/ +AC_ARG_WITH(instdir, [ --with-instdir=instdir Specify the default install dir for anope], [ + INSTDIR=$withval ]) MAKEBIN=`pwd`/run-cc.pl -AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl Specify the default make binary to use],[MAKEBIN=$withval]) +AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl Specify the default make binary to use],[MAKEBIN=$withval]) -AC_SUBST(BINDEST) +AC_SUBST(INSTDIR) AC_SUBST(MAKEBIN) -AC_ARG_WITH(datadir, [ --with-datadir=datadir Specify the location of the services data folder], [ - AC_DEFINE_UNQUOTED(SERVICES_DIR,"$withval","services bin dir") - AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir") - DATDEST=$withval - MODULE_PATH=${withval}/modules/ -]) - -AC_SUBST(DATDEST) -AC_SUBST(MODULE_PATH) - -AC_ARG_WITH(optimization, [ --with-optimisation=1|2|3|4|5 Specify the optimisation level], [ +AC_ARG_WITH(optimization, [ --with-optimization=1|2|3|4|5 Specify the optimization level], [ CFLAGS="$CFLAGS -O$withval" ]) |