--- anope-2.0.9.old/Config +++ anope-2.0.9/Config @@ -125,9 +125,14 @@ # Init values ########################################################################### -INSTDIR=$HOME/services -RUNGROUP= -UMASK= +INSTDIR=__META_PREFIX__/program +RUNGROUP=nogroup +NO_INTRO=1 + +rm -f config.cache +mkdir -p $INSTDIR +UMASK=7 + DEBUG="no" USE_PCH="no" EXTRA_INCLUDE_DIRS= @@ -200,200 +205,10 @@ echo "Beginning Services configuration." echo "" -########################################################################### -# Load the cache -########################################################################### - -if [ ! "$IGNORE_CACHE" ] ; then - Load_Cache -fi - -# Ask the user anything we need to know ahead of time. - -export ok INPUT - -#### - -ok=0 -echo "In what directory should Anope be installed?" -while [ $ok -eq 0 ] ; do - echo2 "[$INSTDIR] " - if read INPUT ; then : ; else echo "" ; exit 1 ; fi - if [ ! "$INPUT" ] ; then - INPUT=$INSTDIR - fi - if [ ! -d "$INPUT" ] ; then - if exists "$INPUT" ; then - echo "$INPUT exists, but is not a directory!" - else - echo "$INPUT does not exist. Create it?" - echo2 "[y] " - read YN - if [ "$YN" != "n" ] ; then - if mkdir -p $INPUT ; then - ok=1 - fi - fi - fi - elif exists "$INPUT/include/services.h" ; then - echo "You cannot use the Services source directory as a target directory." - else - ok=1 - fi -done -INSTDIR=$INPUT -echo "" - -#### - -OLD_RUNGROUP="$RUNGROUP" -if [ "$RUNGROUP" ] ; then - echo "Which group should all Services data files be owned by? (If Services" - echo "should not force files to be owned by a particular group, type \"none\"" - echo "(without the quotes) and press Return.)" -else - echo "Which group should all Services data files be owned by? (If Services" - echo "should not force files to be owned by a particular group, just press" - echo "Return.)" -fi -echo2 "[$RUNGROUP] " -if read INPUT ; then : ; else echo "" ; exit 1 ; fi -if [ "$INPUT" ] ; then - if [ "$INPUT" = "none" ] ; then - RUNGROUP="" - else - RUNGROUP="$INPUT" - fi -fi -echo "" - -#### - -if [ ! "$UMASK" -o "$RUNGROUP" != "$OLD_RUNGROUP" ] ; then - if [ "$RUNGROUP" ] ; then - UMASK=007 - else - UMASK=077 - fi -fi - -ok=0 -echo "What should the default umask for data files be (in octal)?" -echo "(077 = only accessible by owner; 007 = accessible by owner and group)" -while [ $ok -eq 0 ] ; do - echo2 "[$UMASK] " - if read INPUT ; then : ; else echo "" ; exit 1 ; fi - if [ ! "$INPUT" ] ; then - INPUT=$UMASK - fi - if [ `echo "$INPUT" | grep -c '[^0-7]'` -gt 0 ] ; then - echo "$UMASK is not a valid octal number!" - else - if [ "`echo $INPUT | cut -c1`" != "0" ] ; then - INPUT=0$INPUT - fi - ok=1 - fi -done -UMASK=$INPUT -echo "" - -#### - -TEMP_YN="n" -if [ "$DEBUG" = "yes" ] ; then - TEMP_YN="y" -fi -echo "Would you like to build a debug version of Anope?" -echo2 "[$TEMP_YN] " -read YN -if [ "$YN" ] ; then - if [ "$YN" = "y" ] ; then - DEBUG="yes" - else - DEBUG="no" - fi -fi -echo "" - -#### - -TEMP_YN="n" -if [ "$USE_PCH" = "yes" ] ; then - TEMP_YN="y" -fi -echo "Do you want to build using precompiled headers? This can speed up" -echo "the build, but uses more disk space." -echo2 "[$TEMP_YN] " -read YN -if [ "$YN" ] ; then - if [ "$YN" = "y" ] ; then - USE_PCH="yes" - else - USE_PCH="no" - fi -fi -echo "" - -#### - -echo "Are there any extra include directories you wish to use?" -echo "You may only need to do this if CMake is unable to locate" -echo "missing dependencies without hints." -echo "Separate directories with semicolons." -echo "If you need no extra include directories, enter NONE in all caps." -echo2 "[$EXTRA_INCLUDE_DIRS] " -if read INPUT ; then : ; else echo "" ; exit 1 ; fi -if [ "$INPUT" ] ; then - if [ "$INPUT" = "NONE" ] ; then - EXTRA_INCLUDE_DIRS="" - else - EXTRA_INCLUDE_DIRS=$INPUT - fi -fi -echo "" - -#### - -echo "Are there any extra library directories you wish to use?" -echo "You may only need to do this if CMake is unable to locate" -echo "missing dependencies without hints." -echo "Separate directories with semicolons." -echo "If you need no extra library directories, enter NONE in all caps." -echo2 "[$EXTRA_LIB_DIRS] " -if read INPUT ; then : ; else echo "" ; exit 1 ; fi -if [ "$INPUT" ] ; then - if [ "$INPUT" = "NONE" ] ; then - EXTRA_LIB_DIRS="" - else - EXTRA_LIB_DIRS=$INPUT - fi -fi -echo "" - -#### - -echo "Are there any extra arguments you wish to pass to CMake?" -echo "If you need no extra arguments to CMake, enter NONE in all caps." -echo2 "[$EXTRA_CONFIG_ARGS] " -if read INPUT ; then : ; else echo "" ; exit 1 ; fi -if [ "$INPUT" ] ; then - if [ "$INPUT" = "NONE" ] ; then - EXTRA_CONFIG_ARGS="" - else - EXTRA_CONFIG_ARGS=$INPUT - fi -fi -echo "" - -#### - ################################################################################ # Store values ################################################################################ -echo2 "Saving configuration results in config.cache... " - cat <$SOURCE_DIR/config.cache INSTDIR="$INSTDIR" RUNGROUP="$RUNGROUP" @@ -406,7 +221,6 @@ EOT echo "done." - ################################################################################ # Build the build system string ################################################################################