[Muddleftpd-cvs] muddleftpd ./ChangeLog ./autogen.sh ./configure...

[Joerg Jaspert]

CVSROOT:        /cvsroot/muddleftpd
Module name:    muddleftpd
Branch:         dev-ganneff-autotools
Changes by:     Joerg Jaspert <address@hidden>  02/10/26 17:58:04

Modified files:
        .              : ChangeLog autogen.sh configure.ac defaults.h.in 
        modules/auth/authlibexample: authunix.c 
        modules/auth/authlibmsql: authmsql.c 
        modules/auth/authlibmud: authmud.c 
        modules/auth/authlibmysql: authmysql.c 
        modules/auth/authlibsmb: authsmb.c 
        modules/auth/authlibsmb/smbval: smblib.c 
        src            : cfloader.c ftpwho.c init.c main.c reply.h 
                         utils.c version.c 

Log message:
        * autogen.sh: Adapted for the new System.
        
        * src/cfloader.c (configerror): Use PACKAGE_NAME as defined by
        configure script instead of old PROGNAME from defaults.h. Same
        with VERSTR -> PACKAGE_VERSION.
        * src/ftpwho.c (usage): dito.
        * src/init.c (ftpd_init): dito
        * src/main.c (mainprog, usage, main): dito
        * src/reply.h (REPLY_GREET, REPLY_STAT1): dito
        * src/utils.c (errormsg): dito
        * src/version.c (showversion): dito
        
        * defaults.h.in: Use variables from configure where
        possible. (sysconfdir). Maybe I add configure options for other
        things in there as well.
        Removed PROGNAME and VERSTR entry in favour of using the configure
        variable.
        
        * configure.ac: Rebuilt. Added some layout stuff.
        Now everything is made with a single configure script, including
        all modules, thanks to use of automake this is easy.
        MySQL detection has changed a bit. If user doesnt specify a
        directory mysql_config is used to get it.
        Added option to enable system malloc instead of included one.
        Added option to built with Debug support.
        
        * modules/auth/authlibexample/authunix.c,
        modules/auth/authlibmsql/authmsql.c,
        modules/auth/authlibmud/authmud.c,
        modules/auth/authlibmysql/authmysql.c,
        modules/auth/authlibsmb/smbval/smblib.c,
        modules/auth/authlibsmb/authsmb.c: Use ../../../config.h as its
        now a single file for everything.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/ChangeLog.diff?only_with_tag=dev-ganneff-autotools&tr1=1.3&tr2=1.3.4.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/autogen.sh.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/configure.ac.diff?only_with_tag=dev-ganneff-autotools&tr1=1.2&tr2=1.2.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/defaults.h.in.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibexample/authunix.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmsql/authmsql.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmud/authmud.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibmysql/authmysql.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibsmb/authsmb.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/modules/auth/authlibsmb/smbval/smblib.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/cfloader.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/ftpwho.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/init.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/main.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/reply.h.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/utils.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.1&tr2=1.1.8.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/src/version.c.diff?only_with_tag=dev-ganneff-autotools&tr1=1.2&tr2=1.2.6.1&r1=text&r2=text

Patches:
Index: muddleftpd/ChangeLog
diff -c muddleftpd/ChangeLog:1.2 muddleftpd/ChangeLog:1.3
*** muddleftpd/ChangeLog:1.2    Sun Oct 20 11:47:34 2002
--- muddleftpd/ChangeLog        Mon Oct 21 08:41:09 2002
***************
*** 1,3 ****
--- 1,9 ----
+ 2002-10-21  Joerg Jaspert  <address@hidden>
+ 
+       * modules/auth/authlibexample/COPYING: Added back. This license
+       is different (a public domain one) and not GPL as I blindly
+       assumed from the name. Sorry Beau.
+ 
  2002-10-20  Joerg Jaspert  <address@hidden>
  
        * NEWS: Added. Contains summaries of changes between releases.
Index: muddleftpd/configure.ac
diff -c muddleftpd/configure.ac:1.1 muddleftpd/configure.ac:1.2
*** muddleftpd/configure.ac:1.1 Thu Oct 17 04:14:04 2002
--- muddleftpd/configure.ac     Sun Oct 20 07:51:26 2002
***************
*** 1,5 ****
--- 1,7 ----
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT
+ AC_PREREQ(2.54)
+ 
  AC_CONFIG_SRCDIR([src/acl.c])
  AC_CONFIG_HEADER(config.h)
  
