diff options
| -rw-r--r-- | ABOUT-NLS | 2 | ||||
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | intltool-extract.in | 0 | ||||
| -rw-r--r-- | intltool-merge.in | 0 | ||||
| -rw-r--r-- | intltool-update.in | 0 | ||||
| -rw-r--r-- | po/Makefile.in.in | 3 |
6 files changed, 10 insertions, 29 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS deleted file mode 100644 index 8d18e819..00000000 --- a/ABOUT-NLS +++ /dev/null @@ -1,2 +0,0 @@ -PCSX-df uses gettext internally, but can be configured without it. -The gettext library is not included with PCSX-df. diff --git a/configure.ac b/configure.ac index 2cd9fe5e..9d5bf18b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,8 @@ AM_PROG_AS LT_PREREQ([2.2.6]) LT_INIT([disable-static]) -IT_PROG_INTLTOOL([0.35.0]) AM_GLIB_GNU_GETTEXT +IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=pcsx AC_SUBST(GETTEXT_PACKAGE) @@ -165,57 +165,43 @@ AC_ARG_ENABLE(dynarec, [ --enable-dynarec=... force selection of dynamic rec if test "x$DYNAREC" = xauto; then DYNARECSEL="auto" -else if test "x$DYNAREC" = xx86; then +elif test "x$DYNAREC" = xx86; then DYNARECSEL="x86" -else if test "x$DYNAREC" = xx86_64; then +elif test "x$DYNAREC" = xx86_64; then DYNARECSEL="x86_64" -else if test "x$DYNAREC" = xppc; then +elif test "x$DYNAREC" = xppc; then DYNARECSEL="ppc" -else if test "x$DYNAREC" = xno; then +elif test "x$DYNAREC" = xno; then DYNARECSEL="no" else AC_MSG_WARN([Dynamic Recompiler "$DYNAREC" not found. Autodetecting...]) DYNARECSEL="auto" fi -fi -fi -fi -fi if test "x$DYNARECSEL" = xauto; then if expr x"$build_cpu" : 'xi.86' > /dev/null; then DYNARECSEL="x86" - fi - - if expr x"$build_cpu" : 'xx86_64' > /dev/null; then + elif expr x"$build_cpu" : 'xx86_64' > /dev/null; then DYNARECSEL="x86_64" - fi - - if expr x"$build_cpu" : 'xpowerpc' > /dev/null; then + elif expr x"$build_cpu" : 'xpowerpc' > /dev/null; then DYNARECSEL="ppc" fi fi if test "x$DYNARECSEL" = xno; then AC_DEFINE([NOPSXREC], [1], [Define if we are compiling without dynamic recompiler.]) -fi - -if test "x$DYNARECSEL" = xx86; then +elif test "x$DYNARECSEL" = xx86; then AC_DEFINE([__i386__], [1], [Define if we are compiling for x86 architectures.]) AM_CONDITIONAL(ARCH_X86, true) AC_MSG_RESULT([Dynamic Recompiler selected: x86]) -fi - -if test "x$DYNARECSEL" = xx86_64; then +elif test "x$DYNARECSEL" = xx86_64; then AC_DEFINE([__x86_64__], [1], [Define if we are compiling for x86_64 architectures.]) AM_CONDITIONAL(ARCH_X86_64, true) dnl CFLAGS+=" -m64 " dnl AC_COMPILE_IFELSE(AC_LANG_PROGRAM,,AC_MSG_ERROR([Cannot compile with -m64])) AC_MSG_RESULT([Dynamic Recompiler selected: x86_64]) -fi - -if test "x$DYNARECSEL" = xppc; then +elif test "x$DYNARECSEL" = xppc; then AC_DEFINE([__ppc__], [1], [Define if we are compiling for powerpc architectures.]) AM_CONDITIONAL(ARCH_PPC, true) AC_MSG_RESULT([Dynamic Recompiler selected: ppc]) diff --git a/intltool-extract.in b/intltool-extract.in deleted file mode 100644 index e69de29b..00000000 --- a/intltool-extract.in +++ /dev/null diff --git a/intltool-merge.in b/intltool-merge.in deleted file mode 100644 index e69de29b..00000000 --- a/intltool-merge.in +++ /dev/null diff --git a/intltool-update.in b/intltool-update.in deleted file mode 100644 index e69de29b..00000000 --- a/intltool-update.in +++ /dev/null diff --git a/po/Makefile.in.in b/po/Makefile.in.in index c7e83022..324ea039 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -159,9 +159,6 @@ distclean: clean rm -f *.mo *.msg *.cat *.cat.m *.gmo 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 Makefile.in.in distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: $(DISTFILES) |