Remove ENABLE_NLS definition. Either we HAVE_USELOCALE or we don't translate at...

[citadel.git] / webcit / setup.c

diff --git a/webcit/setup.c b/webcit/setup.c
index ee8f8127752ab43a7792a6650f957b3738e0c724..f4653dcac0563304ce5d32be7b594e13acce5627 100644 (file)
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -1,10 +1,7 @@
 /*
- * $Id$
- *
  * WebCit setup utility
  * 
  * (This is basically just an install wizard.  It's not required.)
- *
  */
 
 #include "sysdep.h"
@@ -21,24 +18,23 @@ char setup_directory[SIZ];
 int using_web_installer = 0;
 char suggested_url[SIZ];
 
-/* some copies... */
-int lprintf(int loglevel, const char *format, ...){return 0;}
+/* some copies... 
+int syslog(int loglevel, const char *format, ...){return 0;} */
+void wc_printf(const char *format,...){}
+
 void RegisterNS(const char *NSName, long len, 
                int nMinArgs, 
                int nMaxArgs, 
                WCHandlerFunc HandlerFunc,
+               WCPreevalFunc PreEvalFunc,
                int ContextRequired){}
+void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F){}
 pthread_key_t MyConKey;
 
-#ifdef ENABLE_NLS
-
 #ifdef HAVE_USELOCALE 
 int localeoffset = 1;
-#else
-int localeoffset = 0;
 #endif
 
-#endif
 /*
  * Delete an entry from /etc/inittab
  */
@@ -261,7 +257,6 @@ int GetLocalePrefs(void)
        int i = 0;
        int offs = 0;
 
-
        nLocales = 0; 
        while (!IsEmptyStr(AvailLang[nLocales]))
                nLocales++;
@@ -411,7 +406,7 @@ void progress(char *text, long int curr, long int cmax)
  */
 void install_init_scripts(void)
 {
-#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
        int localechoice;
 #endif
        char question[1024];
@@ -446,10 +441,8 @@ void install_init_scripts(void)
                return;
 
 
-#ifdef ENABLE_NLS
-
+#ifdef HAVE_USELOCALE
        localechoice = GetLocalePrefs();
-
 #endif
        /* Defaults */
        sprintf(http_port, "2000");
@@ -555,22 +548,18 @@ void install_init_scripts(void)
        fprintf(fp,     "CTDL_HOSTNAME=%s\n", hostname);
        fprintf(fp,     "CTDL_PORTNAME=%s\n", portname);
 
-#ifdef ENABLE_NLS
-       
-       if (localechoice == 0) {
 #ifdef HAVE_USELOCALE 
-               fprintf(fp, "unset LANG\n");
-#else
-               fprintf(fp, "export WEBCIT_LANG=c\n");
-#endif
-       }
-       else {
+       if (localechoice == 0) {
                fprintf(fp, "export WEBCIT_LANG=%s\n", AvailLang[localechoice - localeoffset]);
-
        }
 #else
        fprintf(fp,     "# your system doesn't support locales\n");
 #endif
+
+
+
+
+
        fprintf(fp,     "\n"
                        "\n"
                        "case \"$1\" in\n"
@@ -662,6 +651,7 @@ int main(int argc, char *argv[])
        int a;
        char aaa[256];
        int info_only = 0;
+
        strcpy(suggested_url, "http://<your_host_name>:<port>/");
 
        /* set an invalid setup type */