Menu
▾
▴
mod-c-cvs — CVS reports of mod_c
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(38) |
Sep
(134) |
Oct
(30) |
Nov
(8) |
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
(14) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2009 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 20:59:33
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17321/include Modified Files: Common.h Log Message: Added {hex,base64}encode(std::string&). Index: Common.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/Common.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Common.h 8 Sep 2006 14:24:05 -0000 1.8 --- Common.h 8 Sep 2006 20:59:30 -0000 1.9 *************** *** 184,190 **** --- 184,192 ---- std::string hexencode(const MemBuf& mb); //TODO: writeme + std::string hexencode(const std::string& s); //TODO: updateme MemBuf hexdecode(const std::string& s) throw (const char*); //TODO: writeme std::string base64encode(const MemBuf& mb); //TODO: writeme + std::string base64encode(const std::string& s); //TODO: updateme MemBuf base64decode(const std::string& s) throw (const char*); //TODO: writeme |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 20:59:06
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16888/src Modified Files: Common.cpp Log Message: * Bugfixes in base64decode, urldecode. * Added {hex,base64}encode(std::string). Index: Common.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Common.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Common.cpp 8 Sep 2006 14:24:05 -0000 1.7 --- Common.cpp 8 Sep 2006 20:59:02 -0000 1.8 *************** *** 295,300 **** char escape[4] = { '%', ! h2c[(dev[i] >> 4) & 0x0f], ! h2c[dev[i] & 0x0f], '\0' }; --- 295,300 ---- char escape[4] = { '%', ! h2c[(s[i] >> 4) & 0x0f], ! h2c[s[i] & 0x0f], '\0' }; *************** *** 311,319 **** int i = 0; for (; ii < dev.Size(); ++i, ++ii) { if (obuf[ii] != '%') continue; if (ii >= dev.Size() - 2) throw "Invalid string to decode"; ! dev[i] = GetByteFromHex(obuf[++ii], obuf[++ii]); } dev.resize(i); --- 311,320 ---- int i = 0; for (; ii < dev.Size(); ++i, ++ii) { + obuf[i] = obuf[ii]; if (obuf[ii] != '%') continue; if (ii >= dev.Size() - 2) throw "Invalid string to decode"; ! obuf[i] = GetByteFromHex(obuf[++ii], obuf[++ii]); } dev.resize(i); *************** *** 321,324 **** --- 322,329 ---- } + string hexencode(const std::string& s) { + return hexencode(MemBuf::Dup(s.c_str(), s.length())); + } + string hexencode(const MemBuf& mb) { string dev; *************** *** 351,354 **** --- 356,363 ---- "+/"; + std::string base64encode(const std::string& s) { //@todo test + return base64encode(MemBuf::Dup(s.c_str(),s.length())); + } + std::string base64encode(const MemBuf& mb) { //@todo test string dev; *************** *** 401,406 **** unsigned char _b64_aton(char c) { if (c >= 'A' && c <= 'Z') return int(c-'A'); ! if (c >= 'a' && c <= 'z') return int(c-'a') + ('Z'-'A'); ! if (c >= '0' && c <= '9') return int(c-'0') + ('z'-'a') + ('Z'-'A'); if (c == '+') return 62; if (c == '/') return 63; --- 410,415 ---- unsigned char _b64_aton(char c) { if (c >= 'A' && c <= 'Z') return int(c-'A'); ! if (c >= 'a' && c <= 'z') return int(c-'a') + ('Z'-'A') + 1; ! if (c >= '0' && c <= '9') return int(c-'0') + ('z'-'a') + ('Z'-'A') + 2; if (c == '+') return 62; if (c == '/') return 63; |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 20:57:53
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16003/include Modified Files: MemBuf.h Log Message: * Added operator =. * Bugfix in resize(), ~MemBuf(). Index: MemBuf.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/MemBuf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MemBuf.h 8 Sep 2006 14:22:47 -0000 1.1 --- MemBuf.h 8 Sep 2006 20:57:46 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- size_t Size() const { return _b->_size; } + MemBuf& operator = (const MemBuf&); char& operator[](int x) { return ((char*)_b->_buf)[x]; } char* Char() { return (char*)_b->_buf; } |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 20:57:52
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16003/src Modified Files: MemBuf.cpp Log Message: * Added operator =. * Bugfix in resize(), ~MemBuf(). Index: MemBuf.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/MemBuf.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MemBuf.cpp 8 Sep 2006 14:22:47 -0000 1.1 --- MemBuf.cpp 8 Sep 2006 20:57:47 -0000 1.2 *************** *** 11,23 **** MemBuf::~MemBuf() { ! if (_b && _b->_refcnt == 1) { ! delete _b; ! } else { ! _b->_refcnt--; } } void MemBuf::resize(size_t s) { ! assert(_b != NULL); void* p = realloc(_b->_buf, s); if (p == NULL) --- 11,28 ---- MemBuf::~MemBuf() { ! if (_b) { ! if (_b->_refcnt == 1) { ! delete _b; ! } else { ! _b->_refcnt--; ! } } } void MemBuf::resize(size_t s) { ! if (_b == NULL) { ! _b = new Buf(malloc(s),s); ! return; ! } void* p = realloc(_b->_buf, s); if (p == NULL) *************** *** 31,34 **** --- 36,52 ---- } + MemBuf& MemBuf::operator = (const MemBuf& mb) { + if (_b) { + if (_b->_refcnt == 1) { + delete _b; + } else { + _b->_refcnt--; + } + } + _b = mb._b; + ++_b->_refcnt; + return *this; + } + using namespace std; |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 17:37:33
|
Update of /cvsroot/mod-c/ehtml In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30224 Modified Files: ChangeLog Log Message: Reflected latest rework. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 8 Sep 2006 13:55:43 -0000 1.3 --- ChangeLog 8 Sep 2006 17:37:29 -0000 1.4 *************** *** 1,2 **** --- 1,26 ---- + + 2006-09-08 Gonzalo A. Arana <gon...@gm...> + * configure: Added support for doxygen (--enable-doxygen). + * Session managment: shifted from mod_c to EHTML. There are three classes + now: Session, SessionDriver (for session storage), and SessionIDDriver + -for session ID generation-. This is a major rework. + * ehtml_random: Prepared EHTML for a possible better random number + generator than the one provided by libc. + * Wrote {url,hex,base64}{en,de}code (Common.cpp). + + 2006-08-25 Gonzalo A. Arana <gon...@gm...> + * cosmetic change: define RDEBUG & SDEBUG macros. + * cosmetic change: cached_ehtml is renamed to ehtml_rec. + * ehtml_rec has two new fields: mtime & size (used for auto-reloading). + * lib_cache: PutEHTMLIntoCache changes its signature (add ehtml_rec). + * lib_cache: removed GetEHTMLEntry. + * lib_cache: added LoadEHTMLFile (like GetEHTMLEntry, but uses ehtml_rec). + * lib_cache: defined LoadAndCacheEHTML. + * lib_cache functions smaller. + * mod_c.c: defined c_[sdp]config() to get mod_c configuration. + * mod_c.c: CHandler: changed behaviour, supporting auto cache & + auto-refreshing ehtml files. + * mod_c.c: cosmetic change in command record definitions. + 2006-01-07 Matej Urbas <mat...@gm...> * EHTML: |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 16:03:05
|
Update of /cvsroot/mod-c/mod_c/src/dss_tool In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22561/src/dss_tool Removed Files: ChangeLog Makefile.am dss_tool.cpp Log Message: Session handling is shifted to EHTML. --- dss_tool.cpp DELETED --- --- Makefile.am DELETED --- --- ChangeLog DELETED --- |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:01:42
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28783/src Modified Files: mod_c.c Makefile.am Log Message: Session handling shifted to EHTML. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 22 Aug 2006 20:31:57 -0000 1.13 --- Makefile.am 8 Sep 2006 15:01:38 -0000 1.14 *************** *** 10,25 **** noinst_LIBRARIES = libmod_c.a noinst_PROGRAMS = mod_c - bin_PROGRAMS = mod_c_dss - - mod_c_dss_SOURCES = def_session_server.cpp - mod_c_dss_LDADD = -lpthread - mod_c_dss_CXXFLAGS = $(INCLUDE_DIRS) ! libmod_c_a_SOURCES = session_drivers.cpp lib_cache.cpp def_session_driver.cpp mod_c_LDADD = libmod_c.a mod_c$(EXEEXT): mod_c.c libmod_c.a ! $(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so --- 10,20 ---- noinst_LIBRARIES = libmod_c.a noinst_PROGRAMS = mod_c ! libmod_c_a_SOURCES = lib_cache.cpp mod_c_LDADD = libmod_c.a mod_c$(EXEEXT): mod_c.c libmod_c.a ! $(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ -lehtml rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so *************** *** 27,29 **** install-exec-hook: $(APXS) -i -a mod_c.so ! SUBDIRS = dss_tool --- 22,24 ---- install-exec-hook: $(APXS) -i -a mod_c.so ! Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mod_c.c 25 Aug 2006 13:27:41 -0000 1.18 --- mod_c.c 8 Sep 2006 15:01:38 -0000 1.19 *************** *** 21,31 **** #include "mod_c.h" #include "lib_cache.h" ! #include "session_drivers.h" ! #include "def_session_driver.h" ! #include "def_session_server.h" #include <dlfcn.h> #include <ehtml.h> ! #include <mod_c_sessions.h> #include <http_log.h> --- 21,29 ---- #include "mod_c.h" #include "lib_cache.h" ! #include "Session.h" #include <dlfcn.h> #include <ehtml.h> ! //#include <mod_c_sessions.h> #include <http_log.h> *************** *** 131,135 **** dir_config->sessions = 0; // Set the default duration of a session ! dir_config->session_duration = DEF_SESSION_DURATION; // Set the default session management type dir_config->session_funcs = 0; --- 129,133 ---- dir_config->sessions = 0; // Set the default duration of a session ! dir_config->session_duration = 10080 /* DEF_SESSION_DURATION*/; // Set the default session management type dir_config->session_funcs = 0; *************** *** 137,141 **** dir_config->cookieless = 0; // Set the default key size setting ! dir_config->key_size = DEF_ID_SIZE; return dir_config; --- 135,139 ---- dir_config->cookieless = 0; // Set the default key size setting ! dir_config->key_size = 64 /*DEF_ID_SIZE*/; return dir_config; *************** *** 160,174 **** // Initialize the caches (both for session drivers and ehtml files) config->ehtml_cache = CreateEHTMLCache(); ! config->session_drivers = InitSessionDrivers(); ! config->enable_remote_sessions = 0; ! config->session_server_port = -1; ! config->disable_session_server = 0; config->allow_on_demand = 0; config->allow_auto_refresh = 0; // Add the default session driver to the driver list ! const char* retVal = PutSessionDriverEx( config->session_drivers, DefaultSessionIdFunc ); ! if ( retVal ) ! SDEBUG(LOG_ERR, s, "The default driver could not have been imported. " ! "Error message: '%s'", retVal ); return config; --- 158,172 ---- // Initialize the caches (both for session drivers and ehtml files) config->ehtml_cache = CreateEHTMLCache(); ! //config->session_drivers = InitSessionDrivers(); ! //config->enable_remote_sessions = 0; ! //config->session_server_port = -1; ! //config->disable_session_server = 0; config->allow_on_demand = 0; config->allow_auto_refresh = 0; // Add the default session driver to the driver list ! //const char* retVal = PutSessionDriverEx( config->session_drivers, DefaultSessionIdFunc ); ! //if ( retVal ) ! // SDEBUG(LOG_ERR, s, "The default driver could not have been imported. " ! // "Error message: '%s'", retVal ); return config; *************** *** 255,270 **** * Loads and registers a session driver. */ ! static char* LoadEHTMLSessionDriver( cmd_parms* parms, void *mconfig, const char * path ) { ! mod_c_config * config = ( mod_c_config * ) ap_get_module_config( parms->server->module_config, &c_module ); ! const char * retVal = PutSessionDriver( config->session_drivers, path ); ! if ( retVal ) ! { char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionDriver: Could not load the session driver '%s'. Error message: %s", path, retVal ); return errorMsg; ! } ! else ! return 0; } --- 253,277 ---- * Loads and registers a session driver. */ ! static char* LoadEHTMLSessionDriver( cmd_parms* parms, void *mconfig, const char* name, const char* path) { ! if (registerSessionDriver(name, path) < 0) { char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionDriver: Could not load the session driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); return errorMsg; ! } ! return NULL; ! } ! ! /** ! * Loads and registers a session id generation driver. ! */ ! static char* LoadEHTMLSessionIDDriver( cmd_parms* parms, void *mconfig, const char* name, const char* path) ! { ! if (registerSessionIDDriver(name, path) < 0) { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionIDDriver: Could not load the session id driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); ! return errorMsg; ! } ! return NULL; } *************** *** 304,352 **** static char * EHTMLSessionTypeDirective( cmd_parms* parms, void *mconfig, const char * type, const char * arguments ) { ! mod_c_config * config = c_sconfig(parms->server); ! mod_c_dir_config* dir_config = c_pconfig(parms); ! // Search for the session driver that supports the desired type of session management ! ses_dr_info_t* dr_info = GetSessionDriver( config->session_drivers, type ); ! if ( dr_info ) ! { ! // Create a new session api object ! ses_api_t* ses_api = (ses_api_t*) apr_palloc( parms->pool, sizeof( ses_api_t ) ); ! memcpy( ses_api, &dr_info->api, sizeof( ses_api_t ) ); ! // We have found a session driver ! // Does it need any arguments? ! switch( dr_info->needs_args ) ! { ! case MUST_HAVE_ARGS: ! if ( arguments ) ! { ! const char * retVal = dr_info->ParseArgs( arguments, parms->pool, &ses_api->arguments ); ! if ( retVal ) // Was there an error? ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionType: The session driver failed to parse these arguments: '%s'. The driver returned this error: '%s'", arguments, retVal ); ! return errorMsg; ! } ! // There was no error. We assume that the parsed arguments are correctly stored in the ses_api object ! } ! else ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionType: The session driver that handles sessions of type '%s' needs additional arguments.", type ); ! return errorMsg; ! } ! break; ! default: ! break; ! } ! // Store the session api into the per-directory configuration object ! dir_config->session_funcs = ses_api; ! return 0; ! } ! else ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionType: Could not find a session driver that could handle sessions of type '%s'.", type ); ! return errorMsg; ! } } --- 311,343 ---- static char * EHTMLSessionTypeDirective( cmd_parms* parms, void *mconfig, const char * type, const char * arguments ) { ! // mod_c_config * config = c_sconfig(parms->server); ! // mod_c_dir_config* dir_config = c_pconfig(parms); ! // Search for the session driver that supports the desired type of session ! // management ! if (useSessionDriver(type, arguments) < 0) { ! char* errorMsg = (char*)apr_palloc(parms->temp_pool, 512); ! snprintf(errorMsg, 512, "EHTMLSessionType: unknown session type %s, " ! "or invalid argument \"%s\" (%s)", type, arguments, strerror(errno)); ! return errorMsg; ! } ! return NULL; ! } ! ! /** ! * Selects the proper driver for the specified session id generation type. ! */ ! static char * EHTMLSessionIDTypeDirective( cmd_parms* parms, void *mconfig, const char * type, const char * arguments ) ! { ! // mod_c_config * config = c_sconfig(parms->server); ! // mod_c_dir_config* dir_config = c_pconfig(parms); ! // Search for the session driver that supports the desired type of session ! // management ! if (useSessionIDDriver(type, arguments) < 0) { ! char* errorMsg = (char*)apr_palloc(parms->temp_pool, 512); ! snprintf(errorMsg, 512, "EHTMLSessionIDType: unknown session id type %s, " ! "or invalid argument \"%s\" (%s)", type, arguments, strerror(errno)); ! return errorMsg; ! } ! return NULL; } *************** *** 400,406 **** // Session directives ! AP_INIT_TAKE1("LoadEHTMLSessionDriver", (void*)LoadEHTMLSessionDriver, NULL, RSRC_CONF, ! "Arguments: a valid absolute path to a session driver file." ), AP_INIT_FLAG("EHTMLSessions", (void*)EHTMLSessionsDirective, NULL, --- 391,401 ---- // Session directives ! AP_INIT_TAKE2("LoadEHTMLSessionDriver", (void*)LoadEHTMLSessionDriver, NULL, RSRC_CONF, ! "Driver name and a valid absolute path to a session driver file." ), ! ! AP_INIT_TAKE2("LoadEHTMLSessionIDDriver", (void*)LoadEHTMLSessionIDDriver, ! NULL, RSRC_CONF, ! "Driver name and a valid absolute path to a session driver file." ), AP_INIT_FLAG("EHTMLSessions", (void*)EHTMLSessionsDirective, NULL, *************** *** 417,420 **** --- 412,421 ---- "type of session management needs it." ), + AP_INIT_TAKE12("EHTMLSessionIDType", (void*)EHTMLSessionIDTypeDirective, + NULL, + OR_LIMIT, "< type > [ arguments ] - the first parameter is " + "mandatory, while the second one is needed only if the selected " + "type of session management needs it." ), + AP_INIT_FLAG("EHTMLCookieless", (void*)EHTMLCookielessDirective, NULL, OR_LIMIT, "< on | off > - 'on' disables cookies while 'off' " |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:01:41
|
Update of /cvsroot/mod-c/mod_c/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28783/include Modified Files: mod_c.h Log Message: Session handling shifted to EHTML. Index: mod_c.h =================================================================== RCS file: /cvsroot/mod-c/mod_c/include/mod_c.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mod_c.h 25 Aug 2006 14:25:40 -0000 1.5 --- mod_c.h 8 Sep 2006 15:01:38 -0000 1.6 *************** *** 38,59 **** */ void * ehtml_cache; - /** - * The map used by mod_c for looking up session drivers (by their session - * type name). - */ - void * session_drivers; - /** - * Indicates whether the default session server should listen for remote - * session requests. - */ - int enable_remote_sessions; - /** - * The port on which the default session server should listen. - */ - int session_server_port; - /** - * Disables or enables the default session server. - */ - int disable_session_server; /** * On demand application loading. --- 38,41 ---- |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:00:36
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28334/src Modified Files: Makefile.in Log Message: Bootstraped. Index: Makefile.in =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 22 Aug 2006 20:31:57 -0000 1.13 --- Makefile.in 8 Sep 2006 15:00:32 -0000 1.14 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 16,19 **** --- 16,21 ---- + SOURCES = $(libmod_c_a_SOURCES) mod_c.c + srcdir = @srcdir@ top_srcdir = @top_srcdir@ *************** *** 39,45 **** host_triplet = @host@ noinst_PROGRAMS = mod_c$(EXEEXT) - bin_PROGRAMS = mod_c_dss$(EXEEXT) subdir = src ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac --- 41,46 ---- host_triplet = @host@ noinst_PROGRAMS = mod_c$(EXEEXT) subdir = src ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac *************** *** 53,68 **** libmod_c_a_AR = $(AR) $(ARFLAGS) libmod_c_a_LIBADD = ! am_libmod_c_a_OBJECTS = session_drivers.$(OBJEXT) lib_cache.$(OBJEXT) \ ! def_session_driver.$(OBJEXT) libmod_c_a_OBJECTS = $(am_libmod_c_a_OBJECTS) ! am__installdirs = "$(DESTDIR)$(bindir)" ! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ! PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) mod_c_SOURCES = mod_c.c mod_c_OBJECTS = mod_c.$(OBJEXT) mod_c_DEPENDENCIES = libmod_c.a - am_mod_c_dss_OBJECTS = mod_c_dss-def_session_server.$(OBJEXT) - mod_c_dss_OBJECTS = $(am_mod_c_dss_OBJECTS) - mod_c_dss_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp --- 54,63 ---- libmod_c_a_AR = $(AR) $(ARFLAGS) libmod_c_a_LIBADD = ! am_libmod_c_a_OBJECTS = lib_cache.$(OBJEXT) libmod_c_a_OBJECTS = $(am_libmod_c_a_OBJECTS) ! PROGRAMS = $(noinst_PROGRAMS) mod_c_SOURCES = mod_c.c mod_c_OBJECTS = mod_c.$(OBJEXT) mod_c_DEPENDENCIES = libmod_c.a DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp *************** *** 84,98 **** CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! SOURCES = $(libmod_c_a_SOURCES) mod_c.c $(mod_c_dss_SOURCES) ! DIST_SOURCES = $(libmod_c_a_SOURCES) mod_c.c $(mod_c_dss_SOURCES) ! RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ! html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ETAGS = etags CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ --- 79,86 ---- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! SOURCES = $(libmod_c_a_SOURCES) mod_c.c ! DIST_SOURCES = $(libmod_c_a_SOURCES) mod_c.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ *************** *** 122,125 **** --- 110,115 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DOXYGEN = @DOXYGEN@ + DOXYGEN_SUBDIR = @DOXYGEN_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 207,217 **** TEMP_LIBPATH = @abs_srcdir@ noinst_LIBRARIES = libmod_c.a ! mod_c_dss_SOURCES = def_session_server.cpp ! mod_c_dss_LDADD = -lpthread ! mod_c_dss_CXXFLAGS = $(INCLUDE_DIRS) ! libmod_c_a_SOURCES = session_drivers.cpp lib_cache.cpp def_session_driver.cpp mod_c_LDADD = libmod_c.a ! SUBDIRS = dss_tool ! all: all-recursive .SUFFIXES: --- 197,203 ---- TEMP_LIBPATH = @abs_srcdir@ noinst_LIBRARIES = libmod_c.a ! libmod_c_a_SOURCES = lib_cache.cpp mod_c_LDADD = libmod_c.a ! all: all-am .SUFFIXES: *************** *** 253,284 **** $(libmod_c_a_AR) libmod_c.a $(libmod_c_a_OBJECTS) $(libmod_c_a_LIBADD) $(RANLIB) libmod_c.a - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done clean-noinstPROGRAMS: --- 239,242 ---- *************** *** 288,294 **** rm -f $$p $$f ; \ done - mod_c_dss$(EXEEXT): $(mod_c_dss_OBJECTS) $(mod_c_dss_DEPENDENCIES) - @rm -f mod_c_dss$(EXEEXT) - $(CXXLINK) $(mod_c_dss_LDFLAGS) $(mod_c_dss_OBJECTS) $(mod_c_dss_LDADD) $(LIBS) mostlyclean-compile: --- 246,249 ---- *************** *** 298,306 **** -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/def_session_driver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_c.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_c_dss-def_session_server.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session_drivers.Po@am__quote@ .c.o: --- 253,258 ---- *************** *** 346,363 **** @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - mod_c_dss-def_session_server.o: def_session_server.cpp - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mod_c_dss_CXXFLAGS) $(CXXFLAGS) -MT mod_c_dss-def_session_server.o -MD -MP -MF "$(DEPDIR)/mod_c_dss-def_session_server.Tpo" -c -o mod_c_dss-def_session_server.o `test -f 'def_session_server.cpp' || echo '$(srcdir)/'`def_session_server.cpp; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mod_c_dss-def_session_server.Tpo" "$(DEPDIR)/mod_c_dss-def_session_server.Po"; else rm -f "$(DEPDIR)/mod_c_dss-def_session_server.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='def_session_server.cpp' object='mod_c_dss-def_session_server.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mod_c_dss_CXXFLAGS) $(CXXFLAGS) -c -o mod_c_dss-def_session_server.o `test -f 'def_session_server.cpp' || echo '$(srcdir)/'`def_session_server.cpp - - mod_c_dss-def_session_server.obj: def_session_server.cpp - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mod_c_dss_CXXFLAGS) $(CXXFLAGS) -MT mod_c_dss-def_session_server.obj -MD -MP -MF "$(DEPDIR)/mod_c_dss-def_session_server.Tpo" -c -o mod_c_dss-def_session_server.obj `if test -f 'def_session_server.cpp'; then $(CYGPATH_W) 'def_session_server.cpp'; else $(CYGPATH_W) '$(srcdir)/def_session_server.cpp'; fi`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mod_c_dss-def_session_server.Tpo" "$(DEPDIR)/mod_c_dss-def_session_server.Po"; else rm -f "$(DEPDIR)/mod_c_dss-def_session_server.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='def_session_server.cpp' object='mod_c_dss-def_session_server.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mod_c_dss_CXXFLAGS) $(CXXFLAGS) -c -o mod_c_dss-def_session_server.obj `if test -f 'def_session_server.cpp'; then $(CYGPATH_W) 'def_session_server.cpp'; else $(CYGPATH_W) '$(srcdir)/def_session_server.cpp'; fi` - mostlyclean-libtool: -rm -f *.lo --- 298,301 ---- *************** *** 370,444 **** uninstall-info-am: - # 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, - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ --- 308,311 ---- *************** *** 451,471 **** tags: TAGS ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ --- 318,325 ---- tags: TAGS ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ *************** *** 480,484 **** fi ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ --- 334,338 ---- fi ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ *************** *** 529,564 **** fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done check-am: all-am ! check: check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) ! installdirs: installdirs-recursive ! installdirs-am: ! for dir in "$(DESTDIR)$(bindir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done ! install: install-recursive ! install-exec: install-exec-recursive ! install-data: install-data-recursive ! uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ --- 383,399 ---- fi; \ done check-am: all-am ! check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) ! installdirs: ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ *************** *** 576,585 **** @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! clean-am: clean-binPROGRAMS clean-generic clean-libtool \ ! clean-noinstLIBRARIES clean-noinstPROGRAMS mostlyclean-am ! distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile --- 411,420 ---- @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ ! clean-noinstPROGRAMS mostlyclean-am ! distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile *************** *** 587,597 **** distclean-libtool distclean-tags ! dvi: dvi-recursive dvi-am: ! html: html-recursive ! info: info-recursive info-am: --- 422,432 ---- distclean-libtool distclean-tags ! dvi: dvi-am dvi-am: ! html: html-am ! info: info-am info-am: *************** *** 599,607 **** install-data-am: ! install-exec-am: install-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ! install-info: install-info-recursive install-man: --- 434,442 ---- install-data-am: ! install-exec-am: @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ! install-info: install-info-am install-man: *************** *** 609,653 **** installcheck-am: ! maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool ! pdf: pdf-recursive pdf-am: ! ps: ps-recursive ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am ! ! uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ! clean clean-binPROGRAMS clean-generic clean-libtool \ ! clean-noinstLIBRARIES clean-noinstPROGRAMS clean-recursive \ ! ctags ctags-recursive distclean distclean-compile \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distdir dvi dvi-am html html-am info info-am \ ! install install-am install-binPROGRAMS install-data \ install-data-am install-exec install-exec-am install-exec-hook \ install-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ! uninstall-binPROGRAMS uninstall-info-am mod_c$(EXEEXT): mod_c.c libmod_c.a ! $(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so --- 444,482 ---- installcheck-am: ! maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool ! pdf: pdf-am pdf-am: ! ps: ps-am ps-am: ! uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \ ! distclean distclean-compile distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-exec-hook \ install-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-info-am mod_c$(EXEEXT): mod_c.c libmod_c.a ! $(APXS) $(INCLUDE_DIRS) -Wc,"$(CFLAGS)" -L$(srcdir) -c mod_c.c -lmod_c -ldl -lstdc++ -lehtml rm -f mod_c.so ln -s .libs/mod_c.so mod_c.so |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:00:35
|
Update of /cvsroot/mod-c/mod_c/cfgaux In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28334/cfgaux Modified Files: config.guess config.sub install-sh ltmain.sh missing Log Message: Bootstraped. Index: install-sh =================================================================== RCS file: /cvsroot/mod-c/mod_c/cfgaux/install-sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install-sh 18 Jan 2006 22:52:18 -0000 1.1 --- install-sh 8 Sep 2006 15:00:32 -0000 1.2 *************** *** 1,18 **** #!/bin/sh - # # install - install a program, script, or datafile ! # This comes from X11R5 (mit/util/scripts/install.sh). # ! # Copyright 1991 by the Massachusetts Institute of Technology # ! # Permission to use, copy, modify, distribute, and sell this software and its ! # documentation for any purpose is hereby granted without fee, provided that ! # the above copyright notice appear in all copies and that both that ! # copyright notice and this permission notice appear in supporting ! # documentation, and that the name of M.I.T. not be used in advertising or ! # publicity pertaining to distribution of the software without specific, ! # written prior permission. M.I.T. makes no representations about the ! # suitability of this software for any purpose. It is provided "as is" ! # without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent --- 1,37 ---- #!/bin/sh # install - install a program, script, or datafile ! ! scriptversion=2005-02-02.21 ! ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. # ! # Copyright (C) 1994 X Consortium # ! # Permission is hereby granted, free of charge, to any person obtaining a copy ! # of this software and associated documentation files (the "Software"), to ! # deal in the Software without restriction, including without limitation the ! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ! # sell copies of the Software, and to permit persons to whom the Software is ! # furnished to do so, subject to the following conditions: ! # ! # The above copyright notice and this permission notice shall be included in ! # all copies or substantial portions of the Software. ! # ! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. ! # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent *************** *** 24,28 **** # shared with many OS's install programs. - # set DOITPROG to echo to test this script --- 43,46 ---- *************** *** 30,34 **** doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. --- 48,51 ---- *************** *** 42,276 **** mkdirprog="${MKDIRPROG-mkdir}" - transformbasename="" - transform_arg="" - instcmd="$mvprog" chmodcmd="$chmodprog 0755" ! chowncmd="" ! chgrpcmd="" ! stripcmd="" rmcmd="$rmprog -f" mvcmd="$mvprog" ! src="" ! dst="" ! dir_arg="" ! ! while [ x"$1" != x ]; do ! case $1 in ! -c) instcmd=$cpprog ! shift ! continue;; ! ! -d) dir_arg=true ! shift ! continue;; ! ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! ! -o) chowncmd="$chownprog $2" ! shift ! shift ! continue;; ! ! -g) chgrpcmd="$chgrpprog $2" ! shift ! shift ! continue;; ! ! -s) stripcmd=$stripprog ! shift ! continue;; ! ! -t=*) transformarg=`echo $1 | sed 's/-t=//'` ! shift ! continue;; ! ! -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ! shift ! continue;; ! ! *) if [ x"$src" = x ] ! then ! src=$1 ! else ! # this colon is to work around a 386BSD /bin/sh bug ! : ! dst=$1 ! fi ! shift ! continue;; ! esac ! done ! ! if [ x"$src" = x ] ! then ! echo "$0: no input file specified" >&2 ! exit 1 ! else ! : ! fi ! if [ x"$dir_arg" != x ]; then ! dst=$src ! src="" ! if [ -d "$dst" ]; then ! instcmd=: ! chmodcmd="" ! else ! instcmd=$mkdirprog ! fi ! else ! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! if [ -f "$src" ] || [ -d "$src" ] ! then ! : ! else ! echo "$0: $src does not exist" >&2 ! exit 1 ! fi ! if [ x"$dst" = x ] ! then ! echo "$0: no destination specified" >&2 ! exit 1 ! else ! : ! fi ! # If destination is a directory, append the input filename; if your system ! # does not like double slashes in filenames, you may need to add some logic ! if [ -d "$dst" ] ! then ! dst=$dst/`basename "$src"` ! else ! : ! fi ! fi ! ## this sed command emulates the dirname command ! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ! # Make sure that the destination directory exists. ! # this part is taken from Noah Friedman's mkinstalldirs script ! # Skip lots of stat calls in the usual case. ! if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' ! IFS="${IFS-$defaultIFS}" ! oIFS=$IFS ! # Some sh's can't handle IFS=/ for some reason. ! IFS='%' ! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ! IFS=$oIFS ! pathcomp='' ! while [ $# -ne 0 ] ; do ! pathcomp=$pathcomp$1 shift ! if [ ! -d "$pathcomp" ] ; ! then ! $mkdirprog "$pathcomp" ! else ! : ! fi ! pathcomp=$pathcomp/ done fi ! if [ x"$dir_arg" != x ] ! then ! $doit $instcmd "$dst" && ! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi ! else ! # If we're going to rename the final executable, determine the name now. ! if [ x"$transformarg" = x ] ! then ! dstfile=`basename "$dst"` ! else ! dstfile=`basename "$dst" $transformbasename | ! sed $transformarg`$transformbasename ! fi ! # don't allow the sed command to completely eliminate the filename ! if [ x"$dstfile" = x ] ! then ! dstfile=`basename "$dst"` ! else ! : ! fi ! # Make a couple of temp file names in the proper directory. ! dsttmp=$dstdir/#inst.$$# ! rmtmp=$dstdir/#rm.$$# ! # Trap to clean up temp files at exit. ! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 ! trap '(exit $?); exit' 1 2 13 15 ! # Move or copy the file name to the temp name ! $doit $instcmd "$src" "$dsttmp" && ! # and set any options; do chmod last to preserve setuid bits ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ! # Now remove or move aside any old file at destination location. We try this ! # two ways since rm can't unlink itself on some systems and the destination ! # file might be busy for other reasons. In this case, the final cleanup ! # might fail but the new file should still install successfully. ! { ! if [ -f "$dstdir/$dstfile" ] ! then ! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || ! $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || ! { ! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit ! } ! else ! : ! fi ! } && ! # Now rename the file to the real destination. ! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ! fi && ! # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit } --- 59,323 ---- mkdirprog="${MKDIRPROG-mkdir}" chmodcmd="$chmodprog 0755" ! chowncmd= ! chgrpcmd= ! stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" ! src= ! dst= ! dir_arg= ! dstarg= ! no_target_directory= ! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ! or: $0 [OPTION]... SRCFILES... DIRECTORY ! or: $0 [OPTION]... -t DIRECTORY SRCFILES... ! or: $0 [OPTION]... -d DIRECTORIES... ! In the 1st form, copy SRCFILE to DSTFILE. ! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ! In the 4th, create DIRECTORIES. ! Options: ! -c (ignored) ! -d create directories instead of installing files. ! -g GROUP $chgrpprog installed files to GROUP. ! -m MODE $chmodprog installed files to MODE. ! -o USER $chownprog installed files to USER. ! -s $stripprog installed files. ! -t DIRECTORY install into DIRECTORY. ! -T report an error if DSTFILE is a directory. ! --help display this help and exit. ! --version display version info and exit. ! Environment variables override the default commands: ! CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ! " ! while test -n "$1"; do ! case $1 in ! -c) shift ! continue;; ! -d) dir_arg=true ! shift ! continue;; ! -g) chgrpcmd="$chgrpprog $2" ! shift ! shift ! continue;; ! --help) echo "$usage"; exit $?;; ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! -o) chowncmd="$chownprog $2" ! shift ! shift ! continue;; ! -s) stripcmd=$stripprog ! shift ! continue;; ! -t) dstarg=$2 ! shift ! shift ! continue;; ! -T) no_target_directory=true shift + continue;; ! --version) echo "$0 $scriptversion"; exit $?;; ! *) # When -d is used, all remaining arguments are directories to create. ! # When -t is used, the destination is already specified. ! test -n "$dir_arg$dstarg" && break ! # Otherwise, the last argument is the destination. Remove it from $@. ! for arg ! do ! if test -n "$dstarg"; then ! # $@ is not empty: it contains at least $arg. ! set fnord "$@" "$dstarg" ! shift # fnord ! fi ! shift # arg ! dstarg=$arg ! done ! break;; ! esac done + + if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi ! for src ! do ! # Protect names starting with `-'. ! case $src in ! -*) src=./$src ;; ! esac ! if test -n "$dir_arg"; then ! dst=$src ! src= ! if test -d "$dst"; then ! mkdircmd=: ! chmodcmd= ! else ! mkdircmd=$mkdirprog ! fi ! else ! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! if test ! -f "$src" && test ! -d "$src"; then ! echo "$0: $src does not exist." >&2 ! exit 1 ! fi ! if test -z "$dstarg"; then ! echo "$0: no destination specified." >&2 ! exit 1 ! fi ! dst=$dstarg ! # Protect names starting with `-'. ! case $dst in ! -*) dst=./$dst ;; ! esac ! # If destination is a directory, append the input filename; won't work ! # if double slashes aren't ignored. ! if test -d "$dst"; then ! if test -n "$no_target_directory"; then ! echo "$0: $dstarg: Is a directory" >&2 ! exit 1 ! fi ! dst=$dst/`basename "$src"` ! fi ! fi ! # This sed command emulates the dirname command. ! dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ! # Make sure that the destination directory exists. ! # Skip lots of stat calls in the usual case. ! if test ! -d "$dstdir"; then ! defaultIFS=' ! ' ! IFS="${IFS-$defaultIFS}" ! oIFS=$IFS ! # Some sh's can't handle IFS=/ for some reason. ! IFS='%' ! set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ! shift ! IFS=$oIFS ! pathcomp= ! while test $# -ne 0 ; do ! pathcomp=$pathcomp$1 ! shift ! if test ! -d "$pathcomp"; then ! $mkdirprog "$pathcomp" ! # mkdir can fail with a `File exist' error in case several ! # install-sh are creating the directory concurrently. This ! # is OK. ! test -d "$pathcomp" || exit ! fi ! pathcomp=$pathcomp/ ! done ! fi ! if test -n "$dir_arg"; then ! $doit $mkdircmd "$dst" \ ! && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ! && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ! && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ! else ! dstfile=`basename "$dst"` ! # Make a couple of temp file names in the proper directory. ! dsttmp=$dstdir/_inst.$$_ ! rmtmp=$dstdir/_rm.$$_ ! # Trap to clean up those temp files at exit. ! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ! trap '(exit $?); exit' 1 2 13 15 ! # Copy the file name to the temp name. ! $doit $cpprog "$src" "$dsttmp" && ! # and set any options; do chmod last to preserve setuid bits. ! # ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $cpprog $src $dsttmp" command. ! # ! { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ! && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ! && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ! # Now rename the file to the real destination. ! { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ! || { ! # The rename failed, perhaps because mv can't rename something else ! # to itself, or perhaps because mv is so ancient that it does not ! # support -f. ! # Now remove or move aside any old file at destination location. ! # We try this two ways since rm can't unlink itself on some ! # systems and the destination file might be busy for other ! # reasons. In this case, the final cleanup might fail but the new ! # file should still install successfully. ! { ! if test -f "$dstdir/$dstfile"; then ! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ! || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ! || { ! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit 1 ! } ! else ! : ! fi ! } && ! # Now rename the file to the real destination. ! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ! } ! } ! fi || { (exit 1); exit 1; } ! done + # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit 0 } + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: ltmain.sh =================================================================== RCS file: /cvsroot/mod-c/mod_c/cfgaux/ltmain.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ltmain.sh 18 Jan 2006 22:52:18 -0000 1.1 --- ltmain.sh 8 Sep 2006 15:00:32 -0000 1.2 *************** *** 2,6 **** # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 --- 2,6 ---- # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. [...2993 lines suppressed...] esac --- 6392,6396 ---- $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 ! exit $EXIT_FAILURE ;; esac *************** *** 6316,6320 **** $echo "Try \`$modename --help' for more information about other modes." ! exit 0 # The TAGs below are defined such that we never get into a situation --- 6399,6403 ---- $echo "Try \`$modename --help' for more information about other modes." ! exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation Index: config.sub =================================================================== RCS file: /cvsroot/mod-c/mod_c/cfgaux/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.sub 18 Jan 2006 22:52:18 -0000 1.1 --- config.sub 8 Sep 2006 15:00:32 -0000 1.2 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-18' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-04-22' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 71,75 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 119,123 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 119,124 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 145,149 **** -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis) os= basic_machine=$1 --- 146,150 ---- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 *************** *** 229,233 **** --- 230,236 ---- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ *************** *** 235,240 **** | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k \ ! | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 238,243 ---- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 248,251 **** --- 251,255 ---- | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ *************** *** 258,270 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown --- 262,274 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown *************** *** 297,303 **** | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ --- 301,307 ---- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ *************** *** 306,313 **** | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* \ ! | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 310,317 ---- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 321,329 **** | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 325,335 ---- | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ *************** *** 331,338 **** | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ --- 337,344 ---- | pyramid-* \ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ! | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ *************** *** 341,346 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) --- 347,352 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) *************** *** 362,365 **** --- 368,374 ---- os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe *************** *** 379,382 **** --- 388,394 ---- basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl *************** *** 438,447 **** --- 450,474 ---- os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 *************** *** 466,469 **** --- 493,500 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 644,651 **** basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k --- 675,678 ---- *************** *** 728,735 **** basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem --- 755,758 ---- *************** *** 743,746 **** --- 766,773 ---- os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson *************** *** 834,837 **** --- 861,870 ---- basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd *************** *** 957,960 **** --- 990,997 ---- basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd *************** *** 1000,1003 **** --- 1037,1044 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1030,1033 **** --- 1071,1077 ---- basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm *************** *** 1125,1135 **** | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ ! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 1169,1180 ---- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ! | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ! | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ *************** *** 1137,1141 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1182,1186 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1161,1164 **** --- 1206,1212 ---- os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` *************** *** 1173,1176 **** --- 1221,1227 ---- os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince *************** *** 1194,1197 **** --- 1245,1251 ---- os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd *************** *** 1216,1219 **** --- 1270,1276 ---- os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 *************** *** 1252,1255 **** --- 1309,1315 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *************** *** 1283,1289 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1343,1349 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1332,1335 **** --- 1392,1398 ---- os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf *************** *** 1464,1470 **** --- 1527,1539 ---- vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs Index: config.guess =================================================================== RCS file: /cvsroot/mod-c/mod_c/cfgaux/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.guess 18 Jan 2006 22:52:18 -0000 1.1 --- config.guess 8 Sep 2006 15:00:32 -0000 1.2 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-17' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-04-22' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 137,147 **** UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - ## for Red Hat Linux - if test -f /etc/redhat-release ; then - VENDOR=redhat ; - else - VENDOR= ; - fi - # Note: order is significant - the case branches are not exclusive. --- 137,140 ---- *************** *** 205,217 **** echo "${machine}-${os}${release}" exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} --- 198,216 ---- echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; ! cats:OpenBSD:*:*) ! echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 229,251 **** echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) ! echo mipseb-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that --- 228,258 ---- echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sgi:OpenBSD:*:*) ! echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ! ;; ! esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that *************** *** 285,296 **** UNAME_MACHINE="alphaev79" ;; esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! exit 0 ;; ! Alpha*:OpenVMS:*:*) ! echo alpha-hp-vms exit 0 ;; Alpha\ *:Windows_NT*:*) --- 292,301 ---- UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 315,318 **** --- 320,329 ---- echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 335,339 **** echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; --- 346,350 ---- echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; *************** *** 407,410 **** --- 418,424 ---- echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} *************** *** 742,746 **** exit 0 ;; *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) --- 756,760 ---- exit 0 ;; *:UNICOS/mp:*:*) ! echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) *************** *** 750,753 **** --- 764,772 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 759,775 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 778,783 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 797,800 **** --- 805,811 ---- echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin *************** *** 804,809 **** --- 815,825 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 815,820 **** echo cris-axis-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu exit 0 ;; m68*:Linux:*:*) --- 831,845 ---- echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu ! exit 0 ;; ! m32r*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) *************** *** 860,867 **** ;; ppc:Linux:*:*) ! echo powerpc-${VENDOR:-unknown}-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-${VENDOR:-unknown}-linux-gnu exit 0 ;; alpha:Linux:*:*) --- 885,892 ---- ;; ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) *************** *** 891,895 **** exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu exit 0 ;; sh64*:Linux:*:*) --- 916,920 ---- exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh64*:Linux:*:*) *************** *** 903,907 **** exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-${VENDOR:-unknown}-linux-gnu exit 0 ;; i*86:Linux:*:*) --- 928,932 ---- exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-unknown-linux-gnu exit 0 ;; i*86:Linux:*:*) *************** *** 953,959 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; --- 978,987 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; *************** *** 983,986 **** --- 1011,1017 ---- echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} *************** *** 1052,1058 **** echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1083,1089 ---- echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1110,1113 **** --- 1141,1148 ---- echo i860-stratus-sysv4 exit 0 ;; + i*86:VOS:*:*) + # From Pau...@st.... + echo ${UNAME_MACHINE}-stratus-vos + exit 0 ;; *:VOS:*:*) # From Pau...@st.... *************** *** 1152,1158 **** exit 0 ;; *:Darwin:*:*) ! case `uname -p` in *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} --- 1187,1194 ---- exit 0 ;; *:Darwin:*:*) ! UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ! case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; ! unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} *************** *** 1169,1173 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1205,1212 ---- echo i386-pc-qnx exit 0 ;; ! NSE-?:NONSTOP_KERNEL:*:*) ! echo nse-tandem-nsk${UNAME_RELEASE} ! exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1213,1216 **** --- 1252,1268 ---- echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac *************** *** 1372,1376 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1424,1430 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: missing =================================================================== RCS file: /cvsroot/mod-c/mod_c/cfgaux/missing,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** missing 18 Jan 2006 22:52:18 -0000 1.1 --- missing 8 Sep 2006 15:00:32 -0000 1.2 *************** *** 1,5 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. --- 1,9 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2005-02-08.22 ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ! # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. *************** *** 39,42 **** --- 43,48 ---- fi + msg="missing on your system" + case "$1" in --run) *************** *** 45,54 **** shift "$@" && exit 0 ;; - esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. - case "$1" in -h|--h|--he|--hel|--help) --- 51,64 ---- shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -h|--h|--he|--hel|--help) *************** *** 75,83 **** makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; --- 85,97 ---- makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 88,99 **** ;; ! aclocal*) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 fi echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from --- 102,143 ---- ;; ! esac ! ! # Now exit if we have it, but it failed. Also exit now if we ! # don't have it and --version was passed (most likely to detect ! # the program). ! case "$1" in ! lex|yacc) ! # Not GNU programs, they don't have --version. ! ;; ! ! tar) ! if test -n "$run"; then ! echo 1>&2 "ERROR: \`tar' requires --run" ! exit 1 ! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ! exit 1 ! fi ! ;; ! ! *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; + esac + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case "$1" in + aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from *************** *** 103,113 **** autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU --- 147,152 ---- autoconf) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU *************** *** 117,127 **** autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them --- 156,161 ---- autoheader) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them *************** *** 141,151 **** automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. --- 175,180 ---- automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. *************** *** 157,170 **** autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. ! You can get \`$1Help2man' as part of \`Autoconf' from any GNU archive site." --- 186,194 ---- autom4te) echo 1>&2 "\ ! WARNING: \`$1' is needed, but is $msg. ! You might have modified some files without having the proper tools for further handling them. ! You can get \`$1' as part of \`Autoconf' from any GNU archive site." *************** *** 186,190 **** bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get --- 210,214 ---- bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get *************** *** 216,220 **** lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get --- 240,244 ---- lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get *************** *** 238,248 **** help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take --- 262,267 ---- help2man) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take *************** *** 263,273 **** makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious --- 282,287 ---- makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious *************** *** 275,282 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file --- 289,300 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi touch $file *************** *** 285,292 **** tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. --- 303,306 ---- *************** *** 324,331 **** *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." --- 338,345 ---- *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." *************** *** 335,336 **** --- 349,357 ---- exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:00:35
|
Update of /cvsroot/mod-c/mod_c In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28334 Modified Files: aclocal.m4 configure Log Message: Bootstraped. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/mod-c/mod_c/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aclocal.m4 22 Aug 2006 20:24:04 -0000 1.2 --- aclocal.m4 8 Sep 2006 15:00:32 -0000 1.3 *************** *** 1,3 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --- 1,3 ---- ! # generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, *************** *** 14,18 **** # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- [...3996 lines suppressed...] --- 5923,5928 ---- done done SED=$lt_cv_path_SED + ]) AC_MSG_RESULT([$SED]) ]) *************** *** 6423,6427 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- --- 5945,5949 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.5])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Index: configure =================================================================== RCS file: /cvsroot/mod-c/mod_c/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 22 Aug 2006 20:24:04 -0000 1.5 --- configure 8 Sep 2006 15:00:32 -0000 1.6 *************** *** 281,285 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! (unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then --- 281,285 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi [...9949 lines suppressed...] --- 20978,20981 ---- *************** *** 20527,20530 **** --- 21016,21025 ---- esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF *************** *** 21033,21034 **** --- 21528,21530 ---- fi + |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 15:00:35
|
Update of /cvsroot/mod-c/mod_c/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28334/include Modified Files: Makefile.in Log Message: Bootstraped. Index: Makefile.in =================================================================== RCS file: /cvsroot/mod-c/mod_c/include/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 22 Aug 2006 20:31:57 -0000 1.2 --- Makefile.in 8 Sep 2006 15:00:32 -0000 1.3 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 39,43 **** subdir = include DIST_COMMON = $(ehtml_HEADERS) $(srcdir)/Makefile.am \ ! $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac --- 39,43 ---- subdir = include DIST_COMMON = $(ehtml_HEADERS) $(srcdir)/Makefile.am \ ! $(srcdir)/Makefile.in ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac *************** *** 87,90 **** --- 87,92 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DOXYGEN = @DOXYGEN@ + DOXYGEN_SUBDIR = @DOXYGEN_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:59:03
|
Update of /cvsroot/mod-c/mod_c In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27489 Modified Files: TODO Log Message: EHTML should be an apache module by it self. Index: TODO =================================================================== RCS file: /cvsroot/mod-c/mod_c/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TODO 1 Feb 2006 21:37:59 -0000 1.2 --- TODO 8 Sep 2006 14:59:00 -0000 1.3 *************** *** 0 **** --- 1,4 ---- + + * EHTML Directives should go in ehml source tree. + * EHTML Session engines should be stored in ehtml configuration record. + |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:58:35
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27454/src Removed Files: def_session_driver.h def_session_driver.cpp def_session_server.h def_session_server.cpp def_session_protocol.h session_drivers.h session_drivers.cpp Log Message: Session handling is now in EHTML. --- def_session_driver.cpp DELETED --- --- def_session_driver.h DELETED --- --- session_drivers.cpp DELETED --- --- session_drivers.h DELETED --- --- def_session_server.h DELETED --- --- def_session_server.cpp DELETED --- --- def_session_protocol.h DELETED --- |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:55:39
|
Update of /cvsroot/mod-c/ehtml/src/dss_tool In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26225/src/dss_tool Added Files: ChangeLog Makefile.am dss_tool.cpp Log Message: session handling & testing shifted from mod_c to EHTML. --- NEW FILE: dss_tool.cpp --- #include <sys/socket.h> #include <sys/un.h> #include <stdio.h> #include <errno.h> #include <pthread.h> #include <fcntl.h> #include <unistd.h> #include <DefaultSessionProtocol.h> #include <iostream> #include <string> #include <fstream> #include <sstream> #include <ehtml/ehtml.h> using namespace std; /*** * * * * * Testing * * * */ /** * This structure is used internally by the session driver to pass * configuration data to itself. * <p>Configuration data is created by <code>InitConnection</code> which must * be the first call.</p> * */ struct DefSesDr_ConfigStruct { /** * The opened connection to the default session server. */ int Socket; }; int DefSesDr_GetSessionData( PerSessionData *Parms, request_context* req_con, void * conf ) { DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) conf; // We are connected. Send the request and wait for the answer DSSGetData get_data; get_data.MsgType = DSS_CMD_GET_DATA; get_data.IdSize = Parms->IdSize; memcpy( get_data.Id, Parms->Id, get_data.IdSize ); // Send the request if ( send( tmp->Socket, &get_data, sizeof( DSSGetData ), 0 ) < 0 ) return EHTML_ERR; // Receive the answer from the server - it should be data... DSSFetcherStruct buf; if ( recv( tmp->Socket, &buf, sizeof( DSSFetcherStruct ), 0 ) < 0 || buf.MsgType != DSS_CMD_GET_DATA ) { if ( buf.MsgType == DSS_CMD_STATUS && ((DSSStatusRespond*)&buf)->Type == DSS_STATUS_SESSION_OVER ) return EHTML_TIMEOUT; else return EHTML_ERR; } // Ok, we've got the data. Read the size and put it into the 'Parms' structure DSSGetData_Response * resp = ( DSSGetData_Response * ) &buf; Parms->DataSize = resp->DataSize; Parms->Duration = resp->Duration; Parms->LastAccess = resp->LastAccess; Parms->SessionStarted = resp->SessionStarted; Parms->Modified = resp->Modified; // Ensure enough space... if ( Parms->Capacity < Parms->DataSize ) { Parms->Capacity = Parms->DataSize + 256; Parms->Data = new char[ Parms->DataSize ]; } // Two scenarios: a) one packet, or b) two packets if ( Parms->DataSize <= MAX_GET_DATA_SIZE ) memcpy( Parms->Data, resp->Data, Parms->DataSize ); else { memcpy( Parms->Data, resp->Data, MAX_GET_DATA_SIZE ); if ( recv( tmp->Socket, ((char*)Parms->Data) + MAX_GET_DATA_SIZE, Parms->DataSize - MAX_GET_DATA_SIZE, 0 ) < 0 || buf.MsgType != DSS_CMD_GET_DATA ) return EHTML_ERR; } return EHTML_OK; } int DefSesDr_SetSessionData( PerSessionData * Parms, request_context* req_con, void * conf ) { DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) conf; // We are connected. Send the request and wait for the answer DSSFetcherStruct max_size; DSSSetData * set_data = (DSSSetData*)&max_size; set_data->MsgType = DSS_CMD_SET_DATA; set_data->IdSize = Parms->IdSize; set_data->DataSize = Parms->DataSize; set_data->Duration = Parms->Duration; memcpy( set_data->Id, Parms->Id, set_data->IdSize ); // We have 2 scenarios: a) either all data fits into the first packet, or b) the alternative ;) if ( set_data->DataSize <= MAX_SET_DATA_SIZE ) { memcpy( set_data->Data, Parms->Data, set_data->DataSize ); if ( send( tmp->Socket, set_data, sizeof( DSSSetData ) + set_data->DataSize, 0) < 0 ) goto error; } else { memcpy( set_data->Data, Parms->Data, MAX_SET_DATA_SIZE ); if ( send( tmp->Socket, set_data, sizeof( DSSSetData ) + MAX_SET_DATA_SIZE, 0) < 0 || send( tmp->Socket, ((char*)Parms->Data) + MAX_SET_DATA_SIZE, set_data->DataSize - MAX_SET_DATA_SIZE, 0 ) < 0 ) goto error; } // Receive the status answer... DSSStatusRespond response; if ( recv( tmp->Socket, &response, sizeof( DSSStatusRespond ), 0 ) < 0 ) goto error; else if ( response.MsgType == DSS_CMD_STATUS ) { int retVal = EHTML_OK; switch (response.Type ) { case DSS_STATUS_SESSION_OVER: retVal = EHTML_TIMEOUT; break; case DSS_STATUS_ERROR: retVal = EHTML_ERR; break; } return retVal; } error: return EHTML_ERR; } int DefSesDr_SetDuration( PerSessionData* Parms, request_context* req_con, void * conf ) { DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) conf; // Send the request and wait for the answer DSSSetDuration set_dur; set_dur.MsgType = DSS_CMD_SET_DURATION; set_dur.IdSize = Parms->IdSize; set_dur.Duration = Parms->Duration; memcpy( set_dur.Id, Parms->Id, set_dur.IdSize ); // Here goes our request if( send( tmp->Socket, &set_dur, sizeof( DSSSetDuration ), 0) < 0 ) goto error; // Get the answer DSSStatusRespond response; if ( recv( tmp->Socket, &response, sizeof( DSSStatusRespond ), 0 ) > 0 && response.MsgType == DSS_CMD_STATUS ) { int retVal = EHTML_OK; switch ( response.Type ) { case DSS_STATUS_ERROR: retVal = EHTML_ERR; break; case DSS_STATUS_SESSION_OVER: retVal = EHTML_TIMEOUT; break; } return retVal; } error: return EHTML_ERR; } int DefSesDr_UnregisterID( PerSessionData* Parms, request_context* req_con, void * conf ) { DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) conf; // Send the request and wait for the answer DSSUnregisterID unreg; unreg.MsgType = DSS_CMD_UNREGISTER_ID; unreg.IdSize = Parms->IdSize; memcpy( unreg.Id, Parms->Id, unreg.IdSize ); // Here goes our request if( send( tmp->Socket, &unreg, sizeof( DSSUnregisterID ), 0 ) < 0 ) goto error; // Get the answer DSSStatusRespond response; if ( recv( tmp->Socket, &response, sizeof( DSSStatusRespond ), 0 ) > 0 && response.MsgType == DSS_CMD_STATUS && response.Type == DSS_STATUS_OK ) return EHTML_OK; error: return EHTML_ERR; } int DefSesDr_RegisterID( PerSessionData* Buf, request_context* req_con, void * conf ) { DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) conf; // Send the request and wait for the answer DSSRegisterID reg_id; reg_id.Duration = Buf->Duration; reg_id.IdSize = Buf->IdSize; reg_id.MsgType = DSS_CMD_REGISTER_ID; // Here goes our request if( send( tmp->Socket, ®_id, sizeof( DSSRegisterID ), 0) < 0 ) goto error; // Get the answer DSSRegisterID_Respond response; if ( recv( tmp->Socket, &response, sizeof( DSSRegisterID_Respond ), 0 ) > 0 && response.MsgType == DSS_CMD_REGISTER_ID ) { // We've got our session - copy data Buf->Id = new char[ Buf->IdSize = response.IdSize ]; memcpy( Buf->Id, response.Id, Buf->IdSize ); Buf->Duration = response.Duration; Buf->LastAccess = response.LastAccess; Buf->SessionStarted = response.SessionStarted; Buf->Modified = response.Modified; return EHTML_OK; } error: return EHTML_ERR; } int DefSesDr_InitConnection( PerSessionData* Buf, request_context* req_con, void ** Config ) { // Open a new connection to the server int sock = socket( PF_UNIX, SOCK_STREAM, 0 ); sockaddr_un addr; addr.sun_family = AF_UNIX; strncpy( addr.sun_path, UNIX_SOCKET_ADDRESS, 108 ); // Try to connect int retVal = connect( sock, ( sockaddr* ) &addr, sizeof( sockaddr_un ) ); if ( retVal >= 0 ) { // We are connected // Create a new configuration structure and store it into the Config // parameter DefSesDr_ConfigStruct * tmp = ( DefSesDr_ConfigStruct * ) new char[ sizeof( DefSesDr_ConfigStruct ) ]; tmp->Socket = sock; *Config = tmp; // Everything went OK. return EHTML_OK; } else // We couldn't establish a connection. Return an error code return EHTML_ERR; } int DefSesDr_EndConnection( PerSessionData* Buf, request_context* Req, void * Config ) { // Close the connection with the server DefSesDr_ConfigStruct * tmp = (DefSesDr_ConfigStruct *) Config; // The return value int retVal = EHTML_OK; // Post a quit message and close the connection DSSStandard rec; rec.MsgType = DSS_CMD_CLOSE; if( send( tmp->Socket, &rec, sizeof( DSSStandard ), 0) < 0 ) retVal = EHTML_ERR; // Close the connection in any event shutdown( tmp->Socket, SHUT_RDWR ); close( tmp->Socket ); return retVal; } /** * * * * * End testing * * * */ static inline unsigned short GetHexFromByte( unsigned char num ) { register char a = ( 0xf0 & num ) >> 4; register char b = 0x0f & num; if ( a < 10 ) a = ( '0' + a ); else a = ( 'a' - 10 + a ); if ( b < 10 ) b = ( '0' + b ); else b = ( 'a' - 10 + b ); return a | ( b << 8 ); } static inline unsigned char GetByteFromHex( char a, char b ) { register unsigned char retVal = 0; if ( a >= '0' && a <= '9' ) retVal |= (a - '0') << 4; else if ( a >= 'a' && a <= 'f' ) retVal |= (a - 'a' + 10) << 4; else if ( a >= 'A' && a <= 'F' ) retVal |= (a - 'A' + 10) << 4; if ( b >= '0' && b <= '9' ) retVal |= b - '0'; else if ( b >= 'a' && b <= 'f' ) retVal |= b - 'a' + 10; else if ( b >= 'A' && b <= 'F' ) retVal |= b - 'A' + 10; return retVal; } int GetStringFromByte( char * buf, int buf_len, const unsigned char * binary_array, int arr_len ) { // Sanity check if ( buf && binary_array && arr_len > 0 && buf_len >= (arr_len << 1) ) { register int i = 0; unsigned short * tmpBuf = (unsigned short*) buf; for ( ; i < arr_len; i++) tmpBuf[i] = GetHexFromByte( binary_array[i] ); if ( ( i << 1 ) < buf_len ) { buf[ i << 1 ] = 0; return i << 1 + 1; } else return buf_len; } else return -1; } int GetByteFromString( unsigned char * buf, int buf_len, const char * hex_string ) { if ( buf && hex_string ) { register int i = 0; register int j = 0; while( hex_string[i] && hex_string[i+1] && j < buf_len ) { buf[j] = GetByteFromHex( hex_string[i], hex_string[i+1] ); i+=2; j++; } return j; } else return -1; } /** * This structure is used internally by the session driver to pass * configuration data to itself. * <p>Configuration data is created by <code>InitConnection</code> which must * be the first call.</p> * */ struct ConfigStruct : public DefSesDr_ConfigStruct { }; void DisplayMenu(); void PrintStatus( ConfigStruct * Config ); void CleanSessions( ConfigStruct * Config ); int InitConnection( ConfigStruct ** Config ); int EndConnection( ConfigStruct * Config ); int main(int argc, char **argv) { cout << "This is a utility tool for the mod_c default session server." << endl << endl; cout << "You can use this tool to gather info about the session server or perform" << endl; cout << "any kind of supported operation on the session server." << endl; bool run = true; string buf; ConfigStruct * config; if ( InitConnection( &config ) ) { cout << "Could not open a connection with the default session server." << endl; cout << "Shutting down..." << endl; } else { PerSessionData psd; memset( &psd, 0, sizeof( PerSessionData ) ); psd.IdSize = 32; psd.Duration = 1; bool SessionOpened = false; while( run ) { cout << endl; DisplayMenu(); getline( cin, buf ); switch ( buf[0] ) { case 'p': PrintStatus( config ); break; case 'c': CleanSessions( config ); break; case 'q': run = false; break; // Session related stuff... case 'n': // Create a new session if ( SessionOpened ) cout << "You must close the session first." << endl; else { int retVal = DefSesDr_RegisterID( &psd, NULL, config ); if ( retVal != EHTML_OK ) cout << "An error occured while trying to create a new session: " << retVal << endl; else { SessionOpened = true; cout << "A new session was created." << endl; } } { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'd': // Set the duration if ( SessionOpened ) { int old_dur = psd.Duration; cout << "Enter the duration: "; cin >> psd.Duration; int retVal = DefSesDr_SetDuration( &psd, NULL, config ); switch( retVal ) { case EHTML_OK: cout << "The duration was set." << endl; break; case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; break; default: cout << "An error occured: " << retVal << endl; cout << "The duration was not set." << endl; psd.Duration = old_dur; break; } } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 's': // Put some data if ( SessionOpened ) { // Get the string string str; cout << "Enter a string: "; getline( cin, str ); if ( !psd.Data ) { psd.Data = new char[ str.length() ]; psd.Capacity = str.length(); } else if ( psd.Capacity < (int)str.length() ) { delete ((char*)psd.Data); psd.Data = new char[ str.length() ]; psd.Capacity = str.length(); } // Copy the string memcpy( psd.Data, str.c_str(), str.length() ); psd.DataSize = str.length(); // Store it int retVal = DefSesDr_SetSessionData( &psd, NULL, config ); switch( retVal ) { case EHTML_OK: cout << "The data was stored." << endl; break; case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; break; default: cout << "An error occured: " << retVal << endl; cout << "The data was not stored." << endl; break; } } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'f': // Fetch data if ( SessionOpened ) { // Store it int retVal = DefSesDr_GetSessionData( &psd, NULL, config ); switch( retVal ) { case EHTML_OK: cout << "Here is the data: " << endl; cout.write( ( const char * )psd.Data, psd.DataSize ); cout << endl; break; case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; break; default: cout << "An error occured: " << retVal << endl; cout << "The data was not fetched." << endl; break; } } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'o': // Output data if ( SessionOpened ) { // Store it if ( psd.DataSize > 0 && psd.Data ) { cout << "Here is the data: " << endl << endl; cout.write( (char*) psd.Data, psd.DataSize ); } cout << endl; } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'e': // End the session if ( SessionOpened ) { // Store it DefSesDr_UnregisterID( &psd, NULL, config ); cout << "The session was closed." << endl; SessionOpened = false; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'i': // Print the ID out if ( SessionOpened ) { char buf[1024]; GetStringFromByte( buf, 1024, (unsigned char*)psd.Id, psd.IdSize ); cout << "The ID: " << buf << endl; } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'w': if ( SessionOpened ) { string astr; cout << "Enter the name of the file: "; getline( cin, astr ); fstream istr; istr.open( astr.c_str(), ios_base::in ); if ( istr.good() ) { stringbuf sb; char c; while ( !istr.eof() ) { istr.get( c ); sb.sputc( c ); } string str = sb.str(); if ( !psd.Data ) { psd.Data = new char[ str.length() ]; psd.Capacity = str.length(); } else if ( psd.Capacity < (int)str.length() ) { delete ((char*)psd.Data); psd.Data = new char[ str.length() ]; psd.Capacity = str.length(); } // Copy the string memcpy( psd.Data, str.c_str(), str.length() ); psd.DataSize = str.length(); // Store it int retVal = DefSesDr_SetSessionData( &psd, NULL, config ); switch( retVal ) { case EHTML_OK: cout << "The data was stored." << endl; break; case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; break; default: cout << "An error occured: " << retVal << endl; cout << "The data was not stored." << endl; break; } } else cout << "Could not open the file..." << endl; } else cout << "You must open a new session first." << endl; { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; case 'r': // Restore a session if ( SessionOpened ) cout << "You must close the session first." << endl; else { string str; cout << "Enter the ID (in hexadecimal): "; getline( cin, str ); if ( psd.Id ) delete ((char*)psd.Id); psd.Id = new char[ str.length() ]; int retVal = GetByteFromString( (unsigned char*)psd.Id, MAX_ID_SIZE, str.c_str() ); if ( retVal < 0 ) cout << "The ID is not correctly formatted."; else { // Store it retVal = DefSesDr_GetSessionData( &psd, NULL, config ); switch( retVal ) { case EHTML_OK: cout << "The session was restored." << endl; SessionOpened = true; break; case EHTML_TIMEOUT: cout << "The session timed out." << endl; if ( psd.Data ) delete ((char*)psd.Data); psd.Data = 0; break; default: cout << "An error occured: " << retVal << endl; cout << "The session was not restored." << endl; break; } } } { cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } break; default: break; } } if ( psd.Id ) delete [] ((char*) psd.Id); if (psd.Data) delete [] ((char*)psd.Data); EndConnection( config ); } return 0; } void DisplayMenu() { cout << "+-----------------------------------------------------------------+" << endl; cout << "| Select a desired operation: |" << endl; cout << "| |" << endl; cout << "| 'p': Print the status of the server |" << endl; cout << "| 'c': Clean outdated sessions. |" << endl; cout << "| |" << endl; cout << "| 'n': Create a new session. |" << endl; cout << "| 'r': Restore a session with a given ID. |" << endl; cout << "| |" << endl; cout << "| 'd': Set the duration of the session. |" << endl; cout << "| 's': Put some data into the session server. |" << endl; cout << "| 'f': Fetch data from the session server. |" << endl; cout << "| 'o': Output fetched data. |" << endl; cout << "| 'e': End the session. |" << endl; cout << "| |" << endl; cout << "| 'w': Put the contents of a file into the session server. |" << endl; cout << "| |" << endl; cout << "| 'i': Print out the session ID. |" << endl; cout << "| |" << endl; cout << "| 'q': Quit |" << endl; cout << "| |" << endl; cout << "+-----------------------------------------------------------------+" << endl; cout << "Your choice: "; } void PrintStatus( ConfigStruct * Config ) { // Send the request... DSSServerStatus buf; buf.MsgType = DSS_SERVER_STATUS; if ( send( Config->Socket, &buf, sizeof( DSSStandard ), 0 ) < 0 ) { cout << "Could not send data to the server. Error code: '" << errno << "'" << endl; goto error; } // Receive the answer if ( recv( Config->Socket, &buf, sizeof( DSSServerStatus ), 0 ) < 0 ) { cout << "Could not receive data from the server. Error code: '" << errno << "'" << endl; goto error; } // Do we have the correct answer? if ( buf.MsgType == DSS_SERVER_STATUS ) { cout << endl << "The server status:" << endl; cout << "Total sessions: " << buf.TotalSessions << endl; cout << "Outdated sessions: " << buf.OutdatedSessions << endl; cout << "Total stored bytes: " << buf.TotalBytes << endl; } else { cout << "The server responded with an error code." << endl; goto error; } error: cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } void CleanSessions( ConfigStruct * Config ) { // Send the request... DSSStandard buf; buf.MsgType = DSS_CLEANUP; if ( send( Config->Socket, &buf, sizeof( DSSStandard ), 0 ) < 0 ) { cout << "Could not send data to the server. Error code: '" << errno << "'" << endl; goto error; } error: cout << endl << "Press 'return' to continue... "; char tmp; cin.get( tmp ); } int InitConnection( ConfigStruct ** Config ) { // Open a new connection to the server int sock = socket( PF_UNIX, SOCK_STREAM, 0 ); sockaddr_un addr; addr.sun_family = AF_UNIX; strncpy( addr.sun_path, UNIX_SOCKET_ADDRESS, 108 ); // Try to connect int retVal = connect( sock, ( sockaddr* ) &addr, sizeof( sockaddr_un ) ); if ( retVal >= 0 ) { // We are connected // Create a new configuration structure and store it into the Config // parameter ConfigStruct * tmp = new ConfigStruct; tmp->Socket = sock; *Config = tmp; // Everything went OK. return 0; } else // We couldn't establish a connection. Return an error code return 1; } int EndConnection( ConfigStruct * Config ) { // Close the connection with the server // The return value int retVal = 0; // Post a quit message and close the connection DSSStandard rec; rec.MsgType = DSS_CMD_CLOSE; if( send( Config->Socket, &rec, sizeof( DSSStandard ), 0) < 0 ) retVal = 1; // Close the connection in any event shutdown( Config->Socket, SHUT_RDWR ); close( Config->Socket ); delete Config; return retVal; } --- NEW FILE: Makefile.am --- APR_0_INCLUDE = @APR_LOCATION@ HTTPD_INCLUDE_DIR = @APACHE_LOCATION@ EHTML_INCLUDE_DIR = @EHTML_LOCATION@ INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(EHTML_INCLUDE_DIR) INCLUDES = -I$(top_srcdir)/src $(INCLUDE_DIRS) METASOURCES = AUTO noinst_PROGRAMS = dss_tool dss_tool_SOURCES = dss_tool.cpp --- NEW FILE: ChangeLog --- 2006-08-23 Matej Urbas <mat...@gm...> * ChangeLog: Added ChangeLog. |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:55:09
|
Update of /cvsroot/mod-c/ehtml/src/dss_tool In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25838/src/dss_tool Log Message: Directory /cvsroot/mod-c/ehtml/src/dss_tool added to the repository |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:53:14
|
Update of /cvsroot/mod-c/mod_c/src/dss_tool In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25001/src/dss_tool Modified Files: dss_tool.cpp Log Message: s/EHTML_SESSION_TIMEOUT/EHTML_TIMEOUT/g and default session protocol include was renamed. Index: dss_tool.cpp =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/dss_tool/dss_tool.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dss_tool.cpp 22 Aug 2006 21:38:17 -0000 1.2 --- dss_tool.cpp 8 Sep 2006 14:53:11 -0000 1.3 *************** *** 7,11 **** #include <unistd.h> ! #include <def_session_protocol.h> #include <iostream> --- 7,11 ---- #include <unistd.h> ! #include <DefaultSessionProtocol.h> #include <iostream> *************** *** 66,70 **** get_data.MsgType = DSS_CMD_GET_DATA; get_data.IdSize = Parms->IdSize; - get_data.Duration = Parms->Duration; memcpy( get_data.Id, Parms->Id, get_data.IdSize ); // Send the request --- 66,69 ---- *************** *** 76,80 **** { if ( buf.MsgType == DSS_CMD_STATUS && ((DSSStatusRespond*)&buf)->Type == DSS_STATUS_SESSION_OVER ) ! return EHTML_SESSION_TIMEOUT; else return EHTML_ERR; --- 75,79 ---- { if ( buf.MsgType == DSS_CMD_STATUS && ((DSSStatusRespond*)&buf)->Type == DSS_STATUS_SESSION_OVER ) ! return EHTML_TIMEOUT; else return EHTML_ERR; *************** *** 141,145 **** { case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_SESSION_TIMEOUT; break; case DSS_STATUS_ERROR: --- 140,144 ---- { case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_TIMEOUT; break; case DSS_STATUS_ERROR: *************** *** 178,182 **** break; case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_SESSION_TIMEOUT; break; } --- 177,181 ---- break; case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_TIMEOUT; break; } *************** *** 476,480 **** cout << "The duration was set." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 475,479 ---- cout << "The duration was set." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 529,533 **** cout << "The data was stored." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 528,532 ---- cout << "The data was stored." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 563,567 **** cout << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 562,566 ---- cout << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 685,689 **** cout << "The data was stored." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 684,688 ---- cout << "The data was stored." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 736,740 **** SessionOpened = true; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; if ( psd.Data ) --- 735,739 ---- SessionOpened = true; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; if ( psd.Data ) |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:37:47
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18681/src Modified Files: EHTMLApplication.cpp Log Message: Set the application in the selected session driver upon DoInitStage. Index: EHTMLApplication.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/EHTMLApplication.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EHTMLApplication.cpp 6 Mar 2006 08:00:36 -0000 1.8 --- EHTMLApplication.cpp 8 Sep 2006 14:37:44 -0000 1.9 *************** *** 90,95 **** int EHTMLApplication::DoInitStage() { OnInit.Trigger(); ! // TODO: Restore the session... return 0; } --- 90,98 ---- int EHTMLApplication::DoInitStage() { + SessionDriver* driver = SessionDriver::Selected(); + if (driver != NULL) + driver->Application(this); OnInit.Trigger(); ! // @TODO: Restore the session... return 0; } *************** *** 131,135 **** ShutSessionsDown(); ! // TODO: Store the session return 0; } --- 134,138 ---- ShutSessionsDown(); ! // @TODO: Store the session return 0; } |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:37:11
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18274/src Modified Files: Makefile.am Log Message: We build new targets (libsession, libdisksession, libsessionid). Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 15 Feb 2006 19:54:36 -0000 1.5 --- Makefile.am 8 Sep 2006 14:37:07 -0000 1.6 *************** *** 12,19 **** AM_CXXFLAGS = $(INCLUDE_DIRS) ! lib_LTLIBRARIES = libehtml.la ! libehtml_la_SOURCES = EHTMLApplication.cpp Common.cpp PageWriter.cpp TagAttribute.cpp \ ! SimpleTagAttribute.cpp StyleAttribute.cpp TagRenderer.cpp Component.cpp Label.cpp \ ! Input.cpp Session.cpp Container.cpp Page.cpp Form.cpp Request.cpp Response.cpp libehtml_la_LDFLAGS = -shared -module --- 12,57 ---- AM_CXXFLAGS = $(INCLUDE_DIRS) ! lib_LTLIBRARIES = libehtml.la libsession.la libdisksession.la libsessionid.la ! bin_PROGRAMS = mod_c_dss ! EHTML_SOURCES = Common.cpp ! EHTML_SOURCES += Component.cpp ! EHTML_SOURCES += Container.cpp ! EHTML_SOURCES += Dictionary.cpp ! EHTML_SOURCES += EHTMLApplication.cpp ! EHTML_SOURCES += Form.cpp ! EHTML_SOURCES += Input.cpp ! EHTML_SOURCES += Label.cpp ! EHTML_SOURCES += MemBuf.cpp ! EHTML_SOURCES += Page.cpp ! EHTML_SOURCES += PageWriter.cpp ! EHTML_SOURCES += Request.cpp ! EHTML_SOURCES += Response.cpp ! EHTML_SOURCES += Session.cpp ! EHTML_SOURCES += SimpleTagAttribute.cpp ! EHTML_SOURCES += StyleAttribute.cpp ! EHTML_SOURCES += TagAttribute.cpp ! EHTML_SOURCES += TagRenderer.cpp ! EHTML_SOURCES += $(COMMON) ! ! libehtml_la_SOURCES = $(EHTML_SOURCES) libehtml_la_LDFLAGS = -shared -module + + mod_c_dss_SOURCES = DefaultSessionServer.cpp DefaultSessionAddress.cpp + mod_c_dss_LDADD = -lpthread + mod_c_dss_CXXFLAGS = $(INCLUDE_DIRS) + + LIBSESS_SOURCES = DefaultSessionAddress.cpp + LIBSESS_SOURCES += DefaultSessionDriver.cpp + libsession_la_SOURCES = $(LIBSESS_SOURCES) + libsession_la_LDFLAGS = -shared -module + + libdisksession_la_SOURCES = DiskSessionDriver.cpp + libdisksession_la_LDFLAGS = -shared -module + + LIBSESSID_SOURCES = DefaultSessionIDDriver.cpp + libsessionid_la_SOURCES = $(LIBSESSID_SOURCES) + libsessionid_la_LDFLAGS = -shared -module + + #SUBDIRS = dss_tool + |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:36:11
|
Update of /cvsroot/mod-c/ehtml/samples In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17891/samples Modified Files: Makefile.am Log Message: We now build 02session.cpp as well. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/ehtml/samples/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 22 Aug 2006 18:36:19 -0000 1.1 --- Makefile.am 8 Sep 2006 14:36:08 -0000 1.2 *************** *** 12,18 **** # -shared -o basic.so -lehtml ! lib_LTLIBRARIES = libbasic.la ! libbasic_la_SOURCES = 01basic.cpp ! libbasic_la_LDFLAGS = -shared -module -lehtml ! #libbasic_la_LIBADD = ehtml --- 12,21 ---- # -shared -o basic.so -lehtml ! lib_LTLIBRARIES = libsamplebasic.la libsamplesession.la ! libsamplebasic_la_SOURCES = 01basic.cpp ! libsamplebasic_la_LDFLAGS = -shared -module -lehtml ! #libsamplebasic_la_LIBADD = ehtml ! ! libsamplesession_la_SOURCES = 02session.cpp ! libsamplesession_la_LDFLAGS = -shared -module -lehtml |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:35:13
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17753/include Modified Files: ChangeLog Log Message: Meaningless cosmetic changes. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 23 Aug 2006 10:44:19 -0000 1.2 --- ChangeLog 8 Sep 2006 14:35:09 -0000 1.3 *************** *** 1,3 **** 2006-08-23 Matej Urbas <mat...@gm...> ! * ChangeLog: Added ChangeLog. --- 1,4 ---- 2006-08-23 Matej Urbas <mat...@gm...> ! * ChangeLog: Added ChangeLog. ! |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:35:12
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17753/src Modified Files: ChangeLog Log Message: Meaningless cosmetic changes. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 23 Aug 2006 10:44:19 -0000 1.2 --- ChangeLog 8 Sep 2006 14:35:09 -0000 1.3 *************** *** 1,3 **** 2006-08-23 Matej Urbas <mat...@gm...> ! * ChangeLog: Added ChangeLog. --- 1,4 ---- 2006-08-23 Matej Urbas <mat...@gm...> ! * ChangeLog: Added ChangeLog. ! |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:34:52
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17458/src Modified Files: PageWriter.cpp Log Message: s/TODO/@TODO/g Index: PageWriter.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/PageWriter.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PageWriter.cpp 6 Mar 2006 08:00:36 -0000 1.6 --- PageWriter.cpp 8 Sep 2006 14:34:46 -0000 1.7 *************** *** 80,84 **** buf[ i += 2 ] = ( 0x80 | ( 0x3f & *tmpStr ) ); } ! // TODO: Encode characters beyond 0xFFFF... tmpStr += 1; --- 80,84 ---- buf[ i += 2 ] = ( 0x80 | ( 0x3f & *tmpStr ) ); } ! // @TODO: Encode characters beyond 0xFFFF... tmpStr += 1; |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:34:33
|
Update of /cvsroot/mod-c/ehtml/cfgaux In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17401/cfgaux Modified Files: config.guess config.sub install-sh ltmain.sh missing Log Message: Bootstraped. Index: install-sh =================================================================== RCS file: /cvsroot/mod-c/ehtml/cfgaux/install-sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install-sh 21 Jan 2006 09:37:30 -0000 1.2 --- install-sh 8 Sep 2006 14:34:28 -0000 1.3 *************** *** 1,18 **** #!/bin/sh - # # install - install a program, script, or datafile ! # This comes from X11R5 (mit/util/scripts/install.sh). # ! # Copyright 1991 by the Massachusetts Institute of Technology # ! # Permission to use, copy, modify, distribute, and sell this software and its ! # documentation for any purpose is hereby granted without fee, provided that ! # the above copyright notice appear in all copies and that both that ! # copyright notice and this permission notice appear in supporting ! # documentation, and that the name of M.I.T. not be used in advertising or ! # publicity pertaining to distribution of the software without specific, ! # written prior permission. M.I.T. makes no representations about the ! # suitability of this software for any purpose. It is provided "as is" ! # without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent --- 1,37 ---- #!/bin/sh # install - install a program, script, or datafile ! ! scriptversion=2005-02-02.21 ! ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. # ! # Copyright (C) 1994 X Consortium # ! # Permission is hereby granted, free of charge, to any person obtaining a copy ! # of this software and associated documentation files (the "Software"), to ! # deal in the Software without restriction, including without limitation the ! # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ! # sell copies of the Software, and to permit persons to whom the Software is ! # furnished to do so, subject to the following conditions: ! # ! # The above copyright notice and this permission notice shall be included in ! # all copies or substantial portions of the Software. ! # ! # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ! # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ! # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. ! # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent *************** *** 24,28 **** # shared with many OS's install programs. - # set DOITPROG to echo to test this script --- 43,46 ---- *************** *** 30,34 **** doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. --- 48,51 ---- *************** *** 42,276 **** mkdirprog="${MKDIRPROG-mkdir}" - transformbasename="" - transform_arg="" - instcmd="$mvprog" chmodcmd="$chmodprog 0755" ! chowncmd="" ! chgrpcmd="" ! stripcmd="" rmcmd="$rmprog -f" mvcmd="$mvprog" ! src="" ! dst="" ! dir_arg="" ! ! while [ x"$1" != x ]; do ! case $1 in ! -c) instcmd=$cpprog ! shift ! continue;; ! ! -d) dir_arg=true ! shift ! continue;; ! ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! ! -o) chowncmd="$chownprog $2" ! shift ! shift ! continue;; ! ! -g) chgrpcmd="$chgrpprog $2" ! shift ! shift ! continue;; ! ! -s) stripcmd=$stripprog ! shift ! continue;; ! ! -t=*) transformarg=`echo $1 | sed 's/-t=//'` ! shift ! continue;; ! ! -b=*) transformbasename=`echo $1 | sed 's/-b=//'` ! shift ! continue;; ! ! *) if [ x"$src" = x ] ! then ! src=$1 ! else ! # this colon is to work around a 386BSD /bin/sh bug ! : ! dst=$1 ! fi ! shift ! continue;; ! esac ! done ! ! if [ x"$src" = x ] ! then ! echo "$0: no input file specified" >&2 ! exit 1 ! else ! : ! fi ! if [ x"$dir_arg" != x ]; then ! dst=$src ! src="" ! if [ -d "$dst" ]; then ! instcmd=: ! chmodcmd="" ! else ! instcmd=$mkdirprog ! fi ! else ! # Waiting for this to be detected by the "$instcmd $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! if [ -f "$src" ] || [ -d "$src" ] ! then ! : ! else ! echo "$0: $src does not exist" >&2 ! exit 1 ! fi ! if [ x"$dst" = x ] ! then ! echo "$0: no destination specified" >&2 ! exit 1 ! else ! : ! fi ! # If destination is a directory, append the input filename; if your system ! # does not like double slashes in filenames, you may need to add some logic ! if [ -d "$dst" ] ! then ! dst=$dst/`basename "$src"` ! else ! : ! fi ! fi ! ## this sed command emulates the dirname command ! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ! # Make sure that the destination directory exists. ! # this part is taken from Noah Friedman's mkinstalldirs script ! # Skip lots of stat calls in the usual case. ! if [ ! -d "$dstdir" ]; then ! defaultIFS=' ! ' ! IFS="${IFS-$defaultIFS}" ! oIFS=$IFS ! # Some sh's can't handle IFS=/ for some reason. ! IFS='%' ! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ! IFS=$oIFS ! pathcomp='' ! while [ $# -ne 0 ] ; do ! pathcomp=$pathcomp$1 shift ! if [ ! -d "$pathcomp" ] ; ! then ! $mkdirprog "$pathcomp" ! else ! : ! fi ! pathcomp=$pathcomp/ done fi ! if [ x"$dir_arg" != x ] ! then ! $doit $instcmd "$dst" && ! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi ! else ! # If we're going to rename the final executable, determine the name now. ! if [ x"$transformarg" = x ] ! then ! dstfile=`basename "$dst"` ! else ! dstfile=`basename "$dst" $transformbasename | ! sed $transformarg`$transformbasename ! fi ! # don't allow the sed command to completely eliminate the filename ! if [ x"$dstfile" = x ] ! then ! dstfile=`basename "$dst"` ! else ! : ! fi ! # Make a couple of temp file names in the proper directory. ! dsttmp=$dstdir/#inst.$$# ! rmtmp=$dstdir/#rm.$$# ! # Trap to clean up temp files at exit. ! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 ! trap '(exit $?); exit' 1 2 13 15 ! # Move or copy the file name to the temp name ! $doit $instcmd "$src" "$dsttmp" && ! # and set any options; do chmod last to preserve setuid bits ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $instcmd $src $dsttmp" command. ! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && ! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && ! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ! # Now remove or move aside any old file at destination location. We try this ! # two ways since rm can't unlink itself on some systems and the destination ! # file might be busy for other reasons. In this case, the final cleanup ! # might fail but the new file should still install successfully. ! { ! if [ -f "$dstdir/$dstfile" ] ! then ! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || ! $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || ! { ! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit ! } ! else ! : ! fi ! } && ! # Now rename the file to the real destination. ! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ! fi && ! # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit } --- 59,323 ---- mkdirprog="${MKDIRPROG-mkdir}" chmodcmd="$chmodprog 0755" ! chowncmd= ! chgrpcmd= ! stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" ! src= ! dst= ! dir_arg= ! dstarg= ! no_target_directory= ! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ! or: $0 [OPTION]... SRCFILES... DIRECTORY ! or: $0 [OPTION]... -t DIRECTORY SRCFILES... ! or: $0 [OPTION]... -d DIRECTORIES... ! In the 1st form, copy SRCFILE to DSTFILE. ! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ! In the 4th, create DIRECTORIES. ! Options: ! -c (ignored) ! -d create directories instead of installing files. ! -g GROUP $chgrpprog installed files to GROUP. ! -m MODE $chmodprog installed files to MODE. ! -o USER $chownprog installed files to USER. ! -s $stripprog installed files. ! -t DIRECTORY install into DIRECTORY. ! -T report an error if DSTFILE is a directory. ! --help display this help and exit. ! --version display version info and exit. ! Environment variables override the default commands: ! CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ! " ! while test -n "$1"; do ! case $1 in ! -c) shift ! continue;; ! -d) dir_arg=true ! shift ! continue;; ! -g) chgrpcmd="$chgrpprog $2" ! shift ! shift ! continue;; ! --help) echo "$usage"; exit $?;; ! -m) chmodcmd="$chmodprog $2" ! shift ! shift ! continue;; ! -o) chowncmd="$chownprog $2" ! shift ! shift ! continue;; ! -s) stripcmd=$stripprog ! shift ! continue;; ! -t) dstarg=$2 ! shift ! shift ! continue;; ! -T) no_target_directory=true shift + continue;; ! --version) echo "$0 $scriptversion"; exit $?;; ! *) # When -d is used, all remaining arguments are directories to create. ! # When -t is used, the destination is already specified. ! test -n "$dir_arg$dstarg" && break ! # Otherwise, the last argument is the destination. Remove it from $@. ! for arg ! do ! if test -n "$dstarg"; then ! # $@ is not empty: it contains at least $arg. ! set fnord "$@" "$dstarg" ! shift # fnord ! fi ! shift # arg ! dstarg=$arg ! done ! break;; ! esac done + + if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi ! for src ! do ! # Protect names starting with `-'. ! case $src in ! -*) src=./$src ;; ! esac ! if test -n "$dir_arg"; then ! dst=$src ! src= ! if test -d "$dst"; then ! mkdircmd=: ! chmodcmd= ! else ! mkdircmd=$mkdirprog ! fi ! else ! # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ! # might cause directories to be created, which would be especially bad ! # if $src (and thus $dsttmp) contains '*'. ! if test ! -f "$src" && test ! -d "$src"; then ! echo "$0: $src does not exist." >&2 ! exit 1 ! fi ! if test -z "$dstarg"; then ! echo "$0: no destination specified." >&2 ! exit 1 ! fi ! dst=$dstarg ! # Protect names starting with `-'. ! case $dst in ! -*) dst=./$dst ;; ! esac ! # If destination is a directory, append the input filename; won't work ! # if double slashes aren't ignored. ! if test -d "$dst"; then ! if test -n "$no_target_directory"; then ! echo "$0: $dstarg: Is a directory" >&2 ! exit 1 ! fi ! dst=$dst/`basename "$src"` ! fi ! fi ! # This sed command emulates the dirname command. ! dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ! # Make sure that the destination directory exists. ! # Skip lots of stat calls in the usual case. ! if test ! -d "$dstdir"; then ! defaultIFS=' ! ' ! IFS="${IFS-$defaultIFS}" ! oIFS=$IFS ! # Some sh's can't handle IFS=/ for some reason. ! IFS='%' ! set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ! shift ! IFS=$oIFS ! pathcomp= ! while test $# -ne 0 ; do ! pathcomp=$pathcomp$1 ! shift ! if test ! -d "$pathcomp"; then ! $mkdirprog "$pathcomp" ! # mkdir can fail with a `File exist' error in case several ! # install-sh are creating the directory concurrently. This ! # is OK. ! test -d "$pathcomp" || exit ! fi ! pathcomp=$pathcomp/ ! done ! fi ! if test -n "$dir_arg"; then ! $doit $mkdircmd "$dst" \ ! && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ! && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ! && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ! else ! dstfile=`basename "$dst"` ! # Make a couple of temp file names in the proper directory. ! dsttmp=$dstdir/_inst.$$_ ! rmtmp=$dstdir/_rm.$$_ ! # Trap to clean up those temp files at exit. ! trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ! trap '(exit $?); exit' 1 2 13 15 ! # Copy the file name to the temp name. ! $doit $cpprog "$src" "$dsttmp" && ! # and set any options; do chmod last to preserve setuid bits. ! # ! # If any of these fail, we abort the whole thing. If we want to ! # ignore errors from any of these, just make sure not to ignore ! # errors from the above "$doit $cpprog $src $dsttmp" command. ! # ! { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ! && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ! && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ! && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ! # Now rename the file to the real destination. ! { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ! || { ! # The rename failed, perhaps because mv can't rename something else ! # to itself, or perhaps because mv is so ancient that it does not ! # support -f. ! # Now remove or move aside any old file at destination location. ! # We try this two ways since rm can't unlink itself on some ! # systems and the destination file might be busy for other ! # reasons. In this case, the final cleanup might fail but the new ! # file should still install successfully. ! { ! if test -f "$dstdir/$dstfile"; then ! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ! || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ! || { ! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit 1 ! } ! else ! : ! fi ! } && ! # Now rename the file to the real destination. ! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ! } ! } ! fi || { (exit 1); exit 1; } ! done + # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit 0 } + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: Index: ltmain.sh =================================================================== RCS file: /cvsroot/mod-c/ehtml/cfgaux/ltmain.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ltmain.sh 2 Feb 2006 14:51:20 -0000 1.3 --- ltmain.sh 8 Sep 2006 14:34:29 -0000 1.4 *************** *** 2,6 **** # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 --- 2,6 ---- # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. [...1263 lines suppressed...] ;; --- 5360,5364 ---- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in ! *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; *************** *** 6469,6473 **** $echo "Try \`$modename --help' for more information about other modes." ! exit $? # The TAGs below are defined such that we never get into a situation --- 6399,6403 ---- $echo "Try \`$modename --help' for more information about other modes." ! exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation Index: config.sub =================================================================== RCS file: /cvsroot/mod-c/ehtml/cfgaux/config.sub,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.sub 21 Jan 2006 09:37:30 -0000 1.2 --- config.sub 8 Sep 2006 14:34:28 -0000 1.3 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-18' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-04-22' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 71,75 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 119,123 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 119,124 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 145,149 **** -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis) os= basic_machine=$1 --- 146,150 ---- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 *************** *** 229,233 **** --- 230,236 ---- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ *************** *** 235,240 **** | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k \ ! | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 238,243 ---- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 248,251 **** --- 251,255 ---- | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ *************** *** 258,270 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown --- 262,274 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown *************** *** 297,303 **** | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ --- 301,307 ---- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ ! | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ *************** *** 306,313 **** | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* \ ! | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 310,317 ---- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 321,329 **** | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 325,335 ---- | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ *************** *** 331,338 **** | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ --- 337,344 ---- | pyramid-* \ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ! | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ *************** *** 341,346 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) --- 347,352 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) *************** *** 362,365 **** --- 368,374 ---- os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe *************** *** 379,382 **** --- 388,394 ---- basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl *************** *** 438,447 **** --- 450,474 ---- os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 *************** *** 466,469 **** --- 493,500 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 644,651 **** basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k --- 675,678 ---- *************** *** 728,735 **** basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem --- 755,758 ---- *************** *** 743,746 **** --- 766,773 ---- os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson *************** *** 834,837 **** --- 861,870 ---- basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd *************** *** 957,960 **** --- 990,997 ---- basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd *************** *** 1000,1003 **** --- 1037,1044 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1030,1033 **** --- 1071,1077 ---- basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm *************** *** 1125,1135 **** | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ ! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 1169,1180 ---- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ! | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ! | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ *************** *** 1137,1141 **** | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1182,1186 ---- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1161,1164 **** --- 1206,1212 ---- os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` *************** *** 1173,1176 **** --- 1221,1227 ---- os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince *************** *** 1194,1197 **** --- 1245,1251 ---- os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd *************** *** 1216,1219 **** --- 1270,1276 ---- os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 *************** *** 1252,1255 **** --- 1309,1315 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *************** *** 1283,1289 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1343,1349 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1332,1335 **** --- 1392,1398 ---- os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf *************** *** 1464,1470 **** --- 1527,1539 ---- vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs Index: config.guess =================================================================== RCS file: /cvsroot/mod-c/ehtml/cfgaux/config.guess,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.guess 21 Jan 2006 09:37:30 -0000 1.2 --- config.guess 8 Sep 2006 14:34:28 -0000 1.3 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-06-17' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-04-22' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 137,147 **** UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - ## for Red Hat Linux - if test -f /etc/redhat-release ; then - VENDOR=redhat ; - else - VENDOR= ; - fi - # Note: order is significant - the case branches are not exclusive. --- 137,140 ---- *************** *** 205,217 **** echo "${machine}-${os}${release}" exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} --- 198,216 ---- echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; ! cats:OpenBSD:*:*) ! echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 229,251 **** echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) ! echo mipseb-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that --- 228,258 ---- echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sgi:OpenBSD:*:*) ! echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ! ;; ! esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that *************** *** 285,296 **** UNAME_MACHINE="alphaev79" ;; esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! exit 0 ;; ! Alpha*:OpenVMS:*:*) ! echo alpha-hp-vms exit 0 ;; Alpha\ *:Windows_NT*:*) --- 292,301 ---- UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 315,318 **** --- 320,329 ---- echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 335,339 **** echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; --- 346,350 ---- echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; *************** *** 407,410 **** --- 418,424 ---- echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} *************** *** 742,746 **** exit 0 ;; *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) --- 756,760 ---- exit 0 ;; *:UNICOS/mp:*:*) ! echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) *************** *** 750,753 **** --- 764,772 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 759,775 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 778,783 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; ! *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 797,800 **** --- 805,811 ---- echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin *************** *** 804,809 **** --- 815,825 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 815,820 **** echo cris-axis-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu exit 0 ;; m68*:Linux:*:*) --- 831,845 ---- echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu ! exit 0 ;; ! m32r*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) *************** *** 860,867 **** ;; ppc:Linux:*:*) ! echo powerpc-${VENDOR:-unknown}-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-${VENDOR:-unknown}-linux-gnu exit 0 ;; alpha:Linux:*:*) --- 885,892 ---- ;; ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit 0 ;; ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) *************** *** 891,895 **** exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu exit 0 ;; sh64*:Linux:*:*) --- 916,920 ---- exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) ! echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh64*:Linux:*:*) *************** *** 903,907 **** exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-${VENDOR:-unknown}-linux-gnu exit 0 ;; i*86:Linux:*:*) --- 928,932 ---- exit 0 ;; x86_64:Linux:*:*) ! echo x86_64-unknown-linux-gnu exit 0 ;; i*86:Linux:*:*) *************** *** 953,959 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; --- 978,987 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; *************** *** 983,986 **** --- 1011,1017 ---- echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} *************** *** 1052,1058 **** echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1083,1089 ---- echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1110,1113 **** --- 1141,1148 ---- echo i860-stratus-sysv4 exit 0 ;; + i*86:VOS:*:*) + # From Pau...@st.... + echo ${UNAME_MACHINE}-stratus-vos + exit 0 ;; *:VOS:*:*) # From Pau...@st.... *************** *** 1152,1158 **** exit 0 ;; *:Darwin:*:*) ! case `uname -p` in *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} --- 1187,1194 ---- exit 0 ;; *:Darwin:*:*) ! UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ! case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; ! unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} *************** *** 1169,1173 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1205,1212 ---- echo i386-pc-qnx exit 0 ;; ! NSE-?:NONSTOP_KERNEL:*:*) ! echo nse-tandem-nsk${UNAME_RELEASE} ! exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1213,1216 **** --- 1252,1268 ---- echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac *************** *** 1372,1376 **** download the most up to date version of the config scripts from ! ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please --- 1424,1430 ---- download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ! and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please Index: missing =================================================================== RCS file: /cvsroot/mod-c/ehtml/cfgaux/missing,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** missing 21 Jan 2006 09:37:30 -0000 1.2 --- missing 8 Sep 2006 14:34:29 -0000 1.3 *************** *** 1,5 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. --- 1,9 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2005-02-08.22 ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ! # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. *************** *** 39,42 **** --- 43,48 ---- fi + msg="missing on your system" + case "$1" in --run) *************** *** 45,54 **** shift "$@" && exit 0 ;; - esac - - # If it does not exist, or fails to run (possibly an outdated version), - # try to emulate it. - case "$1" in -h|--h|--he|--hel|--help) --- 51,64 ---- shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -h|--h|--he|--hel|--help) *************** *** 75,83 **** makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; --- 85,97 ---- makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 88,99 **** ;; ! aclocal*) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 fi echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from --- 102,143 ---- ;; ! esac ! ! # Now exit if we have it, but it failed. Also exit now if we ! # don't have it and --version was passed (most likely to detect ! # the program). ! case "$1" in ! lex|yacc) ! # Not GNU programs, they don't have --version. ! ;; ! ! tar) ! if test -n "$run"; then ! echo 1>&2 "ERROR: \`tar' requires --run" ! exit 1 ! elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ! exit 1 ! fi ! ;; ! ! *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; + esac + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case "$1" in + aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from *************** *** 103,113 **** autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU --- 147,152 ---- autoconf) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU *************** *** 117,127 **** autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them --- 156,161 ---- autoheader) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them *************** *** 141,151 **** automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. --- 175,180 ---- automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. *************** *** 157,170 **** autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. ! You can get \`$1Help2man' as part of \`Autoconf' from any GNU archive site." --- 186,194 ---- autom4te) echo 1>&2 "\ ! WARNING: \`$1' is needed, but is $msg. ! You might have modified some files without having the proper tools for further handling them. ! You can get \`$1' as part of \`Autoconf' from any GNU archive site." *************** *** 186,190 **** bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get --- 210,214 ---- bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get *************** *** 216,220 **** lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get --- 240,244 ---- lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get *************** *** 238,248 **** help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take --- 262,267 ---- help2man) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take *************** *** 263,273 **** makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious --- 282,287 ---- makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious *************** *** 275,282 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file --- 289,300 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi touch $file *************** *** 285,292 **** tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. --- 303,306 ---- *************** *** 324,331 **** *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." --- 338,345 ---- *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." *************** *** 335,336 **** --- 349,357 ---- exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: |
|
From: Gonzalo A. <ga...@us...> - 2006-09-08 14:34:33
|
Update of /cvsroot/mod-c/ehtml In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17401 Modified Files: aclocal.m4 Makefile.in configure Log Message: Bootstraped. Index: Makefile.in =================================================================== RCS file: /cvsroot/mod-c/ehtml/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 23 Aug 2006 10:32:54 -0000 1.4 --- Makefile.in 8 Sep 2006 14:34:28 -0000 1.5 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 99,102 **** --- 99,104 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DOXYGEN = @DOXYGEN@ + DOXYGEN_SUBDIR = @DOXYGEN_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 174,178 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! SUBDIRS = src include all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive --- 176,180 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! SUBDIRS = src include samples $(DOXYGEN_SUBDIR) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Index: aclocal.m4 =================================================================== RCS file: /cvsroot/mod-c/ehtml/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** aclocal.m4 23 Aug 2006 10:32:54 -0000 1.3 --- aclocal.m4 8 Sep 2006 14:34:28 -0000 1.4 *************** *** 1,3 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --- 1,3 ---- ! # generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, *************** *** 14,18 **** # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- [...3996 lines suppressed...] --- 5923,5928 ---- done done SED=$lt_cv_path_SED + ]) AC_MSG_RESULT([$SED]) ]) *************** *** 6423,6427 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- --- 5945,5949 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.5])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Index: configure =================================================================== RCS file: /cvsroot/mod-c/ehtml/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 23 Aug 2006 10:32:54 -0000 1.5 --- configure 8 Sep 2006 14:34:28 -0000 1.6 *************** *** 281,285 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! (unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then --- 281,285 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi [...9951 lines suppressed...] - { echo "$as_me:$LINENO: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: --- 20990,20993 ---- *************** *** 20542,20545 **** --- 21028,21037 ---- esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF |
