diff options
| author | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2003-01-22 21:54:05 +0000 |
|---|---|---|
| committer | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2003-01-22 21:54:05 +0000 |
| commit | 23525ee8c5d25ad02258b7608cbeab97ab9509d1 (patch) | |
| tree | 49346471c4393ad569a6ab29d2fde3a8d4cd3da4 /common | |
| parent | b3d7ad6a887558de075869db5cfd957c4431b5fc (diff) | |
| download | xfwm4-23525ee8c5d25ad02258b7608cbeab97ab9509d1.tar.gz | |
Update autogen.sh script,
Add internationalization support
Add french locale
Add dependency on libxfcegui4 v .14
Other stuff I don't remember :)
(Old svn revision: 10854)
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.in | 23 | ||||
| -rw-r--r-- | common/my_intl.h | 48 |
2 files changed, 42 insertions, 29 deletions
diff --git a/common/Makefile.in b/common/Makefile.in index c8154be84..f55fa3998 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -46,12 +46,15 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ ECHO = @ECHO@ @@ -61,12 +64,17 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -75,11 +83,16 @@ LIBXFCE4MCS_REQUIRED_VERSION = @LIBXFCE4MCS_REQUIRED_VERSION@ LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MCS_CLIENT_CFLAGS = @MCS_CLIENT_CFLAGS@ MCS_CLIENT_LIBS = @MCS_CLIENT_LIBS@ MCS_MANAGER_CFLAGS = @MCS_MANAGER_CFLAGS@ MCS_MANAGER_LIBS = @MCS_MANAGER_LIBS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -90,13 +103,19 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGO_REQUIRED_VERSION = @PANGO_REQUIRED_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@ XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@ +XGETTEXT = @XGETTEXT@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ @@ -147,10 +166,10 @@ DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu common/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) mostlyclean-libtool: diff --git a/common/my_intl.h b/common/my_intl.h index 62c520948..e92777967 100644 --- a/common/my_intl.h +++ b/common/my_intl.h @@ -2,37 +2,31 @@ #define __MY_INTL_H__ #ifdef HAVE_CONFIG_H -# include "config.h" +# include <config.h> #endif +#include <gtk/gtk.h> + +/* + * Standard gettext macros. + */ #ifdef ENABLE_NLS -#ifdef HAVE_GETTEXT -#include <libintl.h> +# include <libintl.h> +# undef _ +# define _(String) dgettext (PACKAGE, String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif #else -#include "intl/libintl.h" -#endif - -#ifdef N_ -#undef N_ -#endif - -#ifdef _ -#undef _ -#endif - -#define _(String) dgettext(PACKAGE,String) -#define N_(String) String - -#else /* NLS is disabled */ - -#define _(String) String -#define N_(String) String -#define textdomain(String) String -#define gettext(String) String -#define dgettext(Domain,String) String -#define dcgettext(Domain,String,Type) String -#define bindtextdomain(Domain,Directory) (Domain) - +# define textdomain(String) (String) +# define gettext(String) (String) +# define dgettext(Domain,Message) (Message) +# define dcgettext(Domain,Message,Type) (Message) +# define bindtextdomain(Domain,Directory) (Domain) +# define _(String) (String) +# define N_(String) (String) #endif #endif |