summaryrefslogtreecommitdiffstats
path: root/x11-wm/icewm/files/patch-configure.in
blob: 2052fcefd97f01cb7f0b2abb737e966644b2b7e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
--- configure.in.orig	Tue Oct  9 23:54:02 2001
+++ configure.in	Sat May 25 05:50:23 2002
@@ -83,7 +83,7 @@
 AC_FUNC_SELECT_ARGTYPES
 
 dnl Configuring features
-TARGETS='base docs'
+TARGETS='base'
 APPLICATIONS='genpref icewm icesh icewmhint icewmbg'
 
 dnl Checking for X11
@@ -108,27 +108,28 @@
 AC_ARG_ENABLE(i18n,
   [  --enable-i18n           Enable internationalization],
   [ if test "$enable_i18n" != "no"; then
-      AC_CHECK_HEADERS(langinfo.h,,
-      [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found.
-*** Check your installation.])])
-      AC_CHECK_FUNC(nl_langinfo,,
-      [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found.
-*** Check your installation.])])
-
-      ice_nl_codesets=""
-
+dnl      AC_CHECK_HEADERS(langinfo.h,,
+dnl      [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found.
+dnl *** Check your installation.])])
+dnl      AC_CHECK_FUNC(nl_langinfo,,
+dnl      [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found.
+dnl *** Check your installation.])])
+dnl
+dnl      ice_nl_codesets=""
+dnl
       ICE_CHECK_NL_ITEM(_NL_MESSAGES_CODESET,
         [ ice_nl_codesets="${ice_nl_codesets} _NL_MESSAGES_CODESET," ])
       ICE_CHECK_NL_ITEM(_NL_CTYPE_CODESET_NAME,
         [ ice_nl_codesets="${ice_nl_codesets} _NL_CTYPE_CODESET_NAME," ])
       ICE_CHECK_NL_ITEM(CODESET,
         [ ice_nl_codesets="${ice_nl_codesets} CODESET," ])
-
+dnl
       if test "${ice_nl_codesets}" = ""; then
-        AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
-*** return any information about the locale's codeset. Check your manuals.
-*** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know 
-*** the name of the locale-dependent parameter for your platform.])
+dnl        AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
+dnl *** return any information about the locale's codeset. Check your manuals.
+dnl *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know 
+dnl *** the name of the locale-dependent parameter for your platform.])
+        ice_nl_codesets="CODESET"
       fi
       
       ice_nl_codesets="${ice_nl_codesets} 0"
@@ -164,7 +165,7 @@
         [  --unicode-set=CODESET   your iconv's unicode set in machine endian encoding
                           (e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE, UCS-4BE)],
 	   AC_DEFINE_UNQUOTED(CONFIG_UNICODE_SET, "$with_unicode_set"),
-	   with_unicode_set=UCS-4//TRANSLIT)
+	   with_unicode_set=ISO-8859-1)
 
       ice_sufficent_iconv=no
       ICE_CHECK_CONVERSION(ISO-8859-1,$with_unicode_set,no,$ice_libiconv,
@@ -203,7 +204,7 @@
   features="${features} nls"
   TARGETS=$TARGETS' nls'
 
-  localedir='${datadir}/locale'
+  localedir='${prefix}/share/locale'
 fi
 
 dnl ======================================================= /proc/wm-session ===
@@ -464,7 +465,7 @@
 
 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
       else
-	AC_MSG_ERROR([gnome-config can not be found.
+	AC_MSG_WARN([gnome-config can not be found.
 *** Install the GNOME´s development packages or use the argument of the
 *** --with-gnome-menus switch to pass gnome-config´s location.])
       fi
OpenPOWER on IntegriCloud