diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-28 02:26:57 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-12-28 02:26:57 +0000 |
| commit | 9e61a223d6579119901b600be5e40f871d16b22c (patch) | |
| tree | 185a6a5ae350bd7df4535361b1c20e5bab181a60 | |
| parent | 2062913f19d4d8a47daab7e762bb79203fff5c22 (diff) | |
| download | pcsxr-9e61a223d6579119901b600be5e40f871d16b22c.tar.gz | |
mkinstalldirs is not useless for the used gettext version.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61533 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | include/config.h.in | 126 | ||||
| -rw-r--r-- | mkinstalldirs | 162 |
3 files changed, 168 insertions, 133 deletions
diff --git a/configure.ac b/configure.ac index 8bae37f5..a4ca1e90 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,6 @@ AM_MAINTAINER_MODE AC_CONFIG_HEADERS([include/config.h:include/config.h.in]) - AC_PROG_CC AM_PROG_CC_C_O AC_PROG_RANLIB @@ -188,23 +187,23 @@ if test "x$DYNARECSEL" = xno; then fi if test "x$DYNARECSEL" = xx86; then - AC_DEFINE([__i386__], [1], [Define if we are compiling for x86 architectures.]) - AM_CONDITIONAL(ARCH_X86, true) + 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 - AC_DEFINE([__x86_64__], [1], [Define if we are compiling for x86_64 architectures.]) - AM_CONDITIONAL(ARCH_X86_64, true) + 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 - AC_DEFINE([__ppc__], [1], [Define if we are compiling for powerpc architectures.]) - AM_CONDITIONAL(ARCH_PPC, true) + AC_DEFINE([__ppc__], [1], [Define if we are compiling for powerpc architectures.]) + AM_CONDITIONAL(ARCH_PPC, true) AC_MSG_RESULT([Dynamic Recompiler selected: ppc]) fi diff --git a/include/config.h.in b/include/config.h.in deleted file mode 100644 index 0bf018d6..00000000 --- a/include/config.h.in +++ /dev/null @@ -1,126 +0,0 @@ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* gettext domain */ -#undef GETTEXT_PACKAGE - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if you have the iconv() function and it works. */ -#undef HAVE_ICONV - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to the maximum length of any path. */ -#undef MAXPATHLEN - -/* Define if we are compiling without dynamic recompiler. */ -#undef NOPSXREC - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - -/* define on a big endian system */ -#undef __BIGENDIAN__ - -/* Define if building on a GNU/Linux system. */ -#undef __LINUX__ - -/* Define if we are compiling for x86 architectures. */ -#undef __i386__ - -/* Define if we are compiling for powerpc architectures. */ -#undef __ppc__ - -/* Define if we are compiling for x86_64 architectures. */ -#undef __x86_64__ diff --git a/mkinstalldirs b/mkinstalldirs new file mode 100644 index 00000000..4191a45d --- /dev/null +++ b/mkinstalldirs @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2009-04-28.21; # UTC + +# Original author: Noah Friedman <friedman@prep.ai.mit.edu> +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <bug-automake@gnu.org>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp=$pathcomp/ + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: |
