From 9feaa07900d39f2621e3a2af38f0559ac75d948a Mon Sep 17 00:00:00 2001 From: he Date: Wed, 30 Jun 1999 21:05:14 +0000 Subject: [PATCH] isdn4k-utils config menu changes --- eurofile/Makefile | 27 +++++---- eurofile/configure | 94 ++++++++++++++++--------------- eurofile/configure.in | 8 ++- eurofile/src/Makefile | 14 ++++- eurofile/src/eft/extra_version_.h | 2 +- 5 files changed, 81 insertions(+), 64 deletions(-) diff --git a/eurofile/Makefile b/eurofile/Makefile index 6b3e0b92..ee509b34 100644 --- a/eurofile/Makefile +++ b/eurofile/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1999/06/29 18:37:12 he Exp $ +# $Id: Makefile,v 1.3 1999/06/30 21:05:14 he Exp $ SHELL = /bin/sh @@ -13,9 +13,13 @@ SCRIPTS = scripts/eftd.sh scripts/eftp.sh scripts/eftp_setup E4L_EXTRA_VERSION_DEP := $(shell pwd)/CHANGES export E4L_EXTRA_VERSION_DEP +CONF_DEPS = ./configure scripts/eftd.sh scripts/eftp.sh scripts/eftp_setup src/config.h Rules.make +#this target is requested from isdn4k-utils default target +all: $(CONF_DEPS) + make -C src -all: ./configure scripts/eftd.sh scripts/eftp.sh scripts/eftp_setup src/config.h Rules.make +really_all: $(CONF_DEPS) make -C src all config src/config.h Rules.make $(SCRIPTS): configure @@ -52,15 +56,15 @@ update: $(CVS) update -dP . new_version: - echo "Please create the file new_version and fill in the new version number!" - exit 1 + @echo current version is `grep E4L_VERSION src/eft/include/tdu_user.h|sed 's/^.*VERSION//'` + @if [ -z "$(NEW_VERSION)" ]; then echo "You must define the variable NEW_VERSION when making a new version!"; exit 1; fi + @echo new version is $(NEW_VERSION) # Make a new release. The variable NEW_VERSION must be set in the # make command's arguments or environment. # : update -release: distclean - # $(CVS) commit . - @if [ -z "$(NEW_VERSION)" ]; then echo "You must define the variable NEW_VERSION when making a new version!"; exit 1; fi +release: new_version commit + $(CVS) commit . make -C src new_version rm -f xx[0-9][0-9] csplit CHANGES '/$$Log:/+1' @@ -68,8 +72,9 @@ release: distclean echo '===============' >> CHANGES.tmp cat xx[0-9][0-9] >> CHANGES.tmp rm -f xx[0-9][0-9] -# $(CVS) commit -m "Version $(NEW_VERSION)" . -# $(CVS) tag `echo Version_$(NEW_VERSION)|sed s/\\./_/g` . -# tar -czf ../eftp4linux-$(NEW_VERSION).tar.gz . + $(CVS) commit -m "Version $(NEW_VERSION)" . + $(CVS) tag `echo Version_$(NEW_VERSION)|sed s/\\./_/g` . + tar -czf ../eftp4linux-$(NEW_VERSION).tar.gz . + +.PHONY: all config permissions clean distclean release configureclean commit update default -.PHONY: all config permissions clean distclean release configureclean commit update diff --git a/eurofile/configure b/eurofile/configure index d532f658..041989ca 100755 --- a/eurofile/configure +++ b/eurofile/configure @@ -522,11 +522,13 @@ fi # # Set these according to your preferrences # +CONFIG_EFTD=${CONFIG_EFTD:-"y"} # Shall eurofile daemon use authentification modules from wu-ftpd? -CONFIG_EFTD_WUAUTH=y +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-"y"} +CONFIG_EFTP=${CONFIG_EFTP:-"y"} # This will be redefined to "n" by the configure script if no readline # library supporting the alternate interface is found -CONFIG_EFTP_READLINE=y +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-"y"} I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}` @@ -571,7 +573,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:575: checking for a BSD compatible install" >&5 +echo "configure:577: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -623,7 +625,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:627: checking for $ac_word" >&5 +echo "configure:629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -652,7 +654,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:656: checking for $ac_word" >&5 +echo "configure:658: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -700,7 +702,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -710,11 +712,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -734,12 +736,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:740: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:743: checking whether we are using GNU C" >&5 +echo "configure:745: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -748,7 +750,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -763,7 +765,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:767: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:769: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -794,7 +796,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:798: checking for $ac_word" >&5 +echo "configure:800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -826,7 +828,7 @@ fi # Extract the first word of "isdnctrl", so it can be a program name with args. set dummy isdnctrl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:830: checking for $ac_word" >&5 +echo "configure:832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ISDNCTRL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -858,7 +860,7 @@ fi # Extract the first word of "loopctrl", so it can be a program name with args. set dummy loopctrl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:862: checking for $ac_word" >&5 +echo "configure:864: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LOOPCTRL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -890,7 +892,7 @@ fi # Extract the first word of "insmod", so it can be a program name with args. set dummy insmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:894: checking for $ac_word" >&5 +echo "configure:896: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INSMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -922,7 +924,7 @@ fi # Extract the first word of "rmmod", so it can be a program name with args. set dummy rmmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:926: checking for $ac_word" >&5 +echo "configure:928: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RMMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -954,7 +956,7 @@ fi # Extract the first word of "ifconfig", so it can be a program name with args. set dummy ifconfig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:958: checking for $ac_word" >&5 +echo "configure:960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IFCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -986,7 +988,7 @@ fi # Extract the first word of "x25route", so it can be a program name with args. set dummy x25route; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:990: checking for $ac_word" >&5 +echo "configure:992: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_X25ROUTE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1021,7 +1023,7 @@ fi echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6 -echo "configure:1025: checking for rl_callback_handler_install in -lreadline" >&5 +echo "configure:1027: checking for rl_callback_handler_install in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1029,7 +1031,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1071,7 +1073,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1075: checking how to run the C preprocessor" >&5 +echo "configure:1077: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1086,13 +1088,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1103,13 +1105,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1132,12 +1134,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1136: checking for ANSI C header files" >&5 +echo "configure:1138: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1145,7 +1147,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1162,7 +1164,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1180,7 +1182,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1201,7 +1203,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1212,7 +1214,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1239,17 +1241,17 @@ for ac_hdr in fcntl.h sys/ioctl.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1243: checking for $ac_hdr" >&5 +echo "configure:1245: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1280,17 +1282,17 @@ for ac_hdr in linux/isdn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1284: checking for $ac_hdr" >&5 +echo "configure:1286: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1323,12 +1325,12 @@ done echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:1327: checking for crypt" >&5 +echo "configure:1329: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -1373,12 +1375,12 @@ fi echo $ac_n "checking for getdelim""... $ac_c" 1>&6 -echo "configure:1377: checking for getdelim" >&5 +echo "configure:1379: checking for getdelim" >&5 if eval "test \"`echo '$''{'ac_cv_func_getdelim'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_getdelim=yes" else diff --git a/eurofile/configure.in b/eurofile/configure.in index 09d4206f..a842e94c 100644 --- a/eurofile/configure.in +++ b/eurofile/configure.in @@ -1,16 +1,18 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.2 1999/06/29 18:37:15 he Exp $ +dnl $Id: configure.in,v 1.3 1999/06/30 21:05:17 he Exp $ AC_INIT(COPYING.authlib) # # Set these according to your preferrences # +CONFIG_EFTD=${CONFIG_EFTD:-"y"} # Shall eurofile daemon use authentification modules from wu-ftpd? -CONFIG_EFTD_WUAUTH=y +CONFIG_EFTD_WUAUTH=${CONFIG_EFTD_WUAUTH:-"y"} +CONFIG_EFTP=${CONFIG_EFTP:-"y"} # This will be redefined to "n" by the configure script if no readline # library supporting the alternate interface is found -CONFIG_EFTP_READLINE=y +CONFIG_EFTP_READLINE=${CONFIG_EFTP_READLINE:-"y"} I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` I4LCONFFILE=`eval echo ${CONFIG_CONFFILE:-"/etc/isdn"}` diff --git a/eurofile/src/Makefile b/eurofile/src/Makefile index 6b4e4a30..00acbcec 100644 --- a/eurofile/src/Makefile +++ b/eurofile/src/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1999/06/30 17:13:44 he Exp $ +# $Id: Makefile,v 1.2 1999/06/30 21:05:21 he Exp $ SHELL = /bin/sh @@ -20,7 +20,7 @@ CFLAGS = -g -Wall export EFT_LIBDIR EFT_INCDIR EFT_AUTHDIR CONFIG_EFTP_READLINE CONFIG_EFTD_WUAUTH CRYPTLIB CFLAGS KERNEL_INCDIR -LIBDIRS = eft wuauth +LIBDIRS = eft wuauth CLIENTDIRS = eftp SERVERDIRS = eftd TESTDIRS = testing @@ -29,9 +29,17 @@ EFTDIRS = $(CLIENTDIRS) $(SERVERDIRS) SUBDIRS := $(LIBDIRS) $(EFTDIRS) ALL_SUBDIRS := $(SUBDIRS) $(TESTDIRS) +DEFAULT_SUBDIRS := $(LIBDIRS) +ifeq ($(CONFIG_EFTP),y) +DEFAULT_SUBDIRS += eftp +endif -default: $(EFTDIRS) +ifeq ($(CONFIG_EFTD),y) +DEFAULT_SUBDIRS += eftd +endif + +default: $(DEFAULT_SUBDIRS) all: $(ALL_SUBDIRS) diff --git a/eurofile/src/eft/extra_version_.h b/eurofile/src/eft/extra_version_.h index c53e5363..22e4f34a 100644 --- a/eurofile/src/eft/extra_version_.h +++ b/eurofile/src/eft/extra_version_.h @@ -1,2 +1,2 @@ -#define E4L_EXTRA_VERSION_REV "+0.00" +#define E4L_EXTRA_VERSION_REV "+" #define E4L_EXTRA_VERSION_CHANGED ""