[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0d6db12ec9
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0d6db12ec98f18e5e7b9621b8f5e25280d8ad734 |
|
Date: |
Wed, 19 Aug 2009 22:03:28 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 0d6db12ec98f18e5e7b9621b8f5e25280d8ad734 (commit)
from 4a01ae79028f9363e111210e2d267b5e4fa86ce6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0d6db12ec98f18e5e7b9621b8f5e25280d8ad734
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Aug 19 23:58:22 2009 +0200
Localize messages using the GNU gettext package
diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index 11fcb07..1d37779 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -12,6 +12,15 @@ am__aclocal_m4_deps =
$(top_srcdir)/m4/gnome-pthread-check.m4 \
$(top_srcdir)/m4/libxml.m4 $(top_srcdir)/m4/cppunit.m4 \
$(top_srcdir)/configure.in
-SUBDIRS = src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) $(TESTS_DIR)
+SUBDIRS = po src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) $(TESTS_DIR)
EXTRA_DIST = stdafx.h stdafx.cpp doxygen SConstruct
+
+ACLOCAL_AMFLAGS = -I m4
+
+
+localedir.h: Makefile
+ echo '#define LOCALEDIR "$(localedir)"' >$@
+
+all: localedir.h
+# Generate the localedir.h file before any other rule.
diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index f4603c6..7e15cc3 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = languages logs system web certificates plugins
+SUBDIRS = logs system web certificates plugins
EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
virtualhosts.default.xml
diff --git a/myserver/binaries/languages/Makefile.am
b/myserver/binaries/languages/Makefile.am
deleted file mode 100644
index 97c3d3b..0000000
--- a/myserver/binaries/languages/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-SUBDIRS = configure
-
-myserverdatadir = $(datadir)/myserver/languages
-
-dist_myserverdata_DATA = brazilian.xml french.xml italiano.xml
russian_koi8r.xml english.xml german.xml russian.xml spanish.xml
-
diff --git a/myserver/binaries/languages/brazilian.xml
b/myserver/binaries/languages/brazilian.xml
deleted file mode 100644
index 323881d..0000000
--- a/myserver/binaries/languages/brazilian.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--MYSERVER SUPPORT FOR PORTUGUESE (br) LANGUAGE-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Usando português (brasileiro)</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Configuração do servidor terminada</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Não está sendo usada segurança no acesso, o conteúdo da
-pasta web é acessível por todo mundo</AL_NO_SECURITY>
-<MSG_ISOCK>Inicializando biblioteca de socket...</MSG_ISOCK>
-<ERR_ISOCK>Erro inicializando biblioteca de socket</ERR_ISOCK>
-<MSG_SOCKSTART>Biblioteca de socket inicializada</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Criando socket do servidor...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Socket do servidor criado</MSG_SSOCKRUN>
-<ERR_OPENP>Erro ao abrir a porta, ela pode estar sendo usada por outra
-aplicação</ERR_OPENP>
-<MSG_BIND_PORT>Tentando dar bind na porta...</MSG_BIND_PORT>
-<ERR_BIND>Erro de binding na porta, ela pode estar sendo usada por
-outra aplicação</ERR_BIND>
-<MSG_PORT_BOUND>Está feito o binding na porta</MSG_PORT_BOUND>
-<MSG_SLISTEN>Tentando ouvir na porta...</MSG_SLISTEN>
-<ERR_LISTEN>Erro ao ouvir na porta</ERR_LISTEN>
-<MSG_LISTEN>Ouvindo na porta</MSG_LISTEN>
-<MSG_LOADMIME>Carregando MIME types...</MSG_LOADMIME>
-<MSG_GETNAME>O nome do computador é</MSG_GETNAME>
-<MSG_LOADED>Carregado</MSG_LOADED>
-<ERR_LOADED>Erro ao carregar</ERR_LOADED>
-<MSG_MIMERUN>MIME types carregados com sucesso</MSG_MIMERUN>
-<MSG_ADDRESS>Endereço IP</MSG_ADDRESS>
-<ERR_LOADMIME>MIME types não podem ser carregados</ERR_LOADMIME>
-<ERR_ERROR>Erro genérico</ERR_ERROR>
-<MSG_NUM_CPU>Número de processadores:</MSG_NUM_CPU>
-<MSG_CREATET>Criando thread</MSG_CREATET>
-<MSG_THREADR>Thread criada</MSG_THREADR>
-<MSG_LISTENT>Criando thread de escuta...</MSG_LISTENT>
-<MSG_LISTENTR>Thread de escuta criada</MSG_LISTENTR>
-<MSG_READY>MyServer está pronto para aceitar conexões agora</MSG_READY>
-<MSG_BREAK>Use o Ctrl+C para abortar a execução</MSG_BREAK>
-<MSG_STOPT>Terminando threads...</MSG_STOPT>
-<MSG_TSTOPPED>Threads terminadas</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Limpando a memória...</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>Serviço parando...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB carregada com sucesso</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB não pode ser carregada</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/configure/Makefile.am
b/myserver/binaries/languages/configure/Makefile.am
deleted file mode 100644
index 3568df9..0000000
--- a/myserver/binaries/languages/configure/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-myserverdatadir = $(datadir)/myserver/languages/configure
-
-dist_myserverdata_DATA = english.xml italiano.xml spanish.xml
diff --git a/myserver/binaries/languages/configure/english.xml
b/myserver/binaries/languages/configure/english.xml
deleted file mode 100644
index 24e9929..0000000
--- a/myserver/binaries/languages/configure/english.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-<MYSERVER_LANGUAGE_FILE>
-<_ABOUT35>&About</_ABOUT35>
-<_FILE167>&File</_FILE167>
-<_HELP176>&Help</_HELP176>
-<_OPEN___68>&Open...</_OPEN___68>
-<_QUIT202>&Quit</_QUIT202>
-<_REVERT160>&Revert</_REVERT160>
-<_SAVE___65>&Save...</_SAVE___65>
-<ABOUT252>About</ABOUT252>
-<ACCESSES_LOG_FILE_140>Accesses log file:</ACCESSES_LOG_FILE_140>
-<ACTION_154>Action:</ACTION_154>
-<ADD___148>Add...</ADD___148>
-<ADMINISTRATOR102>Administrator</ADMINISTRATOR102>
-<ADMINISTRATOR_E_MAIL247>Administrator e-mail:</ADMINISTRATOR_E_MAIL247>
-<ALWAYS_ACTIVE_THREAD90>Always active threads:</ALWAYS_ACTIVE_THREAD90>
-<ARPA133>Arpa</ARPA133>
-<BROWSE___254>Browse...</BROWSE___254>
-<CANCEL72>Cancel</CANCEL72>
-<CHOSE_LOCATION80>Chose Location</CHOSE_LOCATION80>
-<CHOSE_CONFIGURATION_10>Chose configuration file
location:</CHOSE_CONFIGURATION_10>
-<CONFIGURATION_FILES_197>Configuration files located in
/etc/myserver</CONFIGURATION_FILES_197>
-<CONFIGURATION_FILES_168>Configuration files located in current
directory</CONFIGURATION_FILES_168>
-<CONFIGURATION_FILES_6>Configuration files located in
~/.myserver</CONFIGURATION_FILES_6>
-<CONNECTION_TIME_OUT_75>Connection time-out (in sec):</CONNECTION_TIME_OUT_75>
-<CONSOLE213>Console</CONSOLE213>
-<DEFAULT_FILE_NAMES_249>Default file names:</DEFAULT_FILE_NAMES_249>
-<DEFAULT_FILE_TO_SEND62>Default file to send in a directory when none is
specified</DEFAULT_FILE_TO_SEND62>
-<DIRECTORIES129>Directories</DIRECTORIES129>
-<DOCUMENT_ROOT_98>Document root:</DOCUMENT_ROOT_98>
-<EXECUTE213>Execute</EXECUTE213>
-<EXECUTE_AS_AN_ISAPI_250>Execute as an ISAPI module</EXECUTE_AS_AN_ISAPI_250>
-<EXECUTE_SELF_CONTAIN253>Execute self contained
FastCGI</EXECUTE_SELF_CONTAIN253>
-<EXTENSION_250>Extension:</EXTENSION_250>
-<FTP234>FTP</FTP234>
-<GLOBAL83>Global</GLOBAL83>
-<GZIP_COMPRESSION_THR48>Gzip compression threshold (in
bytes):</GZIP_COMPRESSION_THR48>
-<HTTP65>HTTP</HTTP65>
-<HTTPS148>HTTPS</HTTPS148>
-<HIGHER89>Higher</HIGHER89>
-<HIGHEST206>Highest</HIGHEST206>
-<HOST159>Host</HOST159>
-<HOSTS19>Hosts</HOSTS19>
-<IP153>IP</IP153>
-<INSTALL_SERVICE205>Install Service</INSTALL_SERVICE205>
-<LANGUAGE_97>Language:</LANGUAGE_97>
-<LOCAL236>Local</LOCAL236>
-<LOGS150>Logs</LOGS150>
-<MIME41>MIME</MIME41>
-<MIME_TYPE_39>MIME Type:</MIME_TYPE_39>
-<MANAGER_247>Manager:</MANAGER_247>
-<MAX_CONNECTIONS_41>Max connections:</MAX_CONNECTIONS_41>
-<MAXIMUM_NUMBER_OF_TH202>Maximum number of threads:</MAXIMUM_NUMBER_OF_TH202>
-<MAX_LOG_FILE_SIZE__I245>Max log file size (in
bytes):</MAX_LOG_FILE_SIZE__I245>
-<MEMORY_BUFFER__IN_BY228>Memory buffer (in bytes):</MEMORY_BUFFER__IN_BY228>
-<MYSERVER_CONFIGURE6>MyServer Configure</MYSERVER_CONFIGURE6>
-<NAME_188>Name:</NAME_188>
-<NONE145>None</NONE145>
-<NORMAL107>Normal</NORMAL107>
-<OK154>OK</OK154>
-<PORT_224>Port:</PORT_224>
-<PERSONALIZED_ERROR_P173>Personalized error pages:</PERSONALIZED_ERROR_P173>
-<PROTOCOL85>Protocol</PROTOCOL85>
-<PROTOCOL_143>Protocol:</PROTOCOL_143>
-<REMOVE112>Remove</REMOVE112>
-<REMOVE_SERVICE100>Remove Service</REMOVE_SERVICE100>
-<RUN54>Run</RUN54>
-<RUN_AS_CGI31>Run as CGI</RUN_AS_CGI31>
-<RUN_AS_FASTCGI174>Run as FastCGI</RUN_AS_FASTCGI174>
-<RUN_AS_ISAPI194>Run as ISAPI</RUN_AS_ISAPI194>
-<RUN_AS_MSCGI191>Run as MSCGI</RUN_AS_MSCGI191>
-<RUN_AS_WINCGI14>Run as WINCGI</RUN_AS_WINCGI14>
-<SSL_CERTIFICATE_212>SSL certificate:</SSL_CERTIFICATE_212>
-<SSL_PASSWORD_195>SSL password:</SSL_PASSWORD_195>
-<SSL_PRIVATE_KEY_181>SSL private key:</SSL_PRIVATE_KEY_181>
-<SEND_THE_FILE175>Send the file</SEND_THE_FILE175>
-<SER_VICE249>Ser&vice</SER_VICE249>
-<SERVER121>Server</SERVER121>
-<SERVICE211>Service</SERVICE211>
-<STOP167>Stop</STOP167>
-<STYLESHEET_104>Stylesheet:</STYLESHEET_104>
-<SYSTEM135>System</SYSTEM135>
-<SYSTEM_FOLDER_96>System folder:</SYSTEM_FOLDER_96>
-<URL_LINK195>URL link</URL_LINK195>
-<USER160>User</USER160>
-<VERBOSITY_LEVEL_63>Verbosity level:</VERBOSITY_LEVEL_63>
-<WARNING_LOG_FILE_56>Warning log file:</WARNING_LOG_FILE_56>
-<AS_CONSOLE202>as Console</AS_CONSOLE202>
-<AS_SERVICE200>as Service</AS_SERVICE200>
-<CONTROL35>CONTROL</CONTROL35>
-<RE_MOTE148>Re&mote</RE_MOTE148>
-<LOGIN___133>Login...</LOGIN___133>
-<LOGOUT124>Logout</LOGOUT124>
-<GET_CONFIG153>Get Config</GET_CONFIG153>
-<SEND_CONFIG4>Send Config...</SEND_CONFIG4>
-<CONNECTIONS___18>Connections...</CONNECTIONS___18>
-<REBOOT___247>Reboot...</REBOOT___247>
-<REMOTE_LOGIN137>Remote Login</REMOTE_LOGIN137>
-<ADDRESS_3>Address:</ADDRESS_3>
-<LOGIN_NAME_247>Login name:</LOGIN_NAME_247>
-<LOGIN_PASSWORD_203>Login password:</LOGIN_PASSWORD_203>
-<STATUS134>Status</STATUS134>
-<CONNECTIONS135>Connections</CONNECTIONS135>
-<SERVER_179>Server:</SERVER_179>
-<CONNECTIONS__ID___IP90>Connections (ID - IP - Port - LocalIP - LocalPort -
Login - PWord)</CONNECTIONS__ID___IP90>
-<UPDATE_RATE_109>Update rate:</UPDATE_RATE_109>
-<KILL_CONNECTION225>Kill connection</KILL_CONNECTION225>
-<DONE135>Done</DONE135>
-<ADMINISTRATOR_USER_N68>Administrator user name:</ADMINISTRATOR_USER_N68>
-<ADMINISTRATOR_PASSWO55>Administrator password:</ADMINISTRATOR_PASSWO55>
-<ENABLE_CONTROL_PROTO61>Enable control protocol:</ENABLE_CONTROL_PROTO61>
-<ABOUT_TEXT>MyServer Configure (FLTK)
-Copyright (C) 2002, 2003, 2004
-Free Software Foundation, Inc.
-This program is licensed under the GPL</ABOUT_TEXT>
-<LAST_CHANGE>Last change not saved. Continue anyways?</LAST_CHANGE>
-<NOT_FOUND>Config files not found.</NOT_FOUND>
-<RELOAD_PREV>Reload prevous values?</RELOAD_PREV>
-<ENTER_DEFAULT>Please enter a default file name:</ENTER_DEFAULT>
-<ENTER_EXTENSION>Enter new extension (Example: html):</ENTER_EXTENSION>
-<ENTER_MIME>Enter new MIME type (Example: text/html):</ENTER_MIME>
-<ENTER_NAME>Enter a new name:</ENTER_NAME>
-<ENTER_HOST>Enter a new host name:</ENTER_HOST>
-<ENTER_IP>Enter a new IP:</ENTER_IP>
-<DOWNLAD_CONFIG>Downloading config files:</DOWNLAD_CONFIG>
-<DOWNLAD_FAILED>Download failed. Code: </DOWNLAD_FAILED>
-<KILL_ALL>This will kill all connections. Are you sure?</KILL_ALL>
-<SEND_CONFIG>Sending config files:</SEND_CONFIG>
-<UPLOAD_FAILED>Upload failed. Code: </UPLOAD_FAILED>
-<NOT_SAVE>Could not save.</NOT_SAVE>
-<REBOOT_FAILED>Reboot failed.</REBOOT_FAILED>
-<CONNECT_SERVER>Connecting to server:</CONNECT_SERVER>
-<LOGIN_FAILED>Login failed. Code: </LOGIN_FAILED>
-<CANNOT_CONNECT>Could not connect to server.</CANNOT_CONNECT>
-<SERVER_CLOSED>Server closed connection. Code: </SERVER_CLOSED>
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/configure/italiano.xml
b/myserver/binaries/languages/configure/italiano.xml
deleted file mode 100644
index 354b54a..0000000
--- a/myserver/binaries/languages/configure/italiano.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<MYSERVER_LANGUAGE_FILE>
-<_ABOUT35>&About</_ABOUT35>
-<_FILE167>&File</_FILE167>
-<_HELP176>&Aiuto</_HELP176>
-<_OPEN___68>&Apri...</_OPEN___68>
-<_QUIT202>&Esci</_QUIT202>
-<_REVERT160>&Ricarica</_REVERT160>
-<_SAVE___65>&Salva...</_SAVE___65>
-<ABOUT252>About</ABOUT252>
-<ACCESSES_LOG_FILE_140>File di log degli accessi:</ACCESSES_LOG_FILE_140>
-<ACTION_154>Azione:</ACTION_154>
-<ADD___148>Aggiungi...</ADD___148>
-<ADMINISTRATOR102>Amministratore</ADMINISTRATOR102>
-<ADMINISTRATOR_E_MAIL247>E-mail dell'amministratore:</ADMINISTRATOR_E_MAIL247>
-<ALWAYS_ACTIVE_THREAD90>Threads sempre attivi:</ALWAYS_ACTIVE_THREAD90>
-<ARPA133>Arpa</ARPA133>
-<BROWSE___254>Sfoglia...</BROWSE___254>
-<CANCEL72>Annulla</CANCEL72>
-<CHOSE_LOCATION80>Scegli la posizione</CHOSE_LOCATION80>
-<CHOSE_CONFIGURATION_10>Scegli la posizione del file di
configurazione:</CHOSE_CONFIGURATION_10>
-<CONFIGURATION_FILES_197>File di configurazione situato in
/etc/myserver</CONFIGURATION_FILES_197>
-<CONFIGURATION_FILES_168>File di configurazione posizionato nella directory
corrente</CONFIGURATION_FILES_168>
-<CONFIGURATION_FILES_6>File di configurazione posizionato in
~/.myserver</CONFIGURATION_FILES_6>
-<CONNECTION_TIME_OUT_75>Time-out della connessione (in
sec):</CONNECTION_TIME_OUT_75>
-<CONSOLE213>Console</CONSOLE213>
-<DEFAULT_FILE_NAMES_249>Nome dei files di default :</DEFAULT_FILE_NAMES_249>
-<DEFAULT_FILE_TO_SEND62>File da mandare al posto del
browsing</DEFAULT_FILE_TO_SEND62>
-<DIRECTORIES129>Directories</DIRECTORIES129>
-<DOCUMENT_ROOT_98>Radice dei documenti:</DOCUMENT_ROOT_98>
-<EXECUTE213>Esegui</EXECUTE213>
-<EXECUTE_AS_AN_ISAPI_250>Esegui come modulo ISAPI</EXECUTE_AS_AN_ISAPI_250>
-<EXECUTE_SELF_CONTAIN253>Esegui come server FastCGI</EXECUTE_SELF_CONTAIN253>
-<EXTENSION_250>Estensione:</EXTENSION_250>
-<FTP234>FTP</FTP234>
-<GLOBAL83>Globale</GLOBAL83>
-<GZIP_COMPRESSION_THR48>Soglia della compressione gzip (in
bytes):</GZIP_COMPRESSION_THR48>
-<HTTP65>HTTP</HTTP65>
-<HTTPS148>HTTPS</HTTPS148>
-<HIGHER89>Alto</HIGHER89>
-<HIGHEST206>Altissimo</HIGHEST206>
-<HOST159>Host</HOST159>
-<HOSTS19>Hosts</HOSTS19>
-<IP153>IP</IP153>
-<INSTALL_SERVICE205>Installa come servizio</INSTALL_SERVICE205>
-<LANGUAGE_97>Linguaggio:</LANGUAGE_97>
-<LOCAL236>Locale</LOCAL236>
-<LOGS150>Logs</LOGS150>
-<MIME41>MIME</MIME41>
-<MIME_TYPE_39>MIME Type:</MIME_TYPE_39>
-<MANAGER_247>Manager:</MANAGER_247>
-<MAX_CONNECTIONS_41>Connessioni massime al server:</MAX_CONNECTIONS_41>
-<MAX_LOG_FILE_SIZE__I245>Dimensione massima del file di log (in
bytes):</MAX_LOG_FILE_SIZE__I245>
-<MEMORY_BUFFER__IN_BY228>Buffer di memoria(in bytes):</MEMORY_BUFFER__IN_BY228>
-<MYSERVER_CONFIGURE6>Configura MyServer</MYSERVER_CONFIGURE6>
-<NAME_188>Nome:</NAME_188>
-<NONE145>Nessuno</NONE145>
-<NORMAL107>Normale</NORMAL107>
-<OK154>OK</OK154>
-<PORT_224>Porta:</PORT_224>
-<PERSONALIZED_ERROR_P173>Pagine di errore
personalizzate:</PERSONALIZED_ERROR_P173>
-<PROTOCOL85>Protocollo</PROTOCOL85>
-<PROTOCOL_143>Protocollo:</PROTOCOL_143>
-<REMOVE112>Rimuovi</REMOVE112>
-<REMOVE_SERVICE100>Rimuovi il servizio</REMOVE_SERVICE100>
-<RUN54>Esegui</RUN54>
-<RUN_AS_CGI31>Esegui la CGI</RUN_AS_CGI31>
-<RUN_AS_FASTCGI174>Usa la FastCGI</RUN_AS_FASTCGI174>
-<RUN_AS_ISAPI194>Usa la ISAPI</RUN_AS_ISAPI194>
-<RUN_AS_MSCGI191>Usa la MSCGI</RUN_AS_MSCGI191>
-<RUN_AS_WINCGI14>Usa la WINCGI</RUN_AS_WINCGI14>
-<SSL_CERTIFICATE_212>Certificato SSL:</SSL_CERTIFICATE_212>
-<SSL_PASSWORD_195>Password per SSL:</SSL_PASSWORD_195>
-<SSL_PRIVATE_KEY_181>Chiave privata SSL:</SSL_PRIVATE_KEY_181>
-<SEND_THE_FILE175>Invia il file</SEND_THE_FILE175>
-<SER_VICE249>Ser&vizio</SER_VICE249>
-<SERVER121>Server</SERVER121>
-<SERVICE211>Servizio</SERVICE211>
-<STOP167>Ferma</STOP167>
-<STYLESHEET_104>Stylesheet:</STYLESHEET_104>
-<SYSTEM135>Sistema</SYSTEM135>
-<SYSTEM_FOLDER_96>Directory di sistema:</SYSTEM_FOLDER_96>
-<URL_LINK195>URL link</URL_LINK195>
-<USER160>User</USER160>
-<VERBOSITY_LEVEL_63>Livello di verbosità sul log:</VERBOSITY_LEVEL_63>
-<WARNING_LOG_FILE_56>Warning log file:</WARNING_LOG_FILE_56>
-<AS_CONSOLE202>come Console</AS_CONSOLE202>
-<AS_SERVICE200>come Service</AS_SERVICE200>
-<ABOUT_TEXT>MyServer Configure (FLTK)
-Copyright (C) 2002, 2003, 2004
-Free Software Foundation, Inc.
-Questo programma viene distribuito sotto i termini della licenza
GPL</ABOUT_TEXT>
-<LAST_CHANGE>Cambiamenti non salvati. Continuare lo stesso?</LAST_CHANGE>
-<NOT_FOUND>File di configurazione non trovato.</NOT_FOUND>
-<RELOAD_PREV>Ricarico i valori precedenti?</RELOAD_PREV>
-<ENTER_DEFAULT>Inserisci un file di default:</ENTER_DEFAULT>
-<ENTER_EXTENSION>Inserisci una nuova estensione (Es: html):</ENTER_EXTENSION>
-<ENTER_MIME>Inserisci un nuovo tipo MIME (Es: text/html):</ENTER_MIME>
-<ENTER_NAME>Inserisci un nuovo nome:</ENTER_NAME>
-<ENTER_HOST>Inserisci un nuovo host:</ENTER_HOST>
-<ENTER_IP>Inserisci un nuovo IP:</ENTER_IP>
-<MAXIMUM_NUMBER_OF_TH202>Numero massimo di threads:</MAXIMUM_NUMBER_OF_TH202>
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/configure/spanish.xml
b/myserver/binaries/languages/configure/spanish.xml
deleted file mode 100644
index bdab79d..0000000
--- a/myserver/binaries/languages/configure/spanish.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<MYSERVER_LANGUAGE_FILE>
-<_ABOUT35>&Sobre</_ABOUT35>
-<_FILE167>&Archivo</_FILE167>
-<_HELP176>&Ayuda</_HELP176>
-<_OPEN___68>&Abrir...</_OPEN___68>
-<_QUIT202>&Salir</_QUIT202>
-<_REVERT160>&Invertir</_REVERT160>
-<_SAVE___65>&Grabar...</_SAVE___65>
-<ABOUT252>Sobre</ABOUT252>
-<ACCESSES_LOG_FILE_140>Acceso al fichero diario:</ACCESSES_LOG_FILE_140>
-<ACTION_154>Accion:</ACTION_154>
-<ADD___148>Añadir...</ADD___148>
-<ADMINISTRATOR102>Administrador</ADMINISTRATOR102>
-<ADMINISTRATOR_E_MAIL247>Administrador e-mail:</ADMINISTRATOR_E_MAIL247>
-<ALWAYS_ACTIVE_THREAD90>Siempre activar threads:</ALWAYS_ACTIVE_THREAD90>
-<ARPA133>Arpa</ARPA133>
-<BROWSE___254>Buscar...</BROWSE___254>
-<CANCEL72>Cancelar</CANCEL72>
-<CHOSE_LOCATION80>Elija Localizacion</CHOSE_LOCATION80>
-<CHOSE_CONFIGURATION_10>Elija configuracion de Archivo
localizado:</CHOSE_CONFIGURATION_10>
-<CONFIGURATION_FILES_197>Elija Archivo localizado en
/etc/myserver</CONFIGURATION_FILES_197>
-<CONFIGURATION_FILES_168>Configuracion de Archivo localizado en
directorio</CONFIGURATION_FILES_168>
-<CONFIGURATION_FILES_6>Configuracion de Archivo localizado en
~/.myserver</CONFIGURATION_FILES_6>
-<CONNECTION_TIME_OUT_75>Conexion time-out (en
segundos):</CONNECTION_TIME_OUT_75>
-<CONSOLE213>Consola</CONSOLE213>
-<DEFAULT_FILE_NAMES_249>Nombre del Archivo:</DEFAULT_FILE_NAMES_249>
-<DEFAULT_FILE_TO_SEND62>Archivo para enviar en un directorio cuando no se
especifica ninguno</DEFAULT_FILE_TO_SEND62>
-<DIRECTORIES129>Directorios</DIRECTORIES129>
-<DOCUMENT_ROOT_98>Documento root:</DOCUMENT_ROOT_98>
-<EXECUTE213>Ejecutar</EXECUTE213>
-<EXECUTE_AS_AN_ISAPI_250>Ejecutar como ISAPI modulo</EXECUTE_AS_AN_ISAPI_250>
-<EXECUTE_SELF_CONTAIN253>Ejectuar propio contenido
FastCGI</EXECUTE_SELF_CONTAIN253>
-<EXTENSION_250>Extension:</EXTENSION_250>
-<FTP234>FTP</FTP234>
-<GLOBAL83>Global</GLOBAL83>
-<GZIP_COMPRESSION_THR48>Gzip compresion en su limite (en
bytes):</GZIP_COMPRESSION_THR48>
-<HTTP65>HTTP</HTTP65>
-<HTTPS148>HTTPS</HTTPS148>
-<HIGHER89>Higher</HIGHER89>
-<HIGHEST206>Highest</HIGHEST206>
-<HOST159>Host</HOST159>
-<HOSTS19>Hosts</HOSTS19>
-<IP153>IP</IP153>
-<INSTALL_SERVICE205>Instalar Servicio</INSTALL_SERVICE205>
-<LANGUAGE_97>Lenguaje:</LANGUAGE_97>
-<LOCAL236>Local</LOCAL236>
-<LOGS150>Logs</LOGS150>
-<MIME41>MIME</MIME41>
-<MIME_TYPE_39>MIME Tipo:</MIME_TYPE_39>
-<MANAGER_247>Manager:</MANAGER_247>
-<MAX_CONNECTIONS_41>Max conexiones:</MAX_CONNECTIONS_41>
-<MAX_LOG_FILE_SIZE__I245>Max log Archivo (en bytes):</MAX_LOG_FILE_SIZE__I245>
-<MEMORY_BUFFER__IN_BY228>Memory buffer (en bytes):</MEMORY_BUFFER__IN_BY228>
-<MYSERVER_CONFIGURE6>MyServer Configuracion</MYSERVER_CONFIGURE6>
-<NAME_188>Nombre:</NAME_188>
-<NONE145>Ninguno</NONE145>
-<NORMAL107>Normal</NORMAL107>
-<OK154>OK</OK154>
-<PORT_224>Puerto:</PORT_224>
-<PERSONALIZED_ERROR_P173>Personalisar paginas de
error:</PERSONALIZED_ERROR_P173>
-<PROTOCOL85>Protocolo</PROTOCOL85>
-<PROTOCOL_143>Protocolo:</PROTOCOL_143>
-<REMOVE112>Remover</REMOVE112>
-<REMOVE_SERVICE100>Remover Servicio</REMOVE_SERVICE100>
-<RUN54>funcionamiento</RUN54>
-<RUN_AS_CGI31>Funcionamiento como CGI</RUN_AS_CGI31>
-<RUN_AS_FASTCGI174>Funcionamiento como FastCGI</RUN_AS_FASTCGI174>
-<RUN_AS_ISAPI194>Funcionamiento como ISAPI</RUN_AS_ISAPI194>
-<RUN_AS_MSCGI191>Funcionamiento como MSCGI</RUN_AS_MSCGI191>
-<RUN_AS_WINCGI14>Funcionamiento como WINCGI</RUN_AS_WINCGI14>
-<SSL_CERTIFICATE_212>SSL certificado:</SSL_CERTIFICATE_212>
-<SSL_PASSWORD_195>SSL clave:</SSL_PASSWORD_195>
-<SSL_PRIVATE_KEY_181>SSL privado key:</SSL_PRIVATE_KEY_181>
-<SEND_THE_FILE175>Enviar el archivo</SEND_THE_FILE175>
-<SER_VICE249>Ser&vicio</SER_VICE249>
-<SERVER121>Server</SERVER121>
-<SERVICE211>Servicio</SERVICE211>
-<STOP167>Parar</STOP167>
-<STYLESHEET_104>Stylesheet:</STYLESHEET_104>
-<SYSTEM135>Systema</SYSTEM135>
-<SYSTEM_FOLDER_96>Carpeta de Systema:</SYSTEM_FOLDER_96>
-<URL_LINK195>URL link</URL_LINK195>
-<USER160>Usuario</USER160>
-<VERBOSITY_LEVEL_63>Verbosity level:</VERBOSITY_LEVEL_63>
-<WARNING_LOG_FILE_56>Peligro de log Archivo:</WARNING_LOG_FILE_56>
-<AS_CONSOLE202>Como Consola</AS_CONSOLE202>
-<AS_SERVICE200>Como Servicio</AS_SERVICE200>
-<CONTROL35>CONTROL</CONTROL35>
-<RE_MOTE148>Re&moto</RE_MOTE148>
-<LOGIN___133>Conexion...</LOGIN___133>
-<LOGOUT124>Salir</LOGOUT124>
-<GET_CONFIG153>Tener Config</GET_CONFIG153>
-<SEND_CONFIG4>Enviar Config...</SEND_CONFIG4>
-<CONNECTIONS___18>Connectar...</CONNECTIONS___18>
-<REBOOT___247>Reboot...</REBOOT___247>
-<REMOTE_LOGIN137>Remota Conexion</REMOTE_LOGIN137>
-<ADDRESS_3>Direccion:</ADDRESS_3>
-<LOGIN_NAME_247>Nombre de Conexion:</LOGIN_NAME_247>
-<LOGIN_PASSWORD_203>Clave de Conexion:</LOGIN_PASSWORD_203>
-<STATUS134>Status</STATUS134>
-<CONNECTIONS135>Conexiones</CONNECTIONS135>
-<SERVER_179>Server:</SERVER_179>
-<CONNECTIONS__ID___IP90>Conexiones (ID - IP - Port - LocalIP - LocalPort -
Login - PWord)</CONNECTIONS__ID___IP90>
-<UPDATE_RATE_109>Tarifa de la actualización:</UPDATE_RATE_109>
-<KILL_CONNECTION225>Matar Conexion</KILL_CONNECTION225>
-<DONE135>Terminar</DONE135>
-<ADMINISTRATOR_USER_N68>Administrador nombre:</ADMINISTRATOR_USER_N68>
-<ADMINISTRATOR_PASSWO55>Administrador clave:</ADMINISTRATOR_PASSWO55>
-<ENABLE_CONTROL_PROTO61>Permita el protocolo del
control:</ENABLE_CONTROL_PROTO61>
-<ABOUT_TEXT>MyServer Configuracion (FLTK)
-Copyright (C) 2002, 2003, 2004
-Licencian al equipo de MyServer este programa bajo GLP</ABOUT_TEXT>
-<LAST_CHANGE>Cambio pasado no ahorrado. ¿Continúe de todos
modos?</LAST_CHANGE>
-<NOT_FOUND>Config de archivo no encontrada.</NOT_FOUND>
-<RELOAD_PREV>Valores previous de la recarga?</RELOAD_PREV>
-<ENTER_DEFAULT>Incorpore por favor un nombre del archivo del
defecto:</ENTER_DEFAULT>
-<ENTER_EXTENSION>Entrar una nueva extension (Ejemplo: html):</ENTER_EXTENSION>
-<ENTER_MIME>Entrar una nueva MIME tipo (Example: text/html):</ENTER_MIME>
-<ENTER_NAME>Entrar un nuevo nombre:</ENTER_NAME>
-<ENTER_HOST>Entrar un nuevo host nombre:</ENTER_HOST>
-<ENTER_IP>Entrar un nuevo IP:</ENTER_IP>
-<DOWNLAD_CONFIG>Descargar config Archivo:</DOWNLAD_CONFIG>
-<DOWNLAD_FAILED>Descarga codigo fallado: </DOWNLAD_FAILED>
-<KILL_ALL>Vas a matar/desconectar todo. Estas seguro?</KILL_ALL>
-<SEND_CONFIG>Enviando config Archivos:</SEND_CONFIG>
-<UPLOAD_FAILED>Upload codigo fallado: </UPLOAD_FAILED>
-<NOT_SAVE>No se pudo guardar.</NOT_SAVE>
-<REBOOT_FAILED>Reboot falla.</REBOOT_FAILED>
-<CONNECT_SERVER>Conneccion al server:</CONNECT_SERVER>
-<LOGIN_FAILED>Conexion failed. Code: </LOGIN_FAILED>
-<CANNOT_CONNECT>No se pudo conectar al server.</CANNOT_CONNECT>
-<SERVER_CLOSED>Server cerrando. Code: </SERVER_CLOSED>
-</MYSERVER_LANGUAGE_FILE>
-
diff --git a/myserver/binaries/languages/english.xml
b/myserver/binaries/languages/english.xml
deleted file mode 100644
index 408ce81..0000000
--- a/myserver/binaries/languages/english.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--MYSERVER SUPPORT FOR ENGLISH LANGUAGE-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<MYSERVER_LANGUAGE_FILE>
-
-<MSG_LANGUAGE>Using english language</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Server configuration terminated</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Security access is not used, the web directory contents is
accessible to anyone</AL_NO_SECURITY>
-<MSG_ISOCK>Initializing socket library...</MSG_ISOCK>
-<ERR_ISOCK>Error initializing socket library</ERR_ISOCK>
-<MSG_SOCKSTART>Socket library was initialized</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Creating server socket...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Server socket created</MSG_SSOCKRUN>
-<ERR_OPENP>Error opening port, port can be used by another
application</ERR_OPENP>
-<MSG_BIND_PORT>Trying to bind port...</MSG_BIND_PORT>
-<ERR_BIND>Error binding port, port can be used by another
application</ERR_BIND>
-<MSG_PORT_BOUND>Port was bound</MSG_PORT_BOUND>
-<MSG_SLISTEN>Trying to listen on port...</MSG_SLISTEN>
-<ERR_LISTEN>Error listening</ERR_LISTEN>
-<MSG_LISTEN>Listen on port</MSG_LISTEN>
-<MSG_LOADMIME>Loading MIME types...</MSG_LOADMIME>
-<MSG_GETNAME>Computer name is</MSG_GETNAME>
-<MSG_LOADED>Loaded</MSG_LOADED>
-<ERR_LOADED>Error Loading</ERR_LOADED>
-<MSG_MIMERUN>MIME types loaded successfully</MSG_MIMERUN>
-<MSG_ADDRESS>IP Address</MSG_ADDRESS>
-<ERR_LOADMIME>MIME types cannot be loaded</ERR_LOADMIME>
-<ERR_ERROR>Generic error</ERR_ERROR>
-<MSG_NUM_CPU>Number of processors:</MSG_NUM_CPU>
-<MSG_CREATET>Creating thread...</MSG_CREATET>
-<MSG_THREADR>Thread created</MSG_THREADR>
-<MSG_LISTENT>Creating listen thread...</MSG_LISTENT>
-<MSG_LISTENTR>Listen thread is created</MSG_LISTENTR>
-<MSG_READY>MyServer is now ready to accept connections</MSG_READY>
-<MSG_BREAK>Press Ctrl+C to break execution</MSG_BREAK>
-<MSG_STOPT>Terminating threads...</MSG_STOPT>
-<MSG_TSTOPPED>Threads terminated</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Cleaning memory...</MSG_MEMCLEAN>
-<ERR_LOADVHOSTS>Error loading virtual hosts</ERR_LOADVHOSTS>
-<MSG_SERVICESTOP>Service is stopping...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB loaded successfully</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB cannot be loaded</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/french.xml
b/myserver/binaries/languages/french.xml
deleted file mode 100644
index d3e6792..0000000
--- a/myserver/binaries/languages/french.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--MYSERVER SUPPORT FOR FRENCH LANGUAGE-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Utilisation de la langue française...</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Configuration du serveur terminée</MSG_SERVER_CONF>
-<AL_NO_SECURITY>L'accès sécurisé n'est pas utilisé, les répertoires web sont
accessibles par tout le monde</AL_NO_SECURITY>
-<MSG_ISOCK>Initalisation de la librairie socket...</MSG_ISOCK>
-<ERR_ISOCK>Erreur lors d" l'initialisation de la librairie socket</ERR_ISOCK>
-<MSG_SOCKSTART>La libraire socket est initialisée...</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Création de la socket du serveur...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Socket du serveur créée.</MSG_SSOCKRUN>
-<ERR_OPENP>Erreur lors de l'ouverture du port, le port est déjà peut-être
utilisé par un autre application</ERR_OPENP>
-<MSG_BIND_PORT>Binding du port...</MSG_BIND_PORT>
-<ERR_BIND>Erreur pendant le binding du port, le port est déjà peut-être
utilisé par un autre application</ERR_BIND>
-<MSG_PORT_BOUND>Le port est bindé</MSG_PORT_BOUND>
-<MSG_SLISTEN>Tentative d'écoute du port...</MSG_SLISTEN>
-<ERR_LISTEN>Erreur lors de l'écoute du port</ERR_LISTEN>
-<MSG_LISTEN>Le serveur écoute le port</MSG_LISTEN>
-<MSG_LOADMIME>Chargement des types MIME...</MSG_LOADMIME>
-<MSG_GETNAME>Le nom de l'ordinateur est</MSG_GETNAME>
-<MSG_LOADED>Ouvert</MSG_LOADED>
-<ERR_LOADED>Erreur pendant l'ouverture</ERR_LOADED>
-<MSG_MIMERUN>Les types MIME ouvert avec succès</MSG_MIMERUN>
-<MSG_ADDRESS>Adresse IP</MSG_ADDRESS>
-<ERR_LOADMIME>Les types MIME ne peuvent être chargé</ERR_LOADMIME>
-<ERR_ERROR>Erreur générale</ERR_ERROR>
-<MSG_NUM_CPU>Nombre de processeurs :</MSG_NUM_CPU>
-<MSG_CREATET>Creation du thread</MSG_CREATET>
-<MSG_THREADR>Thread crée</MSG_THREADR>
-<MSG_LISTENT>Création du thread écouteur...</MSG_LISTENT>
-<MSG_LISTENTR>Le thread écouteur est crée</MSG_LISTENTR>
-<MSG_READY>MyServer est maintenant près à accepter des connections</MSG_READY>
-<MSG_BREAK>Appuyer sur Ctrl+C pour arréter le serveur</MSG_BREAK>
-<MSG_STOPT>Extinction des threads...</MSG_STOPT>
-<MSG_TSTOPPED>Threads terminés</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Libération de la mémoire...</MSG_MEMCLEAN>
-<ERR_LOADVHOSTS>Erreur pendant l'ouverture des hosts virtuels</ERR_LOADVHOSTS>
-<MSG_SERVICESTOP>Le service est en train de s'arréter...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB chargéé avec succès</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB n'a pas pu être ouvert</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/german.xml
b/myserver/binaries/languages/german.xml
deleted file mode 100644
index 13ac219..0000000
--- a/myserver/binaries/languages/german.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--MYSERVER SUPPORT FOR GERMAN LANGUAGE-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<!--TRANSLATED BY BINARIX-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Benutze Deutsche Sprache</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Server Konfiguration beendet</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Sicherheitszugriff wird nicht genutzt, der Inhalt des
Webordners ist zugaenglich fuer jeden</AL_NO_SECURITY>
-<MSG_ISOCK>Initialisiere Socket Library...</MSG_ISOCK>
-<ERR_ISOCK>Fehler beim Initialisieren der Socket Library</ERR_ISOCK>
-<MSG_SOCKSTART>Socket Library wurde initialisiert</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Erstelle server socket...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Server socket wurde erstellt</MSG_SSOCKRUN>
-<ERR_OPENP>Fehler beim Oeffnen des Ports, Port kann bereits von einer anderen
Applikation benutzt werden</ERR_OPENP>
-<MSG_BIND_PORT>Versuche Port zu binden...</MSG_BIND_PORT>
-<ERR_BIND>Fehler beim Binden des Ports, Port kann bereits von einer anderen
Applikation bentutz werden</ERR_BIND>
-<MSG_PORT_BOUND>Port wurde gebunden</MSG_PORT_BOUND>
-<MSG_SLISTEN>Versuche auf Port zu hoeren...</MSG_SLISTEN>
-<ERR_LISTEN>Fehler beim Hoeren</ERR_LISTEN>
-<MSG_LISTEN>Hoere auf Port</MSG_LISTEN>
-<MSG_LOADMIME>Lade MIME types...</MSG_LOADMIME>
-<MSG_GETNAME>Computer Name ist</MSG_GETNAME>
-<MSG_LOADED>Geladen</MSG_LOADED>
-<ERR_LOADED>Fehler beim Laden</ERR_LOADED>
-<MSG_MIMERUN>MIME types erfolgreich geladen</MSG_MIMERUN>
-<MSG_ADDRESS>IP Adresse</MSG_ADDRESS>
-<ERR_LOADMIME>MIME types konnten nicht geladen werden</ERR_LOADMIME>
-<ERR_ERROR>Allgemeiner Fehler</ERR_ERROR>
-<ERR_LOADVHOSTS>Fehler beim Laden der virtuellen Hosts</ERR_LOADVHOSTS>
-<MSG_NUM_CPU>Nummer des Prozessors:</MSG_NUM_CPU>
-<MSG_CREATET>Erstelle Thread</MSG_CREATET>
-<MSG_THREADR>Thread erstellt</MSG_THREADR>
-<MSG_LISTENT>Erstelle hoerenden Thread...</MSG_LISTENT>
-<MSG_LISTENTR>Hoerender Thread wurde erstellt</MSG_LISTENTR>
-<MSG_READY>MyServer kann jetzt Verbindungen akzeptieren</MSG_READY>
-<MSG_BREAK>Druecke Strg+C um die Anwendung abzubrechen</MSG_BREAK>
-<MSG_STOPT>Beende Threads...</MSG_STOPT>
-<MSG_TSTOPPED>Threads beendet</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Loesche Speicher...</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>Stoppe Service...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB erfolgreich geladen</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB konnten nicht geladen werden</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
\ No newline at end of file
diff --git a/myserver/binaries/languages/italiano.xml
b/myserver/binaries/languages/italiano.xml
deleted file mode 100644
index 7a15e67..0000000
--- a/myserver/binaries/languages/italiano.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--MYSERVER SUPPORTO PER LA LINGUA ITALIANA-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Uso della lingua italiana</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Configurazione Server terminata</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Non viene usata nessuna sicurezza, tutti possono accedere alla
cartella web</AL_NO_SECURITY>
-<MSG_ISOCK>Inizializzazione della libreria socket...</MSG_ISOCK>
-<ERR_ISOCK>Errore nella inizializzazione della libreria socket</ERR_ISOCK>
-<MSG_SOCKSTART>Libreria socket inizializzata con successo</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Creazione del socket server...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Socket Server creato</MSG_SSOCKRUN>
-<ERR_OPENP>Errore nell'apertura della porta</ERR_OPENP>
-<MSG_BIND_PORT>Binding della porta...</MSG_BIND_PORT>
-<ERR_BIND>Errore nel binding della porta</ERR_BIND>
-<MSG_PORT_BOUND>Bind della porta avvenuto</MSG_PORT_BOUND>
-<MSG_SLISTEN>Tentativo di ascolto sulla porta...</MSG_SLISTEN>
-<ERR_LISTEN>Errore nell'ascoltare sulla porta</ERR_LISTEN>
-<MSG_LISTEN>Il server ascolta sulla porta</MSG_LISTEN>
-<MSG_LOADMIME>Caricamento tipi MIME...</MSG_LOADMIME>
-<MSG_GETNAME>Nome del Computer </MSG_GETNAME>
-<MSG_MIMERUN>Tipi Mime caricati con successo</MSG_MIMERUN>
-<MSG_ADDRESS>Indirizzo IP</MSG_ADDRESS>
-<ERR_LOADMIME>I tipi MIME non sono stati caricati correttamente</ERR_LOADMIME>
-<ERR_ERROR>Errore generico</ERR_ERROR>
-<MSG_NUM_CPU>Numero di processori:</MSG_NUM_CPU>
-<MSG_CREATET>Creazione del thread</MSG_CREATET>
-<MSG_THREADR>Thread creato</MSG_THREADR>
-<MSG_LISTENT>Creazione del thread di ascolto...</MSG_LISTENT>
-<MSG_LISTENTR>Thread di ascolto creato con successo</MSG_LISTENTR>
-<MSG_READY>MyServer pronto ad accettare connessioni</MSG_READY>
-<MSG_BREAK>Premere Ctrl+C per terminare l'esecuzione</MSG_BREAK>
-<MSG_STOPT>Chiusura threads in corso...</MSG_STOPT>
-<MSG_TSTOPPED>Threads chiusi con successo</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Disallocazione memoria in corso...</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>Arresto del servizio in corso...</MSG_SERVICESTOP>
-<MSG_LOADED>Caricata</MSG_LOADED>
-<ERR_LOADED>Errore nel caricare</ERR_LOADED>
-<ERR_LOADVHOSTS>Errore nel caricare i virtual hosts</ERR_LOADVHOSTS>
-<MSG_LOADMSCGI>MSCGI-LIB caricata con successo</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>Errore nel caricare MSCGI-LIB</ERR_LOADMSCGI>
-</MYSERVER_LANGUAGE_FILE>
\ No newline at end of file
diff --git a/myserver/binaries/languages/romana.xml
b/myserver/binaries/languages/romana.xml
deleted file mode 100644
index 21bf033..0000000
--- a/myserver/binaries/languages/romana.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--PORTUL MYSERVER PENTRU LIMBA ROMÃNÄ-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Utilizarea limbii române</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Configurarea serverului s-a terminat</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Accesul securizat nu este utilizat, conţinutul directoarelor
web este accesibil tuturor</AL_NO_SECURITY>
-<MSG_ISOCK>Iniţializarea bibliotecii sockeţilor...</MSG_ISOCK>
-<ERR_ISOCK>Eroare la iniţializarea bibliotecii sockeţilor</ERR_ISOCK>
-<MSG_SOCKSTART>Biblioteca sockeÅ£ilor a fost iniÅ£ializatÄ</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Crearea socketului serverului...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Socketul serverului a fost creat</MSG_SSOCKRUN>
-<ERR_OPENP>Eroare la deschiderea portului, portul ar putea fi utilizat de
cÄtre o altÄ aplicaÅ£ie</ERR_OPENP>
-<MSG_BIND_PORT>Ãncercare de legare(engl. bind) a portul...</MSG_BIND_PORT>
-<ERR_BIND>Eroare la legarea portului, portul ar putea fi utilizat de cÄtre o
altÄ aplicaÅ£ie</ERR_BIND>
-<MSG_PORT_BOUND>Portul a fost legat</MSG_PORT_BOUND>
-<MSG_SLISTEN>Ãncercare de a asculta portul...</MSG_SLISTEN>
-<ERR_LISTEN>Eroare la ascultare</ERR_LISTEN>
-<MSG_LISTEN>Ascult pe portul</MSG_LISTEN>
-<MSG_LOADMIME>Ãncarc tipurile MIME ...</MSG_LOADMIME>
-<MSG_GETNAME>Numele calculatorului este</MSG_GETNAME>
-<MSG_LOADED>ÃncÄrcÄt</MSG_LOADED>
-<ERR_LOADED>Eroare încÄrcând</ERR_LOADED>
-<MSG_MIMERUN>Tipurile MIME au fost încÄrcate cu succes</MSG_MIMERUN>
-<MSG_ADDRESS>Adresa IP</MSG_ADDRESS>
-<ERR_LOADMIME>Tipurile MIME nu pot fi încÄrcate</ERR_LOADMIME>
-<ERR_ERROR>Eroare genericÄ</ERR_ERROR>
-<MSG_NUM_CPU>NumÄrul de procesoare:</MSG_NUM_CPU>
-<MSG_CREATET>Crearea firului de execuţie(engl. thread)...</MSG_CREATET>
-<MSG_THREADR>Firul de execuţie a fost creat</MSG_THREADR>
-<MSG_LISTENT>Crearea firului de execuÅ£ie care ascultÄ...</MSG_LISTENT>
-<MSG_LISTENTR>Firul de execuÅ£ie care ascultÄ a fost creat</MSG_LISTENTR>
-<MSG_READY>MyServer este pregÄtit sÄ accepte conexiuni</MSG_READY>
-<MSG_BREAK>ApÄsaÅ£i Ctrl+C pentru a opri execuÅ£ia</MSG_BREAK>
-<MSG_STOPT>Terminarea firelor de execuţie...</MSG_STOPT>
-<MSG_TSTOPPED>Firele de excuţie au fost terminate</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Eliberarea memoriei...</MSG_MEMCLEAN>
-<ERR_LOADVHOSTS>Eroare la încÄrcarea gazdelor virtuale(engl.virtual
hosts)</ERR_LOADVHOSTS>
-<MSG_SERVICESTOP>Serviciul se opreÅte...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB a fost încÄrcatÄ cu succes</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB nu poate fi încÄrcatÄ</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/russian.xml
b/myserver/binaries/languages/russian.xml
deleted file mode 100644
index de32273..0000000
--- a/myserver/binaries/languages/russian.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--MYSERVER SUPPORT FOR RUSSIAN LANGUAGE-->
-<!--COPYRIGHT 2002 Rocky_10_Balboa-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Èñïîëüçóåòñÿ ðóññêèé ÿçûê</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Êîíôèãóðàöèÿ ñåðâåðà ïðåðâàíà</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Íå èñïîëüçóåòñÿ äîñòóï ñ çàùèòîé, ñîäåðæàíèå web ïàïêè
äîñòóïíî âñåì</AL_NO_SECURITY>
-<MSG_ISOCK>Èíèöèàëèçàöèÿ áèáëèîòåêè ñîêåòà...</MSG_ISOCK>
-<ERR_ISOCK>Îøèáêà èíèöèàëèçàöèè áèáëèîòåêè ñîêåòà</ERR_ISOCK>
-<MSG_SOCKSTART>Áèáëèîòåêà ñîêåòà íå èíèöèàëèçèðîâàíà</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Ñîçäàíèå ñîêåòà ñåðâåðà</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Ñîêåò ñåðâåðà ñîçäàí</MSG_SSOCKRUN>
-<ERR_OPENP>Îøèáêà îòêðûòèÿ ïîðòà, âîçìîæíî, ïîðò èñïîëüçóåòñÿ äðóãèì
ïðèëîæåíèåì</ERR_OPENP>
-<MSG_BIND_PORT>Ïîïûòêà ñâÿçè ñ ïîðòîì</MSG_BIND_PORT>
-<ERR_BIND>Îøèáêà ïðè ïîïûòêå ñâÿçè ñ ïîðòîì, âîçìîæíî, ïîðò èñïîëüçóåòñÿ
äðóãèì ïðèëîæåíèåì</ERR_BIND>
-<MSG_PORT_BOUND>Ñâÿçü ñ ïîðòîì óñòàíîâëåíà</MSG_PORT_BOUND>
-<MSG_SLISTEN>Ïîïûòêà ïðîñëóøèâàíèÿ ïîðòà...</MSG_SLISTEN>
-<ERR_LISTEN>Îøèáêà ïðîñëóøèâàíèÿ</ERR_LISTEN>
-<MSG_LISTEN>Ïðîñëóøèâàíèå ïîðòà</MSG_LISTEN>
-<MSG_LOADMIME>Çàãðóçêà MIME òèïîâ</MSG_LOADMIME>
-<MSG_GETNAME>Èìÿ êîìïüþòåðà: </MSG_GETNAME>
-<MSG_LOADED>Çàãðóæåíî</MSG_LOADED>
-<ERR_LOADED>Îøèáêà çàãðóçêè</ERR_LOADED>
-<MSG_MIMERUN>MIME òèïû áëàãîïîëó÷íî çàãðóæåíû</MSG_MIMERUN>
-<MSG_ADDRESS>IP àäðåñ</MSG_ADDRESS>
-<ERR_LOADMIME>MIME òèïû íå ìîãóò áûòü çàãðóæåíû</ERR_LOADMIME>
-<ERR_ERROR>Îøèáêà</ERR_ERROR>
-<MSG_NUM_CPU>×èñëî ïðîöåññîðîâ: </MSG_NUM_CPU>
-<MSG_CREATET>Ñîçäàíèå ïîäïðîöåññà</MSG_CREATET>
-<MSG_THREADR>Ïîäïðîöåññ ñîçäàí</MSG_THREADR>
-<MSG_LISTENT>Ñîçäàþ ïîäïðîöåññ ïðîñëóøèâàíèÿ...</MSG_LISTENT>
-<MSG_LISTENTR>Ïîäïðîöåññ ïðîñëóøèâàíèÿ ñîçäàí</MSG_LISTENTR>
-<MSG_READY>myServer ãîòîâ ê ñîåäèíåíèþ</MSG_READY>
-<MSG_BREAK>Íàæìèòå Ctrl+C äëÿ ïðåðûâàíèÿ âûïîëíåíèÿ êîìàíäû</MSG_BREAK>
-<MSG_STOPT>Îáðûâ ïîäïðîöåññîâ</MSG_STOPT>
-<MSG_TSTOPPED>Ïîäïðîöåññû îáîðâàíû</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Î÷èñòêà ïàìÿòè</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>Ñåðâèñ îñòàíîâëåí...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB òèïû áëàãîïîëó÷íî çàãðóæåíû</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB òèïû íå ìîãóò áûòü çàãðóæåíû</ERR_LOADMSCGI>
-
-<!--THESE MEMBERS MAX 32 CHARACTERS-->
-<MSG_SENDING>Ïîñûëàþ</MSG_SENDING>
-<MSG_RUNON>Âûïîëíÿåòñÿ îïåðàöèÿ</MSG_RUNON>
-<MSG_FOLDERCONT>Ñîäåðæàíèå ïàïêè</MSG_FOLDERCONT>
-<MSG_FILE>Ôàéë</MSG_FILE>
-<MSG_LMODIFY>Ïîñëåäíåå èçìåíåíèå:</MSG_LMODIFY>
-<MSG_SIZE>Ðàçìåð</MSG_SIZE>
-<MSG_NEWCONNECTION>Ñîåäèíåíèå îò</MSG_NEWCONNECTION>
-<MSG_ERRORCONNECTION>Îøèáêà ñîåäèíåíèÿ îò</MSG_ERRORCONNECTION>
-<MSG_ATTIME>âðåìÿ:</MSG_ATTIME>
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/russian_koi8r.xml
b/myserver/binaries/languages/russian_koi8r.xml
deleted file mode 100644
index 4986d14..0000000
--- a/myserver/binaries/languages/russian_koi8r.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--MYSERVER SUPPORT FOR RUSSIAN LANGUAGE-->
-<!--COPYRIGHT 2002 Rocky_10_Balboa-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>éÓÐÏÌØÚÕÅÔÓÑ ÒÕÓÓËÉÊ ÑÚÙË</MSG_LANGUAGE>
-<MSG_SERVER_CONF>ëÏÎÆÉÇÕÒÁÃÉÑ ÓÅÒ×ÅÒÁ ÐÒÅÒ×ÁÎÁ</MSG_SERVER_CONF>
-<AL_NO_SECURITY>îÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÓÔÕÐ Ó ÚÁÝÉÔÏÊ, ÓÏÄÅÒÖÁÎÉÅ web ÐÁÐËÉ
ÄÏÓÔÕÐÎÏ ×ÓÅÍ</AL_NO_SECURITY>
-<MSG_ISOCK>éÎÉÃÉÁÌÉÚÁÃÉÑ ÂÉÂÌÉÏÔÅËÉ ÓÏËÅÔÁ...</MSG_ISOCK>
-<ERR_ISOCK>ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÉÂÌÉÏÔÅËÉ ÓÏËÅÔÁ</ERR_ISOCK>
-<MSG_SOCKSTART>âÉÂÌÉÏÔÅËÁ ÓÏËÅÔÁ ÎÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÁ</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>óÏÚÄÁÎÉÅ ÓÏËÅÔÁ ÓÅÒ×ÅÒÁ</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>óÏËÅÔ ÓÅÒ×ÅÒÁ ÓÏÚÄÁÎ</MSG_SSOCKRUN>
-<ERR_OPENP>ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÐÏÒÔÁ, ×ÏÚÍÏÖÎÏ, ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÒÕÇÉÍ
ÐÒÉÌÏÖÅÎÉÅÍ</ERR_OPENP>
-<MSG_BIND_PORT>ðÏÐÙÔËÁ Ó×ÑÚÉ Ó ÐÏÒÔÏÍ</MSG_BIND_PORT>
-<ERR_BIND>ïÛÉÂËÁ ÐÒÉ ÐÏÐÙÔËÅ Ó×ÑÚÉ Ó ÐÏÒÔÏÍ, ×ÏÚÍÏÖÎÏ, ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔÓÑ
ÄÒÕÇÉÍ ÐÒÉÌÏÖÅÎÉÅÍ</ERR_BIND>
-<MSG_PORT_BOUND>ó×ÑÚØ Ó ÐÏÒÔÏÍ ÕÓÔÁÎÏ×ÌÅÎÁ</MSG_PORT_BOUND>
-<MSG_SLISTEN>ðÏÐÙÔËÁ ÐÒÏÓÌÕÛÉ×ÁÎÉÑ ÐÏÒÔÁ...</MSG_SLISTEN>
-<ERR_LISTEN>ïÛÉÂËÁ ÐÒÏÓÌÕÛÉ×ÁÎÉÑ</ERR_LISTEN>
-<MSG_LISTEN>ðÒÏÓÌÕÛÉ×ÁÎÉÅ ÐÏÒÔÁ</MSG_LISTEN>
-<MSG_LOADMIME>úÁÇÒÕÚËÁ MIME ÔÉÐÏ×</MSG_LOADMIME>
-<MSG_GETNAME>éÍÑ ËÏÍÐØÀÔÅÒÁ: </MSG_GETNAME>
-<MSG_LOADED>úÁÇÒÕÖÅÎÏ</MSG_LOADED>
-<ERR_LOADED>ïÛÉÂËÁ ÚÁÇÒÕÚËÉ</ERR_LOADED>
-<MSG_MIMERUN>MIME ÔÉÐÙ ÂÌÁÇÏÐÏÌÕÞÎÏ ÚÁÇÒÕÖÅÎÙ</MSG_MIMERUN>
-<MSG_ADDRESS>IP ÁÄÒÅÓ</MSG_ADDRESS>
-<ERR_LOADMIME>MIME ÔÉÐÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÚÁÇÒÕÖÅÎÙ</ERR_LOADMIME>
-<ERR_ERROR>ïÛÉÂËÁ</ERR_ERROR>
-<MSG_NUM_CPU>þÉÓÌÏ ÐÒÏÃÅÓÓÏÒÏ×: </MSG_NUM_CPU>
-<MSG_CREATET>óÏÚÄÁÎÉÅ ÐÏÄÐÒÏÃÅÓÓÁ</MSG_CREATET>
-<MSG_THREADR>ðÏÄÐÒÏÃÅÓÓ ÓÏÚÄÁÎ</MSG_THREADR>
-<MSG_LISTENT>óÏÚÄÁÀ ÐÏÄÐÒÏÃÅÓÓ ÐÒÏÓÌÕÛÉ×ÁÎÉÑ...</MSG_LISTENT>
-<MSG_LISTENTR>ðÏÄÐÒÏÃÅÓÓ ÐÒÏÓÌÕÛÉ×ÁÎÉÑ ÓÏÚÄÁÎ</MSG_LISTENTR>
-<MSG_READY>myServer ÇÏÔÏ× Ë ÓÏÅÄÉÎÅÎÉÀ</MSG_READY>
-<MSG_BREAK>îÁÖÍÉÔÅ Ctrl+C ÄÌÑ ÐÒÅÒÙ×ÁÎÉÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ</MSG_BREAK>
-<MSG_STOPT>ïÂÒÙ× ÐÏÄÐÒÏÃÅÓÓÏ×</MSG_STOPT>
-<MSG_TSTOPPED>ðÏÄÐÒÏÃÅÓÓÙ ÏÂÏÒ×ÁÎÙ</MSG_TSTOPPED>
-<MSG_MEMCLEAN>ïÞÉÓÔËÁ ÐÁÍÑÔÉ</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>óÅÒ×ÉÓ ÏÓÔÁÎÏ×ÌÅÎ...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>MSCGI-LIB ÔÉÐÙ ÂÌÁÇÏÐÏÌÕÞÎÏ ÚÁÇÒÕÖÅÎÙ</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>MSCGI-LIB ÔÉÐÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÚÁÇÒÕÖÅÎÙ</ERR_LOADMSCGI>
-
-<!--THESE MEMBERS MAX 32 CHARACTERS-->
-<MSG_SENDING>ðÏÓÙÌÁÀ</MSG_SENDING>
-<MSG_RUNON>÷ÙÐÏÌÎÑÅÔÓÑ ÏÐÅÒÁÃÉÑ</MSG_RUNON>
-<MSG_FOLDERCONT>óÏÄÅÒÖÁÎÉÅ ÐÁÐËÉ</MSG_FOLDERCONT>
-<MSG_FILE>æÁÊÌ</MSG_FILE>
-<MSG_LMODIFY>ðÏÓÌÅÄÎÅÅ ÉÚÍÅÎÅÎÉÅ:</MSG_LMODIFY>
-<MSG_SIZE>òÁÚÍÅÒ</MSG_SIZE>
-<MSG_NEWCONNECTION>óÏÅÄÉÎÅÎÉÅ ÏÔ</MSG_NEWCONNECTION>
-<MSG_ERRORCONNECTION>ïÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ ÏÔ</MSG_ERRORCONNECTION>
-<MSG_ATTIME>×ÒÅÍÑ:</MSG_ATTIME>
-</MYSERVER_LANGUAGE_FILE>
diff --git a/myserver/binaries/languages/spanish.xml
b/myserver/binaries/languages/spanish.xml
deleted file mode 100644
index 21619e8..0000000
--- a/myserver/binaries/languages/spanish.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--SOPORTE DE MYSERVER PARA LENGUAJE ESPAÑOL-->
-<!--COPYRIGHT 2002 MyServer Team-->
-<!--TRADUCIDO POR MANUEL A. RUBIO "BOMBADIL"-->
-<MYSERVER_LANGUAGE_FILE>
-<MSG_LANGUAGE>Lenguaje Español en uso</MSG_LANGUAGE>
-<MSG_SERVER_CONF>Configuración del servidor terminada</MSG_SERVER_CONF>
-<AL_NO_SECURITY>Acceso de seguridad no usado, los contenidos de la
-carpeta web no son accesibles a nadie</AL_NO_SECURITY>
-<MSG_ISOCK>Inicializando librería de conexión...</MSG_ISOCK>
-<ERR_ISOCK>Error inicializando librería de conexión</ERR_ISOCK>
-<MSG_SOCKSTART>Librería de conexión fué inicializada</MSG_SOCKSTART>
-<MSG_SSOCKCREATE>Creando conexión de servidor...</MSG_SSOCKCREATE>
-<MSG_SSOCKRUN>Conexión de servidor creada</MSG_SSOCKRUN>
-<ERR_OPENP>Error abriendo puerto, puede que el puerto esté siendo usado
-por otra aplicación</ERR_OPENP>
-<MSG_BIND_PORT>Intentando fijar puerto...</MSG_BIND_PORT>
-<ERR_BIND>Error fijando puerto, puede que el puerto esté siendo usado
-por otra aplicación</ERR_BIND>
-<MSG_PORT_BOUND>El puerto está fijado</MSG_PORT_BOUND>
-<MSG_SLISTEN>Intentando escuchar en puerto...</MSG_SLISTEN>
-<ERR_LISTEN>Error al escuchar</ERR_LISTEN>
-<MSG_LISTEN>Escuchando en puerto</MSG_LISTEN>
-<MSG_LOADMIME>Cargando tipos MIME...</MSG_LOADMIME>
-<MSG_GETNAME>El nombre del ordenador es</MSG_GETNAME>
-<MSG_LOADED>Cargado</MSG_LOADED>
-<ERR_LOADED>Error Cargando</ERR_LOADED>
-<MSG_MIMERUN>Tipos MIME cargados correctamente</MSG_MIMERUN>
-<MSG_ADDRESS>Dirección IP</MSG_ADDRESS>
-<ERR_LOADMIME>Tipos MIME no se pudieron cargar</ERR_LOADMIME>
-<ERR_ERROR>Error genérico</ERR_ERROR>
-<MSG_NUM_CPU>Número de procesadores:</MSG_NUM_CPU>
-<MSG_CREATET>Creando hilo</MSG_CREATET>
-<MSG_THREADR>Hilo creado</MSG_THREADR>
-<MSG_LISTENT>Creando hilo para escuchar...</MSG_LISTENT>
-<MSG_LISTENTR>Hilo para escuchar creado</MSG_LISTENTR>
-<MSG_READY>MyServer preparado para aceptar conexiones</MSG_READY>
-<MSG_BREAK>Presione Ctrl+C para interrumpir ejecución</MSG_BREAK>
-<MSG_STOPT>Terminando hilos...</MSG_STOPT>
-<MSG_TSTOPPED>Hilos terminados</MSG_TSTOPPED>
-<MSG_MEMCLEAN>Limpiando memoria...</MSG_MEMCLEAN>
-<MSG_SERVICESTOP>Deteniendo servicio...</MSG_SERVICESTOP>
-<MSG_LOADMSCGI>Tipos MSCGI-LIB cargados correctamente</MSG_LOADMSCGI>
-<ERR_LOADMSCGI>Tipos MSCGI-LIB no se pudieron cargar</ERR_LOADMSCGI>
-
-</MYSERVER_LANGUAGE_FILE>
\ No newline at end of file
diff --git a/myserver/configure.in b/myserver/configure.in
index 5d33249..5102d2a 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -48,6 +48,8 @@ AM_PROG_LEX
AC_PROG_YACC
AC_C_BIGENDIAN
+AM_GNU_GETTEXT([external])
+
AC_CHECK_PROG(make_info, makeinfo, yes, no)
if test x$make_info = xno ; then
AC_MSG_WARN([ Cannot find makeinfo: info file will not be created])
@@ -323,7 +325,7 @@ AC_SUBST(BUILD_DOC)
AC_SUBST(BUILD_MSCGI)
dnl AC_CONFIG_SUBDIRS()
-AC_CONFIG_FILES([
+AC_CONFIG_FILES([ po/Makefile.in
Makefile
binaries/Makefile
binaries/certificates/Makefile
diff --git a/myserver/documentation/basic_configuration.texi
b/myserver/documentation/basic_configuration.texi
index 80a9ac0..0b5a879 100644
--- a/myserver/documentation/basic_configuration.texi
+++ b/myserver/documentation/basic_configuration.texi
@@ -24,12 +24,6 @@ following order:
@item Global scope inside /etc/myserver.
@end enumerate
address@hidden Message localization
-It is possible to change the localization for some MyServer messages
-changing the @code{server.language} value in the @file{myserver.xml} file.
-By default the english language is used, the value specified here must
-refer to a xml file contained in the @file{languages/} directory.
-
@section Server administrator
CGI scripts can get the server administrator e-mail and show them to
the user (through the SERVER_ADMIN environment variable).
diff --git a/myserver/include/connections_scheduler/listen_threads.h
b/myserver/include/connections_scheduler/listen_threads.h
index d24a65c..dd07fd1 100644
--- a/myserver/include/connections_scheduler/listen_threads.h
+++ b/myserver/include/connections_scheduler/listen_threads.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -27,17 +27,17 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class ListenThreads
{
public:
- void addListeningThread(u_short port);
- int initialize(XmlParser* parser);
- int terminate();
+ void addListeningThread (u_short port);
+ int initialize ();
+ int terminate ();
/*! Initialize the shutdown phase. */
- void shutdown(){shutdownStatus = true;}
+ void shutdown (){shutdownStatus = true;}
/*! Is it shutdown phase? */
- bool isShutdown(){return shutdownStatus;}
- void commitFastReboot();
- void beginFastReboot();
- void rollbackFastReboot();
- ListenThreads(ConnectionsScheduler*, Server*);
+ bool isShutdown (){return shutdownStatus;}
+ void commitFastReboot ();
+ void beginFastReboot ();
+ void rollbackFastReboot ();
+ ListenThreads (ConnectionsScheduler*, Server*);
private:
struct SocketInformation
@@ -56,12 +56,11 @@ private:
bool shutdownStatus;
HashMap<u_short, SocketInformation*> usedPorts;
- XmlParser *languageParser;
- int createServerAndListener(u_short port);
- void registerListener(SocketInformation*);
-
- Server* server;
- ConnectionsScheduler* scheduler;
+ int createServerAndListener (u_short port);
+ void registerListener (SocketInformation*);
+
+ Server *server;
+ ConnectionsScheduler *scheduler;
};
#endif
diff --git a/myserver/include/plugin/plugin.h b/myserver/include/plugin/plugin.h
index 04b00a4..9bdfe0a 100755
--- a/myserver/include/plugin/plugin.h
+++ b/myserver/include/plugin/plugin.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -32,17 +32,16 @@ class XmlParser;
class Plugin
{
public:
- Plugin();
- virtual ~Plugin();
- virtual int load(Server* server, XmlParser* languageFile);
- virtual int preLoad(string& file, bool global);
- virtual int postLoad(Server* server, XmlParser* languageFile);
- virtual int unLoad();
- virtual const char* getName(char* buffer, u_long len);
- virtual void* getDirectMethod(char* name);
+ Plugin ();
+ virtual ~Plugin ();
+ virtual int load (Server* server);
+ virtual int preLoad (string& file, bool global);
+ virtual int postLoad (Server* server);
+ virtual int unLoad ();
+ virtual const char* getName (char* buffer, u_long len);
+ virtual void* getDirectMethod (char* name);
protected:
DynamicLibrary hinstLib;
-
};
#endif
diff --git a/myserver/include/plugin/plugins_manager.h
b/myserver/include/plugin/plugins_manager.h
index b1ceffe..10769c5 100755
--- a/myserver/include/plugin/plugins_manager.h
+++ b/myserver/include/plugin/plugins_manager.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -50,7 +50,7 @@ public:
int preLoad (Server *server, string& resource);
int load (Server *server);
- int postLoad (Server *server, XmlParser* languageFile);
+ int postLoad (Server *server);
int unLoad ();
virtual void removePlugin (string& name);
diff --git a/myserver/include/protocol/control/control_protocol.h
b/myserver/include/protocol/control/control_protocol.h
index feefa39..2d3464d 100755
--- a/myserver/include/protocol/control/control_protocol.h
+++ b/myserver/include/protocol/control/control_protocol.h
@@ -30,32 +30,31 @@ using namespace std;
class ControlProtocol : public Protocol, public ConnectionsSchedulerVisitor
{
public:
- virtual int visitConnection(ConnectionPtr, void*);
+ virtual int visitConnection (ConnectionPtr, void*);
- int sendResponse(char*, int, ConnectionPtr, int, ControlHeader& header,
File* = 0);
- virtual int loadProtocol(XmlParser* languageParser);
- int controlConnection(ConnectionPtr a, char *b1, char *b2, int bs1,
+ int sendResponse (char*, int, ConnectionPtr, int, ControlHeader& header,
File* = 0);
+ virtual int loadProtocol ();
+ int controlConnection (ConnectionPtr a, char *b1, char *b2, int bs1,
int bs2, u_long nbtr, u_long id);
- virtual char* registerName(char*,int len);
- ControlProtocol();
- virtual ~ControlProtocol();
+ virtual char* registerName (char*,int len);
+ ControlProtocol ();
+ virtual ~ControlProtocol ();
protected:
static char adminLogin[64];
static char adminPassword[64];
static int controlEnabled;
- int checkAuth(ControlHeader&);
- int showConnections(ConnectionPtr,File* out, char *b1,int bs1,
ControlHeader&);
- int showDynamicProtocols(ConnectionPtr,File* out, char *b1,int bs1,
ControlHeader&);
- int showLanguageFiles(ConnectionPtr, File* out, char *b1,int bs1,
ControlHeader&);
- int killConnection(ConnectionPtr,u_long ID, File* out, char *b1,int bs1,
ControlHeader&);
- int getFile(ConnectionPtr, char*, File* in, File* out,
+ int checkAuth (ControlHeader&);
+ int showConnections (ConnectionPtr,File* out, char *b1,int bs1,
ControlHeader&);
+ int showDynamicProtocols (ConnectionPtr,File* out, char *b1,int bs1,
ControlHeader&);
+ int killConnection (ConnectionPtr,u_long ID, File* out, char *b1,int bs1,
ControlHeader&);
+ int getFile (ConnectionPtr, char*, File* in, File* out,
char *b1,int bs1, ControlHeader&);
- int putFile(ConnectionPtr,char*, File* in, File* out,
+ int putFile (ConnectionPtr,char*, File* in, File* out,
char *b1,int bs1, ControlHeader&);
- int getVersion(ConnectionPtr,File* out, char *b1,int bs1, ControlHeader&);
- int addToLog(int retCode, ConnectionPtr con, char *b1, int bs1,
ControlHeader&);
+ int getVersion (ConnectionPtr,File* out, char *b1,int bs1, ControlHeader&);
+ int addToLog (int retCode, ConnectionPtr con, char *b1, int bs1,
ControlHeader&);
};
#endif
diff --git a/myserver/include/protocol/ftp/ftp.h
b/myserver/include/protocol/ftp/ftp.h
index 88b21aa..61dcc1c 100755
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -107,8 +107,8 @@ public:
virtual int controlConnection (ConnectionPtr pConnection, char *b1,
char *b2, int bs1, int bs2, u_long nbtr,
u_long id);
- static int loadProtocolstatic (XmlParser *);
- static int unLoadProtocolstatic (XmlParser *);
+ static int loadProtocolstatic ();
+ static int unLoadProtocolstatic ();
int parseControlConnection ();
yyscan_t getScanner ()
@@ -234,14 +234,14 @@ public:
return ftp.controlConnection (a, b1, b2, bs1, bs2, nbtr, id);
}
- virtual int loadProtocol (XmlParser * parser)
+ virtual int loadProtocol ()
{
- return Ftp::loadProtocolstatic (parser);
+ return Ftp::loadProtocolstatic ();
}
- virtual int unLoadProtocol (XmlParser * parser)
+ virtual int unLoadProtocol ()
{
- return Ftp::unLoadProtocolstatic (parser);
+ return Ftp::unLoadProtocolstatic ();
}
diff --git a/myserver/include/protocol/http/http.h
b/myserver/include/protocol/http/http.h
index 4a1369b..f6f5c03 100644
--- a/myserver/include/protocol/http/http.h
+++ b/myserver/include/protocol/http/http.h
@@ -173,9 +173,8 @@ public:
u_long nbtr,
u_long id);
- static int loadProtocolStatic(XmlParser*);
-
- static int unLoadProtocolStatic(XmlParser*);
+ static int loadProtocolStatic();
+ static int unLoadProtocolStatic();
u_long getTimeout ();
int preprocessHttpRequest(string& filename, int yetmapped,
@@ -232,14 +231,14 @@ public:
return ret;
}
- virtual int loadProtocol(XmlParser* parser)
+ virtual int loadProtocol()
{
- return Http::loadProtocolStatic(parser);
+ return Http::loadProtocolStatic ();
}
- virtual int unLoadProtocol(XmlParser* parser)
+ virtual int unLoadProtocol ()
{
- return Http::unLoadProtocolStatic(parser);
+ return Http::unLoadProtocolStatic ();
}
diff --git a/myserver/include/protocol/protocol.h
b/myserver/include/protocol/protocol.h
index 404e7e1..d89da41 100755
--- a/myserver/include/protocol/protocol.h
+++ b/myserver/include/protocol/protocol.h
@@ -37,8 +37,8 @@ public:
virtual char* registerName (char*,int len);
virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
int bs1, int bs2, u_long nbtr, u_long id);
- virtual int loadProtocol (XmlParser*);
- virtual int unLoadProtocol (XmlParser*);
+ virtual int loadProtocol ();
+ virtual int unLoadProtocol ();
virtual int getProtocolOptions (){return protocolOptions;}
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 320bdc3..667cf13 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -105,10 +105,7 @@ public:
const char* getMainConfFile();
const char* getVhostConfFile();
const char* getMIMEConfFile();
- const char* getLanguagesPath();
- const char* getLanguageFile();
const char* getExternalPath();
- XmlParser* getLanguageParser();
~Server();
Protocol* getProtocol(const char *protocolName);
int addConnection(Socket,MYSERVER_SOCKADDRIN*);
@@ -131,7 +128,7 @@ public:
int getMaxLogFileSize();
int mustUseLogonOption();
void setVerbosity(u_long);
- void start(string &, string &, string &, string &, string &);
+ void start(string &, string &, string &, string &);
void stop();
void finalCleanup();
int terminate();
@@ -217,7 +214,6 @@ private:
string gid;
int currentThreadID;
ProtocolsManager protocols;
- XmlParser languageParser;
bool autoRebootEnabled;
bool toReboot;
@@ -249,7 +245,7 @@ private:
int copyConfigurationFromDefault(const char *);
void logWriteNTimes(string, unsigned);
int checkConfigurationPaths();
- bool resetConfigurationPaths(string &, string &, string &, string &, string
&);
+ bool resetConfigurationPaths(string &, string &, string &, string &);
Mutex* connectionsMutex;
u_long nStaticThreads;
u_long nMaxThreads;
@@ -262,8 +258,6 @@ private:
int purgeThreads();
int reboot();
- string* languageFile;
- string* languagesPath;
string* mainConfigurationFile;
string* vhostConfigurationFile;
string* mimeConfigurationFile;
diff --git a/myserver/m4/gettext.m4 b/myserver/m4/gettext.m4
new file mode 100644
index 0000000..c9ae1f7
--- /dev/null
+++ b/myserver/m4/gettext.m4
@@ -0,0 +1,381 @@
+# gettext.m4 serial 60 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <address@hidden>, 1995-2000.
+dnl Bruno Haible <address@hidden>, 2000-2006.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl default (if it is not specified or empty) is 'no-libtool'.
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl implementations (in libc or libintl) without the ngettext() function
+dnl will be ignored. If NEEDSYMBOL is specified and is
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries. If empty,
+dnl the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl and used.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl Catalog format: none
+dnl Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+ dnl Argument checking.
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], ,
[ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2],
[need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+ define([gt_included_intl],
+ ifelse([$1], [external],
+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+ [yes]))
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ gt_NEEDS_INIT
+ AM_GNU_GETTEXT_NEED([$2])
+
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
+ ifelse(gt_included_intl, yes, [
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
+ ])
+
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ dnl Ideally we would do this search only after the
+ dnl if test "$USE_NLS" = "yes"; then
+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" !=
"yes"; }; then
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl the configure script would need to contain the same shell code
+ dnl again, outside any 'if'. There are two solutions:
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+ dnl documented, we avoid it.
+ ifelse(gt_included_intl, yes, , [
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+ ])
+
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
+ dnl Set USE_NLS.
+ AC_REQUIRE([AM_NLS])
+
+ ifelse(gt_included_intl, yes, [
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+ ])
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ dnl Add a version number to the cache macros.
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH(included-gettext,
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ ])
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If GNU gettext is available we use this. Else we have
+ dnl to fall back to GNU NLS library.
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+ [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+ [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_domain_bindings],
+ [eval "$gt_func_gnugettext_libc=yes"],
+ [eval "$gt_func_gnugettext_libc=no"])])
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" !=
"yes"; }; then
+ dnl Sometimes libintl requires libiconv, so first search for
libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+ ])
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+ [$gt_func_gnugettext_libintl],
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+ [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_expand_alias ("")],
+ [eval "$gt_func_gnugettext_libintl=yes"],
+ [eval "$gt_func_gnugettext_libintl=no"])
+ dnl Now see whether libintl exists and depends on libiconv.
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val"
!= yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+ [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_expand_alias ("")],
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ fi
+
+ dnl If an already present or preinstalled GNU gettext() is found,
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes";
} \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val"
= "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ dnl Reset the values set by searching for libintl.
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+ dnl GNU gettext is not found in the C library.
+ dnl Fall back on included GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions used to generate GNU NLS library.
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
$LIBICONV $LIBTHREAD"
+
LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
$LTLIBICONV $LTLIBTHREAD"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
+
+ CATOBJEXT=
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions to use GNU gettext tools.
+ CATOBJEXT=.gmo
+ fi
+ ])
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to 1 if translation of program messages to the user's native
language
+ is requested.])
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ AC_MSG_CHECKING([whether to use NLS])
+ AC_MSG_RESULT([$USE_NLS])
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_CHECKING([where the gettext function comes from])
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" =
"yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ AC_MSG_RESULT([$gt_source])
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" =
"yes"; }; then
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+ AC_DEFINE(HAVE_GETTEXT, 1,
+ [Define if the GNU gettext() function is already present or
preinstalled.])
+ AC_DEFINE(HAVE_DCGETTEXT, 1,
+ [Define if the GNU dcgettext() function is already present or
preinstalled.])
+ fi
+
+ dnl We need to process the po/ directory.
+ POSUB=po
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+ dnl to 'yes' because some of the testsuite requires it.
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools;
then
+ BUILD_INCLUDED_LIBINTL=yes
+ fi
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ AC_SUBST(CATOBJEXT)
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+ AC_SUBST(DATADIRNAME)
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+ AC_SUBST(INSTOBJEXT)
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+ AC_SUBST(GENCAT)
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+ AC_SUBST(INTLOBJS)
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+ AC_SUBST(INTLLIBS)
+
+ dnl Make all documented variables known to autoconf.
+ AC_SUBST(LIBINTL)
+ AC_SUBST(LTLIBINTL)
+ AC_SUBST(POSUB)
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+ m4_divert_text([DEFAULTS], [gt_needs=])
+ m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/myserver/m4/iconv.m4 b/myserver/m4/iconv.m4
new file mode 100644
index 0000000..66bc76f
--- /dev/null
+++ b/myserver/m4/iconv.m4
@@ -0,0 +1,180 @@
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+ dnl those with the standalone portable GNU libiconv installed).
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed libiconv and not disabled its use
+ dnl via --without-libiconv-prefix, he wants to use it. The first
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+ AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ am_cv_func_iconv=yes)
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+ [iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);],
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes)
+ LIBS="$am_save_LIBS"
+ fi
+ ])
+ if test "$am_cv_func_iconv" = yes; then
+ AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+ dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne
Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ LIBS="$am_save_LIBS"
+ ])
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+ AC_DEFINE(HAVE_ICONV, 1,
+ [Define if you have the iconv() function and it works.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ AC_MSG_CHECKING([how to link with libiconv])
+ AC_MSG_RESULT([$LIBICONV])
+ else
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+ dnl either.
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+ AC_SUBST(LIBICONV)
+ AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+ AM_ICONV_LINK
+ if test "$am_cv_func_iconv" = yes; then
+ AC_MSG_CHECKING([for iconv declaration])
+ AC_CACHE_VAL(am_cv_proto_iconv, [
+ AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf,
size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd,
$am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf,
size_t *outbytesleft);"])
+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/(
/(/'`
+ AC_MSG_RESULT([$]{ac_t:-
+ }[$]am_cv_proto_iconv)
+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+ [Define as const if the declaration of iconv() needs const.])
+ fi
+])
diff --git a/myserver/m4/lib-ld.m4 b/myserver/m4/lib-ld.m4
new file mode 100644
index 0000000..96c4e2c
--- /dev/null
+++ b/myserver/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]* | [A-Za-z]:[\\/]*)]
+ [re_direlt='/[^/][^/]*/\.\./']
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/myserver/m4/lib-link.m4 b/myserver/m4/lib-link.m4
new file mode 100644
index 0000000..e3d26fc
--- /dev/null
+++ b/myserver/m4/lib-link.m4
@@ -0,0 +1,709 @@
+# lib-link.m4 serial 13 (gettext-0.17)
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ(2.54)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed lib[]Name and not disabled its use
+ dnl via --without-lib[]Name-prefix, he wants to use it.
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIB[]NAME"
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+ HAVE_LIB[]NAME=no
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+ dnl $INC[]NAME either.
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
+ LIB[]NAME[]_PREFIX=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl acl_libext,
+dnl acl_shlibext,
+dnl acl_hardcode_libdir_flag_spec,
+dnl acl_hardcode_libdir_separator,
+dnl acl_hardcode_direct,
+dnl acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld"
\
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+ acl_libext="$acl_cv_libext"
+ acl_shlibext="$acl_cv_shlibext"
+ acl_libname_spec="$acl_cv_libname_spec"
+ acl_library_names_spec="$acl_cv_library_names_spec"
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+ AC_ARG_ENABLE(rpath,
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+
define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and
DIR/lib
+ --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and
libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+])
+ dnl Search the library and its dependencies in $additional_libdir and
+ dnl $LDFLAGS. Using breadth-first-seach.
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='$1 $2'
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
+ uppername=`echo "$name" | sed -e
'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+
}$value"
+ else
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+ dnl that this library doesn't exist. So just drop it.
+ :
+ fi
+ else
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ dnl The same code as in the loop below:
+ dnl First look for a shared library.
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" =
'$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver";
then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ dnl Then look for a static library.
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ dnl First look for a shared library.
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" =
'$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done
\
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4
-k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f
"$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ dnl Then look for a static library.
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "$enable_rpath" = no || test "X$found_dir" =
"X/usr/$acl_libdirstem"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$acl_hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into
the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test
"$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the
resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the
LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl We cannot use $acl_hardcode_runpath_var and
LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects
only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+ else
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+ fi
+ fi
+ dnl Assume the include files are nearby.
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem/"'*$,,'`
+ LIB[]NAME[]_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ dnl Potentially add $additional_includedir to $INCNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's /usr/local/include and we are using GCC on
Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
+ dnl constructed $INCNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $INCNAME.
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+
}-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ dnl Look for dependencies.
+ if test -n "$found_la"; then
+ dnl Read the .la file. It defines the variables
+ dnl dlname, library_names, old_library, dependency_libs, current,
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ dnl We use only dependency_libs.
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ dnl Potentially add $additional_libdir to $LIBNAME and
$LTLIBNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's /usr/local/lib and we are using GCC on
Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem";
then
+ haveit=
+ if test "X$additional_libdir" =
"X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LIBNAME.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+
}-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+
}-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the
end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at
the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ dnl Handle this in the next round.
+ names_next_round="$names_next_round "`echo "X$dep" | sed
-e 's/^X-l//'`
+ ;;
+ *.la)
+ dnl Handle this in the next round. Throw away the .la's
+ dnl directory; it is already contained in a preceding -L
+ dnl option.
+ names_next_round="$names_next_round "`echo "X$dep" | sed
-e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ dnl Most likely an immediate library name.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ dnl Didn't find the library; assume it is in the system directories
+ dnl known to the linker and runtime loader. (All the system
+ dnl directories known to the linker should also be known to the
+ dnl runtime loader, otherwise the system is severely
misconfigured.)
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user must
+ dnl pass all path elements in one option. We can arrange that for a
+ dnl single library, but not when more than one $LIBNAMEs are used.
+ alldirs=
+ for found_dir in $rpathdirs; do
+
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+ for element in [$2]; do
+ haveit=
+ for x in $[$1]; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ [$1]="${[$1]}${[$1]:+ }$element"
+ fi
+ done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+ AC_REQUIRE([AC_LIB_RPATH])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ $1=
+ if test "$enable_rpath" != no; then
+ if test -n "$acl_hardcode_libdir_flag_spec" && test
"$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode directories into the resulting
+ dnl binary.
+ rpathdirs=
+ next=
+ for opt in $2; do
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+ if test "X$dir" != "X/usr/$acl_libdirstem"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+ else
+ case $opt in
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+ if test "X$dir" != "X/usr/$acl_libdirstem"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+ *) next= ;;
+ esac
+ fi
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n ""$3""; then
+ dnl libtool is used for linking. Use -R options.
+ for dir in $rpathdirs; do
+ $1="${$1}${$1:+ }-R$dir"
+ done
+ else
+ dnl The linker is used for linking directly.
+ if test -n "$acl_hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user
+ dnl must pass all path elements in one option.
+ alldirs=
+ for dir in $rpathdirs; do
+
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ $1="$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ $1="${$1}${$1:+ }$flag"
+ done
+ fi
+ fi
+ fi
+ fi
+ fi
+ AC_SUBST([$1])
+])
diff --git a/myserver/m4/lib-prefix.m4 b/myserver/m4/lib-prefix.m4
new file mode 100644
index 0000000..a8684e1
--- /dev/null
+++ b/myserver/m4/lib-prefix.m4
@@ -0,0 +1,185 @@
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+ dnl There is no formal standard regarding lib and lib64. The current
+ dnl practice is that on a system supporting 32-bit and 64-bit instruction
+ dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+ dnl libraries go under $prefix/lib. We determine the compiler's default
+ dnl mode by looking at the compiler's library search path. If at least
+ dnl of its elements ends in /lib64 or points to a directory whose absolute
+ dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+ dnl default, namely "lib".
+ acl_libdirstem=lib
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e
's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+])
diff --git a/myserver/m4/nls.m4 b/myserver/m4/nls.m4
new file mode 100644
index 0000000..7967cc2
--- /dev/null
+++ b/myserver/m4/nls.m4
@@ -0,0 +1,31 @@
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <address@hidden>, 1995-2000.
+dnl Bruno Haible <address@hidden>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+])
diff --git a/myserver/m4/po.m4 b/myserver/m4/po.m4
new file mode 100644
index 0000000..0734762
--- /dev/null
+++ b/myserver/m4/po.m4
@@ -0,0 +1,449 @@
+# po.m4 serial 15 (gettext-0.17)
+dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <address@hidden>, 1995-2000.
+dnl Bruno Haible <address@hidden>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+ dnl Search for GNU msgfmt in the PATH.
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+ dnl The second test excludes FreeBSD msgfmt.
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage
>/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([GMSGFMT_015])
+
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+ dnl The second test excludes FreeBSD xgettext.
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address=
/dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder=
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then
exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
+ dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([XGETTEXT_015])
+
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[
2>&1], :)
+
+ dnl Installation directories.
+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+ dnl have to define it here, so that it can be used in po/Makefile.
+ test -n "$localedir" || localedir='${datadir}/locale'
+ AC_SUBST([localedir])
+
+ dnl Support for AM_XGETTEXT_OPTION.
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+ AC_CONFIG_COMMANDS([po-directories], [[
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo
"creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[
]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" >
"$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in
configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is
obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo
"creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r
$ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e
"s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e
"s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" >
"$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done]],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+ ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+ # When this code is run, in config.status, two variables have already been
+ # set:
+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+ # - LINGUAS is the value of the environment variable LINGUAS at configure
+ # time.
+
+changequote(,)dnl
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ # Find a way to echo strings without interpreting backslash.
+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='echo'
+ else
+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='printf %s\n'
+ else
+ echo_func () {
+ cat <<EOT
+$*
+EOT
+ }
+ gt_echo='echo_func'
+ fi
+ fi
+
+ # A sed script that extracts the value of VARIABLE from a Makefile.
+ sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[ ]*VARIABLE[ ]*=/{
+ # Seen the first line of the variable definition.
+ s/^[ ]*VARIABLE[ ]*=//
+ ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+ # Set POTFILES to the value of the Makefile variable POTFILES.
+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e
's/VARIABLE/POTFILES/g'`
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+ # Compute POTFILES_DEPS as
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+ POTFILES_DEPS=
+ for file in $POTFILES; do
+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+ done
+ POMAKEFILEDEPS=""
+
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is
obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e
's/VARIABLE/LINGUAS/g'`
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ fi
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ # Compute PROPERTIESFILES
+ # as $(foreach lang, $(ALL_LINGUAS),
$(top_srcdir)/$(DOMAIN)_$(lang).properties)
+ # Compute CLASSFILES
+ # as $(foreach lang, $(ALL_LINGUAS),
$(top_srcdir)/$(DOMAIN)_$(lang).class)
+ # Compute QMFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+ # Compute MSGFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+ # Compute RESOURCESDLLFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob
$(lang))/$(DOMAIN).resources.dll)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ PROPERTIESFILES=
+ CLASSFILES=
+ QMFILES=
+ MSGFILES=
+ RESOURCESDLLFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ PROPERTIESFILES="$PROPERTIESFILES
\$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+ QMFILES="$QMFILES $srcdirpre$lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
+ RESOURCESDLLFILES="$RESOURCESDLLFILES
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ JAVACATALOGS=
+ QTCATALOGS=
+ TCLCATALOGS=
+ CSHARPCATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+ QTCATALOGS="$QTCATALOGS $lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ fi
+
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e
"s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e
"s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e
"s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e
"s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file"
> "$ac_file.tmp"
+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm
-f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e
's/^uz-UZ$/uz-UZ-Latn/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po
-r \$(DOMAIN)"; \
+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r
"\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if test -n "$POMAKEFILEDEPS"; then
+ cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+ fi
+ mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+ XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/myserver/m4/progtest.m4 b/myserver/m4/progtest.m4
new file mode 100644
index 0000000..a56365c
--- /dev/null
+++ b/myserver/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <address@hidden>, 1996.
+
+AC_PREREQ(2.50)
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
diff --git a/myserver/po/ChangeLog b/myserver/po/ChangeLog
new file mode 100644
index 0000000..9ea0b32
--- /dev/null
+++ b/myserver/po/ChangeLog
@@ -0,0 +1,12 @@
+2009-08-19 gettextize <address@hidden>
+
+ * Makefile.in.in: New file, from gettext-0.17.
+ * boldquot.sed: New file, from gettext-0.17.
+ * address@hidden: New file, from gettext-0.17.
+ * address@hidden: New file, from gettext-0.17.
+ * insert-header.sin: New file, from gettext-0.17.
+ * quot.sed: New file, from gettext-0.17.
+ * remove-potcdate.sin: New file, from gettext-0.17.
+ * Rules-quot: New file, from gettext-0.17.
+ * POTFILES.in: New file.
+
diff --git a/myserver/po/Makefile.in.in b/myserver/po/Makefile.in.in
new file mode 100644
index 0000000..fecf500
--- /dev/null
+++ b/myserver/po/Makefile.in.in
@@ -0,0 +1,429 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <address@hidden>
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.17
+GETTEXT_MACRO_VERSION = 0.17
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
address@hidden@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2)
$(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+ @echo "$(MSGFMT) -c -o $@ $<"; \
+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o
$${lang}.gmo $${lang}.po"; \
+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o
t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+ sed -e '/^#/d' $< > t-$@
+ mv t-$@ $@
+
+
+all: check-macro-version address@hidden@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+ @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+ || { echo "*** error: gettext infrastructure mismatch: using a
Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf
macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+ exit 1; \
+ }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+ test ! -f $(srcdir)/$(DOMAIN).pot || \
+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+ echo "touch stamp-po" && \
+ echo timestamp > stamp-poT && \
+ mv stamp-poT stamp-po; \
+ }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+ if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v
'libtool:' >/dev/null; then \
+ package_gnu='GNU '; \
+ else \
+ package_gnu=''; \
+ fi; \
+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' =
'@'PACKAGE_BUGREPORT'@'; then \
+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+ else \
+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+ fi; \
+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 |
0.16.[0-1]*) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)
@XGETTEXT_EXTRA_OPTIONS@ \
+ --files-from=$(srcdir)/POTFILES.in \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ ;; \
+ *) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)
@XGETTEXT_EXTRA_OPTIONS@ \
+ --files-from=$(srcdir)/POTFILES.in \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --package-name="address@hidden@" \
+ --package-version='@VERSION@' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ ;; \
+ esac
+ test ! -f $(DOMAIN).po || { \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+ else \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ else \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+ $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: address@hidden@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ for file in $(DISTFILES.common) Makevars.template; do \
+ $(INSTALL_DATA) $(srcdir)/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ for file in Makevars; do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ else \
+ : ; \
+ fi
+install-data-no: all
+install-data-yes: all
+ $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat;
fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc
2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d
$$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ ln -s ../LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ echo "installing $$realcat link as
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+ fi; \
+ done; \
+ done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: address@hidden@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ else \
+ : ; \
+ fi
+installdirs-data-no:
+installdirs-data-yes:
+ $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc
2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d
$$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ fi; \
+ done; \
+ done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: address@hidden@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ for file in $(DISTFILES.common) Makevars.template; do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ else \
+ : ; \
+ fi
+uninstall-data-no:
+uninstall-data-yes:
+ catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ done; \
+ done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+ rm -f remove-potcdate.sed
+ rm -f stamp-poT
+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+ rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+ rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+ rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+ $(MAKE) update-po
+ @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+ dists="$(DISTFILES)"; \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ dists="$$dists Makevars.template"; \
+ fi; \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
+ dists="$$dists $(DOMAIN).pot stamp-po"; \
+ fi; \
+ if test -f $(srcdir)/ChangeLog; then \
+ dists="$$dists ChangeLog"; \
+ fi; \
+ for i in 0 1 2 3 4 5 6 7 8 9; do \
+ if test -f $(srcdir)/ChangeLog.$$i; then \
+ dists="$$dists ChangeLog.$$i"; \
+ fi; \
+ done; \
+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+ for file in $$dists; do \
+ if test -f $$file; then \
+ cp -p $$file $(distdir) || exit 1; \
+ else \
+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+ fi; \
+ done
+
+update-po: Makefile
+ $(MAKE) $(DOMAIN).pot-update
+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+ $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+ echo "File $$lang.po does not exist. If you are a translator, you can
create it through 'msginit'." 1>&2; \
+ exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH;
fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ cd $(srcdir); \
+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ exit 1; \
+ fi; \
+ fi; \
+ else \
+ echo "msgmerge for $$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+ @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status
@POMAKEFILEDEPS@
+ cd $(top_builddir) \
+ && $(SHELL) ./config.status $(subdir)/address@hidden po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/myserver/po/Makevars b/myserver/po/Makevars
new file mode 100644
index 0000000..32692ab
--- /dev/null
+++ b/myserver/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/myserver/po/Makevars.template b/myserver/po/Makevars.template
new file mode 100644
index 0000000..32692ab
--- /dev/null
+++ b/myserver/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/myserver/po/POTFILES.in b/myserver/po/POTFILES.in
new file mode 100644
index 0000000..07c96d7
--- /dev/null
+++ b/myserver/po/POTFILES.in
@@ -0,0 +1,113 @@
+./src/base/base64/mime_utils.cpp
+./src/base/bitvec/bitvec.cpp
+./src/base/dynamic_lib/dynamiclib.cpp
+./src/base/file/file.cpp
+./src/base/file/files_utility.cpp
+./src/base/files_cache/cached_file_buffer.cpp
+./src/base/files_cache/cached_file.cpp
+./src/base/files_cache/cached_file_factory.cpp
+./src/base/find_data/find_data.cpp
+./src/base/hash_map/hash_map.cpp
+./src/base/home_dir/home_dir.cpp
+./src/base/md5/md5.cpp
+./src/base/mem_buff/mem_buff.cpp
+./src/base/multicast/multicast.cpp
+./src/base/pipe/pipe.cpp
+./src/base/process/fork_server.cpp
+./src/base/process/process.cpp
+./src/base/process/process_server_manager.cpp
+./src/base/regex/myserver_regex.cpp
+./src/base/safetime/safetime.cpp
+./src/base/slab/slab.cpp
+./src/base/socket_pair/socket_pair.cpp
+./src/base/socket/socket.cpp
+./src/base/socket/ssl_socket.cpp
+./src/base/ssl/ssl.cpp
+./src/base/string/securestr.cpp
+./src/base/string/stringutils.cpp
+./src/base/sync/event.cpp
+./src/base/sync/mutex.cpp
+./src/base/sync/read_write_lock.cpp
+./src/base/sync/recursive_mutex.cpp
+./src/base/sync/semaphore.cpp
+./src/base/thread/thread.cpp
+./src/base/unix_socket/unix_socket.cpp
+./src/base/utility.cpp
+./src/base/xml/xml_parser.cpp
+./src/conf/mime/mime_manager.cpp
+./src/conf/nodetree.cpp
+./src/conf/security/auth_domain.cpp
+./src/conf/security/auth_method.cpp
+./src/conf/security/auth_method_factory.cpp
+./src/conf/security/security_cache.cpp
+./src/conf/security/security_domain.cpp
+./src/conf/security/security_manager.cpp
+./src/conf/security/security_token.cpp
+./src/conf/security/validator.cpp
+./src/conf/security/validator_factory.cpp
+./src/conf/security/xml_validator.cpp
+./src/conf/vhost/ip.cpp
+./src/conf/vhost/vhost.cpp
+./src/conf/vhost/vhost_manager.cpp
+./src/conf/xml_conf.cpp
+./src/connection/connection.cpp
+./src/connections_scheduler/connections_scheduler.cpp
+./src/connections_scheduler/listen_threads.cpp
+./src/filter/console.cpp
+./src/filter/filter.cpp
+./src/filter/filters_chain.cpp
+./src/filter/filters_factory.cpp
+./src/filter/gzip/gzip.cpp
+./src/filter/gzip/gzip_decompress.cpp
+./src/filter/memory_stream.cpp
+./src/filter/stream.cpp
+./src/http_handler/cgi/cgi.cpp
+./src/http_handler/fastcgi/fastcgi.cpp
+./src/http_handler/http_dir/http_dir.cpp
+./src/http_handler/http_file/http_file.cpp
+./src/http_handler/isapi/isapi.cpp
+./src/http_handler/mscgi/mscgi.cpp
+./src/http_handler/mscgi/mscgi_manager.cpp
+./src/http_handler/proxy/proxy.cpp
+./src/http_handler/scgi/scgi.cpp
+./src/http_handler/wincgi/wincgi.cpp
+./src/log/log_manager.cpp
+./src/log/stream/console_stream.cpp
+./src/log/stream/console_stream_creator.cpp
+./src/log/stream/file_stream.cpp
+./src/log/stream/file_stream_creator.cpp
+./src/log/stream/log_stream.cpp
+./src/log/stream/log_stream_creator.cpp
+./src/log/stream/log_stream_factory.cpp
+./src/log/stream/socket_stream.cpp
+./src/log/stream/socket_stream_creator.cpp
+./src/myserver.cpp
+./src/plugin/plugin.cpp
+./src/plugin/plugin_info.cpp
+./src/plugin/plugins_manager.cpp
+./src/protocol/control/control_header.cpp
+./src/protocol/control/control_protocol.cpp
+./src/protocol/ftp/ftp.cpp
+./src/protocol/ftp/ftp_lexer.cpp
+./src/protocol/ftp/ftp_parser.cpp
+./src/protocol/http/dyn_http_command.cpp
+./src/protocol/http/dyn_http_command_manager.cpp
+./src/protocol/http/dyn_http_manager.cpp
+./src/protocol/http/dyn_http_manager_list.cpp
+./src/protocol/http/env/env.cpp
+./src/protocol/http/http.cpp
+./src/protocol/http/http_data_handler.cpp
+./src/protocol/http/http_data_read.cpp
+./src/protocol/http/http_errors.cpp
+./src/protocol/http/http_headers.cpp
+./src/protocol/http/http_req_security_domain.cpp
+./src/protocol/http/http_request.cpp
+./src/protocol/http/http_response.cpp
+./src/protocol/http/http_thread_context.cpp
+./src/protocol/https/https.cpp
+./src/protocol/protocol_buffer.cpp
+./src/protocol/protocol.cpp
+./src/protocol/protocols_manager.cpp
+./src/protocol/url.cpp
+./src/server/clients_thread.cpp
+./src/server/server.cpp
diff --git a/myserver/po/Rules-quot b/myserver/po/Rules-quot
new file mode 100644
index 0000000..9c2a995
--- /dev/null
+++ b/myserver/po/Rules-quot
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed address@hidden address@hidden
insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
address@hidden:
+ $(MAKE) address@hidden
address@hidden:
+ $(MAKE) address@hidden
+
address@hidden: address@hidden
address@hidden: address@hidden
+
+.insert-header.po-update-en:
+ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH;
GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ ll=`echo $$lang | sed -e 's/@.*//'`; \
+ LC_ALL=C; export LC_ALL; \
+ cd $(srcdir); \
+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null
| sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed
-f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po;
then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "creation of $$lang.po failed: cannot move
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ exit 1; \
+ fi; \
+ fi; \
+ else \
+ echo "creation of $$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi
+
address@hidden: insert-header.sin
+ sed -e '/^#/d' -e 's/HEADER/address@hidden/g'
$(srcdir)/insert-header.sin > address@hidden
+
address@hidden: insert-header.sin
+ sed -e '/^#/d' -e 's/HEADER/address@hidden/g'
$(srcdir)/insert-header.sin > address@hidden
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+ rm -f *.insert-header
diff --git a/myserver/po/boldquot.sed b/myserver/po/boldquot.sed
new file mode 100644
index 0000000..4b937aa
--- /dev/null
+++ b/myserver/po/boldquot.sed
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/â\1â/g
+s/`\([^`']*\)'/â\1â/g
+s/ '\([^`']*\)' / â\1â /g
+s/ '\([^`']*\)'$/ â\1â/g
+s/^'\([^`']*\)' /â\1â /g
+s/ââ/""/g
+s/â/â[1m/g
+s/â/[0mâ/g
+s/â/â[1m/g
+s/â/[0mâ/g
diff --git a/myserver/po/address@hidden b/myserver/po/address@hidden
new file mode 100644
index 0000000..fedb6a0
--- /dev/null
+++ b/myserver/po/address@hidden
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff --git a/myserver/po/address@hidden b/myserver/po/address@hidden
new file mode 100644
index 0000000..a9647fc
--- /dev/null
+++ b/myserver/po/address@hidden
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
diff --git a/myserver/po/insert-header.sin b/myserver/po/insert-header.sin
new file mode 100644
index 0000000..b26de01
--- /dev/null
+++ b/myserver/po/insert-header.sin
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/myserver/po/quot.sed b/myserver/po/quot.sed
new file mode 100644
index 0000000..0122c46
--- /dev/null
+++ b/myserver/po/quot.sed
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/â\1â/g
+s/`\([^`']*\)'/â\1â/g
+s/ '\([^`']*\)' / â\1â /g
+s/ '\([^`']*\)'$/ â\1â/g
+s/^'\([^`']*\)' /â\1â /g
+s/ââ/""/g
diff --git a/myserver/po/remove-potcdate.sin b/myserver/po/remove-potcdate.sin
new file mode 100644
index 0000000..2436c49
--- /dev/null
+++ b/myserver/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 1177344..c12a693 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -10,16 +10,13 @@ myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
$(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
$(XML_LIBS) $(LDFLAGS)
-
clean-libmyserver.a:
rm -f libmyserver.a
-
libmyserver.a: clean-libmyserver.a
find . | grep .*\\.$(OBJEXT)$ | xargs $(AR) cru libmyserver.a
$(RANLIB) libmyserver.a
-
all-local: libmyserver.a myserver${EXEEXT}
cp myserver${EXEEXT} ../binaries
diff --git a/myserver/src/connections_scheduler/listen_threads.cpp
b/myserver/src/connections_scheduler/listen_threads.cpp
index 2d0797e..a5e399d 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -286,9 +286,8 @@ void ListenThreads::addListeningThread (u_short port)
* Initialize the listen threads manager.
* \param parser Xml data to use for error messages.
*/
-int ListenThreads::initialize (XmlParser* parser)
+int ListenThreads::initialize ()
{
- languageParser = parser;
shutdownStatus = false;
return 0;
}
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 64256de..743123d 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -62,8 +62,9 @@ int Proxy::send (HttpThreadContext *td,
if (destUrl.getProtocol ().compare ("http") && destUrl.getProtocol
().compare ("HTTP"))
{
- td->connection->host->warningsLogWrite ("Proxy: %s is not a known
protocol", destUrl.getProtocol ());
- return 0;
+ td->connection->host->warningsLogWrite ("Proxy: %s is not a known
protocol",
+ destUrl.getProtocol ().c_str ());
+ return td->http->raiseHTTPError (500);
}
req.ver.assign ("HTTP/1.1");
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index a0735a0..13c6e30 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -21,26 +21,32 @@
#include <include/base/string/stringutils.h>
#include <include/base/process/process.h>
-extern "C" {
+extern "C"
+{
#ifdef WIN32
-#include <direct.h>
+# include <direct.h>
#endif
#ifdef ARGP
-#include <argp.h>
+# include <argp.h>
#endif
#ifndef WIN32
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
+# include <string.h>
+# include <unistd.h>
+# include <signal.h>
#endif
}
+#ifdef HAVE_GETTEXT
+# include "localedir.h"
+#endif
+
+
#define MYSERVER_RUNAS_CONSOLE 1
#define MYSERVER_RUNAS_SERVICE 2
-void consoleService (string &, string &, string &, string &, string &);
+void consoleService (string &, string &, string &, string &);
#ifdef WIN32
void __stdcall myServerCtrlHandler (u_long fdwControl);
@@ -56,37 +62,36 @@ void runAsService ();
int argn;
char **argv;
-void registerSignals();
+void registerSignals ();
#ifndef WIN32
-void Sig_Quit(int signal)
+void Sig_Quit (int signal)
{
- Server::getInstance()->logWriteln("Exiting...");
- sync();
- Server::getInstance()->stop();
- registerSignals();
+ Server::getInstance ()->logWriteln("Exiting...");
+ sync ();
+ Server::getInstance ()->stop();
+ registerSignals ();
}
-void Sig_Hup(int signal)
+void Sig_Hup (int signal)
{
/*
*On the SIGHUP signal reboot the server.
*/
- Server::getInstance()->rebootOnNextLoop();
- registerSignals();
+ Server::getInstance ()->rebootOnNextLoop ();
+ registerSignals ();
}
#else
-static BOOL SignalHandler(DWORD type)
+static BOOL SignalHandler (DWORD type)
{
- Server::getInstance()->logWriteln("Exiting...");
- Server::getInstance()->stop();
- registerSignals();
+ Server::getInstance ()->logWriteln ("Exiting...");
+ Server::getInstance ()->stop ();
+ registerSignals ();
}
-
#endif
-void registerSignals()
+void registerSignals ()
{
#ifndef WIN32
struct sigaction sig1, sig2, sig3;
@@ -193,8 +198,8 @@ static struct argp myserverArgp = {options, parseOpt,
argsDoc, doc};
/*!
- *Load the external path.
- *Return nonzero on errors.
+ * Load the external path.
+ * Return nonzero on errors.
*/
int loadExternalPath(string &externalPath)
{
@@ -205,23 +210,19 @@ int loadExternalPath(string &externalPath)
#ifdef WIN32
externalPath.assign("plugins");
#else
- if(FilesUtility::fileExists("plugins"))
+ if (FilesUtility::fileExists ("plugins"))
externalPath.assign("plugins");
else
{
-#ifdef PREFIX
+# ifdef PREFIX
externalPath.assign(PREFIX);
externalPath.append("/lib/myserver/plugins");
-#else
+# else
externalPath.assign("/usr/lib/myserver/plugins");
-#endif
+# endif
}
#endif
-
-#ifdef WIN32
- externalPath.assign("plugins");
-#endif
}
catch (...)
{
@@ -229,84 +230,32 @@ int loadExternalPath(string &externalPath)
return 0;
}
-
/*!
- *Load the languages path.
- *Return nonzero on errors.
+ * Load the vhost configuration files locations.
+ * Return nonzero on errors.
*/
-int loadLanguagesPath(string &languagesPath)
-{
- try
- {
- languagesPath = "";
-
-#ifdef WIN32
- languagesPath.assign(getdefaultwd(0, 0));
- languagesPath.append("/languages/");
-#else
- /*
- *Do not use the files in the directory /usr/share/myserver/languages
- *if exists a local directory.
- */
- if (FilesUtility::fileExists("languages"))
- {
- languagesPath.assign(getdefaultwd(0, 0));
- languagesPath.append("/languages/");
- }
- else
- {
-#ifdef PREFIX
- languagesPath.assign(PREFIX);
- languagesPath.append("/share/myserver/languages/");
-#else
- /* Default PREFIX is /usr/. */
- languagesPath.assign("/usr/share/myserver/languages/");
-#endif
- }
-#endif
-
-#ifdef WIN32
- languagesPath.assign( "languages/" );
-#endif
- }
- catch (...)
- {
- }
- return 0;
-}
-
-/*!
- *Load the vhost configuration files locations.
- *Return nonzero on errors.
- */
-int loadVHostConfFilesLocation(string &vhostConfigurationFile)
+int loadVHostConfFilesLocation (string &vhostConfigurationFile)
{
try
{
vhostConfigurationFile = "";
#ifdef WIN32
- vhostConfigurationFile.assign("virtualhosts.xml");
+ vhostConfigurationFile.assign ("virtualhosts.xml");
#else
/*
- *Under an *nix environment look for .xml files in the following order.
+ * Look for .xml files in the following order.
*1) myserver executable working directory
*2) ~/.myserver/
*3) /etc/myserver/
*4) default files will be copied in myserver executable working
*/
- if (FilesUtility::fileExists("virtualhosts.xml"))
- {
- vhostConfigurationFile.assign("virtualhosts.xml");
- }
- else if (FilesUtility::fileExists("~/.myserver/virtualhosts.xml"))
- {
- vhostConfigurationFile.assign("~/.myserver/virtualhosts.xml");
- }
- else if (FilesUtility::fileExists("/etc/myserver/virtualhosts.xml"))
- {
- vhostConfigurationFile.assign("/etc/myserver/virtualhosts.xml");
- }
+ if (FilesUtility::fileExists ("virtualhosts.xml"))
+ vhostConfigurationFile.assign ("virtualhosts.xml");
+ else if (FilesUtility::fileExists ("~/.myserver/virtualhosts.xml"))
+ vhostConfigurationFile.assign ("~/.myserver/virtualhosts.xml");
+ else if (FilesUtility::fileExists ("/etc/myserver/virtualhosts.xml"))
+ vhostConfigurationFile.assign("/etc/myserver/virtualhosts.xml");
#endif
}
catch (...)
@@ -317,17 +266,17 @@ int loadVHostConfFilesLocation(string
&vhostConfigurationFile)
/*!
- *Load the mime configuration files locations.
- *Return nonzero on errors.
+ * Load the mime configuration files locations.
+ * Return nonzero on errors.
*/
-int loadMimeConfFilesLocation(string &mimeConfigurationFile)
+int loadMimeConfFilesLocation (string &mimeConfigurationFile)
{
try
{
mimeConfigurationFile = "";
#ifdef WIN32
- mimeConfigurationFile.assign("MIMEtypes.xml");
+ mimeConfigurationFile.assign ("MIMEtypes.xml");
#else
/*
*Under an *nix environment look for .xml files in the following order.
@@ -336,18 +285,12 @@ int loadMimeConfFilesLocation(string
&mimeConfigurationFile)
*3) /etc/myserver/
*4) default files will be copied in myserver executable working
*/
- if (FilesUtility::fileExists("MIMEtypes.xml"))
- {
- mimeConfigurationFile.assign("MIMEtypes.xml");
- }
- else if (FilesUtility::fileExists("~/.myserver/MIMEtypes.xml"))
- {
- mimeConfigurationFile.assign("~/.myserver/MIMEtypes.xml");
- }
- else if (FilesUtility::fileExists("/etc/myserver/MIMEtypes.xml"))
- {
- mimeConfigurationFile.assign("/etc/myserver/MIMEtypes.xml");
- }
+ if (FilesUtility::fileExists ("MIMEtypes.xml"))
+ mimeConfigurationFile.assign ("MIMEtypes.xml");
+ else if (FilesUtility::fileExists ("~/.myserver/MIMEtypes.xml"))
+ mimeConfigurationFile.assign ("~/.myserver/MIMEtypes.xml");
+ else if (FilesUtility::fileExists ("/etc/myserver/MIMEtypes.xml"))
+ mimeConfigurationFile.assign("/etc/myserver/MIMEtypes.xml");
#endif
}
catch (...)
@@ -358,37 +301,31 @@ int loadMimeConfFilesLocation(string
&mimeConfigurationFile)
/*!
- *Load the main configuration files locations.
- *Return nonzero on errors.
+ * Load the main configuration files locations.
+ * Return nonzero on errors.
*/
-int loadMainConfFilesLocation(string &mainConfigurationFile)
+int loadMainConfFilesLocation (string &mainConfigurationFile)
{
try
{
mainConfigurationFile = "";
#ifdef WIN32
- mainConfigurationFile.assign("myserver.xml");
+ mainConfigurationFile.assign ("myserver.xml");
#else
/*
- *Under an *nix environment look for .xml files in the following order.
- *1) myserver executable working directory
- *2) ~/.myserver/
- *3) /etc/myserver/
- *4) default files will be copied in myserver executable working
+ * Look for .xml files in the following order.
+ * 1) myserver executable working directory
+ * 2) ~/.myserver/
+ * 3) /etc/myserver/
+ * 4) default files will be copied in myserver executable working
*/
- if (FilesUtility::fileExists("myserver.xml"))
- {
- mainConfigurationFile.assign("myserver.xml");
- }
- else if (FilesUtility::fileExists("~/.myserver/myserver.xml"))
- {
- mainConfigurationFile.assign("~/.myserver/myserver.xml");
- }
- else if (FilesUtility::fileExists("/etc/myserver/myserver.xml"))
- {
- mainConfigurationFile.assign("/etc/myserver/myserver.xml");
- }
+ if (FilesUtility::fileExists ("myserver.xml"))
+ mainConfigurationFile.assign ("myserver.xml");
+ else if (FilesUtility::fileExists ("~/.myserver/myserver.xml"))
+ mainConfigurationFile.assign ("~/.myserver/myserver.xml");
+ else if (FilesUtility::fileExists ("/etc/myserver/myserver.xml"))
+ mainConfigurationFile.assign ("/etc/myserver/myserver.xml");
#endif
}
catch (...)
@@ -399,35 +336,29 @@ int loadMainConfFilesLocation(string
&mainConfigurationFile)
/*!
- *Load the configuration files locations.
- *Return nonzero on errors.
+ * Load the configuration files locations.
+ * Return nonzero on errors.
*/
-int loadConfFilesLocation(string &mainConfigurationFile, string
&mimeConfigurationFile,
- string &vhostConfigurationFile, string
&externalPath, string &languagesPath)
+int loadConfFilesLocation (string &mainConfigurationFile,
+ string &mimeConfigurationFile, string &vhostConfigurationFile,
+ string &externalPath)
{
- if (loadMainConfFilesLocation(mainConfigurationFile))
- return -1;
-
- if (loadMimeConfFilesLocation(mimeConfigurationFile))
+ if (loadMainConfFilesLocation (mainConfigurationFile))
return -1;
- if (loadVHostConfFilesLocation(vhostConfigurationFile))
+ if (loadMimeConfFilesLocation (mimeConfigurationFile))
return -1;
- if (loadExternalPath(externalPath))
+ if (loadVHostConfFilesLocation (vhostConfigurationFile))
return -1;
- if (loadLanguagesPath(languagesPath))
+ if (loadExternalPath (externalPath))
return -1;
return 0;
}
-
-/*!
- *Main function for MyServer.
- */
-int main (int argn, char **argv)
+int main (int argn, char **argv)
{
int runas = MYSERVER_RUNAS_CONSOLE;
#ifdef ARGP
@@ -437,21 +368,27 @@ int main (int argn, char **argv)
pid_t pid;
pid_t sid;
#endif
- string mainConf, mimeConf, vhostConf, externPath, langPath;
+ string mainConf, mimeConf, vhostConf, externPath;
+
+ ::argn = argn;
+ ::argv = argv;
- ::argn=argn;
- ::argv=argv;
+ registerSignals ();
- registerSignals();
+#if HAVE_GETTEXT
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+#endif
try
{
- Server::createInstance();
+ Server::createInstance ();
}
catch(...)
{
/* Die if we get exceptions here. */
- return(1);
+ return (1);
};
{
@@ -460,15 +397,15 @@ int main (int argn, char **argv)
bool differentCwd = false;
char *path;
- pathLen = strlen(argv[0]);
+ pathLen = strlen (argv[0]);
path = new char[pathLen + 1];
- if(path == 0)
+ if (path == 0)
return 1;
- strncpy(path, argv[0], pathLen);
+ strncpy (path, argv[0], pathLen);
- for(len = 0; len < pathLen; len++)
+ for (len = 0; len < pathLen; len++)
{
- if(path[len] == '/' || path[len] == '\\')
+ if (path[len] == '/' || path[len] == '\\')
{
differentCwd = true;
break;
@@ -476,14 +413,14 @@ int main (int argn, char **argv)
}
/* Current working directory is where the myserver executable is. */
- if(differentCwd)
+ if (differentCwd)
{
len = pathLen;
- while((path[len] != '\\') && (path[len] != '/'))
+ while ((path[len] != '\\') && (path[len] != '/'))
len--;
path[len] = '\0';
- setcwd(path);
+ setcwd (path);
}
/* We can free path memory now. */
@@ -500,9 +437,9 @@ int main (int argn, char **argv)
input.useForkServer = 0;
/* Call the parser. */
- argp_parse(&myserverArgp, argn, argv, 0, 0, &input);
- runas=input.runas;
- if(input.logFileName)
+ argp_parse (&myserverArgp, argn, argv, 0, 0, &input);
+ runas = input.runas;
+ if (input.logFileName)
{
if (Server::getInstance ()->setLogLocation (input.logFileName))
{
@@ -511,7 +448,7 @@ int main (int argn, char **argv)
}
}
/* If the version flag is up, show the version and exit. */
- if(input.version)
+ if (input.version)
{
cout << MYSERVER_VERSION << endl;
@@ -525,7 +462,7 @@ int main (int argn, char **argv)
return 0;
}
#else
- if(argn > 1)
+ if (argn > 1)
{
if (!strcmpi (argv[1], "VERSION"))
{
@@ -559,7 +496,7 @@ int main (int argn, char **argv)
if (!strcmpi (argv[1], "SERVICE"))
{
/*
- *Set the log file to use when in service mode.
+ * Set the log file to use when in service mode.
*/
runas = MYSERVER_RUNAS_SERVICE;
}
@@ -575,31 +512,31 @@ int main (int argn, char **argv)
#endif
/*
- *Start here the MyServer execution.
+ * Start here the MyServer execution.
*/
try
{
setcwdBuffer ();
- loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath,
langPath);
+ loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath);
switch(runas)
{
case MYSERVER_RUNAS_CONSOLE:
- consoleService (mainConf, mimeConf, vhostConf, externPath, langPath);
+ consoleService (mainConf, mimeConf, vhostConf, externPath);
break;
case MYSERVER_RUNAS_SERVICE:
#ifdef WIN32
runService ();
#else
/*
- *Run the daemon.
- *pid is the process ID for the forked process.
- *Fork the process.
+ * Run the daemon.
+ * pid is the process ID for the forked process.
+ * Fork the process.
*/
pid = fork ();
/*
- *An error happened, return with errors.
+ * An error happened, return with errors.
*/
if (pid < 0)
{
@@ -608,9 +545,6 @@ int main (int argn, char **argv)
if (pid)
{
- /*
- *Store the PID.
- */
#ifdef ARGP
if(input.pidFileName)
writePidfile (input.pidFileName);
@@ -622,21 +556,13 @@ int main (int argn, char **argv)
return 0;
}
/*
- *Create a SID for the new process.
+ * Create a SID for the new process.
*/
sid = setsid ();
-
- /*
- *Error in setting a new sid, return the error.
- */
if (sid < 0)
return 1;
-
-
- /*
- *Finally run the server from the forked process.
- */
- consoleService (mainConf, mimeConf, vhostConf, externPath, langPath);
+
+ consoleService (mainConf, mimeConf, vhostConf, externPath);
#endif
break;
}
@@ -657,7 +583,7 @@ int main (int argn, char **argv)
#ifndef WIN32
/*!
- *Write the current PID to the file.
+ * Write the current PID to the file.
*/
int writePidfile (const char* filename)
{
@@ -690,27 +616,27 @@ int writePidfile (const char* filename)
#endif
/*!
- *Start MyServer in console mode.
+ * Start MyServer in console mode.
*/
-void consoleService(string &mainConf, string &mimeConf, string &vhostConf,
string &externPath, string &langPath)
+void consoleService(string &mainConf, string &mimeConf, string &vhostConf,
string &externPath)
{
- Server::getInstance()->start(mainConf, mimeConf, vhostConf, externPath,
langPath);
+ Server::getInstance()->start(mainConf, mimeConf, vhostConf, externPath);
}
/*!
- *These functions are available only on the windows platform.
+ * These functions are available only on the windows platform.
*/
#ifdef WIN32
SERVICE_STATUS MyServiceStatus;
SERVICE_STATUS_HANDLE MyServiceStatusHandle;
/*!
- *Entry-point for the NT service.
+ * Entry-point for the NT service.
*/
void __stdcall myServerMainNT (u_long, LPTSTR*)
{
- string mainConf, mimeConf, vhostConf, externPath, langPath;
+ string mainConf, mimeConf, vhostConf, externPath;
MyServiceStatus.dwServiceType = SERVICE_WIN32;
MyServiceStatus.dwCurrentState = SERVICE_STOPPED;
@@ -745,8 +671,8 @@ void __stdcall myServerMainNT (u_long, LPTSTR*)
SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
- loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath,
langPath);
- Server::getInstance()->start (mainConf, mimeConf, vhostConf, externPath,
langPath);
+ loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath);
+ Server::getInstance()->start (mainConf, mimeConf, vhostConf, externPath);
MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus( MyServiceStatusHandle, &MyServiceStatus );
@@ -760,7 +686,7 @@ void __stdcall myServerMainNT (u_long, LPTSTR*)
}
/*!
- *Manage the NT service.
+ * Manage the NT service.
*/
void __stdcall myServerCtrlHandler(u_long fdwControl)
{
@@ -792,7 +718,7 @@ void __stdcall myServerCtrlHandler(u_long fdwControl)
#endif
/*!
- *Run MyServer service.
+ * Run MyServer service.
*/
void runService ()
{
@@ -817,7 +743,7 @@ void runService ()
}
/*!
- *Register the service.
+ * Register the service.
*/
void registerService ()
{
@@ -871,7 +797,7 @@ void removeService()
}
/*!
- *Start the service.
+ * Start the service.
*/
void runAsService ()
{
diff --git a/myserver/src/plugin/plugin.cpp b/myserver/src/plugin/plugin.cpp
index b3f939d..f79c0bf 100755
--- a/myserver/src/plugin/plugin.cpp
+++ b/myserver/src/plugin/plugin.cpp
@@ -19,109 +19,104 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
using namespace std;
-
-typedef int (*loadPROC)(Server*, XmlParser*);
-typedef int (*postLoadPROC)(Server*, XmlParser*);
+typedef int (*loadPROC)(Server*);
+typedef int (*postLoadPROC)(Server*);
typedef int (*unLoadPROC)();
typedef int (*versionPROC)();
typedef const char* (*getNamePROC)(char*, u_long);
/*!
- *Construct a plugin object.
+ * Construct a plugin object.
*/
-Plugin::Plugin()
+Plugin::Plugin ()
{
-
+
}
/*!
- *Destroy the object.
-*/
-Plugin::~Plugin()
+ * Destroy the object.
+ */
+Plugin::~Plugin ()
{
- if(hinstLib.validHandle())
- hinstLib.close();
+ if (hinstLib.validHandle ())
+ hinstLib.close ();
}
/*!
- *Load the plugin.
- *\param file The filename to load.
- *\param server The server instance to use.
- *\param languageFile The language file to use to retrieve warnings/errors
- *messages.
+ * Load the plugin.
+ * \param file The filename to load.
+ * \param server The server instance to use.
+ * \param languageFile The language file to use to retrieve warnings/errors
+ * messages.
*/
-int Plugin::load(Server* server, XmlParser* languageFile)
+int Plugin::load (Server* server)
{
- loadPROC proc = (loadPROC)hinstLib.getProc("load");
- if(proc)
- return proc(server, languageFile);
+ loadPROC proc = (loadPROC)hinstLib.getProc ("load");
+ if (proc)
+ return proc (server);
return 0;
}
/*!
- *Preload the plugin. This function doesn't ensure all other
- *plugins are yet loaded.
- *\param file The filename to load.
- *messages.
- *\param global Load the shared library globally.
+ * Preload the plugin. This function doesn't ensure all other
+ * plugins are yet loaded.
+ * \param file The filename to load.
+ * messages.
+ * \param global Load the shared library globally.
*/
-int Plugin::preLoad(string& file,
- bool global)
+int Plugin::preLoad (string& file, bool global)
{
-
- return hinstLib.loadLibrary(file.c_str(), global ? 1 : 0);
+
+ return hinstLib.loadLibrary (file.c_str (), global ? 1 : 0);
}
/*!
- *Post load initialization. This is called once all the plugins are loaded.
- *\param server The server instance to use.
- *\param languageFile The language file to use to retrieve warnings/errors
- *messages.
+ * Post load initialization. This is called once all the plugins are loaded.
+ * \param server The server instance to use.
+ * \param languageFile The language file to use to retrieve warnings/errors
+ * messages.
*/
-int Plugin::postLoad(Server* server, XmlParser* languageFile)
+int Plugin::postLoad(Server* server)
{
- if(hinstLib.validHandle())
- {
- postLoadPROC proc = (postLoadPROC)hinstLib.getProc("postLoad");
- if(proc)
- return proc(server, languageFile);
- }
+ if (hinstLib.validHandle ())
+ {
+ postLoadPROC proc = (postLoadPROC)hinstLib.getProc("postLoad");
+ if (proc)
+ return proc (server);
+ }
return 0;
}
/*!
- *Unload the plugin.
- *\param languageFile The language file to use to retrieve warnings/errors
- *messages.
+ * Unload the plugin.
+ * \param languageFile The language file to use to retrieve warnings/errors
+ * messages.
*/
-int Plugin::unLoad()
+int Plugin::unLoad ()
{
- if(hinstLib.validHandle())
- {
- unLoadPROC proc = (unLoadPROC)hinstLib.getProc("unLoad");
- if(proc)
- return proc();
- }
+ if (hinstLib.validHandle ())
+ {
+ unLoadPROC proc = (unLoadPROC)hinstLib.getProc ("unLoad");
+ if (proc)
+ return proc ();
+ }
return 0;
}
-
-
-
/*!
- *Get the plugin name.
- *\param buffer The buffer where write the plugin name.
- *\param len The buffer length in bytes.
+ * Get the plugin name.
+ * \param buffer The buffer where write the plugin name.
+ * \param len The buffer length in bytes.
*/
-const char* Plugin::getName(char* buffer, u_long len)
+const char* Plugin::getName (char* buffer, u_long len)
{
getNamePROC proc;
- if(!hinstLib.validHandle())
+ if (!hinstLib.validHandle ())
return 0;
- proc = (getNamePROC)hinstLib.getProc("name");
- if(proc)
- return proc(buffer, len);
+ proc = (getNamePROC)hinstLib.getProc ("name");
+ if (proc)
+ return proc (buffer, len);
return 0;
}
@@ -130,9 +125,9 @@ const char* Plugin::getName(char* buffer, u_long len)
*Get directly access to a method.
*\param name The method name.
*/
-void* Plugin::getDirectMethod(char* name)
+void* Plugin::getDirectMethod (char* name)
{
- if(!hinstLib.validHandle())
+ if (!hinstLib.validHandle ())
return 0;
- return hinstLib.getProc(name);
+ return hinstLib.getProc (name);
}
diff --git a/myserver/src/plugin/plugins_manager.cpp
b/myserver/src/plugin/plugins_manager.cpp
index 632364d..ef625c8 100755
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -422,7 +422,6 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
* Add a plugin.
* \param file The plugin file name.
* \param server The server object to use.
- * \param languageFile The language file to use to retrieve warnings/errors
* messages.
* \param global Specify if the library should be loaded globally.
*/
@@ -606,11 +605,9 @@ PluginsManager::load (Server *server)
/*!
* PostLoad functions, called once all the plugins are loaded.
* \param server The server object to use.
- * \param languageFile The language file to use to get errors and warnings
- * messages.
*/
int
-PluginsManager::postLoad (Server *server, XmlParser* languageFile)
+PluginsManager::postLoad (Server *server)
{
HashMap<string, PluginInfo*>::Iterator it = pluginsInfos.begin ();
while (it != pluginsInfos.end ())
@@ -618,7 +615,7 @@ PluginsManager::postLoad (Server *server, XmlParser*
languageFile)
Plugin* plugin = (*it)->getPlugin ();
if (plugin)
{
- plugin->postLoad (server, languageFile);
+ plugin->postLoad (server);
server->logWriteln (MYSERVER_LOG_MSG_INFO,
_("Plugin %s loaded"),
(*it)->getName ().c_str ());
diff --git a/myserver/src/protocol/control/control_protocol.cpp
b/myserver/src/protocol/control/control_protocol.cpp
index 3f1204d..ff65877 100755
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -74,7 +74,7 @@ char* ControlProtocol::registerName (char* out,int len)
}
/*!
- *Class constructor.
+ * Class constructor.
*/
ControlProtocol::ControlProtocol ()
{
@@ -83,7 +83,7 @@ ControlProtocol::ControlProtocol ()
}
/*!
- *Destructor for the class.
+ * Destructor for the class.
*/
ControlProtocol::~ControlProtocol ()
{
@@ -91,9 +91,9 @@ ControlProtocol::~ControlProtocol ()
}
/*!
- *Load the control protocol.
+ * Load the control protocol.
*/
-int ControlProtocol::loadProtocol (XmlParser* languageParser)
+int ControlProtocol::loadProtocol ()
{
char tmpName[64];
char tmpPassword[64];
@@ -111,44 +111,30 @@ int ControlProtocol::loadProtocol (XmlParser*
languageParser)
data = Server::getInstance ()->getHashedData ("control.enabled");
if (data && (!strcmpi (data, "YES")))
- {
controlEnabled = 1;
- }
else
- {
controlEnabled = 0;
- }
data = Server::getInstance ()->getHashedData ("control.admin");
if (data)
- {
strncpy (tmpName, data, 64);
- }
data = Server::getInstance ()->getHashedData ("control.password");
if (data)
- {
strncpy (tmpPassword, data, 64);
- }
data = Server::getInstance ()->getHashedData ("control.admin.md5");
if (data)
- {
if (strcmpi (data, "YES") == 0)
adminNameMD5ized = 1;
- }
data = Server::getInstance ()->getHashedData ("control.password.md5");
if (data)
- {
if (strcmpi (data, "YES") == 0)
adminPasswordMD5ized = 1;
- }
if (adminNameMD5ized)
- {
strncpy (adminLogin, tmpName, 64);
- }
else
{
md5.init ();
@@ -157,9 +143,7 @@ int ControlProtocol::loadProtocol (XmlParser*
languageParser)
}
if (adminPasswordMD5ized)
- {
strncpy (adminPassword, tmpPassword, 64);
- }
else
{
md5.init ();
@@ -478,11 +462,6 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
knownCommand = 1;
}
- else if (!strcmp(command, "SHOWLANGUAGEFILES"))
- {
- knownCommand = 1;
- ret = showLanguageFiles(a, outFile, b1, bs1, header);
- }
else if (!strcmp(command, "VERSION"))
{
knownCommand = 1;
@@ -876,61 +855,6 @@ int ControlProtocol::putFile (ConnectionPtr a, char* fn,
File* in,
}
/*!
- * Show all the language files that the server can use.
- */
-int ControlProtocol::showLanguageFiles (ConnectionPtr a, File* out,
- char *b1,int bs1, ControlHeader&
header)
-{
- string searchPath;
- const char *path = Server::getInstance ()->getLanguagesPath ();
- FindData fd;
- int ret = 0;
- if (path == 0)
- {
- a->host->warningsLogWrite (_("Control: internal error"));
- return CONTROL_INTERNAL;
- }
- searchPath.assign (path);
-
-#ifdef WIN32
- searchPath.append ("*.xml");
-#endif
- ret=fd.findfirst (searchPath.c_str ());
- if (ret == -1)
- {
- a->host->warningsLogWrite (_("Control: internal error"));
- return CONTROL_INTERNAL;
- }
- do
- {
- string filename;
- string ext;
- u_long nbw = 0;
- /* Do not show files starting with a dot. */
- if (fd.name[0]=='.')
- continue;
-
- filename.assign (fd.name);
- FilesUtility::getFileExt (ext, filename);
- if (stringcmpi (ext, "xml") == 0)
- {
- ret = out->writeToFile (filename.c_str(), filename.length(), &nbw);
- if (ret == 0)
- ret = out->writeToFile ("\r\n", 2, &nbw);
- }
-
- if (ret)
- {
- a->host->warningsLogWrite (_("Control: internal error"));
- return CONTROL_INTERNAL;
- }
- }
- while (!fd.findnext ());
- fd.findclose ();
- return 0;
-}
-
-/*!
*Return the current MyServer version.
*/
int ControlProtocol::getVersion (ConnectionPtr a, File* out, char *b1, int bs1,
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index f090a21..51a0b2d 100755
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -391,7 +391,7 @@ char * Ftp::registerNameImpl (char *out, int len)
}
-int Ftp::loadProtocolstatic (XmlParser *)
+int Ftp::loadProtocolstatic ()
{
// load custom messages from cfg here
Server *server = Server::getInstance ();
@@ -424,12 +424,9 @@ int Ftp::loadProtocolstatic (XmlParser *)
return 1;
}
-int Ftp::unLoadProtocolstatic (XmlParser *)
+int Ftp::unLoadProtocolstatic ()
{
- if (true /*everything is ok */ )
- return 1;
- else
- return 0;
+ return 1;
}
void Ftp::ftpReply (int nReplyCode, const std::string & sCustomText /*= ""*/ )
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 9562fee..a423d5e 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -1788,7 +1788,7 @@ int Http::sendAuth ()
/*!
* Load the HTTP protocol.
*/
-int Http::loadProtocolStatic (XmlParser* languageParser)
+int Http::loadProtocolStatic ()
{
const char *data = NULL;
string pluginsResource (Server::getInstance ()->getExternalPath ());
@@ -1832,7 +1832,7 @@ int Http::loadProtocolStatic (XmlParser* languageParser)
/*!
* Unload the HTTP protocol.
*/
-int Http::unLoadProtocolStatic (XmlParser* languageParser)
+int Http::unLoadProtocolStatic ()
{
/* Unload the errors. */
HttpErrors::unLoad ();
diff --git a/myserver/src/protocol/protocol.cpp
b/myserver/src/protocol/protocol.cpp
index 106d613..573e6cc 100755
--- a/myserver/src/protocol/protocol.cpp
+++ b/myserver/src/protocol/protocol.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
* Load the protocol. Called once at runtime.
*/
-int Protocol::loadProtocol (XmlParser* /*languageParser*/)
+int Protocol::loadProtocol ()
{
return 1;
}
@@ -28,7 +28,7 @@ int Protocol::loadProtocol (XmlParser* /*languageParser*/)
/*!
* Unload the protocol. Called once.
*/
-int Protocol::unLoadProtocol (XmlParser* /*languageParser*/)
+int Protocol::unLoadProtocol ()
{
return 1;
}
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 99f1f96..f5f296b 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -85,8 +85,6 @@ Server::Server () : connectionsScheduler (this),
mimeConfigurationFile = 0;
mainConfigurationFile = 0;
vhostConfigurationFile = 0;
- languagesPath = 0;
- languageFile = 0;
externalPath = 0;
path = 0;
ipAddresses = 0;
@@ -116,8 +114,7 @@ Server::initLogManager ()
*Returns false on error.
*/
bool Server::resetConfigurationPaths (string &mainConf, string &mimeConf,
- string &vhostConf, string &externPath,
- string &langPath)
+ string &vhostConf, string &externPath)
{
if (!mainConfigurationFile)
mainConfigurationFile = new string (mainConf);
@@ -139,11 +136,6 @@ bool Server::resetConfigurationPaths (string &mainConf,
string &mimeConf,
else
externalPath->assign (externPath);
- if (!languagesPath)
- languagesPath = new string (langPath);
- else
- languagesPath->assign (langPath);
-
return true;
}
@@ -250,17 +242,10 @@ int Server::loadLibraries ()
/*!
- *Destroy the object.
+ * Destroy the object.
*/
Server::~Server ()
{
- if (languagesPath)
- delete languagesPath;
- languagesPath = 0;
-
- if (languageFile)
- delete languageFile;
- languageFile = 0;
if (vhostList)
delete vhostList;
@@ -294,7 +279,7 @@ Server::~Server ()
*Start the server.
*/
void Server::start (string &mainConf, string &mimeConf, string &vhostConf,
- string &externPath, string &langPath)
+ string &externPath)
{
int err = 0;
#ifdef WIN32
@@ -314,7 +299,7 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
*/
logWriteln (MYSERVER_LOG_MSG_INFO, _("Initializing server
configuration..."));
- if (!resetConfigurationPaths (mainConf, mimeConf, vhostConf, externPath,
langPath))
+ if (!resetConfigurationPaths (mainConf, mimeConf, vhostConf, externPath))
return;
err = checkConfigurationPaths ();
@@ -412,7 +397,7 @@ int Server::postLoad ()
connectionsScheduler.restart ();
- listenThreads.initialize (&languageParser);
+ listenThreads.initialize ();
if (vhostList)
delete vhostList;
@@ -482,14 +467,14 @@ void Server::loadPlugins ()
{
char protocolName[32];
Protocol *protocol = protocolsSet[j];
- protocol->loadProtocol (&languageParser);
+ protocol->loadProtocol ();
protocol->registerName (protocolName, 32);
getProtocolsManager ()->addProtocol (protocolName, protocol);
}
getPluginsManager ()->preLoad (this, *externalPath);
getPluginsManager ()->load (this);
- getPluginsManager ()->postLoad (this, &languageParser);
+ getPluginsManager ()->postLoad (this);
}
/*!
@@ -595,7 +580,7 @@ void Server::mainLoop()
Socket::stopBlockingOperations (false);
connectionsScheduler.restart ();
- listenThreads.initialize (&languageParser);
+ listenThreads.initialize ();
vhostList = new VhostManager (&listenThreads, logManager);
@@ -765,14 +750,6 @@ const char *Server::getGid ()
}
/*!
- *Get a pointer to the language parser.
- */
-XmlParser* Server::getLanguageParser ()
-{
- return &languageParser;
-}
-
-/*!
*Returns the numbers of active connections the list.
*/
u_long Server::getNumConnections ()
@@ -864,7 +841,6 @@ int Server::terminate ()
ipAddresses = 0;
vhostList = 0;
- languageParser.close ();
if (mimeManager)
{
@@ -976,29 +952,6 @@ int Server::initialize ()
initLogManager ();
- data = getHashedData ("server.language");
- if (languageFile)
- delete languageFile;
- languageFile = new string ();
- if (data)
- {
- languageFile->assign (*languagesPath);
- languageFile->append ("/");
- languageFile->append (data);
- }
- else
- languageFile->assign ("languages/english.xml");
-
-
- /* XXX: IT IS NOT USED, AT LEAST IN THIS CLASS. */
- if (languageParser.open (languageFile->c_str ()))
- {
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading language file"));
- return -1;
- }
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Using %s"),
- languageParser.getValue ("MSG_LANGUAGE"));
-
data = getHashedData ("server.verbosity");
if (data)
verbosity = (u_long)atoi(data);
@@ -1749,22 +1702,6 @@ ProtocolsManager *Server::getProtocolsManager ()
}
/*!
- * Get the path to the directory containing all the language files.
- */
-const char *Server::getLanguagesPath ()
-{
- return languagesPath ? languagesPath->c_str () : "";
-}
-
-/*!
- * Get the current language file.
- */
-const char *Server::getLanguageFile ()
-{
- return languageFile ? languageFile->c_str () : "";
-}
-
-/*!
* Return nonzero if the autoreboot is enabled.
*/
bool Server::isAutorebootEnabled ()
diff --git a/myserver/stdafx.h b/myserver/stdafx.h
index 1c28adf..187319d 100644
--- a/myserver/stdafx.h
+++ b/myserver/stdafx.h
@@ -88,5 +88,9 @@ typedef void* HANDLE;
#endif
-
-#define _(X) X
+#ifdef HAVE_GETTEXT
+# include <libintl.h>
+# define _(X) gettext (X)
+#else
+# define _(X) X
+#endif
-----------------------------------------------------------------------
Summary of changes:
myserver/Makefile.am | 11 +-
myserver/binaries/Makefile.am | 2 +-
myserver/binaries/languages/Makefile.am | 7 -
myserver/binaries/languages/brazilian.xml | 45 --
myserver/binaries/languages/configure/Makefile.am | 3 -
myserver/binaries/languages/configure/english.xml | 136 ----
myserver/binaries/languages/configure/italiano.xml | 103 ---
myserver/binaries/languages/configure/spanish.xml | 135 ----
myserver/binaries/languages/english.xml | 43 --
myserver/binaries/languages/french.xml | 42 --
myserver/binaries/languages/german.xml | 43 --
myserver/binaries/languages/italiano.xml | 41 --
myserver/binaries/languages/romana.xml | 43 --
myserver/binaries/languages/russian.xml | 52 --
myserver/binaries/languages/russian_koi8r.xml | 52 --
myserver/binaries/languages/spanish.xml | 46 --
myserver/configure.in | 4 +-
myserver/documentation/basic_configuration.texi | 6 -
.../include/connections_scheduler/listen_threads.h | 31 +-
myserver/include/plugin/plugin.h | 19 +-
myserver/include/plugin/plugins_manager.h | 4 +-
.../include/protocol/control/control_protocol.h | 31 +-
myserver/include/protocol/ftp/ftp.h | 12 +-
myserver/include/protocol/http/http.h | 13 +-
myserver/include/protocol/protocol.h | 4 +-
myserver/include/server/server.h | 10 +-
myserver/m4/gettext.m4 | 381 +++++++++++
myserver/m4/iconv.m4 | 180 +++++
myserver/m4/lib-ld.m4 | 110 +++
myserver/m4/lib-link.m4 | 709 ++++++++++++++++++++
myserver/m4/lib-prefix.m4 | 185 +++++
myserver/m4/nls.m4 | 31 +
myserver/m4/po.m4 | 449 +++++++++++++
myserver/m4/progtest.m4 | 92 +++
myserver/po/ChangeLog | 12 +
myserver/po/Makefile.in.in | 429 ++++++++++++
myserver/po/Makevars | 41 ++
myserver/po/Makevars.template | 41 ++
myserver/po/POTFILES.in | 113 ++++
myserver/po/Rules-quot | 47 ++
myserver/po/boldquot.sed | 10 +
myserver/po/address@hidden | 25 +
myserver/po/address@hidden | 22 +
myserver/po/insert-header.sin | 23 +
myserver/po/quot.sed | 6 +
myserver/po/remove-potcdate.sin | 19 +
myserver/src/Makefile.am | 3 -
.../src/connections_scheduler/listen_threads.cpp | 3 +-
myserver/src/http_handler/proxy/proxy.cpp | 5 +-
myserver/src/myserver.cpp | 330 ++++------
myserver/src/plugin/plugin.cpp | 123 ++--
myserver/src/plugin/plugins_manager.cpp | 7 +-
myserver/src/protocol/control/control_protocol.cpp | 84 +---
myserver/src/protocol/ftp/ftp.cpp | 9 +-
myserver/src/protocol/http/http.cpp | 4 +-
myserver/src/protocol/protocol.cpp | 4 +-
myserver/src/server/server.cpp | 79 +--
myserver/stdafx.h | 8 +-
58 files changed, 3214 insertions(+), 1308 deletions(-)
delete mode 100644 myserver/binaries/languages/Makefile.am
delete mode 100644 myserver/binaries/languages/brazilian.xml
delete mode 100644 myserver/binaries/languages/configure/Makefile.am
delete mode 100644 myserver/binaries/languages/configure/english.xml
delete mode 100644 myserver/binaries/languages/configure/italiano.xml
delete mode 100644 myserver/binaries/languages/configure/spanish.xml
delete mode 100644 myserver/binaries/languages/english.xml
delete mode 100644 myserver/binaries/languages/french.xml
delete mode 100644 myserver/binaries/languages/german.xml
delete mode 100644 myserver/binaries/languages/italiano.xml
delete mode 100644 myserver/binaries/languages/romana.xml
delete mode 100644 myserver/binaries/languages/russian.xml
delete mode 100644 myserver/binaries/languages/russian_koi8r.xml
delete mode 100644 myserver/binaries/languages/spanish.xml
create mode 100644 myserver/m4/gettext.m4
create mode 100644 myserver/m4/iconv.m4
create mode 100644 myserver/m4/lib-ld.m4
create mode 100644 myserver/m4/lib-link.m4
create mode 100644 myserver/m4/lib-prefix.m4
create mode 100644 myserver/m4/nls.m4
create mode 100644 myserver/m4/po.m4
create mode 100644 myserver/m4/progtest.m4
create mode 100644 myserver/po/ChangeLog
create mode 100644 myserver/po/Makefile.in.in
create mode 100644 myserver/po/Makevars
create mode 100644 myserver/po/Makevars.template
create mode 100644 myserver/po/POTFILES.in
create mode 100644 myserver/po/Rules-quot
create mode 100644 myserver/po/boldquot.sed
create mode 100644 myserver/po/address@hidden
create mode 100644 myserver/po/address@hidden
create mode 100644 myserver/po/insert-header.sin
create mode 100644 myserver/po/quot.sed
create mode 100644 myserver/po/remove-potcdate.sin
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0d6db12ec98f18e5e7b9621b8f5e25280d8ad734,
Giuseppe Scrivano <=