diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 21 insertions, 15 deletions
@@ -32,6 +32,7 @@ Anope Version S V N 02/07 F Oddity in do_cmode(). [#859] 02/07 F findchan() debug messages not being logical. [#857] 02/07 F NickServ replying to SVSNICK command when OperServ must. [#861] +02/11 F Fixed configure script so it will complain about args. [#864] Provided by Johno Crawford <johno.crawford@gmail.com> - 2008 02/08 F x86_64 generating improper SHA1 hash values. [#856] @@ -1259,7 +1259,7 @@ Optional Packages: --with-rungroup=group Specify the rungroup for anope --with-permissions=permissions Specify the default permissions for anope --with-bindir=bindir Specify the default binary dir for anope - --with-datadir=datadir Specify the location of the services data folder + --with-datadir=datadir Specify the location of the services data folder Some influential environment variables: CC C compiler command @@ -1694,12 +1694,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $# = 0; 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 +# If no bindir, we tell him to run ./Config. +if test "${with_bindir+set}" != set || test "${with_datadir+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 fi + ac_config_headers="$ac_config_headers include/sysconf.h" ac_ext=c @@ -8331,7 +8333,6 @@ done - # Check whether --with-rungroup was given. if test "${with_rungroup+set}" = set; then withval=$with_rungroup; diff --git a/configure.in b/configure.in index e389f3a54..a5af8ea68 100644 --- a/configure.in +++ b/configure.in @@ -9,15 +9,16 @@ dnl details. dnl Based heavily on the Unreal configure.in script, and extra thanks to dnl codemastr from UnrealIRCD. - AC_INIT -AC_CONFIG_SRCDIR([src/actions.c]) -if test $# = 0; 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 + +# If no bindir, we tell him to run ./Config. +if test "${with_bindir+set}" != set || test "${with_datadir+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 fi +AC_CONFIG_SRCDIR([src/actions.c]) AC_CONFIG_HEADER(include/sysconf.h) AC_PROG_CC if test "$ac_cv_c_compiler_gnu" = "yes"; then @@ -256,7 +257,6 @@ 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_DEFINE_UNQUOTED(RUNGROUP,"$withval","Run group") RUNGROUP=$withval @@ -276,7 +276,7 @@ AC_ARG_WITH(bindir, [ --with-bindir=bindir Specify the default binary dir fo AC_SUBST(BINDEST) -AC_ARG_WITH(datadir, [ --with-datadir=datadir Specify the location of the services data folder], [ +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 diff --git a/version.log b/version.log index 0fae90e03..ac1c30986 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="21" VERSION_EXTRA="-svn" -VERSION_BUILD="1379" +VERSION_BUILD="1380" # $Log$ # +# BUILD : 1.7.21 (1380) +# BUGS : 864 +# NOTES : Fixed configure script so it will complain about args. +# # BUILD : 1.7.21 (1379) # BUGS : 856 # NOTES : x86_64 generating improper SHA1 hash values. Thanks Johno Crawford ;) |