Skip to content

Commit

Permalink
Use a config.h file, instead of passing configuration options on the …
Browse files Browse the repository at this point in the history 
…compiler's

command line.

Fix fatal compilation warning when building without SSL support.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@59 0da03de8-d603-11dd-86c2-0f8696b7b6f9
  • Loading branch information
zodiac committed Feb 11, 2009
1 parent f969b8b commit 1e27276
Show file tree
Hide file tree
Showing 20 changed files with 277 additions and 77 deletions.
17 changes: 17 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
2009-02-11 Markus Gutschke <[email protected]>

* Fixed fatal compiler warning if compiling without SSL support.

* Fixed cursor hiding and showing

* Fixed various rendering glitches reported by Phil Endecott of
Anyterm (http://anyterm.org) fame.

* Made code more portable. In particular, fixed sed scripts.

* Added explicit config.h file, instead of passing configuration
options on the compiler's command line.

* Fixed compilation issues on BSD systems. Code is still untested
and unsupport on non-Linux systems at this time.

2009-01-21 Markus Gutschke <[email protected]>

* Released version 2.3
Expand Down
9 changes: 6 additions & 3 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ EXTRA_DIST = shellinabox/shellinaboxd.man.in \
debian/shellinabox.install \
debian/shellinabox.postinst \
debian/shellinabox.postrm
LIBLOGGING_INCLUDES = logging/logging.h
LIBLOGGING_INCLUDES = logging/logging.h \
config.h
liblogging_la_SOURCES= logging/logging.c \
$(LIBLOGGING_INCLUDES)
liblogging_la_LDFLAGS= -version 1:0:0
Expand All @@ -39,7 +40,8 @@ LIBHTTP_INCLUDES = libhttp/hashmap.h \
libhttp/httpconnection.h \
libhttp/server.h \
libhttp/ssl.h \
libhttp/url.h
libhttp/url.h \
config.h
libhttp_la_SOURCES = libhttp/hashmap.c \
libhttp/trie.c \
libhttp/httpconnection.c \
Expand Down Expand Up @@ -68,7 +70,8 @@ shellinaboxd_SOURCES = shellinabox/shellinaboxd.c \
shellinabox/shell_in_a_box.js \
shellinabox/styles.css \
shellinabox/favicon.ico \
shellinabox/beep.wav
shellinabox/beep.wav \
config.h
shellinaboxd_LDADD = liblogging.la \
libhttp.la
shellinaboxd_LDFLAGS = -static
Expand Down
52 changes: 38 additions & 14 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ bin_PROGRAMS = shellinaboxd$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
TODO config.guess config.sub depcomp install-sh ltmain.sh \
missing
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libhttp_la_LIBADD =
Expand Down Expand Up @@ -265,7 +266,9 @@ EXTRA_DIST = shellinabox/shellinaboxd.man.in \
debian/shellinabox.postinst \
debian/shellinabox.postrm

LIBLOGGING_INCLUDES = logging/logging.h
LIBLOGGING_INCLUDES = logging/logging.h \
config.h

liblogging_la_SOURCES = logging/logging.c \
$(LIBLOGGING_INCLUDES)

Expand All @@ -275,7 +278,8 @@ LIBHTTP_INCLUDES = libhttp/hashmap.h \
libhttp/httpconnection.h \
libhttp/server.h \
libhttp/ssl.h \
libhttp/url.h
libhttp/url.h \
config.h

libhttp_la_SOURCES = libhttp/hashmap.c \
libhttp/trie.c \
Expand Down Expand Up @@ -306,13 +310,15 @@ shellinaboxd_SOURCES = shellinabox/shellinaboxd.c \
shellinabox/shell_in_a_box.js \
shellinabox/styles.css \
shellinabox/favicon.ico \
shellinabox/beep.wav
shellinabox/beep.wav \
config.h

shellinaboxd_LDADD = liblogging.la \
libhttp.la

shellinaboxd_LDFLAGS = -static
all: all-am
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

.SUFFIXES:
.SUFFIXES: .c .css .html .ico .js .lo .o .obj .wav
Expand Down Expand Up @@ -350,6 +356,23 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi

stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@

distclean-hdr:
-rm -f config.h stamp-h1

clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
Expand Down Expand Up @@ -676,11 +699,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
Expand All @@ -692,10 +715,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
Expand Down Expand Up @@ -846,7 +869,8 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) \
config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Expand Down Expand Up @@ -887,7 +911,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
distclean-hdr distclean-libtool distclean-tags

dvi: dvi-am

Expand Down Expand Up @@ -948,7 +972,7 @@ uninstall-man: uninstall-man1
clean-binPROGRAMS clean-generic clean-libtool clean-local \
clean-noinstLTLIBRARIES ctags dist dist-all dist-bzip2 \
dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
Expand Down
12 changes: 12 additions & 0 deletions aclocal.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7022,6 +7022,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])

# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 8

# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

# Do all the work for Automake. -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
Expand Down
Loading

0 comments on commit 1e27276

Please sign in to comment.