***************
*** 144,148 ****
  AC_CHECK_FUNCS(usleep pam_start fgetpwent fgetgrent sendfile)
  AC_CHECK_FUNCS(cap_init seteuid setegid)
  AC_PROG_CC_SWITCH(rdynamic)
! AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
  AC_OUTPUT
--- 146,228 ----
  AC_CHECK_FUNCS(usleep pam_start fgetpwent fgetgrent sendfile)
  AC_CHECK_FUNCS(cap_init seteuid setegid)
  AC_PROG_CC_SWITCH(rdynamic)
! 
! dnl check for additional features
! 
! dnl Checks for libraries.
! 
! # MUD module
! AC_ARG_WITH(authmud,
!       AC_HELP_STRING([--with-authmud], [create MUD authentication module. 
(no)]), 
!       authmud=$withval, authmud=no
! )
! 
! if test "$authmud" != no; then
!       AC_CONFIG_SUBDIRS(modules/auth/authlibmud)
!       modules="$modules authmud"
! fi
! 
! # SMB module
! AC_ARG_WITH(authsmb,
!       AC_HELP_STRING([--with-authsmb], [create SMB authentication module. 
(yes)]), 
!       authsmb=$withval, authsmb=yes
! )
! 
! if test "$authsmb" != no; then
!       AC_CONFIG_SUBDIRS(modules/auth/authlibsmb)
!       modules="$modules authsmb"
! fi
! 
! # MSQL module
! AC_ARG_WITH(authmsql,
!       AC_HELP_STRING([--with-authmsql], [create mSQL authentication module. 
(no)]), 
!       authmsql=$withval, authmsql=no
! )
! 
! AC_ARG_WITH(msqlpath, 
!       AC_HELP_STRING([--with-msqlpath], [specify the top level of the msql 
installation tree.  (default is /usr/local/Hughes)]),
!         mysqltop=$withval, msqltop=/usr/local/Hughes
! )
! 
! if test "$authmsql" != no; then
!       AC_CONFIG_SUBDIRS(modules/auth/authlibmsql)
!       modules="$modules authmsql"
! fi
! 
! # MYSQL module
! AC_ARG_WITH(authmysql,
!       AC_HELP_STRING([--with-authmysql], [create MySQL authentication module. 
(no)]), 
!       authmysql=$withval, authmysql=no
! )
! 
! AC_ARG_WITH(mysqlpath, 
!       AC_HELP_STRING([--with-mysqlpath], [specify the top level of the MySQL 
installation tree.  (default is /usr/local/Hughes)]),
!         mysqltop=$withval, mysqltop=/usr/local/mysql
! )
! 
! if test "$authmysql" != no; then
!       AC_CONFIG_SUBDIRS(modules/auth/authlibmysql)
!       modules="$modules authmysql"
! fi
! 
! # work out zerobind default (false on linux, true on other systems)
! 
! case `uname -s` in
!       Linux)
!               zero_bind=FALSE
!               ;;
!       *)
!               zero_bind=TRUE
!               ;;
! esac
! AC_SUBST(zerobind, "$zero_bind")
! 
! AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile defaults.h])
  AC_OUTPUT
+ 
+ echo
+ echo Muddleftpd is now ready to be compiled!
+ echo
+ echo Modules selected for compile: $modules
+ echo
+ 
Index: muddleftpd/src/version.c
diff -c muddleftpd/src/version.c:1.1 muddleftpd/src/version.c:1.2
*** muddleftpd/src/version.c:1.1        Thu Sep 26 03:55:42 2002
--- muddleftpd/src/version.c    Thu Oct 17 04:20:48 2002
***************
*** 28,33 ****
        printf(" version 2 or later. See 
http://www.fsf.org/copyleft/gpl.html\n";);
        printf(" for a copy of this license\n\n");
        printf(" For updates to muddleftpd, visit its homesite at:\n");
!       printf(" http://www.muddleftpd.cx\n\n";);
        exit(1);
  }
--- 28,33 ----
        printf(" version 2 or later. See 
http://www.fsf.org/copyleft/gpl.html\n";);
        printf(" for a copy of this license\n\n");
        printf(" For updates to muddleftpd, visit its homesite at:\n");
!       printf(" http://savannah.nongnu.org/projects/muddleftpd\n\n";);
        exit(1);
  }