[openbnc-cvs] openbnc acconfig.h,NONE,1.1 config.h.in,NONE,1.1 stamp-h.in,NONE,1.1 Makefile,1.3,1.4
Status: Beta
Brought to you by:
andrereis
From: Mateusz K. <sh...@us...> - 2004-07-09 14:33:08
|
Update of /cvsroot/openbnc/openbnc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10526/openbnc Modified Files: Makefile Makefile.in config.h configure configure.in Added Files: acconfig.h config.h.in stamp-h.in Log Message: - Add --disable functions into ./configure'n'make stuff Index: config.h =================================================================== RCS file: /cvsroot/openbnc/openbnc/config.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- config.h 24 May 2004 16:43:57 -0000 1.1.1.1 +++ config.h 9 Jul 2004 14:32:57 -0000 1.2 @@ -1,73 +1,41 @@ -/* - * Configuration file for psyBNC, created by menuconf - */ - -/* Encryption */ - -#define CRYPT - -/* Encryption Type*/ - -#define BLOWFISH - -/* Allow Translation */ - -#define TRANSLATE - -/* Allow internal network */ - -#define INTNET - -/* Allow traffic logging */ - -#define TRAFFICLOG - -/* Allow linkage of bouncers */ - -#define LINKAGE - -/* Allow the dcc File-Functions */ - -#define DCCFILES - -/* Pipe dcc Chats */ - -#define DCCCHAT - -/* Allow to add more users */ - -#define MULTIUSER - -/* Number of max. Users */ - -#define MAXUSER 50 - -/* Number of max. Connections per User */ - -#define MAXCONN 99 - -/* Allow the usage of scripts */ - -#define SCRIPTING - -/* Allow multiple irc connections per user */ - -#define NETWORK - -/* Allow Proxy Support */ - -#define PROXYS - -/* The logging level */ - -#define LOGLEVEL 0 - -/* SSL-Security */ - -#define SSLSEC 2 - -/* Blocking DNS is preferred. Non Blocking DNS is experimental */ - -#ifndef BLOCKDNS -#define BLOCKDNS -#endif +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +#define CRYPT +#define BLOWFISH +#define TRANSLATE +#define INTNET +#define TRAFFICLOG +#define LINKAGE +#define DCCFILES +#define DCCCHAT +#define MULTIUSER +#define MAXUSER 20 +#define MAXCONN 50 +#define SCRIPTING +#define BLOCKDNS +#define NETWORK +#define PROXYS +#define LOGLEVEL 0 +#define SSLSEC 2 + + +/* Name of package */ +#define PACKAGE "OpenBNC" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Version number of package */ +#define VERSION "1.0" --- NEW FILE: acconfig.h --- #undef CRYPT #undef BLOWFISH #undef TRANSLATE #undef INTNET #undef TRAFFICLOG #undef LINKAGE #undef DCCFILES #undef DCCCHAT #undef MULTIUSER #undef MAXUSER #undef MAXCONN #undef SCRIPTING #undef BLOCKDNS #undef NETWORK #undef PROXYS #undef LOGLEVEL #undef SSLSEC --- NEW FILE: stamp-h.in --- timestamp --- NEW FILE: config.h.in --- /* config.h.in. Generated from configure.in by autoheader. */ #undef CRYPT #undef BLOWFISH #undef TRANSLATE #undef INTNET #undef TRAFFICLOG #undef LINKAGE #undef DCCFILES #undef DCCCHAT #undef MULTIUSER #undef MAXUSER #undef MAXCONN #undef SCRIPTING #undef BLOCKDNS #undef NETWORK #undef PROXYS #undef LOGLEVEL #undef SSLSEC /* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ #undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Version number of package */ #undef VERSION Index: configure =================================================================== RCS file: /cvsroot/openbnc/openbnc/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure 8 Jul 2004 14:57:40 -0000 1.1 +++ configure 9 Jul 2004 14:32:57 -0000 1.2 @@ -1,26 +1,288 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by GNU Autoconf 2.59. # +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## [...4562 lines suppressed...] +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi Index: configure.in =================================================================== RCS file: /cvsroot/openbnc/openbnc/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- configure.in 8 Jul 2004 14:57:40 -0000 1.1 +++ configure.in 9 Jul 2004 14:32:57 -0000 1.2 @@ -1,5 +1,73 @@ AC_INIT(src/openbnc.c) AM_INIT_AUTOMAKE(OpenBNC,1.0) +# AC_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(config.h) + +AC_ARG_ENABLE(crypt,AC_HELP_STRING([--disable-crypt], [Disable crypt usage])) + +if test x"$enable_crypt" != xno; then + AC_DEFINE(CRYPT,,) +fi + +AC_DEFINE(BLOWFISH,,) +AC_ARG_ENABLE(translate,AC_HELP_STRING([--disable-translate], [Disable translate usage])) + +if test x"$enable_translate" != xno; then + AC_DEFINE(TRANSLATE,,) +fi + +AC_ARG_ENABLE(logging,AC_HELP_STRING([--disable-logging], [Disable logging])) + +if test x"$enable_logging" != xno; then + AC_DEFINE(TRAFFICLOG,,) +fi + +AC_ARG_ENABLE(intnet,AC_HELP_STRING([--disable-intnet], [Disable internal network usage])) + +if test x"$enable_intnet" != xno; then + AC_DEFINE(INTNET,,) +fi + +AC_ARG_ENABLE(links,AC_HELP_STRING([--disable-links], [Disable linkage usage])) + +if test x"$enable_links" != xno; then + AC_DEFINE(LINKAGE,,) +fi + +AC_ARG_ENABLE(dcc,AC_HELP_STRING([--disable-dcc], [Disable DCC chats and transfers])) + +if test x"$enable_dcc" != xno; then + AC_DEFINE(DCCFILES,,) + AC_DEFINE(DCCCHAT,,) +fi + +AC_ARG_ENABLE(multinet,AC_HELP_STRING([--disable-multinet], [Disable multiple irc networks per user])) + +if test x"$enable_multinet" != xno; then + AC_DEFINE(MULTIUSER,,) +fi + +AC_DEFINE(MAXUSER,20,) +AC_DEFINE(MAXCONN,50,) + +AC_ARG_ENABLE(scripting,AC_HELP_STRING([--disable-scripting], [Disable script usage])) +if test x"$enable_scripting" != xno; then + AC_DEFINE(SCRIPTING,,) +fi + +AC_DEFINE(BLOCKDNS,,) +AC_DEFINE(NETWORK,,) + + +AC_ARG_ENABLE(proxy,AC_HELP_STRING([--disable-proxy], [Disable proxy support])) + +if test x"$enable_proxy" != xno; then + AC_DEFINE(PROXYS,,) +fi + + +AC_DEFINE(LOGLEVEL,0,) +AC_DEFINE(SSLSEC,2,) AC_PROG_CC AC_PROG_INSTALL AC_OUTPUT(Makefile menuconf/Makefile tools/Makefile src/Makefile) Index: Makefile.in =================================================================== RCS file: /cvsroot/openbnc/openbnc/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.in 8 Jul 2004 14:57:40 -0000 1.1 +++ Makefile.in 9 Jul 2004 14:32:57 -0000 1.2 @@ -65,10 +65,11 @@ SUBDIRS = menuconf tools src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \ -missing mkinstalldirs +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \ +configure configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -92,6 +93,34 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi +stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.h + +maintainer-clean-hdr: + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -157,7 +186,7 @@ here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -169,8 +198,8 @@ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -252,6 +281,9 @@ check: check-recursive installcheck-am: installcheck: installcheck-recursive +all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + install-exec-am: install-exec: install-exec-recursive @@ -263,8 +295,8 @@ install: install-recursive uninstall-am: uninstall: uninstall-recursive -all-am: Makefile -all-redirect: all-recursive +all-am: Makefile config.h +all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive @@ -280,37 +312,37 @@ -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ +dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean Index: Makefile =================================================================== RCS file: /cvsroot/openbnc/openbnc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 8 Jul 2004 14:57:40 -0000 1.3 +++ Makefile 9 Jul 2004 14:32:57 -0000 1.4 @@ -1,4 +1,3 @@ -# Generated automatically from Makefile.in by configure. # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. @@ -16,6 +15,7 @@ srcdir = . top_srcdir = . + prefix = /usr/local exec_prefix = ${prefix} @@ -48,7 +48,7 @@ INSTALL = /bin/install -c INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} transform = s,x,x, NORMAL_INSTALL = : @@ -65,10 +65,11 @@ SUBDIRS = menuconf tools src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \ -missing mkinstalldirs +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \ +configure configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -92,6 +93,34 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi +stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.h + +maintainer-clean-hdr: + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -157,7 +186,7 @@ here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -169,8 +198,8 @@ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -252,6 +281,9 @@ check: check-recursive installcheck-am: installcheck: installcheck-recursive +all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + install-exec-am: install-exec: install-exec-recursive @@ -263,8 +295,8 @@ install: install-recursive uninstall-am: uninstall: uninstall-recursive -all-am: Makefile -all-redirect: all-recursive +all-am: Makefile config.h +all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive @@ -280,37 +312,37 @@ -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ +dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean |