From 9e3e85c9dea50a7a2e4ee6217b6d8e5be82e0e24 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sun, 27 May 2007 12:20:00 +0000 Subject: [PATCH] Test --- configure | 40 ++++++++++++++++++++++++++- configure.ac | 76 ++++++++++++++++++++++++++-------------------------- 2 files changed, 77 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 247c4850..6c142c38 100755 --- a/configure +++ b/configure @@ -1715,6 +1715,10 @@ ac_config_commands="$ac_config_commands default-1" SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang examples html script" +# +# General settings for MBSE BBS +# After changeing the version number, run autoconf! +# PACKAGE="mbsebbs" MAJOR="0" MINOR="91" @@ -1765,6 +1769,10 @@ SYSTEM="`uname -s`" CPU="`uname -m`" LDFLAGS="-I /usr/local/include" +# +# Checks for programs. +# Try to find GNU make +# # Extract the first word of "gmake", so it can be a program name with args. set dummy gmake; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -1839,6 +1847,7 @@ echo "${ECHO_T}no" >&6; } fi +# Alternate awk check, I skip mawk because it doesn't work for MBSE. # Extract the first word of "gawk", so it can be a program name with args. set dummy gawk; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -1950,6 +1959,7 @@ echo "${ECHO_T}no" >&6; } fi +# Try to find GNU install # Extract the first word of "ginstall", so it can be a program name with args. set dummy ginstall; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4264,6 +4274,9 @@ esac +# +# Additional commandline switches +# # Check whether --enable-experiment was given. if test "${enable_experiment+set}" = set; then enableval=$enable_experiment; experiment=$enableval @@ -4316,6 +4329,9 @@ echo "${ECHO_T}$CPUFLAGS" >&6; } fi +# +# Enable full newsgate, this was default upto 0.50.0 +# # Check whether --enable-newsgate was given. if test "${enable_newsgate+set}" = set; then enableval=$enable_newsgate; newsgate=$enableval @@ -4334,6 +4350,9 @@ else fi +# +# Checks for libraries and functions. +# { echo "$as_me:$LINENO: checking for re_comp in -lcompat" >&5 echo $ECHO_N "checking for re_comp in -lcompat... $ECHO_C" >&6; } if test "${ac_cv_lib_compat_re_comp+set}" = set; then @@ -4743,7 +4762,8 @@ fi SHADOW_PASSWORD=1 LIBSHADOW=1 else - { echo "$as_me:$LINENO: checking for setspent in -lc" >&5 + # some libc's (glibc 2.x) keep shadow functions in -lc + { echo "$as_me:$LINENO: checking for setspent in -lc" >&5 echo $ECHO_N "checking for setspent in -lc... $ECHO_C" >&6; } if test "${ac_cv_lib_c_setspent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5598,6 +5618,9 @@ done fi +# +# Support for zlib and bzlib transfers compression +# ZLIBSUP=No { echo "$as_me:$LINENO: checking for compress2 in -lz" >&5 echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; } @@ -6105,6 +6128,9 @@ done fi +# +# Checks for header files. +# { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then @@ -7977,6 +8003,9 @@ _ACEOF fi +# +# Checks for typedefs, structures, and compiler characteristics. +# { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then @@ -8734,6 +8763,9 @@ _ACEOF fi +# +# Checks for library functions. +# @@ -9477,6 +9509,9 @@ fi done +# +# Check for usefull external programs +# # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -10720,6 +10755,9 @@ fi +# +# FIX DEL for Del!=207, this was default upto 207 or 126 if no argument +# # Check whether --enable-gbkdel was given. if test "${enable_gbkdel+set}" = set; then enableval=$enable_gbkdel; gbkdel=$enableval diff --git a/configure.ac b/configure.ac index c7f815e6..e32d7da3 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,10 @@ AM_CONFIG_HEADER(config.h) SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang examples html script" AC_SUBST(SUBDIRS) -dnl -dnl General settings for MBSE BBS -dnl After changeing the version number, run autoconf! -dnl +# +# General settings for MBSE BBS +# After changeing the version number, run autoconf! +# PACKAGE="mbsebbs" MAJOR="0" MINOR="91" @@ -42,17 +42,17 @@ SYSTEM="`uname -s`" CPU="`uname -m`" LDFLAGS="-I /usr/local/include" -dnl -dnl Checks for programs. -dnl Try to find GNU make -dnl +# +# Checks for programs. +# Try to find GNU make +# AC_CHECK_PROG(MAKE, gmake, gmake) AC_CHECK_PROG(MAKE, make, make) -dnl Alternate awk check, I skip mawk because it doesn't work for MBSE. +# Alternate awk check, I skip mawk because it doesn't work for MBSE. AC_CHECK_PROG(AWK, gawk, gawk) AC_CHECK_PROG(AWK, nawk, nawk) AC_CHECK_PROG(AWK, awk, awk) -dnl Try to find GNU install +# Try to find GNU install AC_CHECK_PROG(INSTALL, ginstall, ginstall) AC_CHECK_PROG(INSTALL, install, install) AC_PROG_CC @@ -65,9 +65,9 @@ AC_PATH_PROG(CHOWN, chown, chown, /bin:/sbin:/usr/bin:/usr/sbin:) AC_C_BIGENDIAN -dnl -dnl Additional commandline switches -dnl +# +# Additional commandline switches +# AC_ARG_ENABLE(experiment, [ --enable-experiment Compile experimental code], [ experiment=$enableval ], [ experiment=no ]) if test "$experiment" = "yes"; then AC_DEFINE(USE_EXPERIMENT) @@ -96,9 +96,9 @@ AC_MSG_CHECKING(for cpuflags) fi -dnl -dnl Enable full newsgate, this was default upto 0.50.0 -dnl +# +# Enable full newsgate, this was default upto 0.50.0 +# AC_ARG_ENABLE(newsgate, [ --enable-newsgate Compile with newsgate], [ newsgate=$enableval ], [ newsgate=no ]) if test "$newsgate" = "yes"; then AC_DEFINE(USE_NEWSGATE) @@ -108,9 +108,9 @@ else fi -dnl -dnl Checks for libraries and functions. -dnl +# +# Checks for libraries and functions. +# AC_CHECK_LIB(compat,re_comp,result=yes,result=no) if test "$result" = "yes"; then LIBS="$LIBS -lcompat" @@ -140,7 +140,7 @@ else SHADOW_PASSWORD=1 LIBSHADOW=1 else - dnl some libc's (glibc 2.x) keep shadow functions in -lc + # some libc's (glibc 2.x) keep shadow functions in -lc AC_CHECK_LIB(c,setspent,result=yes,result=no) if test "$result" = "yes"; then if test -f /etc/shadow; then @@ -176,9 +176,9 @@ if test "$result" = "yes"; then fi -dnl -dnl Support for zlib and bzlib transfers compression -dnl +# +# Support for zlib and bzlib transfers compression +# ZLIBSUP=No AC_CHECK_LIB(z,compress2,result=yes,result=no) if test "$result" = "yes"; then @@ -192,9 +192,9 @@ if test "$result" = "yes"; then AC_CHECK_HEADERS(bzlib.h,BZLIBSUP=Yes,BZLIBSUP=No) fi -dnl -dnl Checks for header files. -dnl +# +# Checks for header files. +# AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME @@ -206,9 +206,9 @@ AC_CHECK_HEADERS(limits.h utmp.h utmpx.h lastlog.h rpc/key_prot.h) AC_CHECK_HEADERS(iconv.h) AC_STRUCT_TIMEZONE -dnl -dnl Checks for typedefs, structures, and compiler characteristics. -dnl +# +# Checks for typedefs, structures, and compiler characteristics. +# AC_C_CONST AC_TYPE_UID_T AC_TYPE_OFF_T @@ -219,9 +219,9 @@ AC_STRUCT_ST_BLKSIZE AC_HEADER_STAT AC_STRUCT_TM -dnl -dnl Checks for library functions. -dnl +# +# Checks for library functions. +# AC_CHECK_FUNCS(c64i a64l fchmod fchown fdatasync fsync lckpwdf strcasestr putpwent) AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP @@ -231,9 +231,9 @@ AC_CHECK_FUNCS(gettimeofday re_comp select) AC_CHECK_FUNCS(getspnam initgroups updwtmp updwtmpx) AC_CHECK_FUNCS(iconv_open) -dnl -dnl Check for usefull external programs -dnl +# +# Check for usefull external programs +# AC_PATH_PROG(COMPRESS,compress,no-compress-found-during-configure) AC_PATH_PROG(GZIP,gzip,no-gzip-found-during-configure) AC_PATH_PROG(ARC,arc) @@ -266,9 +266,9 @@ AC_PATH_PROG(GOLDNODE,goldnode) AC_PATH_PROG(GOLDNODE,gnlnx) AC_PATH_PROG(CONVERT,convert) -dnl -dnl FIX DEL for Del!=207, this was default upto 207 or 126 if no argument -dnl +# +# FIX DEL for Del!=207, this was default upto 207 or 126 if no argument +# AC_ARG_ENABLE(gbkdel, [ --enable-gbkdel Delete key is 126 (default is 207)], [ gbkdel=$enableval ], [ gbkdel=no ]) if test "$gbkdel" = "yes"; then GBK_DEL=126