Now on revision 112621. ------------------------------------------------------------ revno: 112621 fixes bug: http://debbugs.gnu.org/14395 committer: Leo Liu branch nick: trunk timestamp: Fri 2013-05-17 12:33:12 +0800 message: * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean up when turned off. (smie--highlight-matching-block-overlay): No longer buffer-local. (smie-highlight-matching-block): Adjust. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-17 04:09:16 +0000 +++ lisp/ChangeLog 2013-05-17 04:33:12 +0000 @@ -1,3 +1,10 @@ +2013-05-17 Leo Liu + + * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean + up when turned off. (Bug#14395) + (smie--highlight-matching-block-overlay): No longer buffer-local. + (smie-highlight-matching-block): Adjust. + 2013-05-17 Paul Eggert Doc string fix for "nanoseconds" (Bug#14406). === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2013-05-16 22:58:58 +0000 +++ lisp/emacs-lisp/smie.el 2013-05-17 04:33:12 +0000 @@ -1025,7 +1025,7 @@ "Face used to highlight matching block." :group 'smie) -(defvar-local smie--highlight-matching-block-overlay nil) +(defvar smie--highlight-matching-block-overlay nil) (defvar-local smie--highlight-matching-block-lastpos -1) (defun smie-highlight-matching-block () @@ -1056,7 +1056,8 @@ nil)))) (highlight (lambda (beg end) - (move-overlay smie--highlight-matching-block-overlay beg end) + (move-overlay smie--highlight-matching-block-overlay + beg end (current-buffer)) (overlay-put smie--highlight-matching-block-overlay 'face 'smie-matching-block-highlight)))) (save-excursion @@ -1095,10 +1096,15 @@ (when (timerp smie--highlight-matching-block-timer) (cancel-timer smie--highlight-matching-block-timer)) (setq smie--highlight-matching-block-timer nil) - (when smie-highlight-matching-block-mode - (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local) - (setq smie--highlight-matching-block-timer - (run-with-idle-timer 0.2 t #'smie-highlight-matching-block)))) + (if smie-highlight-matching-block-mode + (progn + (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local) + (setq smie--highlight-matching-block-timer + (run-with-idle-timer 0.2 t #'smie-highlight-matching-block))) + (when smie--highlight-matching-block-overlay + (delete-overlay smie--highlight-matching-block-overlay) + (setq smie--highlight-matching-block-overlay nil)) + (kill-local-variable 'smie--highlight-matching-block-lastpos))) ;;; The indentation engine. ------------------------------------------------------------ revno: 112620 fixes bug: http://debbugs.gnu.org/14406 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-05-16 21:09:16 -0700 message: Doc string fix for "nanoseconds". * emacs-lisp/timer.el (timer-relative-time, timer-inc-time): Fix doc string typo that had "nanoseconds" instead of "microseconds". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-17 02:57:09 +0000 +++ lisp/ChangeLog 2013-05-17 04:09:16 +0000 @@ -1,3 +1,9 @@ +2013-05-17 Paul Eggert + + Doc string fix for "nanoseconds" (Bug#14406). + * emacs-lisp/timer.el (timer-relative-time, timer-inc-time): + Fix doc string typo that had "nanoseconds" instead of "microseconds". + 2013-05-17 Jay Belanger * calc/calc-units.el (math-extract-units): Preserve powers === modified file 'lisp/emacs-lisp/timer.el' --- lisp/emacs-lisp/timer.el 2013-04-10 13:31:35 +0000 +++ lisp/emacs-lisp/timer.el 2013-05-17 04:09:16 +0000 @@ -124,7 +124,7 @@ (floor (mod next-sec-psec 1000000))))) (defun timer-relative-time (time secs &optional usecs psecs) - "Advance TIME by SECS seconds and optionally USECS nanoseconds + "Advance TIME by SECS seconds and optionally USECS microseconds and PSECS picoseconds. SECS may be either an integer or a floating point number." (let ((delta (if (floatp secs) @@ -139,7 +139,7 @@ (time-less-p (timer--time t1) (timer--time t2))) (defun timer-inc-time (timer secs &optional usecs psecs) - "Increment the time set in TIMER by SECS seconds, USECS nanoseconds, + "Increment the time set in TIMER by SECS seconds, USECS microseconds, and PSECS picoseconds. SECS may be a fraction. If USECS or PSECS are omitted, they are treated as zero." (setf (timer--time timer) ------------------------------------------------------------ revno: 112619 committer: Jay Belanger branch nick: trunk timestamp: Thu 2013-05-16 21:57:09 -0500 message: * calc/calc-units.el (math-extract-units): Preserve powers of units. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-17 02:43:41 +0000 +++ lisp/ChangeLog 2013-05-17 02:57:09 +0000 @@ -1,3 +1,8 @@ +2013-05-17 Jay Belanger + + * calc/calc-units.el (math-extract-units): Preserve powers + of units. + 2013-05-17 Leo Liu * subr.el (delete-consecutive-dups): New function. === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2013-04-05 02:20:35 +0000 +++ lisp/calc/calc-units.el 2013-05-17 02:57:09 +0000 @@ -1497,10 +1497,8 @@ ((memq (car-safe expr) '(* /)) (cons (car expr) (mapcar 'math-extract-units (cdr expr)))) - ((and - (eq (car-safe expr) '^) - (math-check-unit-name (nth 1 expr))) - expr) + ((eq (car-safe expr) '^) + (list '^ (math-extract-units (nth 1 expr)) (nth 2 expr))) ((math-check-unit-name expr) expr) (t 1))) ------------------------------------------------------------ revno: 112618 committer: Leo Liu branch nick: trunk timestamp: Fri 2013-05-17 10:43:41 +0800 message: * subr.el (delete-consecutive-dups): New function. * ido.el (ido-set-matches-1): Use it. * progmodes/octave.el (inferior-octave-completion-table): Use it. * ido.el (ido-remove-consecutive-dups): Remove. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-17 00:36:33 +0000 +++ lisp/ChangeLog 2013-05-17 02:43:41 +0000 @@ -1,3 +1,10 @@ +2013-05-17 Leo Liu + + * subr.el (delete-consecutive-dups): New function. + * ido.el (ido-set-matches-1): Use it. + * progmodes/octave.el (inferior-octave-completion-table): Use it. + * ido.el (ido-remove-consecutive-dups): Remove. + 2013-05-17 Stefan Monnier * progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re) === modified file 'lisp/ido.el' --- lisp/ido.el 2013-05-08 14:22:24 +0000 +++ lisp/ido.el 2013-05-17 02:43:41 +0000 @@ -3785,7 +3785,7 @@ (if (string-match re name) (setq matches (cons item matches))))) items)) - matches)) + (delete-consecutive-dups matches t))) (defun ido-set-matches () @@ -4676,21 +4676,6 @@ ido-temp-list)))) (ido-to-end summaries))) -(defun ido-remove-consecutive-dups (list) - "Remove consecutive duplicates in LIST. -Use `equal' for comparison. First and last elements are -considered consecutive." - (let ((tail list) - (last (make-symbol "")) - (result nil)) - (while (consp tail) - (unless (equal (car tail) last) - (push (setq last (car tail)) result)) - (setq tail (cdr tail))) - (nreverse (or (and (equal last (car list)) - (cdr result)) - result)))) - ;;; Helper functions for other programs (put 'dired-do-rename 'ido 'ignore) @@ -4808,7 +4793,7 @@ (ido-directory-nonreadable nil) (ido-directory-too-big nil) (ido-context-switch-command 'ignore) - (ido-choice-list (ido-remove-consecutive-dups choices))) + (ido-choice-list choices)) ;; Initialize ido before invoking ido-read-internal (ido-common-initialization) (ido-read-internal 'list prompt hist def require-match initial-input))) === modified file 'lisp/progmodes/octave.el' --- lisp/progmodes/octave.el 2013-05-16 08:52:02 +0000 +++ lisp/progmodes/octave.el 2013-05-17 02:43:41 +0000 @@ -38,7 +38,9 @@ (require 'newcomment) (eval-and-compile (unless (fboundp 'user-error) - (defalias 'user-error 'error))) + (defalias 'user-error 'error)) + (unless (fboundp 'delete-consecutive-dups) + (defalias 'delete-consecutive-dups 'delete-dups))) (eval-when-compile (unless (fboundp 'setq-local) (defmacro setq-local (var val) @@ -777,8 +779,8 @@ (inferior-octave-send-list-and-digest (list (concat "completion_matches (\"" command "\");\n"))) (setq cache (list command (float-time) - (sort (delete-dups inferior-octave-output-list) - 'string-lessp)))) + (delete-consecutive-dups + (sort inferior-octave-output-list 'string-lessp))))) (car (cddr cache)))))) (defun inferior-octave-completion-at-point () === modified file 'lisp/subr.el' --- lisp/subr.el 2013-05-16 10:14:30 +0000 +++ lisp/subr.el 2013-05-17 02:43:41 +0000 @@ -376,6 +376,23 @@ (setq tail (cdr tail)))) list) +;; See http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00204.html +(defun delete-consecutive-dups (list &optional circular) + "Destructively remove `equal' consecutive duplicates from LIST. +First and last elements are considered consecutive if CIRCULAR is +non-nil." + (let ((tail list) last) + (while (consp tail) + (if (equal (car tail) (cadr tail)) + (setcdr tail (cddr tail)) + (setq last (car tail) + tail (cdr tail)))) + (if (and circular + (cdr list) + (equal last (car list))) + (nbutlast list) + list))) + (defun number-sequence (from &optional to inc) "Return a sequence of numbers from FROM to TO (both inclusive) as a list. INC is the increment used between numbers in the sequence and defaults to 1. ------------------------------------------------------------ revno: 112617 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-05-16 20:36:33 -0400 message: * lisp/progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re) (f90-hpf-keywords-re, f90-constants-re): Use \\_< rather than regexp-opt's `words'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 22:58:58 +0000 +++ lisp/ChangeLog 2013-05-17 00:36:33 +0000 @@ -1,3 +1,9 @@ +2013-05-17 Stefan Monnier + + * progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re) + (f90-hpf-keywords-re, f90-constants-re): Use \\_< rather than + regexp-opt's `words'. + 2013-05-16 Leo Liu * emacs-lisp/smie.el (smie-matching-block-highlight): New face. === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2013-05-15 00:52:07 +0000 +++ lisp/progmodes/f90.el 2013-05-17 00:36:33 +0000 @@ -319,51 +319,57 @@ ;; User options end here. (defconst f90-keywords-re - (regexp-opt '("allocatable" "allocate" "assign" "assignment" "backspace" - "block" "call" "case" "character" "close" "common" "complex" - "contains" "continue" "cycle" "data" "deallocate" - "dimension" "do" "double" "else" "elseif" "elsewhere" "end" - "enddo" "endfile" "endif" "entry" "equivalence" "exit" - "external" "forall" "format" "function" "goto" "if" - "implicit" "include" "inquire" "integer" "intent" - "interface" "intrinsic" "logical" "module" "namelist" "none" - "nullify" "only" "open" "operator" "optional" "parameter" - "pause" "pointer" "precision" "print" "private" "procedure" - "program" "public" "read" "real" "recursive" "result" "return" - "rewind" "save" "select" "sequence" "stop" "subroutine" - "target" "then" "type" "use" "where" "while" "write" - ;; F95 keywords. - "elemental" "pure" - ;; F2003 - "abstract" "associate" "asynchronous" "bind" "class" - "deferred" "enum" "enumerator" "extends" "extends_type_of" - "final" "generic" "import" "non_intrinsic" "non_overridable" - "nopass" "pass" "protected" "same_type_as" "value" "volatile" - ;; F2008. - "contiguous" "submodule" "concurrent" "codimension" - "sync all" "sync memory" "critical" "image_index" - ) 'words) + (concat + "\\_<" + (regexp-opt '("allocatable" "allocate" "assign" "assignment" "backspace" + "block" "call" "case" "character" "close" "common" "complex" + "contains" "continue" "cycle" "data" "deallocate" + "dimension" "do" "double" "else" "elseif" "elsewhere" "end" + "enddo" "endfile" "endif" "entry" "equivalence" "exit" + "external" "forall" "format" "function" "goto" "if" + "implicit" "include" "inquire" "integer" "intent" + "interface" "intrinsic" "logical" "module" "namelist" "none" + "nullify" "only" "open" "operator" "optional" "parameter" + "pause" "pointer" "precision" "print" "private" "procedure" + "program" "public" "read" "real" "recursive" "result" "return" + "rewind" "save" "select" "sequence" "stop" "subroutine" + "target" "then" "type" "use" "where" "while" "write" + ;; F95 keywords. + "elemental" "pure" + ;; F2003 + "abstract" "associate" "asynchronous" "bind" "class" + "deferred" "enum" "enumerator" "extends" "extends_type_of" + "final" "generic" "import" "non_intrinsic" "non_overridable" + "nopass" "pass" "protected" "same_type_as" "value" "volatile" + ;; F2008. + "contiguous" "submodule" "concurrent" "codimension" + "sync all" "sync memory" "critical" "image_index" + )) + "\\_>") "Regexp used by the function `f90-change-keywords'.") (defconst f90-keywords-level-3-re - (regexp-opt - '("allocatable" "allocate" "assign" "assignment" "backspace" - "close" "deallocate" "dimension" "endfile" "entry" "equivalence" - "external" "inquire" "intent" "intrinsic" "nullify" "only" "open" - ;; FIXME operator and assignment should be F2003 procedures? - "operator" "optional" "parameter" "pause" "pointer" "print" "private" - "public" "read" "recursive" "result" "rewind" "save" "select" - "sequence" "target" "write" - ;; F95 keywords. - "elemental" "pure" - ;; F2003. asynchronous separate. - "abstract" "deferred" "import" "final" "non_intrinsic" "non_overridable" - "nopass" "pass" "protected" "value" "volatile" - ;; F2008. - ;; "concurrent" is only in the sense of "do [,] concurrent", but given - ;; the [,] it's simpler to just do every instance (cf "do while"). - "contiguous" "concurrent" "codimension" "sync all" "sync memory" - ) 'words) + (concat + "\\_<" + (regexp-opt + '("allocatable" "allocate" "assign" "assignment" "backspace" + "close" "deallocate" "dimension" "endfile" "entry" "equivalence" + "external" "inquire" "intent" "intrinsic" "nullify" "only" "open" + ;; FIXME operator and assignment should be F2003 procedures? + "operator" "optional" "parameter" "pause" "pointer" "print" "private" + "public" "read" "recursive" "result" "rewind" "save" "select" + "sequence" "target" "write" + ;; F95 keywords. + "elemental" "pure" + ;; F2003. asynchronous separate. + "abstract" "deferred" "import" "final" "non_intrinsic" "non_overridable" + "nopass" "pass" "protected" "value" "volatile" + ;; F2008. + ;; "concurrent" is only in the sense of "do [,] concurrent", but given + ;; the [,] it's simpler to just do every instance (cf "do while"). + "contiguous" "concurrent" "codimension" "sync all" "sync memory" + )) + "\\_>") "Keyword-regexp for font-lock level >= 3.") (defconst f90-procedures-re @@ -428,61 +434,67 @@ "Regexp matching intrinsic operators.") (defconst f90-hpf-keywords-re - (regexp-opt - ;; Intrinsic procedures. - '("all_prefix" "all_scatter" "all_suffix" "any_prefix" - "any_scatter" "any_suffix" "copy_prefix" "copy_scatter" - "copy_suffix" "count_prefix" "count_scatter" "count_suffix" - "grade_down" "grade_up" - "hpf_alignment" "hpf_distribution" "hpf_template" "iall" "iall_prefix" - "iall_scatter" "iall_suffix" "iany" "iany_prefix" "iany_scatter" - "iany_suffix" "ilen" "iparity" "iparity_prefix" - "iparity_scatter" "iparity_suffix" "leadz" "maxval_prefix" - "maxval_scatter" "maxval_suffix" "minval_prefix" "minval_scatter" - "minval_suffix" "number_of_processors" "parity" - "parity_prefix" "parity_scatter" "parity_suffix" "popcnt" "poppar" - "processors_shape" "product_prefix" "product_scatter" - "product_suffix" "sum_prefix" "sum_scatter" "sum_suffix" - ;; Directives. - "align" "distribute" "dynamic" "independent" "inherit" "processors" - "realign" "redistribute" "template" - ;; Keywords. - "block" "cyclic" "extrinsic" "new" "onto" "pure" "with") 'words) + (concat + "\\_<" + (regexp-opt + ;; Intrinsic procedures. + '("all_prefix" "all_scatter" "all_suffix" "any_prefix" + "any_scatter" "any_suffix" "copy_prefix" "copy_scatter" + "copy_suffix" "count_prefix" "count_scatter" "count_suffix" + "grade_down" "grade_up" + "hpf_alignment" "hpf_distribution" "hpf_template" "iall" "iall_prefix" + "iall_scatter" "iall_suffix" "iany" "iany_prefix" "iany_scatter" + "iany_suffix" "ilen" "iparity" "iparity_prefix" + "iparity_scatter" "iparity_suffix" "leadz" "maxval_prefix" + "maxval_scatter" "maxval_suffix" "minval_prefix" "minval_scatter" + "minval_suffix" "number_of_processors" "parity" + "parity_prefix" "parity_scatter" "parity_suffix" "popcnt" "poppar" + "processors_shape" "product_prefix" "product_scatter" + "product_suffix" "sum_prefix" "sum_scatter" "sum_suffix" + ;; Directives. + "align" "distribute" "dynamic" "independent" "inherit" "processors" + "realign" "redistribute" "template" + ;; Keywords. + "block" "cyclic" "extrinsic" "new" "onto" "pure" "with")) + "\\_>") "Regexp for all HPF keywords, procedures and directives.") (defconst f90-constants-re - (regexp-opt '( ;; F2003 iso_fortran_env constants. - "iso_fortran_env" - "input_unit" "output_unit" "error_unit" - "iostat_end" "iostat_eor" - "numeric_storage_size" "character_storage_size" - "file_storage_size" - ;; F2003 iso_c_binding constants. - "iso_c_binding" - "c_int" "c_short" "c_long" "c_long_long" "c_signed_char" - "c_size_t" - "c_int8_t" "c_int16_t" "c_int32_t" "c_int64_t" - "c_int_least8_t" "c_int_least16_t" "c_int_least32_t" - "c_int_least64_t" - "c_int_fast8_t" "c_int_fast16_t" "c_int_fast32_t" - "c_int_fast64_t" - "c_intmax_t" "c_intptr_t" - "c_float" "c_double" "c_long_double" - "c_float_complex" "c_double_complex" "c_long_double_complex" - "c_bool" "c_char" - "c_null_char" "c_alert" "c_backspace" "c_form_feed" - "c_new_line" "c_carriage_return" "c_horizontal_tab" - "c_vertical_tab" - "c_ptr" "c_funptr" "c_null_ptr" "c_null_funptr" - "ieee_exceptions" - "ieee_arithmetic" - "ieee_features" - ;; F2008 iso_fortran_env constants. - "character_kinds" "int8" "int16" "int32" "int64" - "integer_kinds" "iostat_inquire_internal_unit" - "logical_kinds" "real_kinds" "real32" "real64" "real128" - "lock_type" "atomic_int_kind" "atomic_logical_kind" - ) 'words) + (concat + "\\_<" + (regexp-opt '( ;; F2003 iso_fortran_env constants. + "iso_fortran_env" + "input_unit" "output_unit" "error_unit" + "iostat_end" "iostat_eor" + "numeric_storage_size" "character_storage_size" + "file_storage_size" + ;; F2003 iso_c_binding constants. + "iso_c_binding" + "c_int" "c_short" "c_long" "c_long_long" "c_signed_char" + "c_size_t" + "c_int8_t" "c_int16_t" "c_int32_t" "c_int64_t" + "c_int_least8_t" "c_int_least16_t" "c_int_least32_t" + "c_int_least64_t" + "c_int_fast8_t" "c_int_fast16_t" "c_int_fast32_t" + "c_int_fast64_t" + "c_intmax_t" "c_intptr_t" + "c_float" "c_double" "c_long_double" + "c_float_complex" "c_double_complex" "c_long_double_complex" + "c_bool" "c_char" + "c_null_char" "c_alert" "c_backspace" "c_form_feed" + "c_new_line" "c_carriage_return" "c_horizontal_tab" + "c_vertical_tab" + "c_ptr" "c_funptr" "c_null_ptr" "c_null_funptr" + "ieee_exceptions" + "ieee_arithmetic" + "ieee_features" + ;; F2008 iso_fortran_env constants. + "character_kinds" "int8" "int16" "int32" "int64" + "integer_kinds" "iostat_inquire_internal_unit" + "logical_kinds" "real_kinds" "real32" "real64" "real128" + "lock_type" "atomic_int_kind" "atomic_logical_kind" + )) + "\\_>") "Regexp for Fortran intrinsic constants.") ;; cf f90-looking-at-type-like. ------------------------------------------------------------ revno: 112616 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-05-16 23:29:10 +0000 message: lisp/gnus/message.el (message-expand-group): Decode group names diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-05-16 22:31:47 +0000 +++ lisp/gnus/ChangeLog 2013-05-16 23:29:10 +0000 @@ -1,3 +1,7 @@ +2013-05-16 Katsumi Yamaoka + + * message.el (message-expand-group): Decode group names. + 2013-05-16 Julien Danjou * gnus-notifications.el (gnus-notifications-notify): Use photo-file as === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2013-05-09 01:40:20 +0000 +++ lisp/gnus/message.el 2013-05-16 23:29:10 +0000 @@ -7960,19 +7960,29 @@ (defun message-expand-group () "Expand the group name under point." - (let* ((b (save-excursion - (save-restriction - (narrow-to-region - (save-excursion - (beginning-of-line) - (skip-chars-forward "^:") - (1+ (point))) - (point)) - (skip-chars-backward "^, \t\n") (point)))) - (completion-ignore-case t) - (e (progn (skip-chars-forward "^,\t\n ") (point))) - (hashtb (and (boundp 'gnus-active-hashtb) gnus-active-hashtb))) - (message-completion-in-region e b hashtb))) + (let ((b (save-excursion + (save-restriction + (narrow-to-region + (save-excursion + (beginning-of-line) + (skip-chars-forward "^:") + (1+ (point))) + (point)) + (skip-chars-backward "^, \t\n") (point)))) + (completion-ignore-case t) + (e (progn (skip-chars-forward "^,\t\n ") (point))) + group collection) + (when (and (boundp 'gnus-active-hashtb) + gnus-active-hashtb) + (mapatoms + (lambda (symbol) + (setq group (symbol-name symbol)) + (push (if (string-match "[^\000-\177]" group) + (gnus-group-decoded-name group) + group) + collection)) + gnus-active-hashtb)) + (message-completion-in-region e b collection))) (defalias 'message-completion-in-region (if (fboundp 'completion-in-region) ------------------------------------------------------------ revno: 112615 fixes bug: http://debbugs.gnu.org/14395 committer: Leo Liu branch nick: trunk timestamp: Fri 2013-05-17 06:58:58 +0800 message: * emacs-lisp/smie.el (smie-matching-block-highlight): New face. (smie--highlight-matching-block-overlay) (smie--highlight-matching-block-lastpos) (smie--highlight-matching-block-timer): New variables. (smie-highlight-matching-block): New function. (smie-highlight-matching-block-mode): New minor mode. (smie-setup): Conditionally enable smie-blink-matching-open. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 16:11:38 +0000 +++ lisp/ChangeLog 2013-05-16 22:58:58 +0000 @@ -1,3 +1,13 @@ +2013-05-16 Leo Liu + + * emacs-lisp/smie.el (smie-matching-block-highlight): New face. + (smie--highlight-matching-block-overlay) + (smie--highlight-matching-block-lastpos) + (smie--highlight-matching-block-timer): New variables. + (smie-highlight-matching-block): New function. + (smie-highlight-matching-block-mode): New minor mode. (Bug#14395) + (smie-setup): Conditionally enable smie-blink-matching-open. + 2013-05-16 Wilson Snyder Sync with upstream verilog-mode r840. === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2013-04-25 03:25:34 +0000 +++ lisp/emacs-lisp/smie.el 2013-05-16 22:58:58 +0000 @@ -1021,6 +1021,85 @@ (let ((blink-matching-check-function #'smie-blink-matching-check)) (blink-matching-open)))))))) +(defface smie-matching-block-highlight '((t (:inherit highlight))) + "Face used to highlight matching block." + :group 'smie) + +(defvar-local smie--highlight-matching-block-overlay nil) +(defvar-local smie--highlight-matching-block-lastpos -1) + +(defun smie-highlight-matching-block () + (when (and smie-closer-alist + (/= (point) smie--highlight-matching-block-lastpos)) + (unless (overlayp smie--highlight-matching-block-overlay) + (setq smie--highlight-matching-block-overlay + (make-overlay (point) (point)))) + (setq smie--highlight-matching-block-lastpos (point)) + (let ((beg-of-tok + (lambda (&optional start) + "Move to the beginning of current token at START." + (let* ((token) + (start (or start (point))) + (beg (progn + (funcall smie-backward-token-function) + (forward-comment (point-max)) + (point))) + (end (progn + (setq token (funcall smie-forward-token-function)) + (forward-comment (- (point))) + (point)))) + (if (and (<= beg start) (<= start end) + (or (assoc token smie-closer-alist) + (rassoc token smie-closer-alist))) + (progn (goto-char beg) token) + (goto-char start) + nil)))) + (highlight + (lambda (beg end) + (move-overlay smie--highlight-matching-block-overlay beg end) + (overlay-put smie--highlight-matching-block-overlay + 'face 'smie-matching-block-highlight)))) + (save-excursion + (condition-case nil + (if (nth 8 (syntax-ppss)) + (overlay-put smie--highlight-matching-block-overlay 'face nil) + (let ((token + (or (funcall beg-of-tok) + (funcall beg-of-tok + (prog1 (point) + (funcall smie-forward-token-function)))))) + (cond + ((assoc token smie-closer-alist) ; opener + (forward-sexp 1) + (let ((end (point)) + (closer (funcall smie-backward-token-function))) + (when (rassoc closer smie-closer-alist) + (funcall highlight (point) end)))) + ((rassoc token smie-closer-alist) ; closer + (funcall smie-forward-token-function) + (forward-sexp -1) + (let ((beg (point)) + (opener (funcall smie-forward-token-function))) + (when (assoc opener smie-closer-alist) + (funcall highlight beg (point))))) + (t (overlay-put smie--highlight-matching-block-overlay + 'face nil))))) + (scan-error + (overlay-put smie--highlight-matching-block-overlay 'face nil))))))) + +(defvar smie--highlight-matching-block-timer nil) + +;;;###autoload +(define-minor-mode smie-highlight-matching-block-mode nil + :global t :group 'smie + (when (timerp smie--highlight-matching-block-timer) + (cancel-timer smie--highlight-matching-block-timer)) + (setq smie--highlight-matching-block-timer nil) + (when smie-highlight-matching-block-mode + (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local) + (setq smie--highlight-matching-block-timer + (run-with-idle-timer 0.2 t #'smie-highlight-matching-block)))) + ;;; The indentation engine. (defcustom smie-indent-basic 4 @@ -1701,8 +1780,9 @@ ;; Only needed for interactive calls to blink-matching-open. (set (make-local-variable 'blink-matching-check-function) #'smie-blink-matching-check) - (add-hook 'post-self-insert-hook - #'smie-blink-matching-open 'append 'local) + (unless smie-highlight-matching-block-mode + (add-hook 'post-self-insert-hook + #'smie-blink-matching-open 'append 'local)) (set (make-local-variable 'smie-blink-matching-triggers) (append smie-blink-matching-triggers ;; Rather than wait for SPC to blink, try to blink as ------------------------------------------------------------ revno: 112614 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-05-16 22:31:47 +0000 message: gnus-notifications.el (gnus-notifications-notify): Use photo-file as app-icon diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-05-15 23:55:41 +0000 +++ lisp/gnus/ChangeLog 2013-05-16 22:31:47 +0000 @@ -1,3 +1,8 @@ +2013-05-16 Julien Danjou + + * gnus-notifications.el (gnus-notifications-notify): Use photo-file as + app-icon. + 2013-05-15 Glenn Morris * shr-color.el (shr-color-visible-luminance-min) === modified file 'lisp/gnus/gnus-notifications.el' --- lisp/gnus/gnus-notifications.el 2013-05-09 01:40:20 +0000 +++ lisp/gnus/gnus-notifications.el 2013-05-16 22:31:47 +0000 @@ -92,12 +92,12 @@ :body subject :actions '("read" "Read") :on-action 'gnus-notifications-action - :app-icon (gnus-funcall-no-warning - 'image-search-load-path "gnus/gnus.png") + :app-icon (or photo-file + (gnus-funcall-no-warning + 'image-search-load-path "gnus/gnus.png")) :app-name "Gnus" :category "email.arrived" - :timeout gnus-notifications-timeout - :image-path photo-file) + :timeout gnus-notifications-timeout) (message "New message from %s: %s" from subject) ;; Don't return an id t)) ------------------------------------------------------------ revno: 112613 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 22:15:32 +0300 message: Document arguments of insert_1_both. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-05-16 18:33:27 +0000 +++ src/ChangeLog 2013-05-16 19:15:32 +0000 @@ -1,5 +1,8 @@ 2013-05-16 Eli Zaretskii + * insdel.c (insert_1_both): Document the arguments, instead of + referring to insert_1, which no longer exists. + * xdisp.c (message_dolog): If the *Messages* buffer is shown in some window, increment windows_or_buffers_changed, so that *Messages* display in that window is updated. (Bug#14408) === modified file 'src/insdel.c' --- src/insdel.c 2013-04-05 14:17:55 +0000 +++ src/insdel.c 2013-05-16 19:15:32 +0000 @@ -771,8 +771,13 @@ /* Insert a sequence of NCHARS chars which occupy NBYTES bytes - starting at STRING. INHERIT, PREPARE and BEFORE_MARKERS - are the same as in insert_1. */ + starting at STRING. INHERIT non-zero means inherit the text + properties from neighboring characters; zero means inserted text + will have no text properties. PREPARE non-zero means call + prepare_to_modify_buffer, which checks that the region is not + read-only, and calls before-change-function and any modification + properties the text may have. BEFORE_MARKERS non-zero means adjust + all markers that point at the insertion place to point after it. */ void insert_1_both (const char *string, ------------------------------------------------------------ revno: 112612 fixes bug: http://debbugs.gnu.org/14408 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 21:33:27 +0300 message: Fix bug #14408 with updating *Messages* display. src/xdisp.c (message_dolog): If the *Messages* buffer is shown in some window, increment windows_or_buffers_changed, so that *Messages* display in that window is updated. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-05-16 12:48:54 +0000 +++ src/ChangeLog 2013-05-16 18:33:27 +0000 @@ -1,5 +1,9 @@ 2013-05-16 Eli Zaretskii + * xdisp.c (message_dolog): If the *Messages* buffer is shown in + some window, increment windows_or_buffers_changed, so that + *Messages* display in that window is updated. (Bug#14408) + * w32.c: Include epaths.h. (init_environment): Use cmdproxy.exe without leading directories. Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that === modified file 'src/xdisp.c' --- src/xdisp.c 2013-05-08 17:59:38 +0000 +++ src/xdisp.c 2013-05-16 18:33:27 +0000 @@ -9537,7 +9537,15 @@ shown = buffer_window_count (current_buffer) > 0; set_buffer_internal (oldbuf); - if (!shown) + /* We called insert_1_both above with its 5th argument (PREPARE) + zero, which prevents insert_1_both from calling + prepare_to_modify_buffer, which in turns prevents us from + incrementing windows_or_buffers_changed even if *Messages* is + shown in some window. So we must manually incrementing + windows_or_buffers_changed here to make up for that. */ + if (shown) + windows_or_buffers_changed++; + else windows_or_buffers_changed = old_windows_or_buffers_changed; message_log_need_newline = !nlflag; Vdeactivate_mark = old_deactivate_mark; ------------------------------------------------------------ revno: 112611 fixes bug: http://debbugs.gnu.org/14409 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 20:31:25 +0300 message: Define SIZE_MAX for MSVC, part of bug #14409. nt/inc/stdint.h (SIZE_MAX) [!__GNUC__]: Define. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-05-16 12:48:54 +0000 +++ nt/ChangeLog 2013-05-16 17:31:25 +0000 @@ -1,5 +1,7 @@ 2013-05-16 Eli Zaretskii + * inc/stdint.h (SIZE_MAX) [!__GNUC__]: Define. (Bug#14409) + * msysconfig.sh: New file. * mingw-cfg.site: New file. === modified file 'nt/inc/stdint.h' --- nt/inc/stdint.h 2013-03-16 08:55:38 +0000 +++ nt/inc/stdint.h 2013-05-16 17:31:25 +0000 @@ -65,6 +65,7 @@ #define PTRDIFF_MAX INTPTR_MAX #define PTRDIFF_MIN INTPTR_MIN +#define SIZE_MAX UINTPTR_MAX #endif /* !__GNUC__ */ ------------------------------------------------------------ revno: 112610 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 20:14:21 +0300 message: Give recipe in nt/INSTALL.MSYS to uninstall msys-texinfo. diff: === modified file 'nt/INSTALL.MSYS' --- nt/INSTALL.MSYS 2013-05-16 15:35:59 +0000 +++ nt/INSTALL.MSYS 2013-05-16 17:14:21 +0000 @@ -114,7 +114,9 @@ (We recommend that you refrain from installing the MSYS Texinfo package, which is part of msys-base, because it might produce mixed EOL format when installing Info files. Instead, install the MinGW - port of Texinfo, see the ezwinports URL below.) + port of Texinfo, see the ezwinports URL below. To uninstall the + MSYS Texinfo, after installing it as part of msys-base, invoke the + command "mingw-get remove msys-texinfo".) At this point, you should be ready to configure and build Emacs in its basic configuration. Skip to the "Generating the configure ------------------------------------------------------------ revno: 112609 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-05-16 12:37:05 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2013-05-08 10:17:38 +0000 +++ autogen/Makefile.in 2013-05-16 16:37:05 +0000 @@ -38,6 +38,29 @@ # Generated by gnulib-tool. # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -57,9 +80,155 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gnulib.mk COPYING -@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_1 = gettext.h +DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnulib.mk COPYING +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_1 = core *.stackdump alloca.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ alloca.h-t errno.h errno.h-t \ +@BUILDING_FOR_WINDOWSNT_TRUE@ execinfo.h execinfo.h-t getopt.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt.h-t arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ arg-nonnull.h-t c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c++defs.h-t warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ warn-on-use.h-t stdalign.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdalign.h-t stdarg.h stdarg.h-t \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdbool.h stdbool.h-t stddef.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stddef.h-t stdint.h stdint.h-t +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_2 = libgnu.a + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_3 = $(ALLOCA_H) $(ERRNO_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(EXECINFO_H) $(GETOPT_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ arg-nonnull.h c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ warn-on-use.h $(STDALIGN_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(STDARG_H) $(STDBOOL_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(STDDEF_H) $(STDINT_H) +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_4 = alloca.in.h close-stream.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.h sha1.h sha256.h sha512.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dosname.h ftoastr.c ftoastr.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dup2.c errno.in.h euidaccess.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ execinfo.c execinfo.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c faccessat.c fdatasync.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fdopendir.c filemode.h fpending.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fpending.h at-func.c fstatat.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fsync.c getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt.c getopt.in.h getopt1.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt_int.h gettimeofday.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ group-member.c ignore-value.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ intprops.h lstat.c memrchr.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mktime-internal.h mktime.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ openat.h pathmax.h pselect.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ pthread_sigmask.c putenv.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl-internal.h acl.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c readlinkat.c root-uid.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sig2str.c sig2str.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/_Noreturn.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat.c stat-time.h stdalign.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdarg.in.h stdbool.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stddef.in.h stdint.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strftime.h strtoimax.c strtol.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoll.c strtol.c strtoul.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoull.c strtoimax.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoumax.c symlink.c time_r.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec.h u64.h unsetenv.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ utimens.h verify.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ xalloc-oversized.h +@BUILDING_FOR_WINDOWSNT_TRUE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_5 = gettext.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_6 = core *.stackdump alloca.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ alloca.h-t dirent.h dirent.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ errno.h errno.h-t execinfo.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.h-t fcntl.h fcntl.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.h getopt.h-t inttypes.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ inttypes.h-t signal.h signal.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ arg-nonnull.h arg-nonnull.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c++defs.h c++defs.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ warn-on-use.h warn-on-use.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdalign.h stdalign.h-t stdarg.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdarg.h-t stdbool.h stdbool.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stddef.h stddef.h-t stdint.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdint.h-t stdio.h stdio.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdlib.h stdlib.h-t string.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ string.h-t sys/select.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/select.h-t sys/stat.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/stat.h-t sys/time.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/time.h-t time.h time.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ unistd.h unistd.h-t +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_7 = libgnu.a + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_8 = $(ALLOCA_H) dirent.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(ERRNO_H) $(EXECINFO_H) fcntl.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(GETOPT_H) inttypes.h signal.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ arg-nonnull.h c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ warn-on-use.h $(STDALIGN_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(STDARG_H) $(STDBOOL_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(STDDEF_H) $(STDINT_H) stdio.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdlib.h string.h sys/select.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/stat.h sys/time.h time.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ unistd.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_9 = alloca.in.h allocator.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-priv.h openat-proc.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.h close-stream.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.h sha1.h sha256.h sha512.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dirent.in.h dosname.h ftoastr.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ ftoastr.h dup2.c errno.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ euidaccess.c execinfo.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.in.h at-func.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ faccessat.c fcntl.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fdatasync.c fdopendir.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.h fpending.c fpending.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c fstatat.c fsync.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.c getopt.in.h getopt1.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt_int.h gettimeofday.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ group-member.c ignore-value.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ intprops.h inttypes.in.h lstat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ memrchr.c mktime-internal.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mktime.c openat.h pathmax.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl-internal.h acl.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h sig2str.c sig2str.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ signal.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/_Noreturn.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stat.c stat-time.h stdalign.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdarg.in.h stdbool.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stddef.in.h stdint.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdio.in.h stdlib.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.h string.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtol.c strtoll.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtol.c strtoul.c strtoull.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ symlink.c sys_select.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys_stat.in.h sys_time.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ time.in.h time_r.c timespec.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.h unistd.in.h unsetenv.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.h verify.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ xalloc-oversized.h +@BUILDING_FOR_WINDOWSNT_FALSE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_10 = gettext.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_11 = sys sys subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ @@ -127,17 +296,63 @@ timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \ utimens.c openat-die.c save-cwd.c am__objects_1 = -am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \ - c-strcasecmp.$(OBJEXT) c-strncasecmp.$(OBJEXT) \ - careadlinkat.$(OBJEXT) close-stream.$(OBJEXT) md5.$(OBJEXT) \ - sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \ - dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) filemode.$(OBJEXT) \ - $(am__objects_1) gettime.$(OBJEXT) acl-errno-valid.$(OBJEXT) \ - file-has-acl.$(OBJEXT) qcopy-acl.$(OBJEXT) qset-acl.$(OBJEXT) \ - stat-time.$(OBJEXT) strftime.$(OBJEXT) timespec.$(OBJEXT) \ - timespec-add.$(OBJEXT) timespec-sub.$(OBJEXT) u64.$(OBJEXT) \ - unistd.$(OBJEXT) utimens.$(OBJEXT) openat-die.$(OBJEXT) \ - save-cwd.$(OBJEXT) +@BUILDING_FOR_WINDOWSNT_FALSE@am_libgnu_a_OBJECTS = \ +@BUILDING_FOR_WINDOWSNT_FALSE@ allocator.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-ctype.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strcasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strncasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ close-stream.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.$(OBJEXT) sha1.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sha256.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sha512.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtoastr.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtotimespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(am__objects_1) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ acl-errno-valid.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ file-has-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qcopy-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qset-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stat-time.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-sub.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.$(OBJEXT) unistd.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-die.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ save-cwd.$(OBJEXT) +@BUILDING_FOR_WINDOWSNT_TRUE@am_libgnu_a_OBJECTS = c-ctype.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strcasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strncasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ close-stream.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.$(OBJEXT) sha1.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sha256.$(OBJEXT) sha512.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtoastr.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtotimespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ filemode.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl-errno-valid.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ file-has-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ qcopy-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat-time.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strftime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-sub.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ u64.$(OBJEXT) utimens.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1) +am__EXTRA_libgnu_a_SOURCES_DIST = openat-proc.c ftoastr.c dup2.c \ + euidaccess.c execinfo.c at-func.c faccessat.c fdatasync.c \ + fdopendir.c fpending.c fstatat.c fsync.c getgroups.c \ + getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \ + lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \ + putenv.c acl_entries.c readlink.c readlinkat.c sig2str.c \ + stat.c strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \ + strtoumax.c symlink.c time_r.c unsetenv.c libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -147,11 +362,13 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) +DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) \ + $(am__EXTRA_libgnu_a_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ADDSECTION = @ADDSECTION@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -175,6 +392,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CFLAGS_SOUND = @CFLAGS_SOUND@ +CLIENTRES = @CLIENTRES@ +CLIENTW = @CLIENTW@ +CM_OBJ = @CM_OBJ@ COM_ERRLIB = @COM_ERRLIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -195,6 +415,9 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EMACSRES = @EMACSRES@ +EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ +EMACS_MANIFEST = @EMACS_MANIFEST@ EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ @@ -204,6 +427,7 @@ ERRNO_H = @ERRNO_H@ EXECINFO_H = @EXECINFO_H@ EXEEXT = @EXEEXT@ +FIRSTFILE_OBJ = @FIRSTFILE_OBJ@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONT_OBJ = @FONT_OBJ@ @@ -650,6 +874,7 @@ LIBS = @LIBS@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ LIBSOUND = @LIBSOUND@ +LIBS_ECLIENT = @LIBS_ECLIENT@ LIBS_GNUSTEP = @LIBS_GNUSTEP@ LIBS_MAIL = @LIBS_MAIL@ LIBS_SYSTEM = @LIBS_SYSTEM@ @@ -673,6 +898,7 @@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ LIB_TIMER_TIME = @LIB_TIMER_TIME@ +LIB_WSOCK32 = @LIB_WSOCK32@ LN_S_FILEONLY = @LN_S_FILEONLY@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -717,6 +943,8 @@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NS_OBJ = @NS_OBJ@ NS_OBJC_OBJ = @NS_OBJC_OBJ@ +NTDIR = @NTDIR@ +NTLIB = @NTLIB@ OBJEXT = @OBJEXT@ OLDXMENU = @OLDXMENU@ OLDXMENU_DEPS = @OLDXMENU_DEPS@ @@ -876,6 +1104,7 @@ STRIP = @STRIP@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ +TEMACS_POST_LINK = @TEMACS_POST_LINK@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ TOOLKIT_LIBW = @TOOLKIT_LIBW@ @@ -890,7 +1119,6 @@ VMLIMIT_OBJ = @VMLIMIT_OBJ@ W32_LIBS = @W32_LIBS@ W32_OBJ = @W32_OBJ@ -W32_RES = @W32_RES@ W32_RES_LINK = @W32_RES_LINK@ WARN_CFLAGS = @WARN_CFLAGS@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ @@ -901,6 +1129,7 @@ WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@ WINDRES = @WINDRES@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +XARGS_LIMIT = @XARGS_LIMIT@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ @@ -988,91 +1217,99 @@ top_srcdir = @top_srcdir@ version = @version@ x_default_search_path = @x_default_search_path@ - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. -BUILT_SOURCES = $(ALLOCA_H) dirent.h $(ERRNO_H) $(EXECINFO_H) fcntl.h \ - $(GETOPT_H) inttypes.h signal.h arg-nonnull.h c++defs.h \ - warn-on-use.h $(STDALIGN_H) $(STDARG_H) $(STDBOOL_H) \ - $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h sys/select.h \ - sys/stat.h sys/time.h time.h unistd.h +BUILT_SOURCES = $(am__append_3) $(am__append_8) CLEANFILES = -EXTRA_DIST = alloca.in.h allocator.h openat-priv.h openat-proc.c \ - careadlinkat.h close-stream.h md5.h sha1.h sha256.h sha512.h \ - dirent.in.h dosname.h ftoastr.c ftoastr.h dup2.c errno.in.h \ - euidaccess.c execinfo.c execinfo.in.h at-func.c faccessat.c \ - fcntl.in.h fdatasync.c fdopendir.c filemode.h fpending.c \ - fpending.h at-func.c fstatat.c fsync.c getgroups.c \ - getloadavg.c getopt.c getopt.in.h getopt1.c getopt_int.h \ - gettimeofday.c group-member.c ignore-value.h intprops.h \ - inttypes.in.h lstat.c memrchr.c mktime-internal.h mktime.c \ - openat.h pathmax.h pselect.c pthread_sigmask.c putenv.c \ - acl-internal.h acl.h acl_entries.c readlink.c at-func.c \ - readlinkat.c root-uid.h sig2str.c sig2str.h signal.in.h \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ - $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - $(top_srcdir)/build-aux/snippet/c++defs.h \ - $(top_srcdir)/build-aux/snippet/warn-on-use.h stat.c \ - stat-time.h stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h \ - stdint.in.h stdio.in.h stdlib.in.h strftime.h string.in.h \ - strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \ - strtoimax.c strtoumax.c symlink.c sys_select.in.h \ - sys_stat.in.h sys_time.in.h time.in.h time_r.c timespec.h \ - u64.h unistd.in.h unsetenv.c utimens.h verify.h \ - xalloc-oversized.h -MOSTLYCLEANDIRS = sys sys -MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \ - dirent.h-t errno.h errno.h-t execinfo.h execinfo.h-t fcntl.h \ - fcntl.h-t getopt.h getopt.h-t inttypes.h inttypes.h-t signal.h \ - signal.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ - warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t stdarg.h \ - stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \ - stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h \ - string.h-t sys/select.h sys/select.h-t sys/stat.h sys/stat.h-t \ - sys/time.h sys/time.h-t time.h time.h-t unistd.h unistd.h-t -noinst_LIBRARIES = libgnu.a +EXTRA_DIST = $(am__append_4) $(am__append_9) +MOSTLYCLEANDIRS = $(am__append_11) +MOSTLYCLEANFILES = $(am__append_1) $(am__append_6) +noinst_LIBRARIES = $(am__append_2) $(am__append_7) SUFFIXES = AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src -libgnu_a_SOURCES = allocator.c c-ctype.h c-ctype.c c-strcase.h \ - c-strcasecmp.c c-strncasecmp.c careadlinkat.c close-stream.c \ - md5.c sha1.c sha256.c sha512.c dtoastr.c dtotimespec.c \ - filemode.c $(am__append_1) gettime.c acl-errno-valid.c \ - file-has-acl.c qcopy-acl.c qset-acl.c stat-time.c strftime.c \ - timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \ - utimens.c openat-die.c save-cwd.c -libgnu_a_LIBADD = $(gl_LIBOBJS) -libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -EXTRA_libgnu_a_SOURCES = openat-proc.c ftoastr.c dup2.c euidaccess.c \ - execinfo.c at-func.c faccessat.c fdatasync.c fdopendir.c \ - fpending.c at-func.c fstatat.c fsync.c getgroups.c \ - getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \ - lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \ - putenv.c acl_entries.c readlink.c at-func.c readlinkat.c \ - sig2str.c stat.c strtoimax.c strtol.c strtoll.c strtol.c \ - strtoul.c strtoull.c strtoimax.c strtoumax.c symlink.c \ - time_r.c unsetenv.c - -# Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that -# need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -WARN_ON_USE_H = warn-on-use.h +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_SOURCES = allocator.c c-ctype.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-ctype.c c-strcase.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strcasecmp.c c-strncasecmp.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.c close-stream.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.c sha1.c sha256.c sha512.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtoastr.c dtotimespec.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.c $(am__append_10) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettime.c acl-errno-valid.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ file-has-acl.c qcopy-acl.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qset-acl.c stat-time.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.c timespec.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.c timespec-sub.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.c unistd.c utimens.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-die.c save-cwd.c +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_SOURCES = c-ctype.h c-ctype.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strcase.h c-strcasecmp.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strncasecmp.c close-stream.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.c sha1.c sha256.c sha512.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtoastr.c dtotimespec.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ filemode.c $(am__append_5) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettime.c acl-errno-valid.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ file-has-acl.c qcopy-acl.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat-time.c strftime.c timespec.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.c timespec-sub.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ u64.c utimens.c $(am__append_10) +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_LIBADD = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_LIBADD = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_FALSE@EXTRA_libgnu_a_SOURCES = openat-proc.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ ftoastr.c dup2.c euidaccess.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.c at-func.c faccessat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fdatasync.c fdopendir.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fpending.c at-func.c fstatat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fsync.c getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.c getopt1.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettimeofday.c group-member.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ lstat.c memrchr.c mktime.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl_entries.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ readlink.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ readlinkat.c sig2str.c stat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtol.c strtoll.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtol.c strtoul.c strtoull.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ symlink.c time_r.c unsetenv.c +@BUILDING_FOR_WINDOWSNT_TRUE@EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ euidaccess.c execinfo.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ faccessat.c fdatasync.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fdopendir.c fpending.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fstatat.c fsync.c getgroups.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getloadavg.c getopt.c getopt1.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettimeofday.c group-member.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ lstat.c memrchr.c mktime.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ putenv.c acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c readlinkat.c sig2str.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat.c strtoimax.c strtol.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoll.c strtol.c strtoul.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoull.c strtoimax.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoumax.c symlink.c time_r.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ unsetenv.c + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. +@BUILDING_FOR_WINDOWSNT_FALSE@_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. +@BUILDING_FOR_WINDOWSNT_TRUE@_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h +@BUILDING_FOR_WINDOWSNT_FALSE@ARG_NONNULL_H = arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_TRUE@ARG_NONNULL_H = arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_FALSE@CXXDEFS_H = c++defs.h +@BUILDING_FOR_WINDOWSNT_TRUE@CXXDEFS_H = c++defs.h +@BUILDING_FOR_WINDOWSNT_FALSE@WARN_ON_USE_H = warn-on-use.h +@BUILDING_FOR_WINDOWSNT_TRUE@WARN_ON_USE_H = warn-on-use.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../nt/gnulib.mk $(srcdir)/gnulib.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1401,903 +1638,1091 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ -@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ -@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_TRUE@getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(srcdir)/getopt.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv -f $@-t $@ +# The arg-nonnull.h that gets inserted into generated .h files is the same as +# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +# off. +@BUILDING_FOR_WINDOWSNT_TRUE@arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/GL_ARG_NONNULL/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ +# The c++defs.h that gets inserted into generated .h files is the same as +# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +@BUILDING_FOR_WINDOWSNT_TRUE@c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/_GL_CXXDEFS/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ +# The warn-on-use.h that gets inserted into generated .h files is the same as +# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +# off. +@BUILDING_FOR_WINDOWSNT_TRUE@warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/^.ifndef/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ + +@BUILDING_FOR_WINDOWSNT_TRUE@mostlyclean-local: mostlyclean-generic +@BUILDING_FOR_WINDOWSNT_TRUE@ @for dir in '' $(MOSTLYCLEANDIRS); do \ +@BUILDING_FOR_WINDOWSNT_TRUE@ if test -n "$$dir" && test -d $$dir; then \ +@BUILDING_FOR_WINDOWSNT_TRUE@ echo "rmdir $$dir"; rmdir $$dir; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fi; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ done; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ : + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ - -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ - -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ - -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ - -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ - -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ - -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ - -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ - -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ - -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ - -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ - -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ - -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ - -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ - -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ - -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ - -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ - -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ - -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/dirent.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/dirent.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that is POSIX compliant. -@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status -@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ -@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ -@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status -@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status -@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ -@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ -@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ -@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status -@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ - -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ - -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ - -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ - -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ - -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/fcntl.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/fcntl.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - < $(srcdir)/getopt.in.h; \ - } > $@-t && \ - mv -f $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/getopt.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv -f $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ - -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ - -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ - -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ - -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ - -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ - -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ - -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ - -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ - -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ - -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/inttypes.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/inttypes.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have a complete one. -signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ - -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ - -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ - -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ - -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ - -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ - -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ - -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ - -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ - -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ - -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ - -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/signal.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/signal.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # The arg-nonnull.h that gets inserted into generated .h files is the same as # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut # off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/GL_ARG_NONNULL/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # The c++defs.h that gets inserted into generated .h files is the same as # build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/_GL_CXXDEFS/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # The warn-on-use.h that gets inserted into generated .h files is the same as # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut # off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/^.ifndef/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ -@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ -@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ -@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ -@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ -@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ - -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ - -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ - -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ - -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ - -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ - -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ - -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ - -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ - -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ - -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ - -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ - -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ - -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ - -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ - -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ - -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ - -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ - -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ - -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ - -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ - -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ - -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ - -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ - -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ - -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ - -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ - -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ - -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ - -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ - -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ - -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ - -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ - -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ - -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ - -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ - -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ - -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ - -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ - -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ - -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ - -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ - -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ - -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ - -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ - -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ - -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ - -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/stdio.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ - -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ - -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ - -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ - -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ - -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ - -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ - -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ - -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ - -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ - -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ - -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ - -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ - -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ - -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ - -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ - -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ - -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ - -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ - -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ - -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ - -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ - -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ - -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ - -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ - -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ - -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ - -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ - -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ - -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ - -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ - -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ - -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ - -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ - -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ - -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ - -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ - -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ - -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ - -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ - -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ - -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ - -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ - -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _Noreturn/r $(_NORETURN_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/stdlib.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ - -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ - -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ - -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ - -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ - -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ - -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ - -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ - -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ - -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ - -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ - -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ - -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ - -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ - -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ - -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ - -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ - -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ - -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ - -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ - -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ - -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ - -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ - -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ - -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ - -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ - -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ - -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - < $(srcdir)/string.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/string.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/string.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ - -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ - -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ - -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_select.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_select.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # has one that is incomplete. -sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ - -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ - -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ - -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ - -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ - -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ - -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ - -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ - -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ - -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ - -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ - -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ - -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ - -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ - -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ - -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ - -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ - -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ - -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ - -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ - -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ - -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ - -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ - -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ - -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ - -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_stat.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_stat.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ - -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_time.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_time.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/time.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/time.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create an empty placeholder for # when the system doesn't have one. -unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ - -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ - -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ - -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ - -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ - -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ - -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ - -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ - -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ - -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ - -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ - -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ - -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ - -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ - -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ - -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ - -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ - -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ - -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ - -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ - -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ - -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ - -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - | \ - sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ - -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ - -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ - -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ - -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ - -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ - -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ - -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ - -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ - -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ - -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ - -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ - -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ - -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ - -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/unistd.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : +@BUILDING_FOR_WINDOWSNT_FALSE@mostlyclean-local: mostlyclean-generic +@BUILDING_FOR_WINDOWSNT_FALSE@ @for dir in '' $(MOSTLYCLEANDIRS); do \ +@BUILDING_FOR_WINDOWSNT_FALSE@ if test -n "$$dir" && test -d $$dir; then \ +@BUILDING_FOR_WINDOWSNT_FALSE@ echo "rmdir $$dir"; rmdir $$dir; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fi; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ done; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ : # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. === modified file 'autogen/config.in' --- autogen/config.in 2013-05-08 10:17:38 +0000 +++ autogen/config.in 2013-05-16 16:37:05 +0000 @@ -110,6 +110,9 @@ /* Define to 1 if you are using the GNU C Library. */ #undef DOUG_LEA_MALLOC +/* Define to 1 to enable w32 debug facilities. */ +#undef EMACSDEBUG + /* Define to the canonical Emacs configuration name. */ #undef EMACS_CONFIGURATION @@ -793,6 +796,9 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Define to 1 if you have the header file. */ +#undef HAVE_MMSYSTEM_H + /* Define to 1 if you have the `nanotime' function. */ #undef HAVE_NANOTIME @@ -1569,6 +1575,9 @@ /* Use long long for EMACS_INT if available. */ #undef WIDE_EMACS_INT +/* Define if compiling for native MS Windows. */ +#undef WINDOWSNT + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wint_t'. */ #undef WINT_T_SUFFIX === modified file 'autogen/configure' --- autogen/configure 2013-05-16 10:17:34 +0000 +++ autogen/configure 2013-05-16 16:37:05 +0000 @@ -605,6 +605,9 @@ LIBOBJS SUBDIR_MAKEFILES_IN WINDOW_SYSTEM_OBJ +EMACS_HEAPSIZE +TEMACS_POST_LINK +ADDSECTION LD_SWITCH_SYSTEM_TEMACS LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS @@ -1347,8 +1350,18 @@ VMLIMIT_OBJ GMALLOC_OBJ HAVE_XSERVER +XARGS_LIMIT +NTLIB +LIB_WSOCK32 +LIBS_ECLIENT +CM_OBJ +NTDIR +FIRSTFILE_OBJ W32_RES_LINK -W32_RES +CLIENTW +CLIENTRES +EMACS_MANIFEST +EMACSRES W32_LIBS W32_OBJ WINDRES @@ -1389,6 +1402,8 @@ EGREP GREP CPP +BUILDING_FOR_WINDOWSNT_FALSE +BUILDING_FOR_WINDOWSNT_TRUE am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -2234,7 +2249,7 @@ --without-xaw3d don't use Xaw3d --without-xim don't use X11 XIM --with-ns use NeXTstep (Cocoa or GNUstep) windowing system - --with-w32 use native MS Windows GUI + --with-w32 use native MS Windows GUI in a Cygwin build --without-gpm don't use -lgpm for mouse support on a GNU/Linux console --without-dbus don't compile with D-Bus support @@ -4524,7 +4539,7 @@ ## Make sure CDPATH doesn't affect cd (in case PWD is relative). unset CDPATH case "${srcdir}" in - /* ) ;; + [\\/]* | ?:[\\/]*) ;; . ) ## We may be able to use the $PWD environment variable to make this ## absolute. But sometimes PWD is inaccurate. @@ -4764,6 +4779,11 @@ i[3456]86-*-* ) case "${canonical}" in *-darwin* ) opsys=darwin ;; + *-mingw32 ) + opsys=mingw32 + # MinGW overrides and adds some system headers in nt/inc. + GCC_TEST_OPTIONS="-I $srcdir/nt/inc" + ;; *-sysv4.2uw* ) opsys=unixware ;; *-sysv5uw* ) opsys=unixware ;; *-sysv5OpenUNIX* ) opsys=unixware ;; @@ -5914,6 +5934,15 @@ test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi + if test "x$opsys" = "xmingw32"; then + BUILDING_FOR_WINDOWSNT_TRUE= + BUILDING_FOR_WINDOWSNT_FALSE='#' +else + BUILDING_FOR_WINDOWSNT_TRUE='#' + BUILDING_FOR_WINDOWSNT_FALSE= +fi + + # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. @@ -7325,6 +7354,9 @@ if test $emacs_cv_prog_cc_g3 != yes; then CFLAGS=$emacs_save_CFLAGS fi + if test $opsys = mingw32; then + CFLAGS="$CFLAGS -gdwarf-2" + fi fi case $CFLAGS in @@ -8242,6 +8274,10 @@ +if test "$opsys" = "mingw32"; then + LN_S="ln" +fi + # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8528,7 +8564,6 @@ UNEXEC_OBJ=unexelf.o case "$opsys" in # MSDOS uses unexcoff.o - # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o ;; @@ -8541,6 +8576,9 @@ hpux10-20 | hpux11) UNEXEC_OBJ=unexhp9k800.o ;; + mingw32) + UNEXEC_OBJ=unexw32.o + ;; sol2-10) # Use the Solaris dldump() function, called from unexsol.c, to dump # emacs, instead of the generic ELF dump code found in unexelf.c. @@ -8639,6 +8677,7 @@ ## additional optimization. --nils@exp-math.uni-essen.de test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" +test "$opsys" = "mingw32" && C_SWITCH_SYSTEM="-mtune=pentium4" ## gnu-linux might need -D_BSD_SOURCE on old libc5 systems. ## It is redundant in glibc2, since we define _GNU_SOURCE. @@ -8693,6 +8732,10 @@ ;; hpux10-20 | hpux11 ) ;; + mingw32 ) + LIB_MATH= + SYSTEM_TYPE=windows-nt + ;; netbsd | openbsd ) SYSTEM_TYPE=berkeley-unix ;; @@ -8758,13 +8801,18 @@ - if test "${with_sound}" != "no"; then - # Sound support for GNU/Linux and the free BSDs. - for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h + # Sound support for GNU/Linux, the free BSDs, and MinGW. + for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " + #ifdef __MINGW32__ + #define WIN32_LEAN_AND_MEAN + #include + #endif + +" eval as_val=\$$as_ac_Header if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF @@ -8930,7 +8978,7 @@ if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in - gnu-linux|freebsd|netbsd) + gnu-linux|freebsd|netbsd|mingw32) $as_echo "#define HAVE_SOUND 1" >>confdefs.h @@ -9844,21 +9892,72 @@ HAVE_W32=no W32_OBJ= W32_LIBS= -W32_RES= +EMACSRES= +CLIENTRES= +CLIENTW= W32_RES_LINK= +EMACS_MANIFEST= if test "${with_w32}" != no; then - if test "${opsys}" != "cygwin"; then - as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5 - fi - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" + case "${opsys}" in + cygwin) + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" if test "x$ac_cv_header_windows_h" = x""yes; then : HAVE_W32=yes else as_fn_error "\`--with-w32' was specified, but windows.h - cannot be found." "$LINENO" 5 -fi - - + cannot be found." "$LINENO" 5 +fi + + + ;; + mingw32) + ## Using --with-w32 with MinGW is a no-op, but we allow it. + ;; + *) + as_fn_error "Using w32 with an autotools build is only supported for Cygwin and MinGW32." "$LINENO" 5 + ;; + esac +fi + +if test "${opsys}" = "mingw32"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Windows API headers are recent enough" >&5 +$as_echo_n "checking whether Windows API headers are recent enough... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include +int +main () +{ +void test(PIMAGE_NT_HEADERS pHeader) + {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + emacs_cv_w32api=yes + HAVE_W32=yes +else + emacs_cv_w32api=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_w32api" >&5 +$as_echo "$emacs_cv_w32api" >&6; } + if test "${emacs_cv_w32api}" = "no"; then + as_fn_error "the Windows API headers are too old to support this build." "$LINENO" 5 + fi +fi + +FIRSTFILE_OBJ= +NTDIR= +LIBS_ECLIENT= +LIB_WSOCK32= +NTLIB= +CM_OBJ="cm.o" +XARGS_LIMIT= +if test "${HAVE_W32}" = "yes"; then $as_echo "#define HAVE_NTGUI 1" >>confdefs.h @@ -9956,18 +10055,49 @@ W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" - W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" - W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" - W32_RES="emacs.res" - # Tell the linker that emacs.res is an object (which we compile from - # the rc file), not a linker script. - W32_RES_LINK="-Wl,emacs.res" + EMACSRES="emacs.res" + case "$canonical" in + x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; + *) EMACS_MANIFEST="emacs-x86.manifest" ;; + esac + if test "${opsys}" = "cygwin"; then + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" + # Tell the linker that emacs.res is an object (which we compile from + # the rc file), not a linker script. + W32_RES_LINK="-Wl,emacs.res" + else + W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" + W32_OBJ="$W32_OBJ w32notify.o" + W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" + W32_RES_LINK="\$(EMACSRES)" + CLIENTRES="emacsclient.res" + CLIENTW="emacsclientw\$(EXEEXT)" + FIRSTFILE_OBJ=firstfile.o + NTDIR=nt + CM_OBJ= + LIBS_ECLIENT="-lcomctl32" + LIB_WSOCK32="-lwsock32" + NTLIB="ntlib.$ac_objext" + XARGS_LIMIT="-s 10000" + fi fi + + + + + + + + + + if test "${HAVE_W32}" = "yes"; then window_system=w32 with_xft=no @@ -10829,7 +10959,7 @@ ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. HAVE_RSVG=no -if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then if test "${with_rsvg}" != "no"; then RSVG_REQUIRED=2.11.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" @@ -10988,10 +11118,11 @@ GTK_OBJ= check_gtk2=no gtk3_pkg_errors= -if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.28 - GTK_REQUIRED=3.0 - GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" +if test "${opsys}" != "mingw32"; then + if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then + GLIB_REQUIRED=2.28 + GTK_REQUIRED=3.0 + GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" succeeded=no @@ -11044,29 +11175,29 @@ pkg_check_gtk=no fi - if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then - as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 - fi - if test "$pkg_check_gtk" = "yes"; then + if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then + as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 + fi + if test "$pkg_check_gtk" = "yes"; then $as_echo "#define HAVE_GTK3 1" >>confdefs.h - GTK_OBJ=emacsgtkfixed.o - term_header=gtkutil.h - USE_GTK_TOOLKIT="GTK3" - if test "x$ac_enable_gtk_deprecation_warnings" = x; then - GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" - fi - else - check_gtk2=yes - gtk3_pkg_errors="$GTK_PKG_ERRORS " + GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h + USE_GTK_TOOLKIT="GTK3" + if test "x$ac_enable_gtk_deprecation_warnings" = x; then + GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" + fi + else + check_gtk2=yes + gtk3_pkg_errors="$GTK_PKG_ERRORS " + fi fi -fi -if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then - GLIB_REQUIRED=2.10 - GTK_REQUIRED=2.10 - GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" + if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 + GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" succeeded=no @@ -11119,12 +11250,13 @@ pkg_check_gtk=no fi - if test "$pkg_check_gtk" = "no" && - { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } - then - as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5 + if test "$pkg_check_gtk" = "no" && + { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } + then + as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5 + fi + test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi - test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi if test x"$pkg_check_gtk" = xyes; then @@ -11673,6 +11805,8 @@ fi + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" LIBS="$LIBGNUTLS_LIBS $LIBS" for ac_func in gnutls_certificate_set_verify_function @@ -11692,6 +11826,13 @@ $as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h fi + + # Windows loads GnuTLS dynamically + if test "${opsys}" = "mingw32"; then + CFLAGS=$OLD_CFLAGS + LIBS=$OLD_LIBS + LIBGNUTLS_LIBS= + fi fi @@ -11967,6 +12108,9 @@ hpux* | aix4-2 ) test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" != "Xyes" && LIBXMU= ;; + mingw32 ) + LIBXMU= + ;; esac @@ -12751,10 +12895,10 @@ ### Use -lXpm if available, unless `--with-xpm=no'. +### mingw32 doesn't use -lXpm, since it loads the library dynamically. HAVE_XPM=no LIBXPM= - -if test "${HAVE_W32}" = "yes"; then +if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then if test "${with_xpm}" != "no"; then SAVE_CPPFLAGS="$CPPFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -12931,12 +13075,70 @@ fi fi +### FIXME: Perhaps regroup to minimize code duplication due to MinGW's +### slightly different requirements wrt image libraries (it doesn't +### use -lXpm because it loads the xpm shared library dynamically at +### run time). +if test "${opsys}" = "mingw32"; then + if test "${with_xpm}" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" " +#define FOR_MSW 1 +" +if test "x$ac_cv_header_X11_xpm_h" = x""yes; then : + HAVE_XPM=yes +else + HAVE_XPM=no +fi + + + fi + + if test "${HAVE_XPM}" = "yes"; then + +$as_echo "#define HAVE_XPM 1" >>confdefs.h + + fi +fi + ### Use -ljpeg if available, unless `--with-jpeg=no'. +### mingw32 doesn't use -ljpeg, since it loads the library dynamically. HAVE_JPEG=no LIBJPEG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_jpeg}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" +if test "x$ac_cv_header_jerror_h" = x""yes; then : + HAVE_JPEG=yes +else + HAVE_JPEG=no +fi + + + fi + if test "${HAVE_JPEG}" = "yes"; then + $as_echo "#define HAVE_JPEG 1" >>confdefs.h + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + version=JPEG_LIB_VERSION + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then : + $as_echo "#define HAVE_JPEG 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libjpeg found, but not version 6b or later" >&5 +$as_echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;} + HAVE_JPEG=no +fi +rm -f conftest* + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_jpeg}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" if test "x$ac_cv_header_jerror_h" = x""yes; then : @@ -13001,7 +13203,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libjpeg found, but not version 6b or later" >&5 $as_echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;} - HAVE_JPEG=no + HAVE_JPEG=no fi rm -f conftest* @@ -13013,9 +13215,42 @@ ### Use -lpng if available, unless `--with-png=no'. +### mingw32 doesn't use -lpng, since it loads the library dynamically. HAVE_PNG=no LIBPNG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_png}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +if test "x$ac_cv_header_png_h" = x""yes; then : + HAVE_PNG=yes +else + HAVE_PNG=no +fi + + + fi + if test "${HAVE_PNG}" = "yes"; then + +$as_echo "#define HAVE_PNG 1" >>confdefs.h + + + ac_fn_c_check_decl "$LINENO" "png_longjmp" "ac_cv_have_decl_png_longjmp" "#ifdef HAVE_LIBPNG_PNG_H + # include + #else + # include + #endif + +" +if test "x$ac_cv_have_decl_png_longjmp" = x""yes; then : + +else + +$as_echo "#define PNG_DEPSTRUCT /**/" >>confdefs.h + +fi + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_png}" != "no"; then # Debian unstable as of July 2003 has multiple libpngs, and puts png.h # in /usr/include/libpng. @@ -13103,9 +13338,26 @@ ### Use -ltiff if available, unless `--with-tiff=no'. +### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no LIBTIFF= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_tiff}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" +if test "x$ac_cv_header_tiffio_h" = x""yes; then : + HAVE_TIFF=yes +else + HAVE_TIFF=no +fi + + + fi + if test "${HAVE_TIFF}" = "yes"; then + +$as_echo "#define HAVE_TIFF 1" >>confdefs.h + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_tiff}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" if test "x$ac_cv_header_tiffio_h" = x""yes; then : @@ -13167,9 +13419,26 @@ ### Use -lgif or -lungif if available, unless `--with-gif=no'. +### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. HAVE_GIF=no LIBGIF= -if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ +if test "${opsys}" = "mingw32"; then + if test "${with_gif}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" +if test "x$ac_cv_header_gif_lib_h" = x""yes; then : + HAVE_GIF=yes +else + HAVE_GIF=no +fi + + + fi + if test "${HAVE_GIF}" = "yes"; then + +$as_echo "#define HAVE_GIF 1" >>confdefs.h + + fi +elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ || test "${HAVE_W32}" = "yes"; then ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" if test "x$ac_cv_header_gif_lib_h" = x""yes; then : @@ -13710,6 +13979,7 @@ ### Use libxml (-lxml2) if available +### mingw32 doesn't use -lxml2, since it loads the library dynamically. HAVE_LIBXML2=no if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. @@ -13765,8 +14035,9 @@ fi if test "${HAVE_LIBXML2}" = "yes"; then - LIBS="$LIBXML2_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 + if test "${opsys}" != "mingw32"; then + LIBS="$LIBXML2_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -13808,6 +14079,9 @@ HAVE_LIBXML2=no fi + else + LIBXML2_LIBS="" + fi if test "${HAVE_LIBXML2}" = "yes"; then $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h @@ -13822,6 +14096,10 @@ # If netdb.h doesn't declare h_errno, we must declare it by hand. +# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c. +if test "${opsys}" = "mingw32"; then + emacs_cv_netdb_declares_h_errno=yes +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5 $as_echo_n "checking whether netdb declares h_errno... " >&6; } if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then : @@ -13855,8 +14133,9 @@ fi # sqrt and other floating-point functions such as fmod and frexp -# are found in -lm on most systems. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +# are found in -lm on most systems, but mingw32 doesn't use -lm. +if test "${opsys}" != "mingw32"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 $as_echo_n "checking for sqrt in -lm... " >&6; } if test "${ac_cv_lib_m_sqrt+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -13901,6 +14180,7 @@ fi +fi # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. @@ -14086,6 +14366,9 @@ test $ac_cv_header_maillock_h = yes && mail_lock=no fi ;; + + mingw32) + mail_lock="none-needed" ;; esac BLESSMAIL_TARGET= @@ -14098,6 +14381,8 @@ $as_echo "#define MAIL_USE_LOCKF 1" >>confdefs.h ;; + none-needed) ;; + *) BLESSMAIL_TARGET="need-blessmail" ;; esac @@ -14297,19 +14582,22 @@ # tputs in the test program, due to portability hassles. When # cross-compiling, assume the test program will run if it links. -# Maybe curses should be tried earlier? -# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 -for tputs_library in '' tinfo ncurses terminfo termcap curses; do - OLIBS=$LIBS - if test -z "$tputs_library"; then - LIBS_TERMCAP= - msg='none required' - else - LIBS_TERMCAP=-l$tputs_library - msg=$LIBS_TERMCAP - LIBS="$LIBS_TERMCAP $LIBS" - fi - if test "$cross_compiling" = yes; then : +if test "${opsys}" = "mingw32"; then + msg='none required' +else + # Maybe curses should be tried earlier? + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 + for tputs_library in '' tinfo ncurses terminfo termcap curses; do + OLIBS=$LIBS + if test -z "$tputs_library"; then + LIBS_TERMCAP= + msg='none required' + else + LIBS_TERMCAP=-l$tputs_library + msg=$LIBS_TERMCAP + LIBS="$LIBS_TERMCAP $LIBS" + fi + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14351,11 +14639,12 @@ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LIBS=$OLIBS - if test "X$msg" != Xno; then - break - fi -done + LIBS=$OLIBS + if test "X$msg" != Xno; then + break + fi + done +fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5 $as_echo "$msg" >&6; } if test "X$msg" = Xno; then @@ -14424,6 +14713,11 @@ fi ;; + mingw32) + TERMINFO=no + LIBS_TERMCAP= + ;; + netbsd) if test "x$LIBS_TERMCAP" != "x-lterminfo"; then TERMINFO=no @@ -15699,18 +15993,22 @@ fi +if test "${opsys}" != "mingw32"; then $as_echo "#define AMPERSAND_FULL_NAME 1" >>confdefs.h +fi $as_echo "#define CLASH_DETECTION 1" >>confdefs.h ## Note: PTYs are broken on darwin <6. Use at your own risk. +if test "${opsys}" != "mingw32"; then $as_echo "#define HAVE_PTYS 1" >>confdefs.h +fi $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h @@ -15719,12 +16017,22 @@ -$as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h - - - -$as_echo "#define SEPCHAR ':'" >>confdefs.h - +if test "${opsys}" = "mingw32"; then + $as_echo "#define NULL_DEVICE \"NUL:\"" >>confdefs.h + +else + $as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h + +fi + + +if test "${opsys}" = "mingw32"; then + $as_echo "#define SEPCHAR ';'" >>confdefs.h + +else + $as_echo "#define SEPCHAR ':'" >>confdefs.h + +fi $as_echo "#define subprocesses 1" >>confdefs.h @@ -15740,7 +16048,21 @@ - +if test "${opsys}" = "mingw32"; then + $as_echo "#define DEVICE_SEP ':'" >>confdefs.h + + +$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)" >>confdefs.h + + + +$as_echo "#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')" >>confdefs.h + + + +$as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP(_c_))" >>confdefs.h + +else $as_echo "#define IS_DEVICE_SEP(_c_) 0" >>confdefs.h @@ -15752,7 +16074,7 @@ $as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))" >>confdefs.h - +fi @@ -16126,6 +16448,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + #ifdef __MINGW32__ + # define _longjmp longjmp + #endif int main () @@ -16285,6 +16610,19 @@ ;; + mingw32) + $as_echo "#define DOS_NT /**/" >>confdefs.h + + +$as_echo "#define WINDOWSNT 1" >>confdefs.h + + if test "x$ac_enable_checking" != "x" ; then + +$as_echo "#define EMACSDEBUG 1" >>confdefs.h + + fi + ;; + sol2*) $as_echo "#define USG /**/" >>confdefs.h @@ -16317,6 +16655,10 @@ emacs_cv_usable_FIONREAD=no ;; + mingw32) + emacs_cv_usable_FIONREAD=yes + ;; + *) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16499,6 +16841,13 @@ +case $opsys in + mingw32) + $as_echo "#define config_opsysfile " >>confdefs.h + + ;; +esac + XMENU_OBJ= XOBJ= FONT_OBJ= @@ -16566,12 +16915,14 @@ esac -if test "$USE_X_TOOLKIT" = "none"; then - LIBXT_OTHER="\$(LIBXSM)" - OLDXMENU_TARGET="really-oldXMenu" -else - LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" - OLDXMENU_TARGET="really-lwlib" +if test "${opsys}" != "mingw32"; then + if test "$USE_X_TOOLKIT" = "none"; then + LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" + else + LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" + fi fi @@ -16645,6 +16996,10 @@ ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o +elif test "$opsys" = "mingw32"; then + CYGWIN_OBJ= + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ=lastfile.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o @@ -27750,6 +28105,12 @@ CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS +if test "${opsys}" = "mingw32"; then + CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc" + # Remove unneeded switches from the value of CC that goes to Makefiles + CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"` +fi + case "$opsys" in aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; @@ -27786,6 +28147,16 @@ ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; + mingw32) + ## MinGW64 does not prepend an underscore to symbols, so we must + ## pass a different -entry switch to linker. FIXME: It is better + ## to make the entry points the same by changing unexw32.c. + case "$canonical" in + x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,_start -Wl,-Map,./temacs.map" ;; + *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;; + esac + ;; + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; *) LD_SWITCH_SYSTEM_TEMACS= ;; @@ -27800,6 +28171,24 @@ +## MinGW-specific post-link processing of temacs. +TEMACS_POST_LINK=":" +ADDSECTION= +EMACS_HEAPSIZE= +if test "${opsys}" = "mingw32"; then + TEMACS_POST_LINK="\$(MINGW_TEMACS_POST_LINK)" + ADDSECTION="../nt/addsection\$(EXEEXT)" + ## Preload heap size of temacs.exe in MB. + case "$canonical" in + x86_64-*-*) EMACS_HEAPSIZE=42 ;; + *) EMACS_HEAPSIZE=27 ;; + esac +fi + + + + + ## Common for all window systems if test "$window_system" != "none"; then @@ -27916,9 +28305,9 @@ fi fi -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" -ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" opt_makefile=test/automated/Makefile @@ -28065,6 +28454,10 @@ as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILDING_FOR_WINDOWSNT_TRUE}" && test -z "${BUILDING_FOR_WINDOWSNT_FALSE}"; then + as_fn_error "conditional \"BUILDING_FOR_WINDOWSNT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -28778,7 +29171,7 @@ # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -GCC="$GCC" CPPFLAGS="$CPPFLAGS" +GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" _ACEOF @@ -28807,6 +29200,7 @@ "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; "nextstep/Makefile") CONFIG_FILES="$CONFIG_FILES nextstep/Makefile" ;; + "nt/Makefile") CONFIG_FILES="$CONFIG_FILES nt/Makefile" ;; "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;; "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;; @@ -29537,7 +29931,11 @@ ;; "epaths":C) echo creating src/epaths.h -${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +if test "${opsys}" = "mingw32"; then + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 +else + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +fi ;; "gdbinit":C) if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then ------------------------------------------------------------ revno: 112608 author: Wilson Snyder committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-05-16 09:11:38 -0700 message: Sync with upstream verilog-mode r840. * lisp/progmodes/verilog-mode.el (verilog-mode-version) (verilog-mode-release-date): Update. (verilog-auto-lineup, verilog-auto-reset): Doc fixes. (verilog-sig-tieoff): Fix string error on AUTORESET with colon define, bug594. Reported by Andrew Hou. (verilog-read-decls): Fix parameters confusing AUTOINST interfaces, bug565. Reported by Leith Johnson. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 12:48:54 +0000 +++ lisp/ChangeLog 2013-05-16 16:11:38 +0000 @@ -1,3 +1,14 @@ +2013-05-16 Wilson Snyder + + Sync with upstream verilog-mode r840. + * progmodes/verilog-mode.el (verilog-mode-version) + (verilog-mode-release-date): Update. + (verilog-auto-lineup, verilog-auto-reset): Doc fixes. + (verilog-sig-tieoff): Fix string error on + AUTORESET with colon define, bug594. Reported by Andrew Hou. + (verilog-read-decls): Fix parameters confusing + AUTOINST interfaces, bug565. Reported by Leith Johnson. + 2013-05-16 Eli Zaretskii * subr.el (reveal-filename): New function. === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2013-05-09 01:40:20 +0000 +++ lisp/progmodes/verilog-mode.el 2013-05-16 16:11:38 +0000 @@ -123,9 +123,9 @@ ;;; Code: ;; This variable will always hold the version number of the mode -(defconst verilog-mode-version (substring "$$Revision: 820 $$" 12 -3) +(defconst verilog-mode-version (substring "$$Revision: 840 $$" 12 -3) "Version of this Verilog mode.") -(defconst verilog-mode-release-date (substring "$$Date: 2012-09-17 20:43:10 -0400 (Mon, 17 Sep 2012) $$" 8 -3) +(defconst verilog-mode-release-date (substring "$$Date: 2013-01-03 05:29:05 -0800 (Thu, 03 Jan 2013) $$" 8 -3) "Release date of this Verilog mode.") (defconst verilog-mode-release-emacs t "If non-nil, this version of Verilog mode was released with Emacs itself.") @@ -501,7 +501,7 @@ "Type of statements to lineup across multiple lines. If 'all' is selected, then all line ups described below are done. -If 'declaration', then just declarations are lined up with any +If 'declarations', then just declarations are lined up with any preceding declarations, taking into account widths and the like, so or example the code: reg [31:0] a; @@ -1129,9 +1129,9 @@ (defcustom verilog-auto-inst-interfaced-ports nil "Non-nil means include interfaced ports in AUTOINST expansions." + :version "24.3" ;; rev773, default change rev815 :group 'verilog-mode-auto - :type 'boolean - :version "24.3") + :type 'boolean) (put 'verilog-auto-inst-interfaced-ports 'safe-local-variable 'verilog-booleanp) (defcustom verilog-auto-input-ignore-regexp nil @@ -1158,8 +1158,8 @@ (defcustom verilog-auto-template-warn-unused nil "Non-nil means report warning if an AUTO_TEMPLATE line is not used. This feature is not supported before Emacs 21.1 or XEmacs 21.4." + :version "24.3" ;;rev787 :group 'verilog-mode-auto - :version "24.3" :type 'boolean) (put 'verilog-auto-template-warn-unused 'safe-local-variable 'verilog-booleanp) @@ -1230,14 +1230,14 @@ (defcustom verilog-before-save-font-hook nil "Hook run before `verilog-save-font-mods' removes highlighting." + :version "24.3" ;;rev735 :group 'verilog-mode-auto - :version "24.3" :type 'hook) (defcustom verilog-after-save-font-hook nil "Hook run after `verilog-save-font-mods' restores highlighting." + :version "24.3" ;;rev735 :group 'verilog-mode-auto - :version "24.3" :type 'hook) (defvar verilog-imenu-generic-expression @@ -7773,9 +7773,12 @@ ;; Else presume verilog-auto-reset-widths is true (t (let* ((width (verilog-sig-width sig))) - (if (string-match "^[0-9]+$" width) - (concat width (if (verilog-sig-signed sig) "'sh0" "'h0")) - (concat "{" width "{1'b0}}"))))))) + (cond ((not width) + "`0/*NOWIDTH*/") + ((string-match "^[0-9]+$" width) + (concat width (if (verilog-sig-signed sig) "'sh0" "'h0"))) + (t + (concat "{" width "{1'b0}}")))))))) ;; ;; Dumping @@ -7956,6 +7959,7 @@ vec expect-signal keywd newsig rvalue enum io signed typedefed multidim modport varstack tmp) + ;;(if dbg (setq dbg (concat dbg (format "\n\nverilog-read-decls START PT %s END %s\n" (point) end-mod-point)))) (save-excursion (verilog-beg-of-defun-quick) (setq sigs-const (verilog-read-auto-constants (point) end-mod-point)) @@ -8010,7 +8014,7 @@ (setq paren (1- paren)) (forward-char 1) (when (< paren sig-paren) - (setq expect-signal nil))) ; ) that ends variables inside v2k arg list + (setq expect-signal nil rvalue nil))) ; ) that ends variables inside v2k arg list ((looking-at "\\s-*\\(\\[[^]]+\\]\\)") (goto-char (match-end 0)) (cond (newsig ; Memory, not just width. Patch last signal added's memory (nth 3) @@ -12458,12 +12462,20 @@ By default, AUTORESET will include the width of the signal in the autos, SystemVerilog designs may want to change this. To control -this behavior, see `verilog-auto-reset-widths'. +this behavior, see `verilog-auto-reset-widths'. In some cases +AUTORESET must use a '0 assignment and it will print NOWIDTH; use +`verilog-auto-reset-widths' unbased to prevent this. AUTORESET ties signals to deasserted, which is presumed to be zero. Signals that match `verilog-active-low-regexp' will be deasserted by tying them to a one. +AUTORESET may try to reset arrays or structures that cannot be +reset by a simple assignment, resulting in compile errors. This +is a feature to be taken as a hint that you need to reset these +signals manually (or put them into a \"`ifdef NEVER signal<=`0; +`endif\" so Verilog-Mode ignores them.) + An example: always @(posedge clk or negedge reset_l) begin ------------------------------------------------------------ revno: 112607 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 18:35:59 +0300 message: Fix a typo in nt/INSTALL.MSYS. diff: === modified file 'nt/INSTALL.MSYS' --- nt/INSTALL.MSYS 2013-05-16 09:44:44 +0000 +++ nt/INSTALL.MSYS 2013-05-16 15:35:59 +0000 @@ -104,7 +104,7 @@ are already selected by default on the "Select Components" screen of its wizard. - After that, use "ming-get install PACKAGE" to install the following + After that, use "mingw-get install PACKAGE" to install the following additional packages: . msys-base ------------------------------------------------------------ revno: 112606 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 15:48:54 +0300 message: Support building Emacs on MS-Windows using the Posix configury. lib/Makefile.am: If building for MS-Windows, include nt/gnulib.mk instead of lib/gnulib.mk. configure.ac: Adapt to MSYS build on MS-Windows. Makefile.in (NTDIR): New variable, for the MSYS build on MS-Windows. (SUBDIR): Add $(NTDIR). (.PHONY): Add epaths-force-w32. (msys_to_w32): New variable. (epaths-force-w32, install-nt, uninstall-nt): New targets. (lib-src src): Add $(NTLIB) to prerequisites. (lib lib-src lisp leim nt): Add 'nt'. (config.status): Use $(CFG). (.PHONY): Add install-$(NTDIR) and uninstall-$(NTDIR). (install, install-arch-dep): Add install-$(NTDIR). (uninstall): Depend on uninstall-$(NTDIR). (mostlyclean, clean, distclean, bootstrap-clean): Add 'nt'. * GNUmakefile (CFG): New variable, uses mingw-cfg.site as CONFIG_SITE for the MSYS build on MS-Windows. (Makefile): Use $(CFG). .bzrignore: Ignore *.res, *.tmp, and *.map. Remove src/emacs.res. etc/NEWS: Advertise the MSYS build on MS-Windows. leim/Makefile.in (leim-list.el, check-declare): Use reveal-filename. lib-src/update-game-score.c [WINDOWSNT]: Include "ntlib.h". lib-src/ntlib.h (sleep): Update prototype. (geteuid): Add prototype. lib-src/ntlib.c (sleep): Now returns an unsigned value. (getgid): New function. lib-src/Makefile.in (CLIENTW, LIB_WSOCK32, LIBS_ECLIENT, NTLIB) (CLIENTRES, WINDRES, NTINC, NTDEPS): New variables. (INSTALLABLES): Add $(CLIENTW). (LIBS_MOVE): Use $(LIB_WSOCK32). ($(DESTDIR)${archlibdir}): Use $(EXEEXT) on update-game-score. (test-distrib${EXEEXT}): Use $(EXEEXT) on test-distrib. (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT}) (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) (emacsclient${EXEEXT}, hexl${EXEEXT}, update-game-score${EXEEXT}): Add $(NTLIB) to prerequisites. Use $(EXEEXT). (pop.o): Add pop.h to prerequisites. (emacsclientw${EXEEXT}, ntlib.o): New targets. (emacsclient.res): New target. lisp/subr.el (reveal-filename): New function. lisp/loadup.el: Compute Emacs executable versions on MS-Windows, where executables have the .exe extension. Add a hard link emacs-XX.YY.ZZ.exe on MS-Windows. lisp/Makefile.in (XARGS_LIMIT): New variable. (custom-deps, finder-data, autoloads) ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el) ($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el) ($(CAL_DIR)/hol-loaddefs.el): Use reveal-filename. (compile-main): Limit xargs according to $(XARGS_LIMIT). nt/msysconfig.sh: New file. nt/mingw-cfg.site: New file. nt/makefile.w32-in (LOCAL_FLAGS): Add -DOLD_PATHS=1. nt/inc/unistd.h: Include pwd.h and sys/types.h. nt/inc/sys/time.h (_TIMEVAL_DEFINED, timerisset, timercmp) (timerclear): Define. (gettimeofday): Adjust signature to be Posix compatible, by using the 'restrict' keyword. nt/inc/sys/stat.h (UTIME_NOW, UTIME_OMIT): Define. (struct _stat, struct _stati64): Define. nt/inc/sys/socket.h (timeval): Define only for MSVC. (FD_SET, FD_CLR, FD_ISSET, fd_set): Redefine only if EMACS_CONFIG_H is defined. (timeval): Undefine only for MSVC. nt/inc/ms-w32.h (HAVE___BUILTIN_UNWIND_INIT, restrict) (HAVE_WINDOW_SYSTEM, HAVE_MENUS, EMACS_CONFIGURATION) (EMACS_CONFIG_OPTIONS, HAVE_LONG_LONG_INT) (HAVE_UNSIGNED_LONG_LONG_INT): Define only if not already defined. (fileno): Move definition after including stdio.h. (sigset_t): Guard typedef by _W64. nt/gnulib.mk: New file. nt/epaths.nt: New file. nt/addpm.c [!OLD_PATHS]: Include src/epaths.h, instead of having a copy of the file names there. [!OLD_PATHS]: Use macros from epaths.h instead of literal strings. nt/Makefile.in: New file. nt/INSTALL.MSYS: New file. nt/INSTALL: Mention INSTALL.MSYS. src/w32.c: Include epaths.h. (init_environment): Use cmdproxy.exe without leading directories. Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that case. (gettimeofday): Adjust signature and return value to Posix expectations. src/unexw32.c (open_output_file): Delete the existing emacs.exe before creating it, to break the hard link to the versioned executable. src/Makefile.in (EMACS_MANIFEST, CM_OBJ, TEMACS_POST_LINK) (ADDSECTION, EMACS_HEAPSIZE, MINGW_TEMACS_POST_LINK) (FIRSTFILE_OBJ): New variables. (W32_RES): Rename to EMACSRES. All users changed. (base_obj): Use $(CM_OBJ). (ALLOBJS): Use $(FIRSTFILE_OBJ). (emacs$(EXEEXT)): Depend on $(ADDSECTION). (temacs$(EXEEXT)): Use $(TEMACS_POST_LINK), and move $(W32_RES_LINK) before $(LIBES). (emacs.res): Depend on $(EMACS_MANIFEST). Put emacs.rc in nt. diff: === modified file '.bzrignore' --- .bzrignore 2013-05-16 10:37:55 +0000 +++ .bzrignore 2013-05-16 12:48:54 +0000 @@ -15,6 +15,9 @@ *.dSYM *.elc *.exe +*.res +*.tmp +*.map ./aclocal.m4 autom4te.cache confdefs.h @@ -161,7 +164,6 @@ src/prefix-args* src/stamp-oldxmenu src/stamp-h.in -src/emacs.res src/temacs test/indent/*.new +* === modified file 'ChangeLog' --- ChangeLog 2013-05-16 07:10:39 +0000 +++ ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,31 @@ +2013-05-16 Eli Zaretskii + + * lib/Makefile.am: If building for MS-Windows, include + nt/gnulib.mk instead of lib/gnulib.mk. + + * configure.ac: Adapt to MSYS build on MS-Windows. + + * Makefile.in (NTDIR): New variable, for the MSYS build on + MS-Windows. + (SUBDIR): Add $(NTDIR). + (.PHONY): Add epaths-force-w32. + (msys_to_w32): New variable. + (epaths-force-w32, install-nt, uninstall-nt): New targets. + (lib-src src): Add $(NTLIB) to prerequisites. + (lib lib-src lisp leim nt): Add 'nt'. + (config.status): Use $(CFG). + (.PHONY): Add install-$(NTDIR) and uninstall-$(NTDIR). + (install, install-arch-dep): Add install-$(NTDIR). + (uninstall): Depend on uninstall-$(NTDIR). + (mostlyclean, clean, distclean, bootstrap-clean): Add 'nt'. + + * GNUmakefile (CFG): New variable, uses mingw-cfg.site as + CONFIG_SITE for the MSYS build on MS-Windows. + (Makefile): Use $(CFG). + + * .bzrignore: Ignore *.res, *.tmp, and *.map. Remove + src/emacs.res. + 2013-05-16 Paul Eggert Merge from gnulib, incorporating: === modified file 'GNUmakefile' --- GNUmakefile 2013-01-01 09:11:05 +0000 +++ GNUmakefile 2013-04-17 19:42:10 +0000 @@ -32,6 +32,11 @@ # run "configure" by hand. But run autogen.sh first, if the source # was checked out directly from the repository. +ifneq ($(MSYSTEM),) +CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site +else +CFG = +endif # If a Makefile already exists, just use it. @@ -70,7 +75,7 @@ Makefile: configure @echo >&2 'There seems to be no Makefile in this directory.' @echo >&2 'Running ./configure ...' - ./configure + $(CFG) ./configure @echo >&2 'Makefile built.' endif === modified file 'Makefile.in' --- Makefile.in 2013-05-15 20:12:53 +0000 +++ Makefile.in 2013-05-16 09:58:56 +0000 @@ -93,6 +93,9 @@ ### for, like `mips-dec-ultrix' or `sparc-sun-sunos'. configuration=@configuration@ +### The nt/ subdirectory gets built only for MinGW +NTDIR=@NTDIR@ + # ==================== Where To Install Things ==================== # Location to install Emacs.app under GNUstep / Mac OS X. @@ -272,23 +275,23 @@ EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT} # Subdirectories to make recursively. -SUBDIR = lib lib-src src lisp leim +SUBDIR = $(NTDIR) lib lib-src src lisp leim # The subdir makefiles created by config.status. SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'` -# Subdirectories to install, and where they'll go. -# lib-src's makefile knows how to install it, so we don't do that here. -# Directories that cannot simply be copied, eg info, -# are treated separately. -# quail appears twice because in out-of-tree builds, it exists twice. +# Subdirectories to install, and where they'll go. lib-src's and nt's +# makefiles know how to install them, so we don't do that here. +# Directories that cannot simply be copied, eg info, are treated +# separately. quail appears twice because in out-of-tree builds, it +# exists twice. COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail all: ${SUBDIR} -.PHONY: all ${SUBDIR} blessmail epaths-force FRC +.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' @@ -315,7 +318,20 @@ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h -lib-src src: lib +# Convert MSYS-style /x/foo file name into x:/foo that Windows can grok. +msys_to_w32=sed -e 's,^/\([A-Za-z]\)/,\1:/,' + +# The w32 build needs a slightly different editing, and it uses +# nt/epaths.nt as the template. +epaths-force-w32: FRC + @(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \ + sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ + -e '/^.*#/s/@VER@/${version}/g' \ + -e '/^.*#/s/@CFG@/${configuration}/g' \ + -e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \ + ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h + +lib-src src: $(NTDIR) lib src: lib-src FRC @@ -324,7 +340,7 @@ lisp leim: src # These targets should be "${SUBDIR} without `src'". -lib lib-src lisp leim: Makefile FRC +lib lib-src lisp leim nt: Makefile FRC cd $@ && $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' @@ -378,9 +394,9 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el if [ -x ./config.status ]; then \ - ./config.status --recheck; \ + $(CFG) ./config.status --recheck; \ else \ - $(srcdir)/configure $(CONFIGURE_FLAGS); \ + $(CFG) $(srcdir)/configure $(CONFIGURE_FLAGS); \ fi AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 @@ -417,13 +433,14 @@ # ==================== Installation ==================== .PHONY: install install-arch-dep install-arch-indep install-doc install-info -.PHONY: install-man install-etc install-strip uninstall +.PHONY: install-man install-etc install-strip install-$(NTDIR) +.PHONY: uninstall uninstall-$(NTDIR) ## If we let lib-src do its own installation, that means we ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -install: all install-arch-indep install-doc install-arch-dep blessmail +install: all install-arch-indep install-doc install-arch-dep install-$(NTDIR) blessmail @true ## Ensure that $subdir contains a subdirs.el file. @@ -444,7 +461,7 @@ ### Install the executables that were compiled specifically for this machine. ### We do install-arch-indep first because the executable needs the ### Lisp files and DOC file to work properly. -install-arch-dep: src install-arch-indep install-doc +install-arch-dep: src install-arch-indep install-doc install-$(NTDIR) umask 022; ${MKDIR_P} $(DESTDIR)${bindir} cd lib-src && \ $(MAKE) install $(MFLAGS) prefix=${prefix} \ @@ -464,6 +481,16 @@ rm -rf ${ns_appresdir}/share; \ fi +### Windows-specific install target for installing programs produced +### in nt/, and its Posix do-nothing shadow. +install-: +install-nt: + cd $(NTDIR) && \ + $(MAKE) install $(MFLAGS) prefix=${prefix} \ + exec_prefix=${exec_prefix} bindir=${bindir} \ + libexecdir=${libexecdir} archlibdir=${archlibdir} \ + INSTALL_STRIP=${INSTALL_STRIP} + ## In the share directory, we are deleting: ## applications (with emacs.desktop, also found in etc/) ## emacs (basically empty except for unneeded site-lisp directories) @@ -678,11 +705,12 @@ ### create (but not the noninstalled files such as `make all' would create). ### ### Don't delete the lisp and etc directories if they're in the source tree. -uninstall: +uninstall: uninstall-$(NTDIR) cd lib-src && \ $(MAKE) $(MFLAGS) uninstall \ prefix=${prefix} exec_prefix=${exec_prefix} \ bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} + -unset CDPATH; \ for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ @@ -727,6 +755,15 @@ [ -s $${file} ] || rm -f $$file; \ done +### Windows-specific uninstall target for removing programs produced +### in nt/, and its Posix do-nothing shadow. +uninstall-: +uninstall-nt: + cd $(NTDIR) && \ + $(MAKE) $(MFLAGS) uninstall \ + prefix=${prefix} exec_prefix=${exec_prefix} \ + bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} + FRC: # ==================== Cleaning up and miscellanea ==================== @@ -744,6 +781,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) + (cd nt; $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean) @@ -765,6 +803,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) + (cd nt; $(MAKE) $(MFLAGS) clean) -(cd doc/emacs && $(MAKE) $(MFLAGS) clean) -(cd doc/misc && $(MAKE) $(MFLAGS) clean) -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) @@ -791,6 +830,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) + (cd nt; $(MAKE) $(MFLAGS) distclean) (cd doc/emacs && $(MAKE) $(MFLAGS) distclean) (cd doc/misc && $(MAKE) $(MFLAGS) distclean) (cd doc/lispref && $(MAKE) $(MFLAGS) distclean) @@ -809,6 +849,7 @@ (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) + (cd nt; $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean) === modified file 'configure.ac' --- configure.ac 2013-05-13 06:23:08 +0000 +++ configure.ac 2013-05-15 16:15:07 +0000 @@ -192,7 +192,7 @@ OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system]) -OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI]) +OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) @@ -376,7 +376,7 @@ ## Make sure CDPATH doesn't affect cd (in case PWD is relative). unset CDPATH case "${srcdir}" in - /* ) ;; + [[\\/]]* | ?:[[\\/]]*) ;; . ) ## We may be able to use the $PWD environment variable to make this ## absolute. But sometimes PWD is inaccurate. @@ -554,6 +554,11 @@ i[3456]86-*-* ) case "${canonical}" in *-darwin* ) opsys=darwin ;; + *-mingw32 ) + opsys=mingw32 + # MinGW overrides and adds some system headers in nt/inc. + GCC_TEST_OPTIONS="-I $srcdir/nt/inc" + ;; *-sysv4.2uw* ) opsys=unixware ;; *-sysv5uw* ) opsys=unixware ;; *-sysv5OpenUNIX* ) opsys=unixware ;; @@ -602,6 +607,11 @@ test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi +dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the +dnl alternative to lib/gnulib.mk, so as to avoid generating header files +dnl that clash with MinGW. +AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"]) + # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) @@ -635,6 +645,9 @@ if test $emacs_cv_prog_cc_g3 != yes; then CFLAGS=$emacs_save_CFLAGS fi + if test $opsys = mingw32; then + CFLAGS="$CFLAGS -gdwarf-2" + fi fi case $CFLAGS in @@ -852,6 +865,16 @@ AC_SUBST(LN_S_FILEONLY) +dnl AC_PROG_LN_S sets LN_S to 'cp -pR' for MinGW, on the premise that 'ln' +dnl doesn't support links to directories, as in "ln file dir". But that +dnl use is non-portable, and OTOH MinGW wants to use hard links for Emacs +dnl executables at "make install" time. +dnl See http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00475.html +dnl for more details. +if test "$opsys" = "mingw32"; then + LN_S="ln" +fi + AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) dnl Don't use GZIP, which is used by gzip for additional parameters. @@ -957,7 +980,6 @@ UNEXEC_OBJ=unexelf.o case "$opsys" in # MSDOS uses unexcoff.o - # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o ;; @@ -970,6 +992,9 @@ hpux10-20 | hpux11) UNEXEC_OBJ=unexhp9k800.o ;; + mingw32) + UNEXEC_OBJ=unexw32.o + ;; sol2-10) # Use the Solaris dldump() function, called from unexsol.c, to dump # emacs, instead of the generic ELF dump code found in unexelf.c. @@ -1064,6 +1089,7 @@ ## additional optimization. --nils@exp-math.uni-essen.de test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" +test "$opsys" = "mingw32" && C_SWITCH_SYSTEM="-mtune=pentium4" ## gnu-linux might need -D_BSD_SOURCE on old libc5 systems. ## It is redundant in glibc2, since we define _GNU_SOURCE. AC_SUBST(C_SWITCH_SYSTEM) @@ -1083,9 +1109,9 @@ ## Motif needs -lgen. unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;; esac + AC_SUBST(LIBS_SYSTEM) - ### Make sure subsequent tests use flags consistent with the build flags. if test x"${OVERRIDE_CPPFLAGS}" != x; then @@ -1122,6 +1148,10 @@ ;; hpux10-20 | hpux11 ) ;; + mingw32 ) + LIB_MATH= + SYSTEM_TYPE=windows-nt + ;; dnl NB this may be adjusted below. netbsd | openbsd ) SYSTEM_TYPE=berkeley-unix @@ -1197,11 +1227,15 @@ fi ]) - if test "${with_sound}" != "no"; then - # Sound support for GNU/Linux and the free BSDs. - AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, - have_sound_header=yes) + # Sound support for GNU/Linux, the free BSDs, and MinGW. + AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h, + have_sound_header=yes, [], [ + #ifdef __MINGW32__ + #define WIN32_LEAN_AND_MEAN + #include + #endif + ]) # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) AC_SUBST(LIBSOUND) @@ -1241,7 +1275,7 @@ if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ - gnu-linux|freebsd|netbsd) + gnu-linux|freebsd|netbsd|mingw32) AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.]) ;; esac @@ -1563,31 +1597,98 @@ HAVE_W32=no W32_OBJ= W32_LIBS= -W32_RES= +EMACSRES= +CLIENTRES= +CLIENTW= W32_RES_LINK= +EMACS_MANIFEST= if test "${with_w32}" != no; then - if test "${opsys}" != "cygwin"; then - AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin.]) + case "${opsys}" in + cygwin) + AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], + [AC_MSG_ERROR([`--with-w32' was specified, but windows.h + cannot be found.])]) + ;; + mingw32) + ## Using --with-w32 with MinGW is a no-op, but we allow it. + ;; + *) + AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin and MinGW32.]) + ;; + esac +fi + +if test "${opsys}" = "mingw32"; then + AC_MSG_CHECKING([whether Windows API headers are recent enough]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ]], + [[void test(PIMAGE_NT_HEADERS pHeader) + {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);}]])], + [emacs_cv_w32api=yes + HAVE_W32=yes], + emacs_cv_w32api=no) + AC_MSG_RESULT($emacs_cv_w32api) + if test "${emacs_cv_w32api}" = "no"; then + AC_MSG_ERROR([the Windows API headers are too old to support this build.]) fi - AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], - [AC_MSG_ERROR([`--with-w32' was specified, but windows.h - cannot be found.])]) +fi + +FIRSTFILE_OBJ= +NTDIR= +LIBS_ECLIENT= +LIB_WSOCK32= +NTLIB= +CM_OBJ="cm.o" +XARGS_LIMIT= +if test "${HAVE_W32}" = "yes"; then AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.]) AC_CHECK_TOOL(WINDRES, [windres], [AC_MSG_ERROR([No resource compiler found.])]) W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" - W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" - W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" - W32_RES="emacs.res" - # Tell the linker that emacs.res is an object (which we compile from - # the rc file), not a linker script. - W32_RES_LINK="-Wl,emacs.res" + EMACSRES="emacs.res" + case "$canonical" in + x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; + *) EMACS_MANIFEST="emacs-x86.manifest" ;; + esac + if test "${opsys}" = "cygwin"; then + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" + # Tell the linker that emacs.res is an object (which we compile from + # the rc file), not a linker script. + W32_RES_LINK="-Wl,emacs.res" + else + W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" + W32_OBJ="$W32_OBJ w32notify.o" + W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" + W32_RES_LINK="\$(EMACSRES)" + CLIENTRES="emacsclient.res" + CLIENTW="emacsclientw\$(EXEEXT)" + FIRSTFILE_OBJ=firstfile.o + NTDIR=nt + CM_OBJ= + LIBS_ECLIENT="-lcomctl32" + LIB_WSOCK32="-lwsock32" + NTLIB="ntlib.$ac_objext" + XARGS_LIMIT="-s 10000" + fi fi AC_SUBST(W32_OBJ) AC_SUBST(W32_LIBS) -AC_SUBST(W32_RES) +AC_SUBST(EMACSRES) +AC_SUBST(EMACS_MANIFEST) +AC_SUBST(CLIENTRES) +AC_SUBST(CLIENTW) AC_SUBST(W32_RES_LINK) +AC_SUBST(FIRSTFILE_OBJ) +AC_SUBST(NTDIR) +AC_SUBST(CM_OBJ) +AC_SUBST(LIBS_ECLIENT) +AC_SUBST(LIB_WSOCK32) +AC_SUBST(NTLIB) +AC_SUBST(XARGS_LIMIT) if test "${HAVE_W32}" = "yes"; then window_system=w32 @@ -1912,7 +2013,7 @@ ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. HAVE_RSVG=no -if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then if test "${with_rsvg}" != "no"; then RSVG_REQUIRED=2.11.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" @@ -1955,43 +2056,45 @@ GTK_OBJ= check_gtk2=no gtk3_pkg_errors= -if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.28 - GTK_REQUIRED=3.0 - GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - - dnl Checks for libraries. - PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) - if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then - AC_MSG_ERROR($GTK_PKG_ERRORS) - fi - if test "$pkg_check_gtk" = "yes"; then - AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) - GTK_OBJ=emacsgtkfixed.o - term_header=gtkutil.h - USE_GTK_TOOLKIT="GTK3" - if test "x$ac_enable_gtk_deprecation_warnings" = x; then - GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" - fi - else - check_gtk2=yes - gtk3_pkg_errors="$GTK_PKG_ERRORS " - fi -fi - -if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then - GLIB_REQUIRED=2.10 - GTK_REQUIRED=2.10 - GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - - dnl Checks for libraries. - PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) - if test "$pkg_check_gtk" = "no" && - { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } - then - AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) - fi - test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" +if test "${opsys}" != "mingw32"; then + if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then + GLIB_REQUIRED=2.28 + GTK_REQUIRED=3.0 + GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" + + dnl Checks for libraries. + PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) + if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then + AC_MSG_ERROR($GTK_PKG_ERRORS) + fi + if test "$pkg_check_gtk" = "yes"; then + AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) + GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h + USE_GTK_TOOLKIT="GTK3" + if test "x$ac_enable_gtk_deprecation_warnings" = x; then + GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" + fi + else + check_gtk2=yes + gtk3_pkg_errors="$GTK_PKG_ERRORS " + fi + fi + + if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 + GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" + + dnl Checks for libraries. + PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) + if test "$pkg_check_gtk" = "no" && + { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } + then + AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) + fi + test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" + fi fi if test x"$pkg_check_gtk" = xyes; then @@ -2161,6 +2264,8 @@ AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) fi + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" LIBS="$LIBGNUTLS_LIBS $LIBS" AC_CHECK_FUNCS(gnutls_certificate_set_verify_function, HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes) @@ -2168,6 +2273,13 @@ if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then AC_DEFINE(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY, 1, [Define if using GnuTLS certificate verification callbacks.]) fi + + # Windows loads GnuTLS dynamically + if test "${opsys}" = "mingw32"; then + CFLAGS=$OLD_CFLAGS + LIBS=$OLD_LIBS + LIBGNUTLS_LIBS= + fi fi AC_SUBST(LIBGNUTLS_LIBS) @@ -2283,6 +2395,9 @@ hpux* | aix4-2 ) test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" != "Xyes" && LIBXMU= ;; + mingw32 ) + LIBXMU= + ;; esac AC_SUBST(LIBXMU) @@ -2541,10 +2656,10 @@ AC_SUBST(M17N_FLT_LIBS) ### Use -lXpm if available, unless `--with-xpm=no'. +### mingw32 doesn't use -lXpm, since it loads the library dynamically. HAVE_XPM=no LIBXPM= - -if test "${HAVE_W32}" = "yes"; then +if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then if test "${with_xpm}" != "no"; then SAVE_CPPFLAGS="$CPPFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -2605,19 +2720,33 @@ fi fi +### FIXME: Perhaps regroup to minimize code duplication due to MinGW's +### slightly different requirements wrt image libraries (it doesn't +### use -lXpm because it loads the xpm shared library dynamically at +### run time). +if test "${opsys}" = "mingw32"; then + if test "${with_xpm}" != "no"; then + AC_CHECK_HEADER(X11/xpm.h, HAVE_XPM=yes, HAVE_XPM=no, [ +#define FOR_MSW 1]) + fi + + if test "${HAVE_XPM}" = "yes"; then + AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).]) + fi +fi + AC_SUBST(LIBXPM) ### Use -ljpeg if available, unless `--with-jpeg=no'. +### mingw32 doesn't use -ljpeg, since it loads the library dynamically. HAVE_JPEG=no LIBJPEG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then if test "${with_jpeg}" != "no"; then dnl Checking for jpeglib.h can lose because of a redefinition of - dnl HAVE_STDLIB_H. - AC_CHECK_HEADER(jerror.h, - [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) + dnl HAVE_STDLIB_H. + AC_CHECK_HEADER(jerror.h, HAVE_JPEG=yes, HAVE_JPEG=no) fi - AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) @@ -2629,6 +2758,25 @@ [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then + if test "${with_jpeg}" != "no"; then + dnl Checking for jpeglib.h can lose because of a redefinition of + dnl HAVE_STDLIB_H. + AC_CHECK_HEADER(jerror.h, + [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) + fi + + AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl + if test "${HAVE_JPEG}" = "yes"; then + AC_DEFINE(HAVE_JPEG) + AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], + [#include + version=JPEG_LIB_VERSION +], + [AC_DEFINE(HAVE_JPEG)], + [AC_MSG_WARN([libjpeg found, but not version 6b or later]) + HAVE_JPEG=no]) + fi if test "${HAVE_JPEG}" = "yes"; then LIBJPEG=-ljpeg fi @@ -2636,9 +2784,30 @@ AC_SUBST(LIBJPEG) ### Use -lpng if available, unless `--with-png=no'. +### mingw32 doesn't use -lpng, since it loads the library dynamically. HAVE_PNG=no LIBPNG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_png}" != "no"; then + AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no) + fi + if test "${HAVE_PNG}" = "yes"; then + AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) + + AC_CHECK_DECL(png_longjmp, + [], + [AC_DEFINE(PNG_DEPSTRUCT, [], + [Define to empty to suppress deprecation warnings when building + with --enable-gcc-warnings and with libpng versions before 1.5, + which lack png_longjmp.])], + [[#ifdef HAVE_LIBPNG_PNG_H + # include + #else + # include + #endif + ]]) + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_png}" != "no"; then # Debian unstable as of July 2003 has multiple libpngs, and puts png.h # in /usr/include/libpng. @@ -2669,9 +2838,17 @@ AC_SUBST(LIBPNG) ### Use -ltiff if available, unless `--with-tiff=no'. +### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no LIBTIFF= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_tiff}" != "no"; then + AC_CHECK_HEADER(tiffio.h, HAVE_TIFF=yes, HAVE_TIFF=no) + fi + if test "${HAVE_TIFF}" = "yes"; then + AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).]) + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_tiff}" != "no"; then AC_CHECK_HEADER(tiffio.h, [tifflibs="-lz -lm" @@ -2689,9 +2866,17 @@ AC_SUBST(LIBTIFF) ### Use -lgif or -lungif if available, unless `--with-gif=no'. +### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. HAVE_GIF=no LIBGIF= -if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ +if test "${opsys}" = "mingw32"; then + if test "${with_gif}" != "no"; then + AC_CHECK_HEADER(gif_lib.h, HAVE_GIF=yes, HAVE_GIF=no) + fi + if test "${HAVE_GIF}" = "yes"; then + AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.]) + fi +elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ || test "${HAVE_W32}" = "yes"; then AC_CHECK_HEADER(gif_lib.h, # EGifPutExtensionLast only exists from version libungif-4.1.0b1. @@ -2847,13 +3032,18 @@ ### Use libxml (-lxml2) if available +### mingw32 doesn't use -lxml2, since it loads the library dynamically. HAVE_LIBXML2=no if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) if test "${HAVE_LIBXML2}" = "yes"; then - LIBS="$LIBXML2_LIBS $LIBS" - AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) + if test "${opsys}" != "mingw32"; then + LIBS="$LIBXML2_LIBS $LIBS" + AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) + else + LIBXML2_LIBS="" + fi if test "${HAVE_LIBXML2}" = "yes"; then AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).]) else @@ -2866,6 +3056,10 @@ AC_SUBST(LIBXML2_CFLAGS) # If netdb.h doesn't declare h_errno, we must declare it by hand. +# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c. +if test "${opsys}" = "mingw32"; then + emacs_cv_netdb_declares_h_errno=yes +fi AC_CACHE_CHECK(whether netdb declares h_errno, emacs_cv_netdb_declares_h_errno, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], @@ -2876,8 +3070,10 @@ fi # sqrt and other floating-point functions such as fmod and frexp -# are found in -lm on most systems. -AC_CHECK_LIB(m, sqrt) +# are found in -lm on most systems, but mingw32 doesn't use -lm. +if test "${opsys}" != "mingw32"; then + AC_CHECK_LIB(m, sqrt) +fi # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. @@ -2941,6 +3137,9 @@ test $ac_cv_header_maillock_h = yes && mail_lock=no fi ;; + + mingw32) + mail_lock="none-needed" ;; esac BLESSMAIL_TARGET= @@ -2949,6 +3148,8 @@ lockf) AC_DEFINE(MAIL_USE_LOCKF, 1, [Define if the mailer uses lockf to interlock the mail spool.]) ;; + none-needed) ;; + *) BLESSMAIL_TARGET="need-blessmail" ;; esac AC_SUBST(BLESSMAIL_TARGET) @@ -3020,25 +3221,29 @@ return 0; }]]) ]) -# Maybe curses should be tried earlier? -# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 -for tputs_library in '' tinfo ncurses terminfo termcap curses; do - OLIBS=$LIBS - if test -z "$tputs_library"; then - LIBS_TERMCAP= - msg='none required' - else - LIBS_TERMCAP=-l$tputs_library - msg=$LIBS_TERMCAP - LIBS="$LIBS_TERMCAP $LIBS" - fi - AC_RUN_IFELSE([tputs_link_source], [], [msg=no], - [AC_LINK_IFELSE([tputs_link_source], [], [msg=no])]) - LIBS=$OLIBS - if test "X$msg" != Xno; then - break - fi -done +if test "${opsys}" = "mingw32"; then + msg='none required' +else + # Maybe curses should be tried earlier? + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 + for tputs_library in '' tinfo ncurses terminfo termcap curses; do + OLIBS=$LIBS + if test -z "$tputs_library"; then + LIBS_TERMCAP= + msg='none required' + else + LIBS_TERMCAP=-l$tputs_library + msg=$LIBS_TERMCAP + LIBS="$LIBS_TERMCAP $LIBS" + fi + AC_RUN_IFELSE([tputs_link_source], [], [msg=no], + [AC_LINK_IFELSE([tputs_link_source], [], [msg=no])]) + LIBS=$OLIBS + if test "X$msg" != Xno; then + break + fi + done +fi AC_MSG_RESULT([$msg]) if test "X$msg" = Xno; then AC_MSG_ERROR([The required function `tputs' was not found in any library. @@ -3084,6 +3289,11 @@ fi ;; + mingw32) + TERMINFO=no + LIBS_TERMCAP= + ;; + netbsd) if test "x$LIBS_TERMCAP" != "x-lterminfo"; then TERMINFO=no @@ -3373,11 +3583,14 @@ dnl fi dnl Turned on June 1996 supposing nobody will mind it. -AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that & - in the full name stands for the login id.]) +dnl MinGW emulates passwd database, so this feature doesn't make sense there. +if test "${opsys}" != "mingw32"; then + AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that & + in the full name stands for the login id.]) +fi -dnl Every platform that uses configure (ie every non-MS platform) -dnl supports this. There is a create-lockfiles option you can +dnl Every platform that uses configure supports this. +dnl There is a create-lockfiles option you can dnl customize if you do not want the lock files to be written. dnl So it is not clear that this #define still needs to exist. AC_DEFINE(CLASH_DETECTION, 1, [Define if you want lock files to be written, @@ -3387,7 +3600,9 @@ dnl Everybody supports this, except MS. dnl Seems like the kind of thing we should be testing for, though. ## Note: PTYs are broken on darwin <6. Use at your own risk. -AC_DEFINE(HAVE_PTYS, 1, [Define if the system supports pty devices.]) +if test "${opsys}" != "mingw32"; then + AC_DEFINE(HAVE_PTYS, 1, [Define if the system supports pty devices.]) +fi dnl Everybody supports this, except MS-DOS. dnl Seems like the kind of thing we should be testing for, though. @@ -3397,10 +3612,20 @@ AH_TEMPLATE(INTERNAL_TERMINAL, [This is substituted when $TERM is "internal".]) -AC_DEFINE(NULL_DEVICE, ["/dev/null"], [Name of the file to open to get +AH_TEMPLATE(NULL_DEVICE, [Name of the file to open to get a null file, or a data sink.]) +if test "${opsys}" = "mingw32"; then + AC_DEFINE(NULL_DEVICE, ["NUL:"]) +else + AC_DEFINE(NULL_DEVICE, ["/dev/null"]) +fi -AC_DEFINE(SEPCHAR, [':'], [Character that separates PATH elements.]) +AH_TEMPLATE(SEPCHAR, [Character that separates PATH elements.]) +if test "${opsys}" = "mingw32"; then + AC_DEFINE(SEPCHAR, [';']) +else + AC_DEFINE(SEPCHAR, [':']) +fi dnl Everybody supports this, except MS-DOS. AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.]) @@ -3411,19 +3636,28 @@ AC_DEFINE(DIRECTORY_SEP, ['/'], [Character that separates directories in a file name.]) -dnl Only used on MS platforms. AH_TEMPLATE(DEVICE_SEP, [Character that separates a device in a file name.]) - -AC_DEFINE(IS_DEVICE_SEP(_c_), 0, - [Returns true if character is a device separator.]) - -AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)], - [Returns true if character is a directory separator.]) - -dnl On MS, this also accepts IS_DEVICE_SEP. -AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))], - [Returns true if character is any form of separator.]) - +if test "${opsys}" = "mingw32"; then + dnl Only used on MS platforms. + AC_DEFINE(DEVICE_SEP, ':') + AC_DEFINE(IS_DEVICE_SEP(_c_), [((_c_) == DEVICE_SEP)], + [Returns true if character is a device separator.]) + + AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == '/' || (_c_) == '\\')], + [Returns true if character is a directory separator.]) + + AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP(_c_))], + [Returns true if character is any form of separator.]) +else + AC_DEFINE(IS_DEVICE_SEP(_c_), 0, + [Returns true if character is a device separator.]) + + AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)], + [Returns true if character is a directory separator.]) + + AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))], + [Returns true if character is any form of separator.]) +fi AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.]) @@ -3812,10 +4046,14 @@ esac fi dnl GCC? +dnl In a weird quirk, MS runtime uses _setjmp and longjmp. AC_CACHE_CHECK([for _setjmp], [emacs_cv_func__setjmp], [AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[#include + #ifdef __MINGW32__ + # define _longjmp longjmp + #endif ]], [[jmp_buf j; if (! _setjmp (j)) @@ -3910,6 +4148,14 @@ AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) ;; + mingw32) + AC_DEFINE(DOS_NT, []) + AC_DEFINE(WINDOWSNT, 1, [Define if compiling for native MS Windows.]) + if test "x$ac_enable_checking" != "x" ; then + AC_DEFINE(EMACSDEBUG, 1, [Define to 1 to enable w32 debug facilities.]) + fi + ;; + sol2*) AC_DEFINE(USG, []) AC_DEFINE(USG5, []) @@ -3931,6 +4177,10 @@ emacs_cv_usable_FIONREAD=no ;; + mingw32) + emacs_cv_usable_FIONREAD=yes + ;; + *) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include @@ -4071,6 +4321,12 @@ AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure define this to include extra configuration information.]) +case $opsys in + mingw32) + AC_DEFINE(config_opsysfile, , []) + ;; +esac + XMENU_OBJ= XOBJ= FONT_OBJ= @@ -4131,12 +4387,14 @@ esac AC_SUBST(TOOLKIT_LIBW) -if test "$USE_X_TOOLKIT" = "none"; then - LIBXT_OTHER="\$(LIBXSM)" - OLDXMENU_TARGET="really-oldXMenu" -else - LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" - OLDXMENU_TARGET="really-lwlib" +if test "${opsys}" != "mingw32"; then + if test "$USE_X_TOOLKIT" = "none"; then + LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" + else + LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" + fi fi AC_SUBST(LIBXT_OTHER) @@ -4210,6 +4468,10 @@ ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o +elif test "$opsys" = "mingw32"; then + CYGWIN_OBJ= + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ=lastfile.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o @@ -4237,6 +4499,12 @@ CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS +if test "${opsys}" = "mingw32"; then + CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc" + # Remove unneeded switches from the value of CC that goes to Makefiles + CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"` +fi + case "$opsys" in aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; @@ -4273,6 +4541,16 @@ ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; + mingw32) + ## MinGW64 does not prepend an underscore to symbols, so we must + ## pass a different -entry switch to linker. FIXME: It is better + ## to make the entry points the same by changing unexw32.c. + case "$canonical" in + x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,_start -Wl,-Map,./temacs.map" ;; + *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;; + esac + ;; + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; *) LD_SWITCH_SYSTEM_TEMACS= ;; @@ -4287,6 +4565,24 @@ AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) +## MinGW-specific post-link processing of temacs. +TEMACS_POST_LINK=":" +ADDSECTION= +EMACS_HEAPSIZE= +if test "${opsys}" = "mingw32"; then + TEMACS_POST_LINK="\$(MINGW_TEMACS_POST_LINK)" + ADDSECTION="../nt/addsection\$(EXEEXT)" + ## Preload heap size of temacs.exe in MB. + case "$canonical" in + x86_64-*-*) EMACS_HEAPSIZE=42 ;; + *) EMACS_HEAPSIZE=27 ;; + esac +fi + +AC_SUBST(ADDSECTION) +AC_SUBST(TEMACS_POST_LINK) +AC_SUBST(EMACS_HEAPSIZE) + ## Common for all window systems if test "$window_system" != "none"; then AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) @@ -4445,12 +4741,12 @@ dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). dnl That doesn't have any obvious consequences for Emacs, but on the whole dnl it seems better to just live with the duplication. -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \ - leim/Makefile nextstep/Makefile]) + leim/Makefile nextstep/Makefile nt/Makefile]) dnl test/ is not present in release tarfiles. opt_makefile=test/automated/Makefile @@ -4493,8 +4789,12 @@ dnl the use of force in the `epaths-force' rule in Makefile.in. AC_CONFIG_COMMANDS([epaths], [ echo creating src/epaths.h -${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force -], [GCC="$GCC" CPPFLAGS="$CPPFLAGS"]) +if test "${opsys}" = "mingw32"; then + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 +else + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +fi +], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"]) AC_CONFIG_COMMANDS([gdbinit], [ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-05-15 20:12:53 +0000 +++ etc/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,7 @@ +2013-05-16 Eli Zaretskii + + * NEWS: Advertise the MSYS build on MS-Windows. + 2013-05-15 Stefan Monnier * .gitignore: Don't ignore DOC-* any more. === modified file 'etc/NEWS' --- etc/NEWS 2013-05-16 07:59:01 +0000 +++ etc/NEWS 2013-05-16 11:23:39 +0000 @@ -29,7 +29,15 @@ configure option `--disable-acl'. ** The configure option --with-crt-dir has been removed. -It is no longer needed, as the crt*.o files are no longer linked specially. +It is no longer needed, as the crt*.o files are no longer linked +specially. + +** Emacs for MS-Windows can now be built by running the configure script +using the MSYS environment and MinGW development tools. +This is from now on the preferred method of building Emacs on +MS-Windows. The Windows-specific configure.bat and makefile.w32-in +files are deprecated. See the file nt/INSTALL.MSYS for detailed +instructions. * Startup Changes in Emacs 24.4 === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-04-04 03:46:25 +0000 +++ leim/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,7 @@ +2013-05-16 Eli Zaretskii + + * Makefile.in (leim-list.el, check-declare): Use reveal-filename. + 2013-04-01 Paul Eggert Use UTF-8 for most files with non-ASCII characters (Bug#13936). === modified file 'leim/Makefile.in' --- leim/Makefile.in 2013-03-20 05:18:31 +0000 +++ leim/Makefile.in 2013-04-20 18:34:44 +0000 @@ -140,7 +140,7 @@ --eval "(update-leim-list-file \".\")" ; \ else \ ${RUN_EMACS} -l ${buildlisppath}/international/quail \ - --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \ + --eval "(update-leim-list-file \".\" (reveal-filename \"${srcdir}\"))" ; \ fi sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ @@ -199,4 +199,4 @@ check-declare: $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \ - --eval '(check-declare-directory "$(srcdir)")' + --eval '(check-declare-directory (reveal-filename "$(srcdir)"))' === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-05-15 20:12:53 +0000 +++ lib-src/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,27 @@ +2013-05-16 Eli Zaretskii + + * update-game-score.c [WINDOWSNT]: Include "ntlib.h". + + * ntlib.h (sleep): Update prototype. + (geteuid): Add prototype. + + * ntlib.c (sleep): Now returns an unsigned value. + (getgid): New function. + + * Makefile.in (CLIENTW, LIB_WSOCK32, LIBS_ECLIENT, NTLIB) + (CLIENTRES, WINDRES, NTINC, NTDEPS): New variables. + (INSTALLABLES): Add $(CLIENTW). + (LIBS_MOVE): Use $(LIB_WSOCK32). + ($(DESTDIR)${archlibdir}): Use $(EXEEXT) on update-game-score. + (test-distrib${EXEEXT}): Use $(EXEEXT) on test-distrib. + (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT}) + (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) + (emacsclient${EXEEXT}, hexl${EXEEXT}, update-game-score${EXEEXT}): + Add $(NTLIB) to prerequisites. Use $(EXEEXT). + (pop.o): Add pop.h to prerequisites. + (emacsclientw${EXEEXT}, ntlib.o): New targets. + (emacsclient.res): New target. + 2013-05-15 Stefan Monnier * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2013-03-13 18:42:22 +0000 +++ lib-src/Makefile.in 2013-04-14 16:36:49 +0000 @@ -113,8 +113,11 @@ # ========================== Lists of Files =========================== +# emacsclientw.exe for MinGW, empty otherwise +CLIENTW = @CLIENTW@ + # Things that a user might actually run, which should be installed in bindir. -INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \ +INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \ ebrowse${EXEEXT} INSTALLABLE_SCRIPTS = grep-changelog @@ -163,10 +166,21 @@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ ## empty or -lrt or -lposix4 if HAVE_FDATASYNC LIB_FDATASYNC = @LIB_FDATASYNC@ +## empty or -lwsock2 for MinGW +LIB_WSOCK32=@LIB_WSOCK32@ ## Extra libraries to use when linking movemail. LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ - $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) + $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) $(LIB_WSOCK32) + +## Extra libraries when linking emacsclient +## (empty or -lcomctl32 for MinGW) +LIBS_ECLIENT = @LIBS_ECLIENT@ + +## Extra object files for linking for MinGW +NTLIB = @NTLIB@ +CLIENTRES = @CLIENTRES@ +WINDRES = @WINDRES@ ## Some systems define this to request special libraries. LIBS_SYSTEM = @LIBS_SYSTEM@ @@ -227,7 +241,7 @@ umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \ touch $(DESTDIR)${gamedir}/snake-scores; \ touch $(DESTDIR)${gamedir}/tetris-scores - -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ + -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score${EXEEXT} && chmod u+s $(DESTDIR)${archlibdir}/update-game-score${EXEEXT}; then \ chown ${gameuser} $(DESTDIR)${gamedir}; \ chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ fi @@ -292,7 +306,7 @@ ## distribute Emacs. If they were clobbered, all the .elc files were ## clobbered too. test-distrib${EXEEXT}: ${srcdir}/test-distrib.c - $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c + $(CC) ${ALL_CFLAGS} -o test-distrib${EXEEXT} ${srcdir}/test-distrib.c ./test-distrib ${srcdir}/testfile ../lib/libgnu.a: $(config_h) @@ -302,47 +316,68 @@ ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ${srcdir}/../src/regex.c -etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h) +etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - regex.o $(LOADLIBES) -o etags + regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT} -ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h) +ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ + $(config_h) $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ - ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse + ${srcdir}/ebrowse.c $(LOADLIBES) $(NTLIB) -o ebrowse${EXEEXT} ## We depend on etags to assure that parallel makes do not write two ## etags.o files on top of each other. ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \ - regex.o $(LOADLIBES) -o ctags + regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT} -profile${EXEEXT}: ${srcdir}/profile.c $(config_h) +profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ - $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile - -make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h) - $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \ - -o make-docfile - -movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(config_h) + $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o profile${EXEEXT} + +make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h) + $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) $(NTLIB) \ + -o make-docfile${EXEEXT} + +movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \ - $(LOADLIBES) $(LIBS_MOVE) -o movemail + $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o movemail${EXEEXT} -pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h) +pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c -emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(config_h) +emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ - -DVERSION="\"${version}\"" \ - $(LOADLIBES) $(LIB_FDATASYNC) -o emacsclient - -hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h) - $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl - -update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(config_h) + -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \ + $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclient${EXEEXT} + +emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) + $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \ + -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \ + $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclientw${EXEEXT} + +NTINC = ${srcdir}/../nt/inc +NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \ + $(NTINC)/stdint.h $(NTINC)/pwd.h $(NTINC)/sys/time.h $(NTINC)/stdbool.h \ + $(NTINC)/sys/wait.h $(NTINC)/unistd.h $(NTINC)/sys/file.h $(NTINC)/netdb.h + +# The dependency on $(NTDEPS) is a trick intended to cause recompile of +# programs on MinGW whenever some private header in nt/inc is modified. +ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS) + $(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c + +hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h) + $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl${EXEEXT} + +update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ - ${srcdir}/update-game-score.c $(LOADLIBES) -o update-game-score + ${srcdir}/update-game-score.c $(LOADLIBES) $(NTLIB) \ + -o update-game-score${EXEEXT} + +emacsclient.res: $(NTINC)/../emacsclient.rc + $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o emacsclient.res \ + $(NTINC)/../emacsclient.rc ## Makefile ends here. === modified file 'lib-src/ntlib.c' --- lib-src/ntlib.c 2013-03-26 08:21:27 +0000 +++ lib-src/ntlib.c 2013-03-31 14:04:49 +0000 @@ -49,10 +49,11 @@ /* Emulate sleep...we could have done this with a define, but that would necessitate including windows.h in the files that used it. This is much easier. */ -void -sleep (unsigned long seconds) +unsigned +sleep (unsigned seconds) { Sleep (seconds * 1000); + return 0; } /* Get the current working directory. */ @@ -138,6 +139,12 @@ } unsigned +geteuid (void) +{ + return getuid (); +} + +unsigned getgid (void) { return 0; @@ -415,4 +422,3 @@ { return stat (path, buf); } - === modified file 'lib-src/ntlib.h' --- lib-src/ntlib.h 2013-01-01 09:11:05 +0000 +++ lib-src/ntlib.h 2013-03-30 17:00:51 +0000 @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ - #include #include @@ -29,12 +28,13 @@ #ifdef sleep #undef sleep #endif -void sleep (unsigned long seconds); +unsigned sleep (unsigned seconds); char *getwd (char *dir); int getppid (void); char * getlogin (void); char * cuserid (char * s); unsigned getuid (void); +unsigned geteuid (void); unsigned getegid (void); unsigned getgid (void); int setuid (unsigned uid); === modified file 'lib-src/update-game-score.c' --- lib-src/update-game-score.c 2013-01-02 16:13:04 +0000 +++ lib-src/update-game-score.c 2013-03-30 17:00:51 +0000 @@ -46,6 +46,10 @@ #include #include +#ifdef WINDOWSNT +#include "ntlib.h" +#endif + #define MAX_ATTEMPTS 5 #define MAX_SCORES 200 #define MAX_DATA_LEN 1024 === modified file 'lib/Makefile.am' --- lib/Makefile.am 2013-05-07 21:34:03 +0000 +++ lib/Makefile.am 2013-05-15 16:15:07 +0000 @@ -9,6 +9,10 @@ AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src +if BUILDING_FOR_WINDOWSNT +include ../nt/gnulib.mk +else include gnulib.mk libgnu_a_SOURCES += openat-die.c save-cwd.c +endif === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 08:52:02 +0000 +++ lisp/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,18 @@ +2013-05-16 Eli Zaretskii + + * subr.el (reveal-filename): New function. + + * loadup.el: Compute Emacs executable versions on MS-Windows, + where executables have the .exe extension. Add a hard link + emacs-XX.YY.ZZ.exe on MS-Windows. + + * Makefile.in (XARGS_LIMIT): New variable. + (custom-deps, finder-data, autoloads) + ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el) + ($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el) + ($(CAL_DIR)/hol-loaddefs.el): Use reveal-filename. + (compile-main): Limit xargs according to $(XARGS_LIMIT). + 2013-05-16 Leo Liu * progmodes/octave.el (octave-indent-defun): Mark obsolete. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-04-25 21:20:17 +0000 +++ lisp/Makefile.in 2013-05-01 17:47:50 +0000 @@ -24,6 +24,10 @@ lisp = $(srcdir) VPATH = $(srcdir) +# Empty for all systems except MinGW, where xargs needs an explicit +# limitation. +XARGS_LIMIT = @XARGS_LIMIT@ + # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". @@ -160,21 +164,21 @@ custom-deps: doit cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ - $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins + $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file (reveal-filename "$(lisp)/cus-load.el"))' -f custom-make-dependencies $$wins $(lisp)/finder-inf.el: $(MAKE) $(MFLAGS) finder-data finder-data: doit cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ - $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins + $(emacs) -l finder --eval '(setq generated-finder-keywords-file (reveal-filename "$(lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins # The chmod +w is to handle env var CVSREAD=1. autoloads: $(LOADDEFS) doit cd $(lisp) && chmod +w $(AUTOGEN_VCS) cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ - $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins + $(emacs) -l autoload --eval '(setq generated-autoload-file (reveal-filename "$(lisp)/loaddefs.el"))' -f batch-update-autoloads $$wins # This is required by the bootstrap-emacs target in ../src/Makefile, so # we know that if we have an emacs executable, we also have a subdirs.el. @@ -274,7 +278,7 @@ test -f $$el || continue; \ test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \ echo "$${el}c"; \ - done | xargs echo) | \ + done | xargs $(XARGS_LIMIT) echo) | \ while read chunk; do \ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done @@ -369,7 +373,7 @@ $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ - --eval "(setq generated-autoload-file \"$@\")" \ + --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(MH_E_DIR) @@ -387,7 +391,7 @@ $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ - --eval "(setq generated-autoload-file \"$@\")" \ + --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(TRAMP_DIR) @@ -409,21 +413,21 @@ $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC) $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ - --eval "(setq generated-autoload-file \"$@\")" \ + --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ - --eval "(setq generated-autoload-file \"$@\")" \ + --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ - --eval "(setq generated-autoload-file \"$@\")" \ + --eval "(setq generated-autoload-file (reveal-filename \"$@\"))" \ --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) === modified file 'lisp/loadup.el' --- lisp/loadup.el 2013-05-15 20:12:53 +0000 +++ lisp/loadup.el 2013-05-16 09:58:56 +0000 @@ -290,9 +290,12 @@ (equal (nth 4 command-line-args) "dump")) (not (eq system-type 'ms-dos))) (let* ((base (concat "emacs-" emacs-version ".")) + (exelen (if (eq system-type 'windows-nt) -4)) (files (file-name-all-completions base default-directory)) - (versions (mapcar (function (lambda (name) - (string-to-number (substring name (length base))))) + (versions (mapcar (function + (lambda (name) + (string-to-number + (substring name (length base) exelen)))) files))) (setq emacs-bzr-version (condition-case nil (emacs-bzr-get-version) (error nil))) @@ -376,18 +379,25 @@ (dump-emacs "emacs" "temacs") (message "%d pure bytes used" pure-bytes-used) ;; Recompute NAME now, so that it isn't set when we dump. - (if (not (or (memq system-type '(ms-dos windows-nt)) + (if (not (or (eq system-type 'ms-dos) ;; Don't bother adding another name if we're just ;; building bootstrap-emacs. (equal (nth 3 command-line-args) "bootstrap") (equal (nth 4 command-line-args) "bootstrap"))) - (let ((name (concat "emacs-" emacs-version))) + (let ((name (concat "emacs-" emacs-version)) + (exe (if (eq system-type 'windows-nt) ".exe" ""))) (while (string-match "[^-+_.a-zA-Z0-9]+" name) (setq name (concat (downcase (substring name 0 (match-beginning 0))) "-" (substring name (match-end 0))))) + (setq name (concat name exe)) (message "Adding name %s" name) - (add-name-to-file "emacs" name t))) + ;; When this runs on Windows, invocation-directory is not + ;; necessarily the current directory. + (add-name-to-file (expand-file-name (concat "emacs" exe) + invocation-directory) + (expand-file-name name invocation-directory) + t))) (kill-emacs))) ;; For machines with CANNOT_DUMP defined in config.h, === modified file 'lisp/subr.el' --- lisp/subr.el 2013-05-14 23:38:14 +0000 +++ lisp/subr.el 2013-05-16 10:14:30 +0000 @@ -4678,4 +4678,20 @@ (prin1-to-string (make-hash-table))))) (provide 'hashtable-print-readable)) +;; This is used in lisp/Makefile.in and in leim/Makefile.in to +;; generate file names for autoloads, custom-deps, and finder-data. +(defun reveal-filename (file) + "Produce the real file name for FILE. + +On systems other than MS-Windows, just returns FILE. +On MS-Windows, converts /d/foo/bar form of file names +passed by MSYS Make into d:/foo/bar that Emacs can grok. + +This function is called from lisp/Makefile." + (when (and (eq system-type 'windows-nt) + (string-match "\\`/[a-zA-Z]/" file)) + (setq file (concat (substring file 1 2) ":" (substring file 2)))) + file) + + ;;; subr.el ends here === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-05-15 20:12:53 +0000 +++ nt/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,48 @@ +2013-05-16 Eli Zaretskii + + * msysconfig.sh: New file. + + * mingw-cfg.site: New file. + + * makefile.w32-in (LOCAL_FLAGS): Add -DOLD_PATHS=1. + + * inc/unistd.h: Include pwd.h and sys/types.h. + + * inc/sys/time.h (_TIMEVAL_DEFINED, timerisset, timercmp) + (timerclear): Define. + (gettimeofday): Adjust signature to be Posix compatible, by using + the 'restrict' keyword. + + * inc/sys/stat.h (UTIME_NOW, UTIME_OMIT): Define. + (struct _stat, struct _stati64): Define. + + * inc/sys/socket.h (timeval): Define only for MSVC. + (FD_SET, FD_CLR, FD_ISSET, fd_set): Redefine only if + EMACS_CONFIG_H is defined. + (timeval): Undefine only for MSVC. + + * inc/ms-w32.h (HAVE___BUILTIN_UNWIND_INIT, restrict) + (HAVE_WINDOW_SYSTEM, HAVE_MENUS, EMACS_CONFIGURATION) + (EMACS_CONFIG_OPTIONS, HAVE_LONG_LONG_INT) + (HAVE_UNSIGNED_LONG_LONG_INT): Define only if not already defined. + (fileno): Move definition after including stdio.h. + (sigset_t): Guard typedef by _W64. + + * gnulib.mk: New file. + + * epaths.nt: New file. + + * addpm.c [!OLD_PATHS]: Include src/epaths.h, instead of having a + copy of the file names there. + [!OLD_PATHS]: Use macros from epaths.h instead of + literal strings. + + * Makefile.in: New file. + + * INSTALL.MSYS: New file. + + * INSTALL: Mention INSTALL.MSYS. + 2013-05-15 Stefan Monnier * makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. === modified file 'nt/INSTALL' --- nt/INSTALL 2013-02-02 08:23:52 +0000 +++ nt/INSTALL 2013-04-17 16:37:57 +0000 @@ -13,9 +13,13 @@ Do not use this recipe with Cygwin. For building on Cygwin, use the normal installation instructions, ../INSTALL. - If you have a Cygwin or MSYS port of Bash on your Path, you will be - better off removing it from PATH. (For details, search for "MSYS - sh.exe" below.) + Do not use these instructions with MSYS environment. For building + the native Windows binary with MinGW and MSYS, follow the + instructions in the file INSTALL.MSYS in this directory. + + For building without MSYS, if you have a Cygwin or MSYS port of Bash + on your Path, you will be better off removing it from PATH. (For + details, search for "MSYS sh.exe" below.) 1. Change to the `nt' directory (the directory of this file): === added file 'nt/INSTALL.MSYS' --- nt/INSTALL.MSYS 1970-01-01 00:00:00 +0000 +++ nt/INSTALL.MSYS 2013-05-16 09:44:44 +0000 @@ -0,0 +1,640 @@ + Building and Installing Emacs on MS-Windows + using the MSYS and MinGW tools + + Copyright (C) 2013 Free Software Foundation, Inc. + See the end of the file for license conditions. + +The MSYS/MinGW build described here is supported on versions of +Windows starting with Windows 2000 and newer. Windows 9X are not +supported (but the Emacs binary produced by this build will run on +Windows 9X as well). + +* For the brave (a.k.a. "impatient"): + + For those who have a working MSYS/MinGW development environment and + are comfortable with running Posix configure scripts, here are the + concise instructions for configuring and building the native Windows + binary of Emacs with these tools. + + Do not use this recipe with Cygwin. For building on Cygwin, use the + normal installation instructions, ../INSTALL. + + Do not use these instructions if you don't have MSYS installed; for + that, see the file INSTALL in this directory. + + 0. Start the MSYS Bash window. Everything else below is done from + that window's Bash prompt. + + 0a. If you are building from the development trunk (as opposed to a + release tarball), produce the configure script, by typing from + the top-level Emacs source directory: + + ./autogen.sh + + 1. If you want to build Emacs outside of the source tree + (recommended), create the build directory and chdir there. + + 2. Invoke the MSYS-specific configure script: + + - If you are building outside the source tree: + + /PATH/TO/EMACS/SOURCE/TREE/nt/msysconfig.sh --prefix=PREFIX ... + + - If you are building in-place, i.e. inside the source tree: + + ./nt/msysconfig.sh --prefix=PREFIX ... + + It is always preferable to use --prefix to configure Emacs for + some specific location of its installed tree; the default + /usr/local is not suitable for Windows. + + You can pass other options to the configure script. Here's a + typical example (for an in-place debug build): + + CPPFLAGS='-DGLYPH_DEBUG=1' CFLAGS='-O0 -g3' ./nt/msysconfig.sh --prefix=d:/usr/emacs --enable-checking + + 3. After the configure script finishes, it should display the + resulting configuration. After that, type + + make + + Use "make -j N" if your MSYS Make supports parallel execution; + the build will take significantly less time in that case. Here N + is the number of simultaneous parallel jobs; use the number of + the cores on your system. + + 4. Install the produced binaries: + + make install + + If you want the installation tree to go to a place that is + different from the one specified by --prefix, say + + make install prefix=/where/ever/you/want + + That's it! + + If these short instructions somehow fail, read the rest of this + file. + +* Installing MinGW and MSYS + + Make sure you carefully read the following two sections in their + entirety and install/configure the various packages as instructed. + A correct installation makes all the rest almost trivial; a botched + installation will likely make you miserable for quite some time. + + There are two alternative to installing MinGW + MSYS: using the GUI + installer, called mingw-get, provided by the MinGW project, or + manual installation. The next two sections describe each one of + these. + +** Installing MinGW and MSYS using mingw-get + + A nice GUI installer, called mingw-get, is available for those who + don't like to mess with manual installations. You can download it + from here: + + https://sourceforge.net/projects/mingw/files/Installer/mingw-get/ + + (This installer only supports packages downloaded from the MinGW + site; for the rest you will still need the manual method.) + + After installing mingw-get, invoke it to install the packages that + are already selected by default on the "Select Components" screen of + its wizard. + + After that, use "ming-get install PACKAGE" to install the following + additional packages: + + . msys-base + . mingw-developer-toolkit + . msys-automake + + (We recommend that you refrain from installing the MSYS Texinfo + package, which is part of msys-base, because it might produce mixed + EOL format when installing Info files. Instead, install the MinGW + port of Texinfo, see the ezwinports URL below.) + + At this point, you should be ready to configure and build Emacs in + its basic configuration. Skip to the "Generating the configure + script" section for the build instructions. If you want to build it + with image support and other optional libraries, read about the + optional libraries near the end of this document, before you start + the build. Also, consider installing additional MinGW packages that + are required/recommended, especially if you are building from the + Bazaar repository, as described in the next section. + +** Installing MinGW and MSYS manually + +*** MinGW + + You will need to install the MinGW port of GCC and Binutils, and the + MinGW runtime and Windows API distributions, to compile Emacs. You + can find these on the MinGW download/Base page: + + https://sourceforge.net/projects/mingw/files/MinGW/Base/ + + In general, install the latest stable versions of the following + MinGW packages from that page: gcc, binutils, mingw-rt, w32api. You + only need the 'bin' and the 'dll' tarballs of each of the above. + + MinGW packages are distributed as .tar.lzma compressed archives. To + install the packages manually, we recommend to use the Windows port + of the 'bsdtar' program to unpack the tarballs. 'bsdtar' is + available as part of the 'libarchive' package from here: + + http://sourceforge.net/projects/ezwinports/files/ + + The recommended place to install these packages is a single tree + starting from some directory on a drive other than the system drive + C:. A typical example would be D:\usr, with D:\usr\bin holding the + binaries and DLLs (should be added to your Path environment + variable), D:\usr\include holding the include files, D:\usr\lib + holding the static and import libraries, D:\usr\share holding docs, + message catalogs, and package-specific subdirectories, etc. + + Having all the headers and libraries in a single place will greatly + reduce the number of -I and -L flags you will have to pass to the + configure script (see below), as these files will be right where the + compiler expects them. + + We specifically do NOT recommend installing packages below + "C:\Program Files" or "C:\Program Files (x86)". These directories + are protected on versions of Windows from Vista and on, and you will + have difficulties updating and maintaining your installation later, + due to UAC elevation prompts, file virtualization, etc. You *have* + been warned! + + Additional MinGW packages are required/recommended, especially if + you are building from the Bazaar repository: + + . Texinfo (needed to produce the Info manuals when building from + bzr, and for "make install") + + Available from http://sourceforge.net/projects/ezwinports/files/. + + . gzip (needed to compress files during "make install") + + Available from http://gnuwin32.sourceforge.net/packages/gzip.htm. + + . pkg-config (needed for building with some optional libraries, + such as GnuTLS and libxml2) + + Available from http://www.gtk.org/download/win32.php + + Each package might list other packages as prerequisites on its + download page (under "Runtime requirements"); download those as + well. (Using the GUI installer mingw-get will fetch those + prerequisites automatically for you.) A missing prerequisite will + manifest itself by the program failing to run and presenting a + pop-up dialog that states the missing or incompatible DLL; be sure + to find and install these missing DLLs. + + Once you think you have MinGW installed, test the installation by + building a trivial "hello, world!" program, and make sure that it + builds without any error messages and the binary works when run. + +*** MSYS + + You will need a reasonably full MSYS installation. MSYS is an + environment needed to run the Posix configure scripts and the + resulting Makefile's, in order to produce native Windows binaries + using the MinGW compiler and runtime libraries. Here's the list of + MSYS packages that are required: + + . All the packages from the MSYS Base distribution, listed here: + + https://sourceforge.net/projects/mingw/files/MSYS/Base/ + + . Additional packages listed below, from the MSYS Extension + distribution here: + + https://sourceforge.net/projects/mingw/files/MSYS/Extension/ + + - flex + - bison + - m4 + - perl + - mktemp + + These should only be needed if you intend to build development + versions of Emacs from the Bazaar repository. + + . Additional packages (needed only if building from the Bazaar + repository): Automake and Autoconf. They are available from + here: + + http://sourceforge.net/projects/ezwinports/files/automake-1.11.6-msys-bin.zip/download + http://sourceforge.net/projects/ezwinports/files/autoconf-2.65-msys-bin.zip/download + + MSYS packages are distributed as .tar.lzma compressed archives. To + install the packages manually, we recommend to use the Windows port + of the 'bsdtar' program, already mentioned above. + + If/when you are confident in your MinGW/MSYS installation, and want + to speed up the builds, we recommend installing a pre-release + version of Make from here: + + https://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/ + + These are snapshot builds of many packages, but you only need + make.exe from there. The advantage of this make.exe is that it + supports parallel builds, so you can use "make -j N" to considerably + speed up your builds + + For each of these packages, install the 'bin' and 'dll' tarballs of + their latest stable releases. If there's an 'ext' tarball (e.g., + msysCORE and Coreutils have it), download and install those as well. + + Each package might list other packages as prerequisites on its + download page (under "Runtime requirements"); download those as + well. (Using the GUI installer mingw-get will fetch those + prerequisites automatically for you.) A missing prerequisite will + manifest itself by the program failing to run and presenting a + pop-up dialog that states the missing or incompatible DLL; be sure + to find and install these missing DLLs. + + MSYS packages should be installed in a separate tree from MinGW. + For example, use D:\MSYS or D:\usr\MSYS as the top-level directory + from which you unpack all of the MSYS packages. + + Do NOT add the MSYS bin directory to your Windows Path! Only the + MinGW bin directory should be on Path. When you install MSYS, it + creates a shortcut on your desktop that invokes the MSYS Bash shell + in a Command Prompt window; that shell is already set up so that the + MSYS bin directory is on PATH ahead of any other directory. Thus, + Bash will find MSYS executables first, which is exactly what you + need. + + At this point, you are ready to build Emacs in its basic + configuration. If you want to build it with image support and other + optional libraries, read about that near the end of this document. + +* Generating the configure script + + If you are building a release or pretest tarball, skip this section, + because the configure script is already present in the tarball. + + To build a development snapshot from the Emacs Bazaar repository, + you will first need to generate the configure script and a few other + auto-generated files. (If this step, described below, somehow + fails, you can use the files in the autogen/ directory instead, but + they might be outdated, and, most importantly, you are well advised + not to disregard any failures in your local build procedures, as + these are likely to be symptoms of incorrect installation that will + bite you down the road.) + + To generate the configure script, type this at the MSYS Bash prompt + from the top-level directory of the Emacs tree: + + ./autogen.sh + + If successful, this command should produce the following output: + + $ ./autogen.sh + Checking whether you have the necessary tools... + (Read INSTALL.BZR for more details on building Emacs) + + Checking for autoconf (need at least version 2.65)... + ok + Checking for automake (need at least version 1.11)... + ok + Your system has the required tools, running autoreconf... + You can now run `./configure'. + +* Configuring Emacs for MinGW: + + Now it's time to run the configure script. You can do that either + from a separate build directory that is outside of the Emacs source + tree (recommended), or from inside the source tree. The former is + recommended because it allows you to have several different builds, + e.g., an optimized build and an unoptimized one, of the same + revision of the source tree; the source tree will be left in its + pristine state, without any build products. + + You invoke the configure script like this: + + /PATH/TO/EMACS/SOURCE/TREE/nt/msysconfig.sh --prefix=PREFIX ... + + or, if you are building in-place, i.e. inside the source tree: + + ./nt/msysconfig.sh --prefix=PREFIX ... + + Here PREFIX is the place where you eventually want to install Emacs + once built, e.g. d:/usr. + + You can pass additional options to the configure script, for the + full list type + + ./nt/msysconfig.sh --help + + As explained in the help text, you may need to tell the script what + are the optional flags to invoke the compiler. This is needed if + some of your headers and libraries, e.g., those belonging to + optional image libraries, are installed in places where the compiler + normally doesn't look for them. (Remember that advice above to + avoid such situations? here's is where you will start paying for + disregarding that recommendation.) For example, if you have libpng + headers in C:\emacs\libs\libpng-1.2.37-lib\include and jpeg library + headers in C:\emacs\libs\jpeg-6b-4-lib\include, you will need to say + something like this: + + CPPFLAGS='-Ic:/emacs/libs/libpng-1.2.37-lib/include -Ic:/emacs/libs/jpeg-6b-4-lib/include' ./nt/msysconfig.sh --prefix=PREFIX + + which is quite a mouth-full, especially if you have more directories + to specify... Perhaps you may wish to revisit your installation + decisions now. + + A few frequently used options are needed when you want to produce an + unoptimized binary with runtime checks enabled: + + CPPFLAGS='-DGLYPH_DEBUG=1' CFLAGS='-O0 -g3' ./nt/msysconfig.sh --prefix=PREFIX --enable-checking + + Once invoked, the configure script will run for some time, and, if + successful, will eventually produce a summary of the configuration + like this: + + Configured for `i686-pc-mingw32'. + + Where should the build process find the source code? /path/to/emacs/sources + What compiler should emacs be built with? gcc -std=gnu99 -O0 -g3 + Should Emacs use the GNU version of malloc? yes + Should Emacs use a relocating allocator for buffers? yes + Should Emacs use mmap(2) for buffer allocation? no + What window system should Emacs use? w32 + What toolkit should Emacs use? none + Where do we find X Windows header files? NONE + Where do we find X Windows libraries? NONE + Does Emacs use -lXaw3d? no + Does Emacs use -lXpm? yes + Does Emacs use -ljpeg? yes + Does Emacs use -ltiff? yes + Does Emacs use a gif library? yes + Does Emacs use -lpng? yes + Does Emacs use -lrsvg-2? no + Does Emacs use imagemagick? no + Does Emacs use -lgpm? no + Does Emacs use -ldbus? no + Does Emacs use -lgconf? no + Does Emacs use GSettings? no + Does Emacs use -lselinux? no + Does Emacs use -lgnutls? yes + Does Emacs use -lxml2? yes + Does Emacs use -lfreetype? no + Does Emacs use -lm17n-flt? no + Does Emacs use -lotf? no + Does Emacs use -lxft? no + Does Emacs use toolkit scroll bars? yes + + You are almost there, hang on. + + If the output is significantly different, or if configure finishes + prematurely and displays some error message, you should examine the + configuration log in config.log and find the reason for the failure. + + Once you succeeded in configuring Emacs, and just want to rebuild it + after updating your local repository from the main repository, you + don't need to re-run the configure script manually, unless you want + to change the configure-time options. Just typing "make" will + re-run configure if necessary with the exact same options you + specified originally, and then go on to invoking Make, described + below. + +* Running Make. + + This is simple: just type "make" and sit back, watching the fun. + + If you installed a snapshot build of Make, the build will be much + faster if you type "make -j N" instead, where N is the number of + independent processing units on your machine. E.g., on a core i7 + system try using N of 6 or even 8. + + When Make finishes, you can install the produced binaries: + + make install + + or, if you want the installed tree to go in a place different from + the configured one, type + + make install prefix=WHEREVER + + Congrats! You have built and installed your own Emacs! + +* Make targets + + The following make targets may be used by users building the source + distribution, or users who have checked out of Bazaar after + an initial bootstrapping. + + make + Builds Emacs from the available sources and pre-compiled lisp files. + + make install + Installs the built programs and the auxiliary files. + + make clean + Removes object and executable files produced by the build process in + the current configuration. After "make clean", you can rebuild with + the same configuration using make. useful when you want to be sure + that all of the products are built from coherent sources. + + make distclean + In addition to the files removed by make clean, this also removes + Makefiles and other generated files to get back to the state of a + freshly unpacked source distribution. After make distclean, it is + necessary to run the configure script followed by "make", in order + to rebuild. + + The following targets are intended only for use with the Bazaar sources. + + make bootstrap + Removes all the auto-generated files and all the *.elc byte-compiled + files, and builds Emacs from scratch. Useful when some change in + basic Emacs functionality makes byte compilation of updated files + fail. + + make maintainer-clean + Removes everything that can be recreated, including compiled Lisp + files, to get back to the state of a fresh Bazaar tree. After make + maintainer-clean, it is necessary to run configure and "make" or + "make bootstrap" to rebuild. Occasionally it may be necessary to + run this target after an update. + +* Optional image library support + + In addition to its "native" image formats (pbm and xbm), Emacs can + handle other image types: xpm, tiff, gif, png, jpeg and experimental + support for svg. + + To build Emacs with support for them, the corresponding headers must + be in the include path and libraries should be where the linker + looks for them, when the configure script is run. If needed, this + can be set up using the CPPFLAGS and CFLAGS variable specified on + the configure command line. The configure script will report + whether it was able to detect the headers and libraries. If the + results of this testing appear to be incorrect, please look for + details in the file config.log: it will show the failed test + programs and compiler error messages that should explain what is + wrong. (Usually, any such failures happen because some headers are + missing due to bad packaging of the image support libraries.) + + Note that any file path passed to the compiler or linker must use + forward slashes, or double each backslash, as that is how Bash + works. + + If the configure script finds the necessary headers and libraries, + but they are for some reason incompatible, or if you want to omit + support for some image library that is installed on your system for + some other reason, use the --without-PACKAGE option to configure, + such as --without-gif to omit GIF, --without-tiff to omit TIFF, etc. + Passing the --help option to the configure script displays all of + the supported --without-PACKAGE options. + + To use the external image support, the DLLs implementing the + functionality must be found when Emacs first needs them, either on the + PATH, or in the same directory as emacs.exe. Failure to find a + library is not an error; the associated image format will simply be + unavailable. Note that once Emacs has determined that a library can + not be found, there's no way to force it to try again, other than + restarting. See the variable `dynamic-library-alist' to configure the + expected names of the libraries. + + Some image libraries have dependencies on one another, or on zlib. + For example, tiff support depends on the jpeg library. If you did not + compile the libraries yourself, you must make sure that any dependency + is in the PATH or otherwise accessible and that the binaries are + compatible (for example, that they were built with the same compiler). + + Binaries for the image libraries (among many others) can be found at + the GnuWin32 project. PNG, JPEG and TIFF libraries are also + included with GTK, which is installed along with other Free Software + that requires it. Note specifically that, due to some packaging + snafus in the GnuWin32-supplied image libraries, you will need to + download _source_ packages for some of the libraries in order to get + the header files necessary for building Emacs with image support. + + For PNG images, we recommend to use versions 1.4.x and later of + libpng, because previous versions had security issues. You can find + precompiled libraries and headers on the GTK download page for + Windows (http://www.gtk.org/download/win32.php). + + Versions 1.4.0 and later of libpng are binary incompatible with + earlier versions, so Emacs will only look for libpng libraries which + are compatible with the version it was compiled against. That + version is given by the value of the Lisp variable `libpng-version'; + e.g., 10403 means version 1.4.3. The variable `dynamic-library-alist' + is automatically set to name only those DLL names that are known to + be compatible with the version given by `libpng-version'. If PNG + support does not work for you even though you have the support DLL + installed, check the name of the installed DLL against + `dynamic-library-alist' and the value of `libpng-version', and + download compatible DLLs if needed. + +* Optional GnuTLS support + + To compile with GnuTLS, you will need pkg-config to be installed, as + the configure script invokes pkg-config to find out which compiler + switches to use for GnuTLS. See above for the URL where you can + find pkg-config for Windows. + + You will also need to install the p11-kit package, which is a + dependency of GnuTLS, and its header files are needed for + compilation of programs that use GnuTLS. You can find p11-kit on + the same site as GnuTLS, see the URL below. + + If the configure script finds the GnuTLS header files and libraries + on your system, Emacs is built with GnuTLS support by default; to + avoid that you can pass the argument --without-gnutls. + + In order to support GnuTLS at runtime, a GnuTLS-enabled Emacs must + be able to find the relevant DLLs during startup; failure to do so + is not an error, but GnuTLS won't be available to the running + session. + + You can get pre-built binaries (including any required DLL and the + header files) at http://sourceforge.net/projects/ezwinports/files/. + +* Optional libxml2 support + + To compile with libxml2, you will need pkg-config to be installed, + as the configure script invokes pkg-config to find out which + compiler switches to use for libxml2. See above for the URL where + you can find pkg-config for Windows. + + If the configure script finds the libxml2 header files and libraries + on your system, Emacs is built with libxml2 support by default; to + avoid that you can pass the argument --without-libxml2. + + In order to support libxml2 at runtime, a libxml2-enabled Emacs must + be able to find the relevant DLLs during startup; failure to do so + is not an error, but libxml2 features won't be available to the + running session. + + One place where you can get pre-built Windows binaries of libxml2 + (including any required DLL and the header files) is here: + + http://sourceforge.net/projects/ezwinports/files/ + + For runtime support of libxml2, you will also need to install the + libiconv "development" tarball, because the libiconv headers need to + be available to the compiler when you compile with libxml2 support. + A MinGW port of libiconv can be found on the MinGW site: + + http://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/ + + You need the libiconv-X.Y.Z-N-mingw32-dev.tar.lzma tarball from that + site. + +* Experimental SVG support + + To compile with SVG, you will need pkg-config to be installed, as + the configure script invokes pkg-config to find out which compiler + switches to use for SVG. See above for the URL where you can find + pkg-config for Windows. + + SVG support is currently experimental, and not built by default. + Specify --with-rsvg and ensure you have all the dependencies in your + include path. Unless you have built a minimalist librsvg yourself + (untested), librsvg depends on a significant chunk of GTK+ to build, + plus a few Gnome libraries, libxml2, libbz2 and zlib at runtime. The + easiest way to obtain the dependencies required for building is to + download a pre-bundled GTK+ development environment for Windows. + + To use librsvg at runtime, ensure that librsvg and its dependencies + are on your PATH. If you didn't build librsvg yourself, you will + need to check with where you downloaded it from for the + dependencies, as there are different build options. If it is a + short list, then it most likely only lists the immediate + dependencies of librsvg, but the dependencies themselves have + dependencies - so don't download individual libraries from GTK+, + download and install the whole thing. If you think you've got all + the dependencies and SVG support is still not working, check your + PATH for other libraries that shadow the ones you downloaded. + Libraries of the same name from different sources may not be + compatible, this problem was encountered with libbzip2 from GnuWin32 + with libcroco from gnome.org. + + If you can see etc/images/splash.svg, then you have managed to get + SVG support working. Congratulations for making it through DLL hell + to this point. You'll probably find that some SVG images crash + Emacs. Problems have been observed in some images that contain + text, they seem to be a problem in the Windows port of Pango, or + maybe a problem with the way Cairo or librsvg is using it that + doesn't show up on other platforms. + + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . === added file 'nt/Makefile.in' --- nt/Makefile.in 1970-01-01 00:00:00 +0000 +++ nt/Makefile.in 2013-04-21 15:13:24 +0000 @@ -0,0 +1,212 @@ +# nt/Makefile for GNU Emacs. + +# Copyright (C) 2013 Free Software Foundation, Inc. + +# This file is part of GNU Emacs. + +# GNU Emacs is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see . + +# Avoid trouble on systems where the `SHELL' variable might be +# inherited from the environment. +SHELL = /bin/sh + +# ==================== Things `configure' will edit ==================== + +CC=@CC@ +CFLAGS=@CFLAGS@ +version=@version@ +## Used in $archlibdir. +configuration=@configuration@ +EXEEXT=@EXEEXT@ +C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ +C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ +PROFILING_CFLAGS = @PROFILING_CFLAGS@ +WARN_CFLAGS = @WARN_CFLAGS@ +WERROR_CFLAGS = @WERROR_CFLAGS@ + +# Program name transformation. +TRANSFORM = @program_transform_name@ + +# ==================== Where To Install Things ==================== + +# The default location for installation. Everything is placed in +# subdirectories of this directory. The default values for many of +# the variables below are expressed in terms of this one, so you may +# not need to change them. This is set with the --prefix option to +# `../configure'. +prefix=@prefix@ + +# Like `prefix', but used for architecture-specific files. This is +# set with the --exec-prefix option to `../configure'. +exec_prefix=@exec_prefix@ + +# Where to install Emacs and other binaries that people will want to +# run directly (like etags). This is set with the --bindir option +# to `../configure'. +bindir=@bindir@ + +# Where to install and expect executable files to be run by Emacs +# rather than directly by users, and other architecture-dependent +# data. ${archlibdir} is usually below this. This is set with the +# --libexecdir option to `../configure'. +libexecdir=@libexecdir@ + +# Directory for local state files for all programs. +localstatedir=@localstatedir@ + +# Where to find the source code. This is set by the configure +# script's `--srcdir' option. However, the value of ${srcdir} in +# this makefile is not identical to what was specified with --srcdir, +# since the variable here has `/lib-src' added at the end. + +# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. +srcdir=@srcdir@ +VPATH=@srcdir@ + +# The top-level source directory, also set by configure. +top_srcdir=@top_srcdir@ + +# ==================== Emacs-specific directories ==================== + +# These variables hold the values Emacs will actually use. They are +# based on the values of the standard Make variables above. + +# Where to put executables to be run by Emacs rather than the user. +# This path usually includes the Emacs version and configuration name, +# so that multiple configurations for multiple versions of Emacs may +# be installed at once. This can be set with the --archlibdir option +# to `../configure'. +archlibdir=@archlibdir@ + +# ==================== Utility Programs for the Build ================= + +# ../configure figures out the correct values for these. +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +# By default, we uphold the dignity of our programs. +INSTALL_STRIP = +MKDIR_P = @MKDIR_P@ + +# ========================== Lists of Files =========================== + +# Things that a user might actually run, which should be installed in bindir. +INSTALLABLES = runemacs${EXEEXT} addpm${EXEEXT} + +# Things that Emacs runs internally, which should not be installed in bindir. +UTILITIES = cmdproxy${EXEEXT} ddeclient${EXEEXT} + +# Things that Emacs runs during the build process. +DONT_INSTALL = addsection${EXEEXT} + +# All files that are created by the linker, i.e., whose names end in ${EXEEXT}. +EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} + +# =========================== Configuration =========================== + +# MS-Windows resource files and resource compiler +EMACSRES = @EMACSRES@ +EMACS_MANIFEST = @EMACS_MANIFEST@ +WINDRES = @WINDRES@ + +## Extra libraries to use when linking addpm. +LIBS_ADDPM = -lole32 -luuid + +## Compilation and linking flags +BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + -I. -I${srcdir} + +ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} +LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} +CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} + +all: ${EXE_FILES} + +.PHONY: all + +## Install the internal utilities. Until they are installed, we can +## just run them directly from nt/. +$(DESTDIR)${archlibdir}: all + @echo + @echo "Installing utilities run internally by Emacs." + umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} + if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \ + for file in ${UTILITIES}; do \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ + done ; \ + fi + +.PHONY: install uninstall mostlyclean clean distclean maintainer-clean +.PHONY: extraclean check tags + +install: $(DESTDIR)${archlibdir} + @echo + @echo "Installing utilities for users to run." + umask 022; ${MKDIR_P} $(DESTDIR)${bindir} + for file in ${INSTALLABLES} ; do \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ + done + +uninstall: + for file in ${INSTALLABLES}; do \ + rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ + done + if [ -d $(DESTDIR)${archlibdir} ]; then \ + (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES}) \ + fi + +mostlyclean: + -rm -f core *.o + +clean: mostlyclean + -rm -f ${EXE_FILES} + +distclean: clean + -rm -f TAGS + -rm -f Makefile + +maintainer-clean: distclean + true + +extraclean: maintainer-clean + -rm -f *~ \#* + +## Test the contents of the directory. +check: + @echo "We don't have any tests for the nt/ directory yet." + +tags: TAGS +TAGS: ${EXE_FILES:${EXEEXT}=.c} + ../lib-src/etags *.[ch] + +## Build the programs +addsection${EXEEXT}: ${srcdir}/addsection.c + $(CC) ${ALL_CFLAGS} ${srcdir}/addsection.c -o addsection${EXEEXT} + +addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h + $(CC) ${ALL_CFLAGS} ${srcdir}/addpm.c $(LIBS_ADDPM) -o addpm${EXEEXT} + +ddeclient${EXEEXT}: ${srcdir}/ddeclient.c + $(CC) ${ALL_CFLAGS} ${srcdir}/ddeclient.c -o ddeclient${EXEEXT} + +cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c + $(CC) ${ALL_CFLAGS} ${srcdir}/cmdproxy.c -o cmdproxy${EXEEXT} + +runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) + $(CC) ${ALL_CFLAGS} ${srcdir}/runemacs.c $(EMACSRES) -mwindows \ + -o runemacs${EXEEXT} + +emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST) + ${WINDRES} -O coff -o emacs.res ${srcdir}/emacs.rc === modified file 'nt/addpm.c' --- nt/addpm.c 2013-03-27 07:21:43 +0000 +++ nt/addpm.c 2013-04-15 13:39:41 +0000 @@ -50,6 +50,10 @@ #include #include +#ifndef OLD_PATHS +#include "../src/epaths.h" +#endif + HDDEDATA CALLBACK DdeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, @@ -76,6 +80,7 @@ } env_vars[] = { +#ifdef OLD_PATHS {"emacs_dir", NULL}, {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"}, {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"}, @@ -86,6 +91,18 @@ /* {"INFOPATH", "%emacs_dir%/info"}, */ {"EMACSDOC", "%emacs_dir%/etc"}, {"TERM", "cmd"} +#else /* !OLD_PATHS */ + {"emacs_dir", NULL}, + {"EMACSLOADPATH", PATH_SITELOADSEARCH ";" PATH_LOADSEARCH}, + {"SHELL", PATH_EXEC "/cmdproxy.exe"}, + {"EMACSDATA", PATH_DATA}, + {"EMACSPATH", PATH_EXEC}, + /* We no longer set INFOPATH because Info-default-directory-list + is then ignored. */ + /* {"INFOPATH", "%emacs_dir%/info"}, */ + {"EMACSDOC", PATH_DOC}, + {"TERM", "cmd"} +#endif }; BOOL === added file 'nt/epaths.nt' --- nt/epaths.nt 1970-01-01 00:00:00 +0000 +++ nt/epaths.nt 2013-04-06 13:25:17 +0000 @@ -0,0 +1,89 @@ +/* Hey Emacs, this is -*- C -*- code! */ +/* epaths.in file for MS-Windows build that uses the configure script. + + Since Emacs on Windows must be relocatable to any directory, it + cannot have here hard-coded directories determined at configure + time. Therefore, each directory must begin with %emacs_dir%, which + is resolved at startup to the root of the Emacs installation tree + (see w32.c:init_environment). + + This file is edited at configure time to replace @VER@ by the Emacs + version being built (e.g., 25.9.77), @CFG@ by the canonical name of + the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of + the Emacs source tree used to build Emacs. */ +/* +Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software +Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + + +/* Together with PATH_SITELOADSEARCH, this gives the default value of + load-path, which is the search path for the Lisp function "load". + Configure (using "make epaths-force") sets this to + ${standardlisppath}, which typically has a value like: + /emacs/VERSION/lisp:/emacs/VERSION/leim + where datadir is eg /usr/local/share. +*/ +#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim" + +/* Like PATH_LOADSEARCH, but contains the non-standard pieces. + These are the site-lisp directories, typically something like + /emacs/VERSION/site-lisp:/emacs/site-lisp + Configure prepends any $locallisppath, as set by the + --enable-locallisppath argument. + This is combined with PATH_LOADSEARCH to make the default load-path. + If the --no-site-lisp option is used, this piece is excluded. +*/ +#define PATH_SITELOADSEARCH "%emacs_dir%/share/emacs/@VER@/site-lisp;%emacs_dir%/share/emacs/site-lisp" + +/* Like PATH_LOADSEARCH, but used only during the build process + when Emacs is dumping. Configure (using "make epaths-force") sets + this to $buildlisppath, which normally has the value: /lisp. +*/ +#define PATH_DUMPLOADSEARCH "@SRC@/lisp" + +/* The extra search path for programs to invoke. This is appended to + whatever the PATH environment variable says to set the Lisp + variable exec-path and the first file name in it sets the Lisp + variable exec-directory. exec-directory is used for finding + executables and other architecture-dependent files. */ +#define PATH_EXEC "%emacs_dir%/libexec/emacs/@VER@/@CFG@" + +/* Where Emacs should look for its architecture-independent data + files, like the NEWS file. The lisp variable data-directory + is set to this value. */ +#define PATH_DATA "%emacs_dir%/share/emacs/@VER@/etc" + +/* Where Emacs should look for X bitmap files. + The lisp variable x-bitmap-file-path is set based on this value. */ +#define PATH_BITMAPS "" + +/* Where Emacs should look for its docstring file. The lisp variable + doc-directory is set to this value. */ +#define PATH_DOC "%emacs_dir%/share/emacs/@VER@/etc" + +/* Where the configuration process believes the info tree lives. The + lisp variable configure-info-directory gets its value from this + macro, and is then used to set the Info-default-directory-list. */ +#define PATH_INFO "%emacs_dir%/share/info" + +/* Where Emacs should store game score files. */ +#define PATH_GAME "%emacs_dir%/var/games/emacs" + +/* Where Emacs should look for the application default file. */ +#define PATH_X_DEFAULTS "" + === added file 'nt/gnulib.mk' --- nt/gnulib.mk 1970-01-01 00:00:00 +0000 +++ nt/gnulib.mk 2013-05-16 05:51:39 +0000 @@ -0,0 +1,902 @@ +## This file is an edited copy if ../lib/gnulib.mk. +## +## The purpose of the edits is to avoid generating any headers +## which would conflict with either the headers we have in nt/inc, +## or with MinGW system headers and subsequent redirection of some +## functions in nt/inc/ms-w32.h. +## +## In general, do NOT remove anything from ../lib/gnulib.mk that +## doesn't need to be removed, to minimize the differences from +## upstream gnulib.mk and thus make the maintenance easier. Every +## header file whose generation is controlled by configure-time tests +## does NOT need to be removed; instead, force the configure script to +## accept whatever MinGW has to offer, by defining the appropriate +## Autoconf variable in the nt/mingw-cfg.site file. Headers that are +## generated conditionally have the tell-tale "if GL_GENERATE_foo_H" +## condition before their Makefile snippet in this file. Likewise, do +## NOT remove gnulib modules which introduce header files that don't +## exist in MinGW and in nt/inc/, since they cannot possibly clash +## with anything. Gnulib modules that introduce source *.c files also +## need not be removed; if they define functions that could clash with +## the w32 substitutes in Emacs, disable their compilation by defining +## suitable variables in nt/mingw-cfg.site. +## +## Process this file with automake to produce Makefile.in. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings + + +MOSTLYCLEANFILES += core *.stackdump + +noinst_LIBRARIES += libgnu.a + +libgnu_a_SOURCES = +libgnu_a_LIBADD = $(gl_LIBOBJS) +libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +EXTRA_libgnu_a_SOURCES = + +## begin gnulib module alloca-opt + +BUILT_SOURCES += $(ALLOCA_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_ALLOCA_H +alloca.h: alloca.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(srcdir)/alloca.in.h; \ + } > $@-t && \ + mv -f $@-t $@ +else +alloca.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += alloca.h alloca.h-t + +EXTRA_DIST += alloca.in.h + +## end gnulib module alloca-opt + +## begin gnulib module c-ctype + +libgnu_a_SOURCES += c-ctype.h c-ctype.c + +## end gnulib module c-ctype + +## begin gnulib module c-strcase + +libgnu_a_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c + +## end gnulib module c-strcase + +## begin gnulib module close-stream + +libgnu_a_SOURCES += close-stream.c + +EXTRA_DIST += close-stream.h + +## end gnulib module close-stream + +## begin gnulib module crypto/md5 + +libgnu_a_SOURCES += md5.c + +EXTRA_DIST += md5.h + +## end gnulib module crypto/md5 + +## begin gnulib module crypto/sha1 + +libgnu_a_SOURCES += sha1.c + +EXTRA_DIST += sha1.h + +## end gnulib module crypto/sha1 + +## begin gnulib module crypto/sha256 + +libgnu_a_SOURCES += sha256.c + +EXTRA_DIST += sha256.h + +## end gnulib module crypto/sha256 + +## begin gnulib module crypto/sha512 + +libgnu_a_SOURCES += sha512.c + +EXTRA_DIST += sha512.h + +## end gnulib module crypto/sha512 + +## begin gnulib module dosname + +if gl_GNULIB_ENABLED_dosname + +endif +EXTRA_DIST += dosname.h + +## end gnulib module dosname + +## begin gnulib module dtoastr + +libgnu_a_SOURCES += dtoastr.c + +EXTRA_DIST += ftoastr.c ftoastr.h + +EXTRA_libgnu_a_SOURCES += ftoastr.c + +## end gnulib module dtoastr + +## begin gnulib module dtotimespec + +libgnu_a_SOURCES += dtotimespec.c + +## end gnulib module dtotimespec + +## begin gnulib module dup2 + + +EXTRA_DIST += dup2.c + +EXTRA_libgnu_a_SOURCES += dup2.c + +## end gnulib module dup2 + +## begin gnulib module errno + +BUILT_SOURCES += $(ERRNO_H) + +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +if GL_GENERATE_ERRNO_H +errno.h: errno.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ + -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ + -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ + -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ + -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ + -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ + -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ + < $(srcdir)/errno.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +errno.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += errno.h errno.h-t + +EXTRA_DIST += errno.in.h + +## end gnulib module errno + +## begin gnulib module euidaccess + +if gl_GNULIB_ENABLED_euidaccess + +endif +EXTRA_DIST += euidaccess.c + +EXTRA_libgnu_a_SOURCES += euidaccess.c + +## end gnulib module euidaccess + +## begin gnulib module execinfo + +BUILT_SOURCES += $(EXECINFO_H) + +# We need the following in order to create when the system +# doesn't have one that works. +if GL_GENERATE_EXECINFO_H +execinfo.h: execinfo.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(srcdir)/execinfo.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +execinfo.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += execinfo.h execinfo.h-t + +EXTRA_DIST += execinfo.c execinfo.in.h + +EXTRA_libgnu_a_SOURCES += execinfo.c + +## end gnulib module execinfo + +## begin gnulib module faccessat + + +EXTRA_DIST += at-func.c faccessat.c + +EXTRA_libgnu_a_SOURCES += at-func.c faccessat.c + +## end gnulib module faccessat + +## begin gnulib module fdatasync + + +EXTRA_DIST += fdatasync.c + +EXTRA_libgnu_a_SOURCES += fdatasync.c + +## end gnulib module fdatasync + +## begin gnulib module fdopendir + + +EXTRA_DIST += fdopendir.c + +EXTRA_libgnu_a_SOURCES += fdopendir.c + +## end gnulib module fdopendir + +## begin gnulib module filemode + +libgnu_a_SOURCES += filemode.c + +EXTRA_DIST += filemode.h + +## end gnulib module filemode + +## begin gnulib module fpending + + +EXTRA_DIST += fpending.c fpending.h + +EXTRA_libgnu_a_SOURCES += fpending.c + +## end gnulib module fpending + +## begin gnulib module fstatat + + +EXTRA_DIST += at-func.c fstatat.c + +EXTRA_libgnu_a_SOURCES += at-func.c fstatat.c + +## end gnulib module fstatat + +## begin gnulib module fsync + + +EXTRA_DIST += fsync.c + +EXTRA_libgnu_a_SOURCES += fsync.c + +## end gnulib module fsync + +## begin gnulib module getgroups + +if gl_GNULIB_ENABLED_getgroups + +endif +EXTRA_DIST += getgroups.c + +EXTRA_libgnu_a_SOURCES += getgroups.c + +## end gnulib module getgroups + +## begin gnulib module getloadavg + + +EXTRA_DIST += getloadavg.c + +EXTRA_libgnu_a_SOURCES += getloadavg.c + +## end gnulib module getloadavg + +## begin gnulib module getopt-posix + +BUILT_SOURCES += $(GETOPT_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + < $(srcdir)/getopt.in.h; \ + } > $@-t && \ + mv -f $@-t $@ +MOSTLYCLEANFILES += getopt.h getopt.h-t + +EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h + +EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c + +## end gnulib module getopt-posix + +## begin gnulib module gettext-h + +if gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36 +libgnu_a_SOURCES += gettext.h + +endif +## end gnulib module gettext-h + +## begin gnulib module gettime + +libgnu_a_SOURCES += gettime.c + +## end gnulib module gettime + +## begin gnulib module gettimeofday + + +EXTRA_DIST += gettimeofday.c + +EXTRA_libgnu_a_SOURCES += gettimeofday.c + +## end gnulib module gettimeofday + +## begin gnulib module group-member + +if gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1 + +endif +EXTRA_DIST += group-member.c + +EXTRA_libgnu_a_SOURCES += group-member.c + +## end gnulib module group-member + +## begin gnulib module ignore-value + + +EXTRA_DIST += ignore-value.h + +## end gnulib module ignore-value + +## begin gnulib module intprops + + +EXTRA_DIST += intprops.h + +## end gnulib module intprops + +## begin gnulib module lstat + + +EXTRA_DIST += lstat.c + +EXTRA_libgnu_a_SOURCES += lstat.c + +## end gnulib module lstat + +## begin gnulib module memrchr + + +EXTRA_DIST += memrchr.c + +EXTRA_libgnu_a_SOURCES += memrchr.c + +## end gnulib module memrchr + +## begin gnulib module mktime + + +EXTRA_DIST += mktime-internal.h mktime.c + +EXTRA_libgnu_a_SOURCES += mktime.c + +## end gnulib module mktime + +## begin gnulib module openat-h + +if gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7 + +endif +EXTRA_DIST += openat.h + +## end gnulib module openat-h + +## begin gnulib module pathmax + +if gl_GNULIB_ENABLED_pathmax + +endif +EXTRA_DIST += pathmax.h + +## end gnulib module pathmax + +## begin gnulib module pselect + + +EXTRA_DIST += pselect.c + +EXTRA_libgnu_a_SOURCES += pselect.c + +## end gnulib module pselect + +## begin gnulib module pthread_sigmask + + +EXTRA_DIST += pthread_sigmask.c + +EXTRA_libgnu_a_SOURCES += pthread_sigmask.c + +## end gnulib module pthread_sigmask + +## begin gnulib module putenv + + +EXTRA_DIST += putenv.c + +EXTRA_libgnu_a_SOURCES += putenv.c + +## end gnulib module putenv + +## begin gnulib module qacl + +libgnu_a_SOURCES += acl-errno-valid.c file-has-acl.c qcopy-acl.c + +EXTRA_DIST += acl-internal.h acl.h acl_entries.c + +EXTRA_libgnu_a_SOURCES += acl_entries.c + +## end gnulib module qacl + +## begin gnulib module readlink + + +EXTRA_DIST += readlink.c + +EXTRA_libgnu_a_SOURCES += readlink.c + +## end gnulib module readlink + +## begin gnulib module readlinkat + + +EXTRA_DIST += at-func.c readlinkat.c + +EXTRA_libgnu_a_SOURCES += at-func.c readlinkat.c + +## end gnulib module readlinkat + +## begin gnulib module root-uid + +if gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c + +endif +EXTRA_DIST += root-uid.h + +## end gnulib module root-uid + +## begin gnulib module sig2str + + +EXTRA_DIST += sig2str.c sig2str.h + +EXTRA_libgnu_a_SOURCES += sig2str.c + +## end gnulib module sig2str + +## begin gnulib module snippet/_Noreturn + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. + +_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h + +EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h + +## end gnulib module snippet/_Noreturn + +## begin gnulib module snippet/arg-nonnull + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +BUILT_SOURCES += arg-nonnull.h +# The arg-nonnull.h that gets inserted into generated .h files is the same as +# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +# off. +arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/GL_ARG_NONNULL/,$$p' \ + < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ + > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t + +ARG_NONNULL_H=arg-nonnull.h + +EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h + +## end gnulib module snippet/arg-nonnull + +## begin gnulib module snippet/c++defs + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +BUILT_SOURCES += c++defs.h +# The c++defs.h that gets inserted into generated .h files is the same as +# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/_GL_CXXDEFS/,$$p' \ + < $(top_srcdir)/build-aux/snippet/c++defs.h \ + > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += c++defs.h c++defs.h-t + +CXXDEFS_H=c++defs.h + +EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h + +## end gnulib module snippet/c++defs + +## begin gnulib module snippet/warn-on-use + +BUILT_SOURCES += warn-on-use.h +# The warn-on-use.h that gets inserted into generated .h files is the same as +# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +# off. +warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h + $(AM_V_GEN)rm -f $@-t $@ && \ + sed -n -e '/^.ifndef/,$$p' \ + < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ + > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t + +WARN_ON_USE_H=warn-on-use.h + +EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h + +## end gnulib module snippet/warn-on-use + +## begin gnulib module stat + +if gl_GNULIB_ENABLED_stat + +endif +EXTRA_DIST += stat.c + +EXTRA_libgnu_a_SOURCES += stat.c + +## end gnulib module stat + +## begin gnulib module stat-time + +libgnu_a_SOURCES += stat-time.c + +EXTRA_DIST += stat-time.h + +## end gnulib module stat-time + +## begin gnulib module stdalign + +BUILT_SOURCES += $(STDALIGN_H) + +# We need the following in order to create when the system +# doesn't have one that works. +if GL_GENERATE_STDALIGN_H +stdalign.h: stdalign.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(srcdir)/stdalign.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +stdalign.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdalign.h stdalign.h-t + +EXTRA_DIST += stdalign.in.h + +## end gnulib module stdalign + +## begin gnulib module stdarg + +BUILT_SOURCES += $(STDARG_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_STDARG_H +stdarg.h: stdarg.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ + < $(srcdir)/stdarg.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +stdarg.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdarg.h stdarg.h-t + +EXTRA_DIST += stdarg.in.h + +## end gnulib module stdarg + +## begin gnulib module stdbool + +BUILT_SOURCES += $(STDBOOL_H) + +# We need the following in order to create when the system +# doesn't have one that works. +if GL_GENERATE_STDBOOL_H +stdbool.h: stdbool.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +stdbool.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdbool.h stdbool.h-t + +EXTRA_DIST += stdbool.in.h + +## end gnulib module stdbool + +## begin gnulib module stddef + +BUILT_SOURCES += $(STDDEF_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_STDDEF_H +stddef.h: stddef.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ + -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ + -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ + < $(srcdir)/stddef.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +stddef.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stddef.h stddef.h-t + +EXTRA_DIST += stddef.in.h + +## end gnulib module stddef + +## begin gnulib module stdint + +BUILT_SOURCES += $(STDINT_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_STDINT_H +stdint.h: stdint.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ + -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ + -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ + -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ + -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ + -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ + -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ + -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ + -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ + -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ + -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ + -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ + -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +stdint.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdint.h stdint.h-t + +EXTRA_DIST += stdint.in.h + +## end gnulib module stdint + +## begin gnulib module strftime + +libgnu_a_SOURCES += strftime.c + +EXTRA_DIST += strftime.h + +## end gnulib module strftime + +## begin gnulib module strtoimax + + +EXTRA_DIST += strtoimax.c + +EXTRA_libgnu_a_SOURCES += strtoimax.c + +## end gnulib module strtoimax + +## begin gnulib module strtoll + +if gl_GNULIB_ENABLED_strtoll + +endif +EXTRA_DIST += strtol.c strtoll.c + +EXTRA_libgnu_a_SOURCES += strtol.c strtoll.c + +## end gnulib module strtoll + +## begin gnulib module strtoull + +if gl_GNULIB_ENABLED_strtoull + +endif +EXTRA_DIST += strtol.c strtoul.c strtoull.c + +EXTRA_libgnu_a_SOURCES += strtol.c strtoul.c strtoull.c + +## end gnulib module strtoull + +## begin gnulib module strtoumax + + +EXTRA_DIST += strtoimax.c strtoumax.c + +EXTRA_libgnu_a_SOURCES += strtoimax.c strtoumax.c + +## end gnulib module strtoumax + +## begin gnulib module symlink + + +EXTRA_DIST += symlink.c + +EXTRA_libgnu_a_SOURCES += symlink.c + +## end gnulib module symlink + +## begin gnulib module time_r + + +EXTRA_DIST += time_r.c + +EXTRA_libgnu_a_SOURCES += time_r.c + +## end gnulib module time_r + +## begin gnulib module timespec + +libgnu_a_SOURCES += timespec.c + +EXTRA_DIST += timespec.h + +## end gnulib module timespec + +## begin gnulib module timespec-add + +libgnu_a_SOURCES += timespec-add.c + +## end gnulib module timespec-add + +## begin gnulib module timespec-sub + +libgnu_a_SOURCES += timespec-sub.c + +## end gnulib module timespec-sub + +## begin gnulib module u64 + +libgnu_a_SOURCES += u64.c + +EXTRA_DIST += u64.h + +## end gnulib module u64 + +## begin gnulib module unsetenv + + +EXTRA_DIST += unsetenv.c + +EXTRA_libgnu_a_SOURCES += unsetenv.c + +## end gnulib module unsetenv + +## begin gnulib module utimens + +libgnu_a_SOURCES += utimens.c + +EXTRA_DIST += utimens.h + +## end gnulib module utimens + +## begin gnulib module verify + +if gl_GNULIB_ENABLED_verify + +endif +EXTRA_DIST += verify.h + +## end gnulib module verify + +## begin gnulib module xalloc-oversized + +if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec + +endif +EXTRA_DIST += xalloc-oversized.h + +## end gnulib module xalloc-oversized + + +mostlyclean-local: mostlyclean-generic + @for dir in '' $(MOSTLYCLEANDIRS); do \ + if test -n "$$dir" && test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done; \ + : === modified file 'nt/inc/ms-w32.h' --- nt/inc/ms-w32.h 2013-05-07 21:34:03 +0000 +++ nt/inc/ms-w32.h 2013-05-15 17:06:26 +0000 @@ -67,7 +67,9 @@ #endif #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) -#define HAVE___BUILTIN_UNWIND_INIT 1 +# ifndef HAVE___BUILTIN_UNWIND_INIT +# define HAVE___BUILTIN_UNWIND_INIT 1 +# endif #endif /* This isn't perfect, as some systems might have the page file in @@ -99,8 +101,12 @@ #endif #ifdef __GNUC__ -# define restrict __restrict__ +/* config.h may have defined already. */ +# ifndef restrict +# define restrict __restrict__ +# endif #else + /* FIXME: should we define to __restrict, which MSVC supports? */ # define restrict #endif @@ -138,9 +144,6 @@ /* Make a leaner executable. */ #define WIN32_LEAN_AND_MEAN 1 -#ifdef HAVE_STRINGS_H -#include "strings.h" -#endif #include #ifndef MAXPATHLEN @@ -148,8 +151,12 @@ #endif #ifdef HAVE_NTGUI -#define HAVE_WINDOW_SYSTEM 1 -#define HAVE_MENUS 1 +# ifndef HAVE_WINDOW_SYSTEM +# define HAVE_WINDOW_SYSTEM 1 +# endif +# ifndef HAVE_MENUS +# define HAVE_MENUS 1 +# endif #endif /* Get some redefinitions in place. */ @@ -248,9 +255,6 @@ #define execvp _execvp #define fdatasync _commit #define fdopen _fdopen -#ifndef fileno -#define fileno _fileno -#endif #define fsync _commit #define ftruncate _chsize #define getpid _getpid @@ -266,9 +270,6 @@ #define popen _popen #define pclose _pclose #define umask _umask -#ifndef _MSC_VER -#define utimbuf _utimbuf -#endif #define strdup _strdup #define strupr _strupr #define strnicmp _strnicmp @@ -285,10 +286,6 @@ array, and triggers an error message. */ #include #define tzname _tzname -#if !defined (_MSC_VER) || (_MSC_VER < 1400) -#undef utime -#define utime _utime -#endif /* 'struct timespec' is used by time-related functions in lib/ and elsewhere, but we don't use lib/time.h where the structure is @@ -327,6 +324,9 @@ #include #include #endif /* !_MSC_VER */ +#ifndef fileno +#define fileno _fileno +#endif /* Defines that we need that aren't in the standard signal.h. */ #define SIGHUP 1 /* Hang up */ @@ -346,20 +346,21 @@ #define ENOTSUP ENOSYS #endif -/* WINDOWSNT doesn't define EOPNOTSUPP, and we don't have - 'configure' working yet so we can't rely on the Gnulib replacement - errno.h defining EOPNOTSUPP. Work around the problem by defining - it here. */ +/* In case lib/errno.h is not used. */ +#ifndef EOPNOTSUPP #define EOPNOTSUPP 130 +#endif #ifdef _MSC_VER typedef int sigset_t; typedef int ssize_t; #endif -#ifndef _POSIX /* MinGW64 */ +#ifdef _W64 /* MinGW64 */ +#ifndef _POSIX typedef _sigset_t sigset_t; #endif +#endif typedef void (_CALLBACK_ *signal_handler) (int); extern signal_handler sys_signal (int, signal_handler); @@ -395,10 +396,12 @@ #define getdefdir(_drv, _buf) _getdcwd (_drv, _buf, MAXPATHLEN) #endif +#ifndef EMACS_CONFIGURATION extern char *get_emacs_configuration (void); extern char *get_emacs_configuration_options (void); #define EMACS_CONFIGURATION get_emacs_configuration () #define EMACS_CONFIG_OPTIONS get_emacs_configuration_options () +#endif /* Define this so that winsock.h definitions don't get included with windows.h. For this to have proper effect, config.h must always be @@ -452,10 +455,14 @@ #if defined (__MINGW32__) /* Define to 1 if the system has the type `long long int'. */ -# define HAVE_LONG_LONG_INT 1 +# ifndef HAVE_LONG_LONG_INT +# define HAVE_LONG_LONG_INT 1 +# endif /* Define to 1 if the system has the type `unsigned long long int'. */ -# define HAVE_UNSIGNED_LONG_LONG_INT 1 +# ifndef HAVE_UNSIGNED_LONG_LONG_INT +# define HAVE_UNSIGNED_LONG_LONG_INT 1 +# endif #endif === modified file 'nt/inc/sys/socket.h' --- nt/inc/sys/socket.h 2013-01-02 16:13:04 +0000 +++ nt/inc/sys/socket.h 2013-03-28 18:13:59 +0000 @@ -43,8 +43,9 @@ #undef FD_ZERO #endif -/* avoid duplicate definition of timeval */ -#ifdef HAVE_TIMEVAL +/* Avoid duplicate definition of timeval. MinGW uses _TIMEVAL_DEFINED + in sys/time.h to avoid that. */ +#if defined (HAVE_TIMEVAL) && defined (_MSC_VER) #define timeval ws_timeval #endif @@ -62,7 +63,9 @@ #undef MUST_REDEF_SELECT #endif -/* revert to our version of FD_SET */ +/* Revert to our version of FD_SET, but not when included from test + programs run by configure. */ +#ifdef EMACS_CONFIG_H #undef FD_SET #undef FD_CLR #undef FD_ISSET @@ -71,8 +74,9 @@ /* allow us to provide our own version of fd_set */ #define fd_set ws_fd_set #include "w32.h" +#endif /* EMACS_CONFIG_H */ -#ifdef HAVE_TIMEVAL +#if defined (HAVE_TIMEVAL) && defined (_MSC_VER) #undef timeval #endif === modified file 'nt/inc/sys/stat.h' --- nt/inc/sys/stat.h 2013-03-26 13:45:01 +0000 +++ nt/inc/sys/stat.h 2013-04-01 16:28:53 +0000 @@ -83,6 +83,9 @@ #define S_TYPEISSHM(p) 0 #define S_TYPEISTMO(p) 0 +#define UTIME_NOW (-1) +#define UTIME_OMIT (-2) + struct stat { unsigned __int64 st_ino; /* ino_t in sys/types.h is too narrow */ dev_t st_dev; @@ -99,6 +102,39 @@ char st_gname[260]; }; +/* These are here to avoid compiler warnings when using wchar.h. */ +struct _stat +{ + _dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */ + _ino_t st_ino; /* Always zero ? */ + _mode_t st_mode; /* See above constants */ + short st_nlink; /* Number of links. */ + short st_uid; /* User: Maybe significant on NT ? */ + short st_gid; /* Group: Ditto */ + _dev_t st_rdev; /* Seems useless (not even filled in) */ + _off_t st_size; /* File size in bytes */ + time_t st_atime; /* Accessed date (always 00:00 hrs local + * on FAT) */ + time_t st_mtime; /* Modified time */ + time_t st_ctime; /* Creation time */ +}; + +#if defined (__MSVCRT__) +struct _stati64 { + _dev_t st_dev; + _ino_t st_ino; + _mode_t st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +}; +#endif + /* Internal variable for asking 'stat'/'lstat' to produce accurate info about owner and group of files. */ extern int w32_stat_get_owner_group; === modified file 'nt/inc/sys/time.h' --- nt/inc/sys/time.h 2013-03-26 08:21:27 +0000 +++ nt/inc/sys/time.h 2013-03-28 20:51:26 +0000 @@ -9,12 +9,23 @@ /* The guards are for MinGW64, which defines these structs on its system headers which are included by ms-w32.h. */ #ifndef _W64 +/* Allow inclusion of sys/time.h and winsock2.h in any order. Needed + for running the configure test, which is only relevant to MinGW. */ +#ifndef _TIMEVAL_DEFINED +#define _TIMEVAL_DEFINED struct timeval { long tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; -#endif +#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) +#define timercmp(tvp, uvp, cmp) \ + (((tvp)->tv_sec != (uvp)->tv_sec) ? \ + ((tvp)->tv_sec cmp (uvp)->tv_sec) : \ + ((tvp)->tv_usec cmp (uvp)->tv_usec)) +#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 +#endif /* _TIMEVAL_DEFINED */ +#endif /* _W64 */ #ifndef _TIMEZONE_DEFINED struct timezone @@ -24,7 +35,10 @@ }; #endif -void gettimeofday (struct timeval *, struct timezone *); +/* This needs to be compatible with Posix signature, in order to pass + the configure test for the type of the second argument. See + m4/gettimeofday.m4. */ +int gettimeofday (struct timeval *restrict, struct timezone *restrict); #define ITIMER_REAL 0 #define ITIMER_PROF 1 === modified file 'nt/inc/unistd.h' --- nt/inc/unistd.h 2013-03-05 22:35:41 +0000 +++ nt/inc/unistd.h 2013-03-28 18:13:59 +0000 @@ -3,6 +3,9 @@ #ifndef _UNISTD_H #define _UNISTD_H +#include +#include + /* On Microsoft platforms, declares 'environ'; on POSIX platforms, does. Every file in Emacs that includes also includes , so there's no need to declare === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2013-05-15 20:12:53 +0000 +++ nt/makefile.w32-in 2013-05-16 09:58:56 +0000 @@ -29,6 +29,8 @@ TRES = $(BLD)/emacs.res CLIENTRES = $(BLD)/emacsclient.res +LOCAL_FLAGS = -DOLD_PATHS=1 + XMFLAGS = ALL = $(BLD)/addpm.exe $(BLD)/ddeclient.exe $(BLD)/runemacs.exe \ === added file 'nt/mingw-cfg.site' --- nt/mingw-cfg.site 1970-01-01 00:00:00 +0000 +++ nt/mingw-cfg.site 2013-05-16 09:44:44 +0000 @@ -0,0 +1,106 @@ +#! /bin/sh +# Site defaults for the MinGW configuration of GNU Emacs. +# +# This file's purpose is to short-circuit configure-time tests for +# which we want to provide the results instead of letting the +# 'configure' script do that. This is mainly for features that +# 'configure' tests that are implemented as part of Emacs sources, not +# as part of system libraries. The idea is to set shell variables +# that appear to the script as cached values. +# +# For each header file foo.h you want to supply test results, set the +# value of a shell variable ac_cv_header_foo_h. The value should be +# yes if the header is deemed to exist, no otherwise. Or it could be +# something else, if the value computed by 'configure' requires that. +# In general, since nt/msysconfig.sh instructs GCC to use header files +# in nt/inc, you should not need to futz with header file tests. But +# there are exceptions, like with getopt.h below (which is a MinGW +# system header, but we do not want to use it). +# +# For each library function foo you want to supply test results, set +# the value of a shell variable ac_cv_func_foo. Again, the value is +# determined by what 'configure' expects; sometimes it could be "not +# needed" or whatever, see the examples below. In addition, you may +# need to set the various gl_cv_* variables for those tests that come +# from gnulib. +# +# In short, examine the test in 'configure' and push the knobs that +# are necessary to steer the test in the direction you need, by +# judicioulsy setting variables that control the test results. + +# We want to use getopt.h from gnulib +ac_cv_header_getopt_h=no + +# ACL functions are implemented in w32.c +ac_cv_search_acl_get_file="none required" +ac_cv_func_acl_get_file=yes +ac_cv_func_acl_set_file=yes +ac_cv_func_acl_free=yes +ac_cv_func_acl_from_text=yes +gl_cv_func_working_acl_get_file=yes +# Autoconf's test program is not smart enough, and fails to detect gethostname +ac_cv_func_gethostname=yes +# Implemented as sys_select in w32proc.c +ac_cv_func_select=yes +ac_cv_func_pselect=yes +gl_cv_sig_pselect=yes +gl_cv_func_pselect_detects_ebadf=yes +# Implemented as sys_shutdown in w32.c +ac_cv_func_shutdown=yes +# Implemented in w32proc.c +ac_cv_func_setitimer=yes +# Implemented as sys_sendto in w32.c +ac_cv_func_sendto=yes +# Implemented as sys_recvfrom in w32.c +ac_cv_func_recvfrom=yes +# Implemented as sys_getsockname in w32.c +ac_cv_func_getsockname=yes +# Implemented as sys_getpeername in w32.c +ac_cv_func_getpeername=yes +# Implemented as sys_socket in w32.c +ac_cv_func_socket=yes +# Implemented in w32.c +ac_cv_func_readlink=yes +ac_cv_func_symlink=yes +# Avoid run-time tests of readlink and symlink, which will fail +gl_cv_func_readlink_works=yes +gl_cv_func_symlink_works=yes +ac_cv_func_readlinkat=yes +ac_cv_func_faccessat=yes +# We don't need fdopendir +ac_cv_func_fdopendir="not-needed" +gl_cv_func_fdopendir_works="no-but-not-needed-so-yes" +# Implemented in w32.c +ac_cv_func_lstat=yes +gl_cv_func_lstat_dereferences_slashed_symlink=yes +ac_cv_func_fstatat=yes +gl_cv_func_fstatat_zero_flag=yes +# Aliased to _commit in ms-w32.h +ac_cv_func_fsync=yes +ac_cv_func_fdatasync=yes +# Implemented in w32proc.c +ac_cv_func_pthread_sigmask=yes +# Avoid gnulib replacement +gl_threads_api=posix +gl_cv_func_pthread_sigmask_return_works=yes +gl_cv_func_pthread_sigmask_unblock_works="not relevant" +# Implemented in w32proc.c +emacs_cv_langinfo_codeset=yes +# Declared in ms-w32.h +ac_cv_have_decl_alarm=yes +# Avoid including the gnulib dup2 module +gl_cv_func_dup2_works=yes +# Defined in w32.c +ac_cv_func_getloadavg=yes +# Avoid compiling gnulib mktime +gl_cv_func_working_mktime=yes +# Implemented in w32.c +ac_cv_have_decl_unsetenv=yes +ac_cv_func_unsetenv=yes +gt_cv_func_unsetenv_ret='int' +gl_cv_func_unsetenv_works=yes +gl_cv_func_stat_dir_slash=yes +gl_cv_func_stat_file_slash=yes +ac_cv_func_random=yes +# Implemented in w32.c as sys_putenv +gl_cv_func_svid_putenv=yes === added file 'nt/msysconfig.sh' --- nt/msysconfig.sh 1970-01-01 00:00:00 +0000 +++ nt/msysconfig.sh 2013-05-16 09:44:44 +0000 @@ -0,0 +1,39 @@ +#! /bin/sh +### msysconfig.sh - Run the top-level 'configure' script as approriate +### for the MinGW/MSYS build of a native MS-Windows port of Emacs. + +## Copyright (C) 2013 Free Software Foundation, Inc. + +## Author: Eli Zaretskii + +## This file is part of GNU Emacs. + +## GNU Emacs is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. + +## GNU Emacs is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with GNU Emacs. If not, see . + +### Commentary: + +## The Posix 'configure' script needs a few tweaks to produce desired +## results when running under MSYS with the purpose of configuring +## Emacs for the MinGW MS-Windows build. Rather than asking users to +## type these tweaks every time they configure the package, we provide +## this helper script which takes care of the mundane things. + +### Code: + +srcdir=`dirname "$0"` +parent=`dirname "$srcdir"` + +## The nt/mingw-cfg.site file provides various autoconf variables that +## are needed for a successful MinGW build. +CONFIG_SITE="$srcdir/mingw-cfg.site" $parent/configure "$@" === modified file 'src/ChangeLog' --- src/ChangeLog 2013-05-15 20:12:53 +0000 +++ src/ChangeLog 2013-05-16 12:48:54 +0000 @@ -1,3 +1,27 @@ +2013-05-16 Eli Zaretskii + + * w32.c: Include epaths.h. + (init_environment): Use cmdproxy.exe without leading directories. + Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that + case. + (gettimeofday): Adjust signature and return value to Posix + expectations. + + * unexw32.c (open_output_file): Delete the existing emacs.exe + before creating it, to break the hard link to the versioned + executable. + + * Makefile.in (EMACS_MANIFEST, CM_OBJ, TEMACS_POST_LINK) + (ADDSECTION, EMACS_HEAPSIZE, MINGW_TEMACS_POST_LINK) + (FIRSTFILE_OBJ): New variables. + (W32_RES): Rename to EMACSRES. All users changed. + (base_obj): Use $(CM_OBJ). + (ALLOBJS): Use $(FIRSTFILE_OBJ). + (emacs$(EXEEXT)): Depend on $(ADDSECTION). + (temacs$(EXEEXT)): Use $(TEMACS_POST_LINK), and move + $(W32_RES_LINK) before $(LIBES). + (emacs.res): Depend on $(EMACS_MANIFEST). Put emacs.rc in nt. + 2013-05-15 Stefan Monnier * makefile.w32-in (DOC): Use just "DOC". === modified file 'src/Makefile.in' --- src/Makefile.in 2013-05-15 20:12:53 +0000 +++ src/Makefile.in 2013-05-16 09:58:56 +0000 @@ -267,10 +267,13 @@ W32_LIBS=@W32_LIBS@ ## emacs.res if HAVE_W32 -W32_RES=@W32_RES@ +EMACSRES = @EMACSRES@ +## emacs-*.manifest if HAVE_W32 +EMACS_MANIFEST = @EMACS_MANIFEST@ ## If HAVE_W32, compiler arguments for including ## the resource file in the binary. -## XXX -Wl,-b -Wl,pe-i386 -Wl,emacs.res +## Cygwin: -Wl,emacs.res +## MinGW: emacs.res W32_RES_LINK=@W32_RES_LINK@ ## Empty if !HAVE_X_WINDOWS @@ -279,6 +282,9 @@ ## else xfont.o FONT_OBJ=@FONT_OBJ@ +## Empty for MinGW, cm.o for the rest. +CM_OBJ=@CM_OBJ@ + LIBGPM = @LIBGPM@ ## -lresolv, or empty. @@ -297,6 +303,14 @@ RUN_TEMACS = `/bin/pwd`/temacs +## Invoke ../nt/addsection for MinGW, ":" elsewhere. +TEMACS_POST_LINK = @TEMACS_POST_LINK@ +ADDSECTION = @ADDSECTION@ +EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ +MINGW_TEMACS_POST_LINK = \ + mv temacs$(EXEEXT) temacs.tmp; \ + ../nt/addsection temacs.tmp temacs$(EXEEXT) EMHEAP $(EMACS_HEAPSIZE) + UNEXEC_OBJ = @UNEXEC_OBJ@ CANNOT_DUMP=@CANNOT_DUMP@ @@ -339,7 +353,7 @@ ## be dumped as pure by dump-emacs. base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ - cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ + $(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ minibuf.o fileio.o dired.o \ @@ -377,9 +391,9 @@ ## ralloc.o if !SYSTEM_MALLOC && REL_ALLOC, else empty. RALLOC_OBJ=@RALLOC_OBJ@ -## Empty on Cygwin, lastfile.o elsewhere. +## Empty on Cygwin and MinGW, lastfile.o elsewhere. PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ -## lastfile.o on Cygwin, empty elsewhere. +## lastfile.o on Cygwin and MinGW, empty elsewhere. POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ ## List of object files that make-docfile should not be told about. @@ -387,7 +401,9 @@ $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) ## All object files linked into temacs. $(VMLIMIT_OBJ) should be first. -ALLOBJS = $(VMLIMIT_OBJ) $(obj) $(otherobj) +## (On MinGW, firstfile.o should be before vm-limit.o.) +FIRSTFILE_OBJ=@FIRSTFILE_OBJ@ +ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) ## Configure inserts the file lisp.mk at this point, defining $lisp. @lisp_frag@ @@ -416,7 +432,8 @@ ## Strictly speaking, emacs does not depend directly on all of $lisp, ## since not all pieces are used on all platforms. But DOC depends ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. -emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el +emacs$(EXEEXT): temacs$(EXEEXT) $(ADDSECTION) \ + $(etc)/DOC $(lisp) $(leimdir)/leim-list.el if test "$(CANNOT_DUMP)" = "yes"; then \ rm -f emacs$(EXEEXT); \ ln temacs$(EXEEXT) emacs$(EXEEXT); \ @@ -468,10 +485,10 @@ cd $(lib) && $(MAKE) libgnu.a temacs$(EXEEXT): stamp-oldxmenu $(ALLOBJS) \ - $(lib)/libgnu.a $(W32_RES) + $(lib)/libgnu.a $(EMACSRES) $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ - -o temacs $(ALLOBJS) $(lib)/libgnu.a $(LIBES) \ - $(W32_RES_LINK) + -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) + $(TEMACS_POST_LINK) test "$(CANNOT_DUMP)" = "yes" || \ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) @@ -514,8 +531,9 @@ emacs.res: $(ntsource)/emacs.rc \ $(ntsource)/icons/emacs.ico \ - $(ntsource)/emacs-x86.manifest - $(WINDRES) -O COFF -o $@ $(ntsource)/emacs.rc + $(ntsource)/$(EMACS_MANIFEST) + $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \ + -o $@ $(ntsource)/emacs.rc ns-app: emacs$(EXEEXT) cd ../nextstep && $(MAKE) $(MFLAGS) all === modified file 'src/unexw32.c' --- src/unexw32.c 2013-02-02 17:14:24 +0000 +++ src/unexw32.c 2013-04-16 18:08:03 +0000 @@ -159,6 +159,14 @@ HANDLE file_mapping; void *file_base; + /* We delete any existing FILENAME because loadup.el will create a + hard link to it under the name emacs-XX.YY.ZZ.nn.exe. Evidently, + overwriting a file on Unix breaks any hard links to it, but that + doesn't happen on Windows. If we don't delete the file before + creating it, all the emacs-XX.YY.ZZ.nn.exe end up being hard + links to the same file, which defeats the purpose of these hard + links: being able to run previous builds. */ + DeleteFile (filename); file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); if (file == INVALID_HANDLE_VALUE) === modified file 'src/w32.c' --- src/w32.c 2013-03-27 12:01:31 +0000 +++ src/w32.c 2013-04-15 13:39:41 +0000 @@ -65,6 +65,7 @@ #undef localtime #include "lisp.h" +#include "epaths.h" /* for SHELL */ #include #include @@ -2018,7 +2019,7 @@ {"PRELOAD_WINSOCK", NULL}, {"emacs_dir", "C:/emacs"}, {"EMACSLOADPATH", NULL}, - {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"}, + {"SHELL", "cmdproxy.exe"}, /* perhaps it is somewhere on PATH */ {"EMACSDATA", NULL}, {"EMACSPATH", NULL}, {"INFOPATH", NULL}, @@ -2094,9 +2095,12 @@ emacs_abort (); *p = 0; - if ((p = _mbsrchr (modname, '\\')) && xstrcasecmp (p, "\\bin") == 0) + if ((p = _mbsrchr (modname, '\\')) + /* From bin means installed Emacs, from src means uninstalled. */ + && (xstrcasecmp (p, "\\bin") == 0 || xstrcasecmp (p, "\\src") == 0)) { char buf[SET_ENV_BUF_SIZE]; + int within_build_tree = xstrcasecmp (p, "\\src") == 0; *p = 0; for (p = modname; *p; p = CharNext (p)) @@ -2104,6 +2108,15 @@ _snprintf (buf, sizeof (buf)-1, "emacs_dir=%s", modname); _putenv (strdup (buf)); + /* If we are running from the Posix-like build tree, define + SHELL to point to our own cmdproxy. The loop below will + then disregard PATH_EXEC and the default value. */ + if (within_build_tree) + { + _snprintf (buf, sizeof (buf) - 1, + "SHELL=%s/nt/cmdproxy.exe", modname); + _putenv (strdup (buf)); + } } /* Handle running emacs from the build directory: src/oo-spd/i386/ */ @@ -2139,16 +2152,60 @@ if (!getenv (env_vars[i].name)) { int dont_free = 0; + char bufc[SET_ENV_BUF_SIZE]; if ((lpval = w32_get_resource (env_vars[i].name, &dwType)) == NULL /* Also ignore empty environment variables. */ || *lpval == 0) { xfree (lpval); - lpval = env_vars[i].def_value; - dwType = REG_EXPAND_SZ; dont_free = 1; - if (!strcmp (env_vars[i].name, "HOME") && !appdata) + if (strcmp (env_vars[i].name, "SHELL") == 0) + { + /* Look for cmdproxy.exe in every directory in + PATH_EXEC. FIXME: This does not find cmdproxy + in nt/ when we run uninstalled. */ + char fname[MAX_PATH]; + const char *pstart = PATH_EXEC, *pend; + + do { + pend = _mbschr (pstart, ';'); + if (!pend) + pend = pstart + strlen (pstart); + /* Be defensive against series of ;;; characters. */ + if (pend > pstart) + { + strncpy (fname, pstart, pend - pstart); + fname[pend - pstart] = '/'; + strcpy (&fname[pend - pstart + 1], "cmdproxy.exe"); + ExpandEnvironmentStrings ((LPSTR) fname, bufc, + sizeof (bufc)); + if (check_existing (bufc)) + { + lpval = bufc; + dwType = REG_SZ; + break; + } + } + if (*pend) + pstart = pend + 1; + else + pstart = pend; + if (!*pstart) + { + /* If not found in any directory, use the + default as the last resort. */ + lpval = env_vars[i].def_value; + dwType = REG_EXPAND_SZ; + } + } while (*pstart); + } + else + { + lpval = env_vars[i].def_value; + dwType = REG_EXPAND_SZ; + } + if (strcmp (env_vars[i].name, "HOME") == 0 && !appdata) Vdelayed_warnings_list = Fcons (listn (CONSTYPE_HEAP, 2, intern ("initialization"), @@ -2394,8 +2451,8 @@ #include /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */ -void -gettimeofday (struct timeval *tv, struct timezone *tz) +int +gettimeofday (struct timeval *restrict tv, struct timezone *restrict tz) { struct _timeb tb; _ftime (&tb); @@ -2413,6 +2470,7 @@ tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */ tz->tz_dsttime = tb.dstflag; /* type of dst correction */ } + return 0; } /* Emulate fdutimens. */ ------------------------------------------------------------ revno: 112605 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-05-16 13:37:55 +0300 message: Add lib/errno.h to .bzrignore. diff: === modified file '.bzrignore' --- .bzrignore 2013-05-15 20:12:53 +0000 +++ .bzrignore 2013-05-16 10:37:55 +0000 @@ -92,6 +92,7 @@ lib/arg-nonnull.h lib/c++defs.h lib/dirent.h +lib/errno.h lib/execinfo.h lib/fcntl.h lib/getopt.h ------------------------------------------------------------ revno: 112604 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-05-16 06:17:34 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-05-13 10:17:36 +0000 +++ autogen/configure 2013-05-16 10:17:34 +0000 @@ -7445,14 +7445,51 @@ nw="$nw -Wwrite-strings" ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5 +$as_echo_n "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; } +if test "${gl_cv_warn_c__Werror__Wunknown_warning_option+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Werror__Wunknown_warning_option=yes +else + gl_cv_warn_c__Werror__Wunknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5 +$as_echo "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; } +if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = x""yes; then : + gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror' +else + gl_unknown_warnings_are_errors= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 $as_echo_n "checking whether C compiler handles -Werror... " >&6; } if test "${gl_cv_warn_c__Werror+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Werror" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7635,6 +7672,7 @@ -W \ -Wabi \ -Waddress \ + -Waggressive-loop-optimizations \ -Wall \ -Warray-bounds \ -Wattributes \ @@ -7662,7 +7700,6 @@ -Wformat-security \ -Wformat-y2k \ -Wformat-zero-length \ - -Wformat=2 \ -Wfree-nonheap-object \ -Wignored-qualifiers \ -Wimplicit \ @@ -7680,9 +7717,7 @@ -Wmissing-braces \ -Wmissing-declarations \ -Wmissing-field-initializers \ - -Wmissing-format-attribute \ -Wmissing-include-dirs \ - -Wmissing-noreturn \ -Wmissing-parameter-type \ -Wmissing-prototypes \ -Wmudflap \ @@ -7703,6 +7738,7 @@ -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-local-addr \ -Wreturn-type \ -Wsequence-point \ -Wshadow \ @@ -7724,7 +7760,6 @@ -Wtype-limits \ -Wuninitialized \ -Wunknown-pragmas \ - -Wunreachable-code \ -Wunsafe-loop-optimizations \ -Wunused \ -Wunused-but-set-parameter \ @@ -7775,7 +7810,8 @@ ws=$gl_warn_set for w in $ws; do - as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh` + +as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5 $as_echo_n "checking whether C compiler handles $w... " >&6; } if { as_var=$as_gl_Warn; eval "test \"\${$as_var+set}\" = set"; }; then : @@ -7783,7 +7819,7 @@ else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $w" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $w" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7814,14 +7850,15 @@ done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-missing-field-initializers" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-missing-field-initializers" >&5 $as_echo_n "checking whether C compiler handles -Wno-missing-field-initializers... " >&6; } if test "${gl_cv_warn_c__Wno_missing_field_initializers+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-missing-field-initializers" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-missing-field-initializers" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7849,14 +7886,15 @@ fi # We need this one - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5 $as_echo_n "checking whether C compiler handles -Wno-sign-compare... " >&6; } if test "${gl_cv_warn_c__Wno_sign_compare+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-sign-compare" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-sign-compare" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7884,14 +7922,15 @@ fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-type-limits" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-type-limits" >&5 $as_echo_n "checking whether C compiler handles -Wno-type-limits... " >&6; } if test "${gl_cv_warn_c__Wno_type_limits+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-type-limits" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-type-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7919,14 +7958,15 @@ fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-switch" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-switch" >&5 $as_echo_n "checking whether C compiler handles -Wno-switch... " >&6; } if test "${gl_cv_warn_c__Wno_switch+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-switch" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-switch" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7954,14 +7994,15 @@ fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5 $as_echo_n "checking whether C compiler handles -Wno-unused-parameter... " >&6; } if test "${gl_cv_warn_c__Wno_unused_parameter+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-unused-parameter" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-parameter" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7989,14 +8030,15 @@ fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5 $as_echo_n "checking whether C compiler handles -Wno-format-nonliteral... " >&6; } if test "${gl_cv_warn_c__Wno_format_nonliteral+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-format-nonliteral" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-nonliteral" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8027,14 +8069,15 @@ # In spite of excluding -Wlogical-op above, it is enabled, as of # gcc 4.5.0 20090517. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-logical-op" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-logical-op" >&5 $as_echo_n "checking whether C compiler handles -Wno-logical-op... " >&6; } if test "${gl_cv_warn_c__Wno_logical_op+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-logical-op" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-logical-op" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8063,14 +8106,15 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5 $as_echo_n "checking whether C compiler handles -fdiagnostics-show-option... " >&6; } if test "${gl_cv_warn_c__fdiagnostics_show_option+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -fdiagnostics-show-option" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-show-option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8098,14 +8142,15 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5 $as_echo_n "checking whether C compiler handles -funit-at-a-time... " >&6; } if test "${gl_cv_warn_c__funit_at_a_time+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -funit-at-a-time" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -funit-at-a-time" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ------------------------------------------------------------ revno: 112603 committer: Leo Liu branch nick: trunk timestamp: Thu 2013-05-16 16:52:02 +0800 message: * progmodes/octave.el (octave-indent-defun): Mark obsolete. (octave-mode-menu, octave-mode-map): Remove its uses. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 07:56:46 +0000 +++ lisp/ChangeLog 2013-05-16 08:52:02 +0000 @@ -1,3 +1,8 @@ +2013-05-16 Leo Liu + + * progmodes/octave.el (octave-indent-defun): Mark obsolete. + (octave-mode-menu, octave-mode-map): Remove its uses. + 2013-05-16 Reto Zimmermann Sync with upstream vhdl mode v3.34.2. === modified file 'lisp/progmodes/octave.el' --- lisp/progmodes/octave.el 2013-05-15 08:17:22 +0000 +++ lisp/progmodes/octave.el 2013-05-16 08:52:02 +0000 @@ -98,8 +98,6 @@ (let ((map (make-sparse-keymap))) (define-key map "\M-." 'octave-find-definition) (define-key map "\M-\C-j" 'octave-indent-new-comment-line) - ;; C-c C-q is also used by cc modes for similar command - (define-key map "\C-c\C-q" 'octave-indent-defun) (define-key map "\C-c\C-p" 'octave-previous-code-line) (define-key map "\C-c\C-n" 'octave-next-code-line) (define-key map "\C-c\C-a" 'octave-beginning-of-line) @@ -134,27 +132,26 @@ "Menu for Octave mode." '("Octave" ("Lines" - ["Previous Code Line" octave-previous-code-line t] - ["Next Code Line" octave-next-code-line t] - ["Begin of Continuation" octave-beginning-of-line t] - ["End of Continuation" octave-end-of-line t] - ["Split Line at Point" octave-indent-new-comment-line t]) + ["Previous Code Line" octave-previous-code-line t] + ["Next Code Line" octave-next-code-line t] + ["Begin of Continuation" octave-beginning-of-line t] + ["End of Continuation" octave-end-of-line t] + ["Split Line at Point" octave-indent-new-comment-line t]) ("Blocks" - ["Mark Block" octave-mark-block t] - ["Close Block" smie-close-block t]) + ["Mark Block" octave-mark-block t] + ["Close Block" smie-close-block t]) ("Functions" - ["Indent Function" octave-indent-defun t] - ["Insert Function" octave-insert-defun t] - ["Update function file comment" octave-update-function-file-comment t]) + ["Insert Function" octave-insert-defun t] + ["Update function file comment" octave-update-function-file-comment t]) "-" ("Debug" - ["Send Current Line" octave-send-line t] - ["Send Current Block" octave-send-block t] - ["Send Current Function" octave-send-defun t] - ["Send Region" octave-send-region t] - ["Show Process Buffer" octave-show-process-buffer t] - ["Hide Process Buffer" octave-hide-process-buffer t] - ["Kill Process" octave-kill-process t]) + ["Send Current Line" octave-send-line t] + ["Send Current Block" octave-send-block t] + ["Send Current Function" octave-send-defun t] + ["Send Region" octave-send-region t] + ["Show Process Buffer" octave-show-process-buffer t] + ["Hide Process Buffer" octave-hide-process-buffer t] + ["Kill Process" octave-kill-process t]) "-" ["Indent Line" indent-according-to-mode t] ["Complete Symbol" completion-at-point t] @@ -1111,14 +1108,8 @@ (insert (concat " " octave-continuation-string)) (reindent-then-newline-and-indent)))) -(defun octave-indent-defun () - "Properly indent the Octave function which contains point." - (interactive) - (save-excursion - (mark-defun) - (message "Indenting function...") - (indent-region (point) (mark) nil)) - (message "Indenting function...done.")) +(define-obsolete-function-alias + 'octave-indent-defun 'prog-indent-sexp "24.4") ;;; Motion ------------------------------------------------------------ revno: 112602 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-05-16 00:59:01 -0700 message: Add some VHDL NEWS entries. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-05-15 18:54:49 +0000 +++ etc/NEWS 2013-05-16 07:59:01 +0000 @@ -282,6 +282,12 @@ *** Handlers for `file-acl' and `set-file-acl' for remote machines which support POSIX ACLs. +** VHDL mode + +*** New options: `vhdl-actual-generic-name', `vhdl-beautify-options'. + +*** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'. + ** Woman *** The commands `woman-default-faces' and `woman-monochrome-faces' ------------------------------------------------------------ revno: 112601 author: Reto Zimmermann committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-05-16 00:56:46 -0700 message: Sync with upstream vhdl mode v3.34.2. * lisp/progmodes/vhdl-mode.el: Use `push' throughout. (vhdl-version, vhdl-time-stamp, vhdl-doc-release-notes): Update. (vhdl-compiler-alist): Replace "\t\n" by "\\t\\n". Add IBM & Quartus compiler. Enhance entry for ADVance MS compiler. (vhdl-actual-generic-name): New option to derive actual generic name. (vhdl-port-paste-signals): Replace formal by actual generics. (vhdl-beautify): New name for old group vhdl-align. Update users. (vhdl-beautify-options): New option. (vhdl-last-input-event): New compat alias. Use throughout. (vhdl-goto-line): Replace user level function `goto-line'. (vhdl-mode-map): Add bindings for vhdl-fix-statement-region, vhdl-fix-statement-buffer. (vhdl-create-mode-menu): Add some entries. (vhdl-align-region-groups): Respect vhdl-beautify-options. (vhdl-align-inline-comment-region-1): Handle "--" inside string. (vhdl-fixup-whitespace-region): Handle symbols at EOL. (vhdl-fix-statement-region, vhdl-fix-statement-buffer): New commands, to force statements on one line. (vhdl-remove-trailing-spaces-region): New, split from vhdl-remove-trailing-spaces. (vhdl-beautify-region): Fix statements, trailing spaces, ^M character. Respect vhdl-beautify-options. (vhdl-update-sensitivity-list-buffer): If non-interactive save buffer. (vhdl-update-sensitivity-list): Not add with index if exists without. Not include array index with signal. Ignore keywords in comments. (vhdl-get-visible-signals): Regexp tweaks. (vhdl-template-component-inst): Handle empty library. (vhdl-template-type): Add template for 'enum' type. (vhdl-port-paste-generic-map, vhdl-port-paste-constants): Use vhdl-replace-string. (vhdl-port-paste-signals): Use vhdl-prepare-search-1. (vhdl-speedbar-mode-map): Rename from vhdl-speedbar-key-map. (vhdl-speedbar-initialize): Update for above name change. (vhdl-compose-wire-components): Fix in handling of constants. (vhdl-error-regexp-emacs-alist): New variable. (vhdl-error-regexp-add-emacs): New function; adds support for new compile.el (Emacs 22+) (vhdl-generate-makefile-1): Change target order for single lib. units. Allow use of absolute file names. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-16 03:41:52 +0000 +++ lisp/ChangeLog 2013-05-16 07:56:46 +0000 @@ -1,3 +1,46 @@ +2013-05-16 Reto Zimmermann + + Sync with upstream vhdl mode v3.34.2. + * progmodes/vhdl-mode.el: Use `push' throughout. + (vhdl-version, vhdl-time-stamp, vhdl-doc-release-notes): Update. + (vhdl-compiler-alist): Replace "\t\n" by "\\t\\n". + Add IBM & Quartus compiler. Enhance entry for ADVance MS compiler. + (vhdl-actual-generic-name): New option to derive actual generic name. + (vhdl-port-paste-signals): Replace formal by actual generics. + (vhdl-beautify): New name for old group vhdl-align. Update users. + (vhdl-beautify-options): New option. + (vhdl-last-input-event): New compat alias. Use throughout. + (vhdl-goto-line): Replace user level function `goto-line'. + (vhdl-mode-map): Add bindings for vhdl-fix-statement-region, + vhdl-fix-statement-buffer. + (vhdl-create-mode-menu): Add some entries. + (vhdl-align-region-groups): Respect vhdl-beautify-options. + (vhdl-align-inline-comment-region-1): Handle "--" inside string. + (vhdl-fixup-whitespace-region): Handle symbols at EOL. + (vhdl-fix-statement-region, vhdl-fix-statement-buffer): New commands, + to force statements on one line. + (vhdl-remove-trailing-spaces-region): + New, split from vhdl-remove-trailing-spaces. + (vhdl-beautify-region): Fix statements, trailing spaces, ^M character. + Respect vhdl-beautify-options. + (vhdl-update-sensitivity-list-buffer): If non-interactive save buffer. + (vhdl-update-sensitivity-list): Not add with index if exists without. + Not include array index with signal. Ignore keywords in comments. + (vhdl-get-visible-signals): Regexp tweaks. + (vhdl-template-component-inst): Handle empty library. + (vhdl-template-type): Add template for 'enum' type. + (vhdl-port-paste-generic-map, vhdl-port-paste-constants): + Use vhdl-replace-string. + (vhdl-port-paste-signals): Use vhdl-prepare-search-1. + (vhdl-speedbar-mode-map): Rename from vhdl-speedbar-key-map. + (vhdl-speedbar-initialize): Update for above name change. + (vhdl-compose-wire-components): Fix in handling of constants. + (vhdl-error-regexp-emacs-alist): New variable. + (vhdl-error-regexp-add-emacs): New function; + adds support for new compile.el (Emacs 22+) + (vhdl-generate-makefile-1): Change target order for single lib. units. + Allow use of absolute file names. + 2013-05-16 Leo Liu * simple.el (prog-indent-sexp): Indent enclosing defun. === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2013-05-15 23:55:41 +0000 +++ lisp/progmodes/vhdl-mode.el 2013-05-16 07:56:46 +0000 @@ -13,10 +13,10 @@ ;; filed in the Emacs bug reporting system against this file, a copy ;; of the bug report be sent to the maintainer's email address. -(defconst vhdl-version "3.33.28" +(defconst vhdl-version "3.34.2" "VHDL Mode version number.") -(defconst vhdl-time-stamp "2010-09-22" +(defconst vhdl-time-stamp "2012-11-21" "VHDL Mode time stamp for last update.") ;; This file is part of GNU Emacs. @@ -72,8 +72,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Emacs Versions -;; supported: GNU Emacs 20.X/21.X/22.X,23.X, XEmacs 20.X/21.X -;; tested on: GNU Emacs 20.4/21.3/22.1,23.X, XEmacs 21.1 (marginally) +;; this updated version was only tested on: GNU Emacs 20.4 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Installation @@ -84,7 +83,7 @@ ;; or into an arbitrary directory that is added to the load path by the ;; following line in your Emacs start-up file `.emacs': -;; (setq load-path (cons (expand-file-name "") load-path)) +;; (push (expand-file-name "") load-path) ;; If you already have the compiled `vhdl-mode.elc' file, put it in the same ;; directory. Otherwise, byte-compile the source file: @@ -96,7 +95,7 @@ ;; (not required in Emacs 20 and higher): ;; (autoload 'vhdl-mode "vhdl-mode" "VHDL Mode" t) -;; (setq auto-mode-alist (cons '("\\.vhdl?\\'" . vhdl-mode) auto-mode-alist)) +;; (push '("\\.vhdl?\\'" . vhdl-mode) auto-mode-alist) ;; More detailed installation instructions are included in the official ;; VHDL Mode distribution. @@ -130,6 +129,7 @@ ;; Emacs 21+ handling (defconst vhdl-emacs-21 (and (<= 21 emacs-major-version) (not (featurep 'xemacs))) "Non-nil if GNU Emacs 21, 22, ... is used.") +;; Emacs 22+ handling (defconst vhdl-emacs-22 (and (<= 22 emacs-major-version) (not (featurep 'xemacs))) "Non-nil if GNU Emacs 22, ... is used.") @@ -210,22 +210,25 @@ (defcustom vhdl-compiler-alist '( + ;; 60: docal <= false; + ;; ^^^^^ + ;; [Error] Assignment error: variable is illegal target of signal assignment ("ADVance MS" "vacom" "-work \\1" "make" "-f \\1" nil "valib \\1; vamap \\2 \\1" "./" "work/" "Makefile" "adms" - ("\\s-\\([0-9]+\\):" 0 1 0) ("Compiling file \\(.+\\)" 1) + ("^\\s-+\\([0-9]+\\):\\s-+" nil 1 nil) ("Compiling file \\(.+\\)" 1) ("ENTI/\\1.vif" "ARCH/\\1-\\2.vif" "CONF/\\1.vif" "PACK/\\1.vif" "BODY/\\1.vif" upcase)) ;; Aldec - ;; COMP96 ERROR COMP96_0078: "Unknown identifier "Addr_Bits"." "" 40 30 - ("Aldec" "vcom" "-93 -work \\1" "make" "-f \\1" + ;; COMP96 ERROR COMP96_0018: "Identifier expected." "test.vhd" 66 3 + ("Aldec" "vcom" "-work \\1" "make" "-f \\1" nil "vlib \\1; vmap \\2 \\1" "./" "work/" "Makefile" "aldec" - (".+?[ \t]+\\(?:ERROR\\)[^:]+:.+?\\(?:.+\"\\(.+?\\)\"[ \t]+\\([0-9]+\\)\\)" 1 2 0) ("" 0) + (".* ERROR [^:]+: \".*\" \"\\([^ \\t\\n]+\\)\" \\([0-9]+\\) \\([0-9]+\\)" 1 2 3) ("" 0) nil) ;; Cadence Leapfrog: cv -file test.vhd ;; duluth: *E,430 (test.vhd,13): identifier (POSITIV) is not declared ("Cadence Leapfrog" "cv" "-work \\1 -file" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "leapfrog" - ("duluth: \\*E,[0-9]+ (\\(.+\\),\\([0-9]+\\)):" 1 2 0) ("" 0) + ("duluth: \\*E,[0-9]+ (\\([^ \\t\\n]+\\),\\([0-9]+\\)):" 1 2 nil) ("" 0) ("\\1/entity" "\\2/\\1" "\\1/configuration" "\\1/package" "\\1/body" downcase)) ;; Cadence Affirma NC vhdl: ncvhdl test.vhd @@ -233,21 +236,27 @@ ;; (PLL_400X_TOP) is not declared [10.3]. ("Cadence NC" "ncvhdl" "-work \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "ncvhdl" - ("ncvhdl_p: \\*E,\\w+ (\\(.+\\),\\([0-9]+\\)|\\([0-9]+\\)):" 1 2 3) ("" 0) + ("ncvhdl_p: \\*E,\\w+ (\\([^ \\t\\n]+\\),\\([0-9]+\\)|\\([0-9]+\\)):" 1 2 3) ("" 0) ("\\1/entity/pc.db" "\\2/\\1/pc.db" "\\1/configuration/pc.db" "\\1/package/pc.db" "\\1/body/pc.db" downcase)) ;; ghdl vhdl: ghdl test.vhd ("GHDL" "ghdl" "-i --workdir=\\1 --ieee=synopsys -fexplicit " "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "ghdl" - ("ghdl_p: \\*E,\\w+ (\\(.+\\),\\([0-9]+\\)|\\([0-9]+\\)):" 1 2 3) ("" 0) + ("ghdl_p: \\*E,\\w+ (\\([^ \\t\\n]+\\),\\([0-9]+\\)|\\([0-9]+\\)):" 1 2 3) ("" 0) ("\\1/entity" "\\2/\\1" "\\1/configuration" "\\1/package" "\\1/body" downcase)) + ;; IBM Compiler + ;; 00 COACHDL* | [CCHDL-1]: File: adder.vhd, line.column: 120.6 + ("IBM Compiler" "g2tvc" "-src" "precomp" "\\1" + nil "mkdir \\1" "./" "work/" "Makefile" "ibm" + ("[0-9]+ COACHDL.*: File: \\([^ \\t\\n]+\\), line.column: \\([0-9]+\\).\\([0-9]+\\)" 1 2 3) (" " 0) + nil) ;; Ikos Voyager: analyze test.vhd ;; analyze test.vhd ;; E L4/C5: this library unit is inaccessible ("Ikos" "analyze" "-l \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "ikos" - ("E L\\([0-9]+\\)/C\\([0-9]+\\):" 0 1 2) + ("E L\\([0-9]+\\)/C\\([0-9]+\\):" nil 1 2) ("^analyze +\\(.+ +\\)*\\(.+\\)$" 2) nil) ;; ModelSim, Model Technology: vcom test.vhd @@ -257,29 +266,39 @@ ;; ** Error: adder.vhd(190): Unknown identifier: ctl_numb ("ModelSim" "vcom" "-93 -work \\1" "make" "-f \\1" nil "vlib \\1; vmap \\2 \\1" "./" "work/" "Makefile" "modelsim" - ("\\(ERROR\\|WARNING\\|\\*\\* Error\\|\\*\\* Warning\\)[^:]*:\\( *\[[0-9]+\]\\)? \\(.+\\)(\\([0-9]+\\)):" 3 4 0) ("" 0) + ("\\(ERROR\\|WARNING\\|\\*\\* Error\\|\\*\\* Warning\\)[^:]*:\\( *\[[0-9]+\]\\)? \\([^ \\t\\n]+\\)(\\([0-9]+\\)):" 3 4 nil) ("" 0) ("\\1/_primary.dat" "\\2/\\1.dat" "\\1/_primary.dat" "\\1/_primary.dat" "\\1/body.dat" downcase)) ;; ProVHDL, Synopsys LEDA: provhdl -w work -f test.vhd ;; test.vhd:34: error message ("LEDA ProVHDL" "provhdl" "-w \\1 -f" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "provhdl" - ("\\([^ \t\n]+\\):\\([0-9]+\\): " 1 2 0) ("" 0) + ("\\([^ \\t\\n]+\\):\\([0-9]+\\): " 1 2 nil) ("" 0) ("ENTI/\\1.vif" "ARCH/\\1-\\2.vif" "CONF/\\1.vif" "PACK/\\1.vif" "BODY/BODY-\\1.vif" upcase)) + ;; Quartus compiler + ;; Error: VHDL error at dvi2sdi.vhd(473): object k2_alto_out_lvl is used + ;; Error: Verilog HDL syntax error at otsuif_v1_top.vhd(147) near text + ;; Error: VHDL syntax error at otsuif_v1_top.vhd(147): clk_ is an illegal + ;; Error: VHDL Use Clause error at otsuif_v1_top.vhd(455): design library + ;; Warning: VHDL Process Statement warning at dvi2sdi_tst.vhd(172): ... + ("Quartus" "make" "-work \\1" "make" "-f \\1" + nil "mkdir \\1" "./" "work/" "Makefile" "quartus" + ("\\(Error\\|Warning\\): .* \\([^ \\t\\n]+\\)(\\([0-9]+\\))" 2 3 nil) ("" 0) + nil) ;; QuickHDL, Mentor Graphics: qvhcom test.vhd ;; ERROR: test.vhd(24): near "dnd": expecting: END ;; WARNING[4]: test.vhd(30): A space is required between ... ("QuickHDL" "qvhcom" "-work \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "quickhdl" - ("\\(ERROR\\|WARNING\\)[^:]*: \\(.+\\)(\\([0-9]+\\)):" 2 3 0) ("" 0) + ("\\(ERROR\\|WARNING\\)[^:]*: \\([^ \\t\\n]+\\)(\\([0-9]+\\)):" 2 3 nil) ("" 0) ("\\1/_primary.dat" "\\2/\\1.dat" "\\1/_primary.dat" "\\1/_primary.dat" "\\1/body.dat" downcase)) ;; Savant: scram -publish-cc test.vhd ;; test.vhd:87: _set_passed_through_out_port(IIR_Boolean) not defined for ("Savant" "scram" "-publish-cc -design-library-name \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work._savant_lib/" "Makefile" "savant" - ("\\([^ \t\n]+\\):\\([0-9]+\\): " 1 2 0) ("" 0) + ("\\([^ \\t\\n]+\\):\\([0-9]+\\): " 1 2 nil) ("" 0) ("\\1_entity.vhdl" "\\2_secondary_units._savant_lib/\\2_\\1.vhdl" "\\1_config.vhdl" "\\1_package.vhdl" "\\1_secondary_units._savant_lib/\\1_package_body.vhdl" downcase)) @@ -287,39 +306,39 @@ ;; Error: CSVHDL0002: test.vhd: (line 97): Invalid prefix ("Simili" "vhdlp" "-work \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "simili" - ("\\(Error\\|Warning\\): \\w+: \\(.+\\): (line \\([0-9]+\\)): " 2 3 0) ("" 0) + ("\\(Error\\|Warning\\): \\w+: \\([^ \\t\\n]+\\): (line \\([0-9]+\\)): " 2 3 nil) ("" 0) ("\\1/prim.var" "\\2/_\\1.var" "\\1/prim.var" "\\1/prim.var" "\\1/_body.var" downcase)) ;; Speedwave (Innoveda): analyze -libfile vsslib.ini -src test.vhd ;; ERROR[11]::File test.vhd Line 100: Use of undeclared identifier ("Speedwave" "analyze" "-libfile vsslib.ini -src" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "speedwave" - ("^ *ERROR\[[0-9]+\]::File \\(.+\\) Line \\([0-9]+\\):" 1 2 0) ("" 0) + ("^ *ERROR\[[0-9]+\]::File \\([^ \\t\\n]+\\) Line \\([0-9]+\\):" 1 2 nil) ("" 0) nil) ;; Synopsys, VHDL Analyzer (sim): vhdlan -nc test.vhd ;; **Error: vhdlan,703 test.vhd(22): OTHERS is not legal in this context. ("Synopsys" "vhdlan" "-nc -work \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "synopsys" - ("\\*\\*Error: vhdlan,[0-9]+ \\(.+\\)(\\([0-9]+\\)):" 1 2 0) ("" 0) + ("\\*\\*Error: vhdlan,[0-9]+ \\([^ \\t\\n]+\\)(\\([0-9]+\\)):" 1 2 nil) ("" 0) ("\\1.sim" "\\2__\\1.sim" "\\1.sim" "\\1.sim" "\\1__.sim" upcase)) ;; Synopsys, VHDL Analyzer (syn): vhdlan -nc -spc test.vhd ;; **Error: vhdlan,703 test.vhd(22): OTHERS is not legal in this context. ("Synopsys Design Compiler" "vhdlan" "-nc -spc -work \\1" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "synopsys_dc" - ("\\*\\*Error: vhdlan,[0-9]+ \\(.+\\)(\\([0-9]+\\)):" 1 2 0) ("" 0) + ("\\*\\*Error: vhdlan,[0-9]+ \\([^ \\t\\n]+\\)(\\([0-9]+\\)):" 1 2 nil) ("" 0) ("\\1.syn" "\\2__\\1.syn" "\\1.syn" "\\1.syn" "\\1__.syn" upcase)) ;; Synplify: ;; @W:"test.vhd":57:8:57:9|Optimizing register bit count_x(5) to a constant 0 ("Synplify" "n/a" "n/a" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "synplify" - ("@[EWN]:\"\\(.+\\)\":\\([0-9]+\\):\\([0-9]+\\):" 1 2 3) ("" 0) + ("@[EWN]:\"\\([^ \\t\\n]+\\)\":\\([0-9]+\\):\\([0-9]+\\):" 1 2 3) ("" 0) nil) ;; Vantage: analyze -libfile vsslib.ini -src test.vhd ;; Compiling "test.vhd" line 1... ;; **Error: LINE 49 *** No aggregate value is valid in this context. ("Vantage" "analyze" "-libfile vsslib.ini -src" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "vantage" - ("\\*\\*Error: LINE \\([0-9]+\\) \\*\\*\\*" 0 1 0) + ("\\*\\*Error: LINE \\([0-9]+\\) \\*\\*\\*" nil 1 nil) ("^ *Compiling \"\\(.+\\)\" " 1) nil) ;; VeriBest: vc vhdl test.vhd @@ -329,21 +348,21 @@ ;; [Error] Name BITA is unknown ("VeriBest" "vc" "vhdl" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "veribest" - ("^ +\\([0-9]+\\): +[^ ]" 0 1 0) ("" 0) + ("^ +\\([0-9]+\\): +[^ ]" nil 1 nil) ("" 0) nil) ;; Viewlogic: analyze -libfile vsslib.ini -src test.vhd ;; Compiling "test.vhd" line 1... ;; **Error: LINE 49 *** No aggregate value is valid in this context. ("Viewlogic" "analyze" "-libfile vsslib.ini -src" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "viewlogic" - ("\\*\\*Error: LINE \\([0-9]+\\) \\*\\*\\*" 0 1 0) + ("\\*\\*Error: LINE \\([0-9]+\\) \\*\\*\\*" nil 1 nil) ("^ *Compiling \"\\(.+\\)\" " 1) nil) ;; Xilinx XST: ;; ERROR:HDLParsers:164 - "test.vhd" Line 3. parse error ("Xilinx XST" "xflow" "" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "xilinx" - ("^ERROR:HDLParsers:[0-9]+ - \"\\(.+\\)\" Line \\([0-9]+\\)\." 1 2 0) ("" 0) + ("^ERROR:HDLParsers:[0-9]+ - \"\\([^ \\t\\n]+\\)\" Line \\([0-9]+\\)\." 1 2 nil) ("" 0) nil) ) "List of available VHDL compilers and their properties. @@ -429,9 +448,13 @@ (string :tag "ID string ") (list :tag "Error message" :indent 4 (regexp :tag "Regexp ") - (integer :tag "File subexp index") + (choice :tag "File subexp " + (integer :tag "Index") + (const :tag "No file name" nil)) (integer :tag "Line subexp index") - (integer :tag "Column subexp idx")) + (choice :tag "Column subexp " + (integer :tag "Index") + (const :tag "No column number" nil))) (list :tag "File message" :indent 4 (regexp :tag "Regexp ") (integer :tag "File subexp index")) @@ -450,6 +473,7 @@ (const :tag "Downcase" downcase)))))) :set (lambda (variable value) (vhdl-custom-set variable value 'vhdl-update-mode-menu)) + :version "24.4" :group 'vhdl-compile) (defcustom vhdl-compiler "GHDL" @@ -457,7 +481,7 @@ Select a compiler name from the ones defined in option `vhdl-compiler-alist'." :type (let ((alist vhdl-compiler-alist) list) (while alist - (setq list (cons (list 'const (caar alist)) list)) + (push (list 'const (caar alist)) list) (setq alist (cdr alist))) (append '(choice) (nreverse list))) :group 'vhdl-compile) @@ -602,7 +626,7 @@ (list :tag "Compiler" :indent 6 ,(let ((alist vhdl-compiler-alist) list) (while alist - (setq list (cons (list 'const (caar alist)) list)) + (push (list 'const (caar alist)) list) (setq alist (cdr alist))) (append '(choice :tag "Compiler name") (nreverse list))) @@ -637,7 +661,7 @@ browser. The current project can also be changed temporarily in the menu." :type (let ((alist vhdl-project-alist) list) (while alist - (setq list (cons (list 'const (caar alist)) list)) + (push (list 'const (caar alist)) list) (setq alist (cdr alist))) (append '(choice (const :tag "None" nil) (const :tag "--")) (nreverse list))) @@ -1268,6 +1292,18 @@ (const :tag "Always" always)) :group 'vhdl-port) +(defcustom vhdl-actual-generic-name '(".*" . "\\&") + (concat + "Specifies how actual generic names are obtained from formal generic names. +In a component instantiation, an actual generic name can be +obtained by modifying the formal generic name (e.g. attaching or stripping +off a substring)." + vhdl-name-doc-string) + :type '(cons (regexp :tag "From regexp") + (string :tag "To string ")) + :group 'vhdl-port + :version "24.4") + (defcustom vhdl-actual-port-name '(".*" . "\\&") (concat "Specifies how actual port names are obtained from formal port names. @@ -1469,21 +1505,21 @@ (defvar end-comment-column) -(defgroup vhdl-align nil - "Customizations for alignment." +(defgroup vhdl-beautify nil + "Customizations for beautification." :group 'vhdl) (defcustom vhdl-auto-align t "Non-nil means align some templates automatically after generation." :type 'boolean - :group 'vhdl-align) + :group 'vhdl-beautify) (defcustom vhdl-align-groups t "Non-nil means align groups of code lines separately. A group of code lines is a region of consecutive lines between two lines that match the regexp in option `vhdl-align-group-separate'." :type 'boolean - :group 'vhdl-align) + :group 'vhdl-beautify) (defcustom vhdl-align-group-separate "^\\s-*$" "Regexp for matching a line that separates groups of lines for alignment. @@ -1491,7 +1527,7 @@ \"^\\s-*$\": matches an empty line \"^\\s-*\\(--.*\\)?$\": matches an empty line or a comment-only line" :type 'regexp - :group 'vhdl-align) + :group 'vhdl-beautify) (defcustom vhdl-align-same-indent t "Non-nil means align blocks with same indent separately. @@ -1500,7 +1536,18 @@ lists). This gives nicer alignment in most cases. Option `vhdl-align-groups' still applies within these blocks." :type 'boolean - :group 'vhdl-align) + :group 'vhdl-beautify) + +(defcustom vhdl-beautify-options '(t t t t t) + "List of options for beautifying code. Allows to disable individual +features of code beautification." + :type '(list (boolean :tag "Whitespace cleanup ") + (boolean :tag "Single statement per line") + (boolean :tag "Indentation ") + (boolean :tag "Alignment ") + (boolean :tag "Case fixing ")) + :group 'vhdl-beautify + :version "24.4") (defgroup vhdl-highlight nil @@ -1846,7 +1893,7 @@ :group 'vhdl-misc) (defcustom vhdl-indent-comment-like-next-code-line t - "*Non-nil means comment lines are indented like the following code line. + "Non-nil means comment lines are indented like the following code line. Otherwise, comment lines are indented like the preceding code line. Indenting comment lines like the following code line gives nicer indentation when comments precede the code that they refer to." @@ -2067,7 +2114,7 @@ (lambda (var) (cons var (symbol-value var)))) varlist)))) - (setq vhdl-style-alist (cons default vhdl-style-alist)))) + (push default vhdl-style-alist))) (defvar vhdl-mode-hook nil "Hook called by `vhdl-mode'.") @@ -2084,10 +2131,11 @@ (require 'hippie-exp) ;; optional (minimize warning messages during compile) +(unless (featurep 'xemacs) (eval-when-compile (require 'font-lock) (require 'ps-print) - (require 'speedbar)) + (require 'speedbar))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2187,6 +2235,17 @@ (unless (fboundp 'member-ignore-case) (defalias 'member-ignore-case 'member)) +;; `last-input-char' obsolete in Emacs 24, `last-input-event' different +;; behavior in XEmacs +(defvar vhdl-last-input-event) +(if (featurep 'xemacs) + (defvaralias 'vhdl-last-input-event 'last-input-char) + (defvaralias 'vhdl-last-input-event 'last-input-event)) + +;; `help-print-return-message' changed to `print-help-return-message' in Emacs +;;;(unless (fboundp 'help-print-return-message) +;;; (defalias 'help-print-return-message 'print-help-return-message)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Compatibility with older VHDL Mode versions @@ -2207,7 +2266,7 @@ (vhdl-warning (apply 'format args) t) (unless vhdl-warnings (vhdl-run-when-idle .1 nil 'vhdl-print-warnings)) - (setq vhdl-warnings (cons (apply 'format args) vhdl-warnings)))) + (push (apply 'format args) vhdl-warnings))) (defun vhdl-warning (string &optional nobeep) "Print out warning STRING and beep." @@ -2241,7 +2300,7 @@ (let ((old-alist vhdl-model-alist) new-alist) (while old-alist - (setq new-alist (cons (append (car old-alist) '("")) new-alist)) + (push (append (car old-alist) '("")) new-alist) (setq old-alist (cdr old-alist))) (setq vhdl-model-alist (nreverse new-alist))) (customize-save-variable 'vhdl-model-alist vhdl-model-alist)) @@ -2251,7 +2310,7 @@ (let ((old-alist vhdl-project-alist) new-alist) (while old-alist - (setq new-alist (cons (append (car old-alist) '("")) new-alist)) + (push (append (car old-alist) '("")) new-alist) (setq old-alist (cdr old-alist))) (setq vhdl-project-alist (nreverse new-alist))) (customize-save-variable 'vhdl-project-alist vhdl-project-alist)) @@ -2339,7 +2398,6 @@ (unless (get 'speedbar-indentation-width 'saved-value) (setq speedbar-indentation-width 2))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Help functions / inline substitutions / macros ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2487,7 +2545,7 @@ (defun vhdl-delete (elt list) "Delete by side effect the first occurrence of ELT as a member of LIST." - (setq list (cons nil list)) + (push nil list) (let ((list1 list)) (while (and (cdr list1) (not (equal elt (cadr list1)))) (setq list1 (cdr list1))) @@ -2535,6 +2593,11 @@ (set-buffer (marker-buffer marker))) (goto-char marker)) +(defun vhdl-goto-line (line) + "Use this instead of calling user level function `goto-line'." + (goto-char (point-min)) + (forward-line (1- line))) + (defun vhdl-menu-split (list title) "Split menu LIST into several submenus, if number of elements > `vhdl-menu-max-size'." @@ -2545,19 +2608,19 @@ (menuno 1) (i 0)) (while remain - (setq sublist (cons (car remain) sublist)) + (push (car remain) sublist) (setq remain (cdr remain)) (setq i (+ i 1)) (if (= i vhdl-menu-max-size) (progn - (setq result (cons (cons (format "%s %s" title menuno) - (nreverse sublist)) result)) + (push (cons (format "%s %s" title menuno) + (nreverse sublist)) result) (setq i 0) (setq menuno (+ menuno 1)) (setq sublist '())))) (and sublist - (setq result (cons (cons (format "%s %s" title menuno) - (nreverse sublist)) result))) + (push (cons (format "%s %s" title menuno) + (nreverse sublist)) result)) (nreverse result)) list)) @@ -2792,6 +2855,8 @@ (define-key vhdl-mode-map "\C-c\C-l\C-o" 'vhdl-line-open) (define-key vhdl-mode-map "\C-c\C-l\C-g" 'goto-line) (define-key vhdl-mode-map "\C-c\C-l\C-c" 'vhdl-comment-uncomment-line) + (define-key vhdl-mode-map "\C-c\C-x\C-s" 'vhdl-fix-statement-region) + (define-key vhdl-mode-map "\C-c\C-x\M-s" 'vhdl-fix-statement-buffer) (define-key vhdl-mode-map "\C-c\C-x\C-p" 'vhdl-fix-clause) (define-key vhdl-mode-map "\C-c\C-x\M-c" 'vhdl-fix-case-region) (define-key vhdl-mode-map "\C-c\C-x\C-c" 'vhdl-fix-case-buffer) @@ -3499,6 +3564,9 @@ ["Whitespace Region" vhdl-fixup-whitespace-region (mark)] ["Whitespace Buffer" vhdl-fixup-whitespace-buffer t] "--" + ["Statement Region" vhdl-fix-statement-region (mark)] + ["Statement Buffer" vhdl-fix-statement-buffer t] + "--" ["Trailing Spaces Buffer" vhdl-remove-trailing-spaces t]) ("Update" ["Sensitivity List" vhdl-update-sensitivity-list-process t] @@ -3807,6 +3875,7 @@ ["Always" (customize-set-variable 'vhdl-include-group-comments 'always) :style radio :selected (eq 'always vhdl-include-group-comments)]) + ["Actual Generic Name..." (customize-option 'vhdl-actual-generic-name) t] ["Actual Port Name..." (customize-option 'vhdl-actual-port-name) t] ["Instance Name..." (customize-option 'vhdl-instance-name) t] ("Testbench" @@ -3903,7 +3972,7 @@ ["End Comment Column..." (customize-option 'vhdl-end-comment-column) t] "--" ["Customize Group..." (customize-group 'vhdl-comment) t]) - ("Align" + ("Beautify" ["Auto Align Templates" (customize-set-variable 'vhdl-auto-align (not vhdl-auto-align)) :style toggle :selected vhdl-auto-align] @@ -3911,13 +3980,14 @@ (customize-set-variable 'vhdl-align-groups (not vhdl-align-groups)) :style toggle :selected vhdl-align-groups] ["Group Separation String..." - (customize-set-variable 'vhdl-align-group-separate) t] + (customize-option 'vhdl-align-group-separate) t] ["Align Lines with Same Indent" (customize-set-variable 'vhdl-align-same-indent (not vhdl-align-same-indent)) :style toggle :selected vhdl-align-same-indent] + ["Beautify Options..." (customize-option 'vhdl-beautify-options) t] "--" - ["Customize Group..." (customize-group 'vhdl-align) t]) + ["Customize Group..." (customize-group 'vhdl-beautify) t]) ("Highlight" ["Highlighting On/Off..." (customize-option @@ -4181,14 +4251,13 @@ (setq found nil) (while file-list (setq found t) - (setq menu-list (cons (vector (car file-list) - (list 'find-file (car file-list)) t) - menu-list)) + (push (vector (car file-list) (list 'find-file (car file-list)) t) + menu-list) (setq file-list (cdr file-list))) (setq menu-list (vhdl-menu-split menu-list "Sources")) - (when found (setq menu-list (cons "--" menu-list))) - (setq menu-list (cons ["*Rescan*" vhdl-add-source-files-menu t] menu-list)) - (setq menu-list (cons "Sources" menu-list)) + (when found (push "--" menu-list)) + (push ["*Rescan*" vhdl-add-source-files-menu t] menu-list) + (push "Sources" menu-list) ;; Create menu (easy-menu-add menu-list) (easy-menu-define vhdl-sources-menu newmap @@ -4572,7 +4641,7 @@ option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu (e.g. add \"(global-set-key '[S-down-mouse-3] 'imenu)\" to your start-up file) for browsing the file contents (is not populated if buffer is - larger than `font-lock-maximum-size'). Also, a source file menu can be + larger than 256000). Also, a source file menu can be added (set option `vhdl-source-file-menu' to non-nil) for browsing the current directory for VHDL source files. @@ -4699,7 +4768,7 @@ automatically recognized as VHDL source files. To add an extension \".xxx\", add the following line to your Emacs start-up file (`.emacs'): - \(setq auto-mode-alist (cons '(\"\\\\.xxx\\\\'\" . vhdl-mode) auto-mode-alist)) + \(push '(\"\\\\.xxx\\\\'\" . vhdl-mode) auto-mode-alist) HINTS: @@ -7270,7 +7339,7 @@ (beginning-of-line 2) (setq syntax (vhdl-get-syntactic-context))))) (when is-comment - (setq syntax (cons (cons 'comment nil) syntax))) + (push (cons 'comment nil) syntax)) (apply '+ (mapcar 'vhdl-get-offset syntax))) ;; indent like previous nonblank line (save-excursion (beginning-of-line) @@ -7381,7 +7450,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Alignment, whitespace fixup, beautifying +;;; Alignment, beautifying ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defconst vhdl-align-alist @@ -7597,7 +7666,8 @@ (when vhdl-progress-interval (setq vhdl-progress-info (vector (count-lines (point-min) beg) (count-lines (point-min) end) 0)))) - (vhdl-fixup-whitespace-region beg end t) + (when (nth 0 vhdl-beautify-options) + (vhdl-fixup-whitespace-region beg end t)) (goto-char beg) (if (not vhdl-align-groups) ;; align entire region @@ -7721,14 +7791,14 @@ ;; search for comment start positions and lengths (while (< (point) end) (when (and (not (looking-at "^\\s-*\\(begin\\|end\\)\\>")) - (looking-at "^\\(.*[^ \t\n\r\f-]+\\)\\s-*\\(--.*\\)$") + (looking-at "^\\(.*?[^ \t\n\r\f-]+\\)\\s-*\\(--.*\\)$") (not (save-excursion (goto-char (match-beginning 2)) (vhdl-in-literal)))) (setq start (+ (- (match-end 1) (match-beginning 1)) spacing)) (setq length (- (match-end 2) (match-beginning 2))) (setq start-max (max start start-max)) (setq length-max (max length length-max)) - (setq comment-list (cons (cons start length) comment-list))) + (push (cons start length) comment-list)) (beginning-of-line 2)) (setq comment-list (sort comment-list (function (lambda (a b) (> (car a) (car b)))))) @@ -7739,14 +7809,14 @@ (unless (or (= (caar comment-list) (car start-list)) (<= (+ (car start-list) (cdar comment-list)) end-comment-column)) - (setq start-list (cons (caar comment-list) start-list))) + (push (caar comment-list) start-list)) (setq comment-list (cdr comment-list))) ;; align lines as nicely as possible (goto-char beg) (while (< (point) end) (setq cur-start nil) (when (and (not (looking-at "^\\s-*\\(begin\\|end\\)\\>")) - (or (and (looking-at "^\\(.*[^ \t\n\r\f-]+\\)\\(\\s-*\\)\\(--.*\\)$") + (or (and (looking-at "^\\(.*?[^ \t\n\r\f-]+\\)\\(\\s-*\\)\\(--.*\\)$") (not (save-excursion (goto-char (match-beginning 3)) (vhdl-in-literal)))) @@ -7872,7 +7942,7 @@ (replace-match "\\2"))) ;; surround operator symbols by one space (goto-char beg) - (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\([^/:<>=]\\)\\(:\\|\\??=\\|\\??<<\\|\\??>>\\|\\??<\\|\\??>\\|:=\\|\\??<=\\|\\??>=\\|=>\\|\\??/=\\|\\?\\?\\)\\([^=>]\\|$\\)\\)" end t) + (while (re-search-forward "\\(--.*\n\\|\"[^\"\n]*[\"\n]\\|\'.\'\\|\\\\[^\\\n]*[\\\n]\\)\\|\\(\\([^/:<>=\n]\\)\\(:\\|\\??=\\|\\??<<\\|\\??>>\\|\\??<\\|\\??>\\|:=\\|\\??<=\\|\\??>=\\|=>\\|\\??/=\\|\\?\\?\\)\\([^=>\n]\\|$\\)\\)" end t) (if (or (match-string 1) (<= (match-beginning 0) ; not if at boi (save-excursion (back-to-indentation) (point)))) @@ -7906,6 +7976,154 @@ (vhdl-fixup-whitespace-region (point-min) (point-max))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Case fixing + +(defun vhdl-fix-case-region-1 (beg end upper-case word-regexp &optional count) + "Convert all words matching WORD-REGEXP in region to lower or upper case, +depending on parameter UPPER-CASE." + (let ((case-replace nil) + (last-update 0)) + (vhdl-prepare-search-2 + (save-excursion + (goto-char end) + (setq end (point-marker)) + (goto-char beg) + (while (re-search-forward word-regexp end t) + (or (vhdl-in-literal) + (if upper-case + (upcase-word -1) + (downcase-word -1))) + (when (and count vhdl-progress-interval (not noninteractive) + (< vhdl-progress-interval + (- (nth 1 (current-time)) last-update))) + (message "Fixing case... (%2d%s)" + (+ (* count 20) (/ (* 20 (- (point) beg)) (- end beg))) + "%") + (setq last-update (nth 1 (current-time))))) + (goto-char end))))) + +(defun vhdl-fix-case-region (beg end &optional arg) + "Convert all VHDL words in region to lower or upper case, depending on +options vhdl-upper-case-{keywords,types,attributes,enum-values}." + (interactive "r\nP") + (vhdl-fix-case-region-1 + beg end vhdl-upper-case-keywords vhdl-keywords-regexp 0) + (vhdl-fix-case-region-1 + beg end vhdl-upper-case-types vhdl-types-regexp 1) + (vhdl-fix-case-region-1 + beg end vhdl-upper-case-attributes (concat "'" vhdl-attributes-regexp) 2) + (vhdl-fix-case-region-1 + beg end vhdl-upper-case-enum-values vhdl-enum-values-regexp 3) + (vhdl-fix-case-region-1 + beg end vhdl-upper-case-constants vhdl-constants-regexp 4) + (when vhdl-progress-interval (message "Fixing case...done"))) + +(defun vhdl-fix-case-buffer () + "Convert all VHDL words in buffer to lower or upper case, depending on +options vhdl-upper-case-{keywords,types,attributes,enum-values}." + (interactive) + (vhdl-fix-case-region (point-min) (point-max))) + +(defun vhdl-fix-case-word (&optional arg) + "Convert word after cursor to upper case if necessary." + (interactive "p") + (save-excursion + (when arg (backward-word 1)) + (vhdl-prepare-search-1 + (when (and vhdl-upper-case-keywords + (looking-at vhdl-keywords-regexp)) + (upcase-word 1)) + (when (and vhdl-upper-case-types + (looking-at vhdl-types-regexp)) + (upcase-word 1)) + (when (and vhdl-upper-case-attributes + (looking-at vhdl-attributes-regexp)) + (upcase-word 1)) + (when (and vhdl-upper-case-enum-values + (looking-at vhdl-enum-values-regexp)) + (upcase-word 1)) + (when (and vhdl-upper-case-constants + (looking-at vhdl-constants-regexp)) + (upcase-word 1))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Fix statements +;; - force each statement to be on a separate line except when on same line +;; with 'end' keyword + +(defun vhdl-fix-statement-region (beg end &optional arg) + "Force statements in region on separate line except when on same line +with 'end' keyword (necessary for correct indentation). +Currently supported keywords: 'begin', 'if'." + (interactive "r\nP") + (vhdl-prepare-search-2 + (let (point) + (save-excursion + (goto-char end) + (setq end (point-marker)) + (goto-char beg) + ;; `begin' keyword + (while (re-search-forward + "^\\s-*[^ \t\n].*?\\(\\\\)\\(.*\\\\)?" end t) + (goto-char (match-end 0)) + (setq point (point-marker)) + (when (and (match-string 1) + (or (not (match-string 2)) + (save-excursion (goto-char (match-end 2)) + (vhdl-in-literal))) + (not (save-excursion (goto-char (match-beginning 1)) + (vhdl-in-literal)))) + (goto-char (match-beginning 1)) + (insert "\n") + (indent-according-to-mode)) + (goto-char point)) + (goto-char beg) + ;; `for', `if' keywords + (while (re-search-forward "\\<\\(for\\|if\\)\\>" end t) + (goto-char (match-end 1)) + (setq point (point-marker)) + ;; exception: in literal or preceded by `end' or label + (when (and (not (save-excursion (goto-char (match-beginning 1)) + (vhdl-in-literal))) + (save-excursion + (beginning-of-line 1) + (save-match-data + (and (re-search-forward "^\\s-*\\([^ \t\n].*\\)" + (match-beginning 1) t) + (not (string-match + "\\(\\\\|\\\\|\\w+\\s-*:\\)\\s-*$" + (match-string 1))))))) + (goto-char (match-beginning 1)) + (insert "\n") + (indent-according-to-mode)) + (goto-char point)))))) + +(defun vhdl-fix-statement-buffer () + "Force statements in buffer on separate line except when on same line +with 'end' keyword (necessary for correct indentation)." + (interactive) + (vhdl-fix-statement-region (point-min) (point-max))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Trailing spaces + +(defun vhdl-remove-trailing-spaces-region (beg end &optional arg) + "Remove trailing spaces in region." + (interactive "r\nP") + (save-excursion + (goto-char end) + (setq end (point-marker)) + (goto-char beg) + (while (re-search-forward "[ \t]+$" end t) + (unless (vhdl-in-literal) + (replace-match "" nil nil))))) + +(defun vhdl-remove-trailing-spaces () + "Remove trailing spaces in buffer." + (interactive) + (vhdl-remove-trailing-spaces-region (point-min) (point-max))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Beautify (defun vhdl-beautify-region (beg end) @@ -7915,10 +8133,17 @@ `vhdl-fix-case-buffer'." (interactive "r") (setq end (save-excursion (goto-char end) (point-marker))) - (vhdl-indent-region beg end) + (save-excursion ; remove DOS EOL characters in UNIX file + (goto-char beg) + (while (search-forward " " nil t) + (replace-match "" nil t))) + (when (nth 0 vhdl-beautify-options) (vhdl-fixup-whitespace-region beg end t)) + (when (nth 1 vhdl-beautify-options) (vhdl-fix-statement-region beg end)) + (when (nth 2 vhdl-beautify-options) (vhdl-indent-region beg end)) (let ((vhdl-align-groups t)) - (vhdl-align-region beg end)) - (vhdl-fix-case-region beg end)) + (when (nth 3 vhdl-beautify-options) (vhdl-align-region beg end))) + (when (nth 4 vhdl-beautify-options) (vhdl-fix-case-region beg end)) + (when (nth 0 vhdl-beautify-options) (vhdl-remove-trailing-spaces-region beg end))) (defun vhdl-beautify-buffer () "Beautify buffer by applying indentation, whitespace fixup, alignment, and @@ -8014,7 +8239,8 @@ (while (re-search-forward "^\\s-*\\(\\w+[ \t\n\r\f]*:[ \t\n\r\f]*\\)?process\\>" nil t) (goto-char (match-beginning 0)) (condition-case nil (vhdl-update-sensitivity-list) (error ""))) - (message "Updating sensitivity lists...done")))) + (message "Updating sensitivity lists...done"))) + (when noninteractive (save-buffer))) (defun vhdl-update-sensitivity-list () "Update sensitivity list." @@ -8040,57 +8266,57 @@ (scan-regions-list '(;; right-hand side of signal/variable assignment ;; (special case: "<=" is relational operator in a condition) - ((re-search-forward "[<:]=" proc-end t) - (re-search-forward ";\\|\\<\\(then\\|loop\\|report\\|severity\\|is\\)\\>" proc-end t)) + ((vhdl-re-search-forward "[<:]=" proc-end t) + (vhdl-re-search-forward ";\\|\\<\\(then\\|loop\\|report\\|severity\\|is\\)\\>" proc-end t)) ;; if condition - ((re-search-forward "^\\s-*if\\>" proc-end t) - (re-search-forward "\\" proc-end t)) + ((vhdl-re-search-forward "^\\s-*if\\>" proc-end t) + (vhdl-re-search-forward "\\" proc-end t)) ;; elsif condition - ((re-search-forward "\\" proc-end t) - (re-search-forward "\\" proc-end t)) + ((vhdl-re-search-forward "\\" proc-end t) + (vhdl-re-search-forward "\\" proc-end t)) ;; while loop condition - ((re-search-forward "^\\s-*while\\>" proc-end t) - (re-search-forward "\\" proc-end t)) + ((vhdl-re-search-forward "^\\s-*while\\>" proc-end t) + (vhdl-re-search-forward "\\" proc-end t)) ;; exit/next condition - ((re-search-forward "\\<\\(exit\\|next\\)\\s-+\\w+\\s-+when\\>" proc-end t) - (re-search-forward ";" proc-end t)) + ((vhdl-re-search-forward "\\<\\(exit\\|next\\)\\s-+\\w+\\s-+when\\>" proc-end t) + (vhdl-re-search-forward ";" proc-end t)) ;; assert condition - ((re-search-forward "\\" proc-end t) - (re-search-forward "\\(\\\\|\\\\|;\\)" proc-end t)) + ((vhdl-re-search-forward "\\" proc-end t) + (vhdl-re-search-forward "\\(\\\\|\\\\|;\\)" proc-end t)) ;; case expression - ((re-search-forward "^\\s-*case\\>" proc-end t) - (re-search-forward "\\" proc-end t)) + ((vhdl-re-search-forward "^\\s-*case\\>" proc-end t) + (vhdl-re-search-forward "\\" proc-end t)) ;; parameter list of procedure call, array index ((and (re-search-forward "^\\s-*\\(\\w\\|\\.\\)+[ \t\n\r\f]*(" proc-end t) (1- (point))) (progn (backward-char) (forward-sexp) (while (looking-at "(") (forward-sexp)) (point))))) - name field read-list sens-list signal-list + name field read-list sens-list signal-list tmp-list sens-beg sens-end beg end margin) ;; scan for signals in old sensitivity list (goto-char proc-beg) - (re-search-forward "\\" proc-mid t) + (vhdl-re-search-forward "\\" proc-mid t) (if (not (looking-at "[ \t\n\r\f]*(")) (setq sens-beg (point)) - (setq sens-beg (re-search-forward "\\([ \t\n\r\f]*\\)([ \t\n\r\f]*" nil t)) + (setq sens-beg (vhdl-re-search-forward "\\([ \t\n\r\f]*\\)([ \t\n\r\f]*" nil t)) (goto-char (match-end 1)) (forward-sexp) (setq sens-end (1- (point))) (goto-char sens-beg) - (while (and (re-search-forward "\\(\\w+\\)" sens-end t) + (while (and (vhdl-re-search-forward "\\(\\w+\\)" sens-end t) (setq sens-list (cons (downcase (match-string 0)) sens-list)) - (re-search-forward "\\s-*,\\s-*" sens-end t)))) + (vhdl-re-search-forward "\\s-*,\\s-*" sens-end t)))) (setq signal-list (append visible-list sens-list)) ;; search for sequential parts (goto-char proc-mid) (while (setq beg (re-search-forward "^\\s-*\\(els\\)?if\\>" proc-end t)) - (setq end (re-search-forward "\\" proc-end t)) - (when (re-search-backward "\\('event\\|\\<\\(falling\\|rising\\)_edge\\)\\>" beg t) + (setq end (vhdl-re-search-forward "\\" proc-end t)) + (when (vhdl-re-search-backward "\\('event\\|\\<\\(falling\\|rising\\)_edge\\)\\>" beg t) (goto-char end) (backward-word 1) (vhdl-forward-sexp) - (setq seq-region-list (cons (cons end (point)) seq-region-list)) + (push (cons end (point)) seq-region-list) (beginning-of-line))) ;; scan for signals read in process (while scan-regions-list @@ -8107,15 +8333,35 @@ (and tmp-list (< (point) (cdar tmp-list)))))) (while (vhdl-re-search-forward "[^'\".]\\<\\([a-zA-Z]\\w*\\)\\(\\(\\.\\w+\\|[ \t\n\r\f]*([^)]*)\\)*\\)[ \t\n\r\f]*\\('\\(\\w+\\)\\|\\(=>\\)\\)?" end t) (setq name (match-string 1)) + ;; get array index range (when vhdl-array-index-record-field-in-sensitivity-list - (setq field (match-string 2))) + (setq field (match-string 2)) + ;; not use if it includes a variable name + (save-match-data + (setq tmp-list visible-list) + (while (and field tmp-list) + (when (string-match + (concat "\\<" (car tmp-list) "\\>") field) + (setq field nil)) + (setq tmp-list (cdr tmp-list))))) (when (and (not (match-string 6)) ; not when formal parameter (not (and (match-string 5) ; not event attribute (not (member (downcase (match-string 5)) '("event" "last_event" "transaction"))))) (member (downcase name) signal-list)) - (unless (member-ignore-case (concat name field) read-list) - (setq read-list (cons (concat name field) read-list)))) + ;; not add if name or name+field already exists + (unless + (or (member-ignore-case name read-list) + (member-ignore-case (concat name field) read-list)) + (push (concat name field) read-list)) + (setq tmp-list read-list) + ;; remove existing name+field if name is added + (save-match-data + (while tmp-list + (when (string-match (concat "^" name field "[(.]") + (car tmp-list)) + (setq read-list (delete (car tmp-list) read-list))) + (setq tmp-list (cdr tmp-list))))) (goto-char (match-end 1))))) (setq scan-regions-list (cdr scan-regions-list))) ;; update sensitivity list @@ -8171,7 +8417,7 @@ (while (< (point) end) (when (looking-at "signal[ \t\n\r\f]+") (goto-char (match-end 0))) - (while (looking-at "\\(\\w+\\)[ \t\n\r\f,]+") + (while (looking-at "\\([a-zA-Z]\\w*\\)[ \t\n\r\f,]+") (setq signal-list (cons (downcase (match-string 1)) signal-list)) (goto-char (match-end 0)) @@ -8190,12 +8436,12 @@ (when (= 0 (nth 0 (parse-partial-sexp beg (point)))) (if (match-string 2) ;; scan signal name - (while (looking-at "[ \t\n\r\f,]+\\(\\w+\\)") + (while (looking-at "[ \t\n\r\f,]+\\([a-zA-Z]\\w*\\)") (setq signal-list (cons (downcase (match-string 1)) signal-list)) (goto-char (match-end 0))) ;; scan alias name, check is alias of (declared) signal - (when (and (looking-at "[ \t\n\r\f]+\\(\\w+\\)[^;]*\\ \"" (interactive "p") (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) - (if (= (preceding-char) last-input-event) + (if (= (preceding-char) vhdl-last-input-event) (progn (delete-char -1) (insert-char ?\" 1)) (insert-char ?\' 1)) (self-insert-command count))) @@ -8399,7 +8632,7 @@ (defun vhdl-electric-semicolon (count) "';;' --> ' : ', ': ;' --> ' := '" (interactive "p") (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) - (cond ((= (preceding-char) last-input-event) + (cond ((= (preceding-char) vhdl-last-input-event) (progn (delete-char -1) (unless (eq (preceding-char) ? ) (insert " ")) (insert ": ") @@ -8413,7 +8646,7 @@ (defun vhdl-electric-comma (count) "',,' --> ' <= '" (interactive "p") (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) - (cond ((= (preceding-char) last-input-event) + (cond ((= (preceding-char) vhdl-last-input-event) (progn (delete-char -1) (unless (eq (preceding-char) ? ) (insert " ")) (insert "<= "))) @@ -8423,7 +8656,7 @@ (defun vhdl-electric-period (count) "'..' --> ' => '" (interactive "p") (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) - (cond ((= (preceding-char) last-input-event) + (cond ((= (preceding-char) vhdl-last-input-event) (progn (delete-char -1) (unless (eq (preceding-char) ? ) (insert " ")) (insert "=> "))) @@ -8433,7 +8666,7 @@ (defun vhdl-electric-equal (count) "'==' --> ' == '" (interactive "p") (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) - (cond ((= (preceding-char) last-input-event) + (cond ((= (preceding-char) vhdl-last-input-event) (progn (delete-char -1) (unless (eq (preceding-char) ? ) (insert " ")) (insert "== "))) @@ -8704,12 +8937,13 @@ "[COMPONENT | ENTITY | CONFIGURATION]" " " t)) (setq unit (upcase (or unit ""))) (cond ((equal unit "ENTITY") - (vhdl-template-field "library name" "." nil nil nil nil + (let ((begin (point))) + (vhdl-template-field "library name" "." t begin (point) nil (vhdl-work-library)) (vhdl-template-field "entity name" "(") (if (vhdl-template-field "[architecture name]" nil t) (insert ")") - (delete-char -1))) + (delete-char -1)))) ((equal unit "CONFIGURATION") (vhdl-template-field "library name" "." nil nil nil nil (vhdl-work-library)) @@ -9845,7 +10079,7 @@ (let ((definition (upcase (or (vhdl-template-field - "[scalar type | ARRAY | RECORD | ACCESS | FILE]" nil t) + "[scalar type | ARRAY | RECORD | ACCESS | FILE | ENUM]" nil t) "")))) (cond ((equal definition "") (delete-char -4) @@ -9863,6 +10097,11 @@ ((equal definition "FILE") (vhdl-insert-keyword " OF ") (vhdl-template-field "type" ";")) + ((equal definition "ENUM") + (kill-word -1) + (insert "(") + (setq end-pos (point-marker)) + (insert ");")) (t (insert ";"))) (when mid-pos (setq end-pos (point-marker)) @@ -10909,7 +11148,7 @@ (backward-word 1) (vhdl-case-word 1) (delete-char 1)) - (let ((invoke-char last-command-event) + (let ((invoke-char vhdl-last-input-event) (abbrev-mode -1) (vhdl-template-invoked-by-hook t)) (let ((caught (catch 'abort @@ -11633,7 +11872,8 @@ ;; paste formal and actual generic (insert (car (nth 0 generic)) " => " (if no-constants - (car (nth 0 generic)) + (vhdl-replace-string vhdl-actual-generic-name + (car (nth 0 generic))) (or (nth 2 generic) ""))) (setq generic-list (cdr generic-list)) (insert (if generic-list "," ")")) @@ -11776,7 +12016,7 @@ ;; paste generic constants (setq name (nth 0 generic)) (when name - (insert (car name)) + (insert (vhdl-replace-string vhdl-actual-generic-name (car name))) ;; paste type (insert " : " (nth 1 generic)) ;; paste initialization @@ -11802,7 +12042,7 @@ (message "Pasting port as signals...") (unless no-indent (indent-according-to-mode)) (let ((margin (current-indentation)) - start port names + start port names type generic-list port-name constant-name pos (port-list (nth 2 vhdl-port-list))) (when port-list (setq start (point)) @@ -11822,7 +12062,21 @@ (setq names (cdr names)) (when names (insert ", "))) ;; paste type - (insert " : " (nth 3 port)) + (setq type (nth 3 port)) + (setq generic-list (nth 1 vhdl-port-list)) + (vhdl-prepare-search-1 + (setq pos 0) + ;; replace formal by actual generics + (while generic-list + (setq port-name (car (nth 0 (car generic-list)))) + (while (string-match (concat "\\<" port-name "\\>") type pos) + (setq constant-name + (save-match-data (vhdl-replace-string + vhdl-actual-generic-name port-name))) + (setq type (replace-match constant-name t nil type)) + (setq pos (match-end 0))) + (setq generic-list (cdr generic-list)))) + (insert " : " type) ;; paste initialization (inputs only) (when (and initialize (nth 2 port) (equal "IN" (upcase (nth 2 port)))) (insert " := " @@ -12411,77 +12665,6 @@ try-expand-list-all-buffers))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Case fixing - -(defun vhdl-fix-case-region-1 (beg end upper-case word-regexp &optional count) - "Convert all words matching WORD-REGEXP in region to lower or upper case, -depending on parameter UPPER-CASE." - (let ((case-replace nil) - (last-update 0)) - (vhdl-prepare-search-2 - (save-excursion - (goto-char end) - (setq end (point-marker)) - (goto-char beg) - (while (re-search-forward word-regexp end t) - (or (vhdl-in-literal) - (if upper-case - (upcase-word -1) - (downcase-word -1))) - (when (and count vhdl-progress-interval (not noninteractive) - (< vhdl-progress-interval - (- (nth 1 (current-time)) last-update))) - (message "Fixing case... (%2d%s)" - (+ (* count 20) (/ (* 20 (- (point) beg)) (- end beg))) - "%") - (setq last-update (nth 1 (current-time))))) - (goto-char end))))) - -(defun vhdl-fix-case-region (beg end &optional arg) - "Convert all VHDL words in region to lower or upper case, depending on -options vhdl-upper-case-{keywords,types,attributes,enum-values}." - (interactive "r\nP") - (vhdl-fix-case-region-1 - beg end vhdl-upper-case-keywords vhdl-keywords-regexp 0) - (vhdl-fix-case-region-1 - beg end vhdl-upper-case-types vhdl-types-regexp 1) - (vhdl-fix-case-region-1 - beg end vhdl-upper-case-attributes (concat "'" vhdl-attributes-regexp) 2) - (vhdl-fix-case-region-1 - beg end vhdl-upper-case-enum-values vhdl-enum-values-regexp 3) - (vhdl-fix-case-region-1 - beg end vhdl-upper-case-constants vhdl-constants-regexp 4) - (when vhdl-progress-interval (message "Fixing case...done"))) - -(defun vhdl-fix-case-buffer () - "Convert all VHDL words in buffer to lower or upper case, depending on -options vhdl-upper-case-{keywords,types,attributes,enum-values}." - (interactive) - (vhdl-fix-case-region (point-min) (point-max))) - -(defun vhdl-fix-case-word (&optional arg) - "Convert word after cursor to upper case if necessary." - (interactive "p") - (save-excursion - (when arg (backward-word 1)) - (vhdl-prepare-search-1 - (when (and vhdl-upper-case-keywords - (looking-at vhdl-keywords-regexp)) - (upcase-word 1)) - (when (and vhdl-upper-case-types - (looking-at vhdl-types-regexp)) - (upcase-word 1)) - (when (and vhdl-upper-case-attributes - (looking-at vhdl-attributes-regexp)) - (upcase-word 1)) - (when (and vhdl-upper-case-enum-values - (looking-at vhdl-enum-values-regexp)) - (upcase-word 1)) - (when (and vhdl-upper-case-constants - (looking-at vhdl-constants-regexp)) - (upcase-word 1))))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Line handling functions (defun vhdl-current-line () @@ -12635,7 +12818,7 @@ ;; print results (message "\n\ File statistics: \"%s\"\n\ ----------------------\n\ +-----------------------\n\ # statements : %5d\n\ # code lines : %5d\n\ # empty lines : %5d\n\ @@ -13486,9 +13669,9 @@ (while (and (re-search-backward "^[ \t]*\\(end\\|use\\)\\>" nil t) (equal "USE" (upcase (match-string 1)))) (when (looking-at "^[ \t]*use[ \t\n\r\f]*\\(\\w+\\)\\.\\(\\w+\\)\\.\\w+") - (setq lib-alist (cons (cons (match-string-no-properties 1) + (push (cons (match-string-no-properties 1) (vhdl-match-string-downcase 2)) - lib-alist)))))) + lib-alist))))) lib-alist)) (defun vhdl-scan-directory-contents (name &optional project update num-string @@ -13534,7 +13717,7 @@ file-tmp-list) (while file-list (unless (string-match file-exclude-regexp (car file-list)) - (setq file-tmp-list (cons (car file-list) file-tmp-list))) + (push (car file-list) file-tmp-list)) (setq file-list (cdr file-list))) (setq file-list (nreverse file-tmp-list)))) ;; do for all files @@ -13569,7 +13752,7 @@ "Entity declared twice (used 1.): \"%s\"\n 1. in \"%s\" (line %d)\n 2. in \"%s\" (line %d)" ent-name (nth 1 ent-entry) (nth 2 ent-entry) file-name (vhdl-current-line)) - (setq ent-list (cons ent-key ent-list)) + (push ent-key ent-list) (aput 'ent-alist ent-key (list ent-name file-name (vhdl-current-line) (nth 3 ent-entry) (nth 4 ent-entry) @@ -13621,7 +13804,7 @@ "Configuration declared twice (used 1.): \"%s\" of \"%s\"\n 1. in \"%s\" (line %d)\n 2. in \"%s\" (line %d)" conf-name ent-name (nth 1 conf-entry) (nth 2 conf-entry) file-name conf-line) - (setq conf-list (cons conf-key conf-list)) + (push conf-key conf-list) ;; scan for subconfigurations and subentities (while (re-search-forward "^[ \t]*for[ \t\n\r\f]+\\(\\w+\\([ \t\n\r\f]*,[ \t\n\r\f]*\\w+\\)*\\)[ \t\n\r\f]*:[ \t\n\r\f]*\\(\\w+\\)[ \t\n\r\f]+" end-of-unit t) (setq inst-comp-key (vhdl-match-string-downcase 3) @@ -13684,8 +13867,8 @@ (setq func-alist (nreverse func-alist)) (setq comp-alist (nreverse comp-alist)) (if is-body - (setq pack-body-list (cons pack-key pack-body-list)) - (setq pack-list (cons pack-key pack-list))) + (push pack-key pack-body-list) + (push pack-key pack-list)) (aput 'pack-alist pack-key (if is-body @@ -13939,7 +14122,7 @@ (let ((case-fold-search nil)) (while dir-list (unless (string-match file-exclude-regexp (car dir-list)) - (setq dir-list-tmp (cons (car dir-list) dir-list-tmp))) + (push (car dir-list) dir-list-tmp)) (setq dir-list (cdr dir-list))) (setq dir-list (nreverse dir-list-tmp)))) (message "Collecting source files...done") @@ -14331,7 +14514,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Add hierarchy browser functionality to speedbar -(defvar vhdl-speedbar-key-map nil +(defvar vhdl-speedbar-mode-map nil "Keymap used when in the VHDL hierarchy browser mode.") (defvar vhdl-speedbar-menu-items nil @@ -14359,24 +14542,24 @@ (speedbar-item-info . vhdl-speedbar-item-info) (speedbar-line-directory . vhdl-speedbar-line-project))) ;; keymap - (unless vhdl-speedbar-key-map - (setq vhdl-speedbar-key-map (speedbar-make-specialized-keymap)) - (define-key vhdl-speedbar-key-map "e" 'speedbar-edit-line) - (define-key vhdl-speedbar-key-map "\C-m" 'speedbar-edit-line) - (define-key vhdl-speedbar-key-map "+" 'speedbar-expand-line) - (define-key vhdl-speedbar-key-map "=" 'speedbar-expand-line) - (define-key vhdl-speedbar-key-map "-" 'vhdl-speedbar-contract-level) - (define-key vhdl-speedbar-key-map "_" 'vhdl-speedbar-contract-all) - (define-key vhdl-speedbar-key-map "C" 'vhdl-speedbar-port-copy) - (define-key vhdl-speedbar-key-map "P" 'vhdl-speedbar-place-component) - (define-key vhdl-speedbar-key-map "F" 'vhdl-speedbar-configuration) - (define-key vhdl-speedbar-key-map "A" 'vhdl-speedbar-select-mra) - (define-key vhdl-speedbar-key-map "K" 'vhdl-speedbar-make-design) - (define-key vhdl-speedbar-key-map "R" 'vhdl-speedbar-rescan-hierarchy) - (define-key vhdl-speedbar-key-map "S" 'vhdl-save-caches) + (unless vhdl-speedbar-mode-map + (setq vhdl-speedbar-mode-map (speedbar-make-specialized-keymap)) + (define-key vhdl-speedbar-mode-map "e" 'speedbar-edit-line) + (define-key vhdl-speedbar-mode-map "\C-m" 'speedbar-edit-line) + (define-key vhdl-speedbar-mode-map "+" 'speedbar-expand-line) + (define-key vhdl-speedbar-mode-map "=" 'speedbar-expand-line) + (define-key vhdl-speedbar-mode-map "-" 'vhdl-speedbar-contract-level) + (define-key vhdl-speedbar-mode-map "_" 'vhdl-speedbar-contract-all) + (define-key vhdl-speedbar-mode-map "C" 'vhdl-speedbar-port-copy) + (define-key vhdl-speedbar-mode-map "P" 'vhdl-speedbar-place-component) + (define-key vhdl-speedbar-mode-map "F" 'vhdl-speedbar-configuration) + (define-key vhdl-speedbar-mode-map "A" 'vhdl-speedbar-select-mra) + (define-key vhdl-speedbar-mode-map "K" 'vhdl-speedbar-make-design) + (define-key vhdl-speedbar-mode-map "R" 'vhdl-speedbar-rescan-hierarchy) + (define-key vhdl-speedbar-mode-map "S" 'vhdl-save-caches) (let ((key 0)) (while (<= key 9) - (define-key vhdl-speedbar-key-map (int-to-string key) + (define-key vhdl-speedbar-mode-map (int-to-string key) `(lambda () (interactive) (vhdl-speedbar-set-depth ,key))) (setq key (1+ key))))) (define-key speedbar-mode-map "h" @@ -14429,10 +14612,10 @@ ["Save Caches" vhdl-save-caches vhdl-updated-project-list]))) ;; hook-ups (speedbar-add-expansion-list - '("vhdl directory" vhdl-speedbar-menu-items vhdl-speedbar-key-map + '("vhdl directory" vhdl-speedbar-menu-items vhdl-speedbar-mode-map vhdl-speedbar-display-directory)) (speedbar-add-expansion-list - '("vhdl project" vhdl-speedbar-menu-items vhdl-speedbar-key-map + '("vhdl project" vhdl-speedbar-menu-items vhdl-speedbar-mode-map vhdl-speedbar-display-projects)) (setq speedbar-stealthy-function-list (append @@ -14719,15 +14902,15 @@ (setq arch-alist (nth 4 (car ent-alist))) (setq subunit-alist nil) (while arch-alist - (setq subunit-alist (cons (caar arch-alist) subunit-alist)) + (push (caar arch-alist) subunit-alist) (setq arch-alist (cdr arch-alist))) - (setq unit-alist (cons (list (caar ent-alist) subunit-alist) unit-alist)) + (push (list (caar ent-alist) subunit-alist) unit-alist) (setq ent-alist (cdr ent-alist))) (while conf-alist - (setq unit-alist (cons (list (caar conf-alist)) unit-alist)) + (push (list (caar conf-alist)) unit-alist) (setq conf-alist (cdr conf-alist))) (while pack-alist - (setq unit-alist (cons (list (caar pack-alist)) unit-alist)) + (push (list (caar pack-alist)) unit-alist) (setq pack-alist (cdr pack-alist))) (aput 'vhdl-speedbar-shown-unit-alist key unit-alist) (vhdl-speedbar-refresh) @@ -15367,7 +15550,7 @@ (concat (speedbar-line-directory indent) token)))) (while oldl (if (not (string-match (concat "^" (regexp-quote td)) (car oldl))) - (setq newl (cons (car oldl) newl))) + (push (car oldl) newl)) (setq oldl (cdr oldl))) (setq speedbar-shown-directories (nreverse newl))) (speedbar-change-expand-button-char ?+) @@ -15474,7 +15657,7 @@ (setq dir (car path-list)) (string-match "\\(-r \\)?\\(\\([^?*]*[/\\]\\)*\\)" dir) (if (file-directory-p (match-string 2 dir)) - (setq path-list-1 (cons dir path-list-1)) + (push dir path-list-1) (vhdl-warning-when-idle "No such directory: \"%s\"" (match-string 2 dir))) (setq path-list (cdr path-list))) ;; resolve path wildcards @@ -15496,13 +15679,13 @@ dir-list) (while all-list (when (file-directory-p (car all-list)) - (setq dir-list (cons (car all-list) dir-list))) + (push (car all-list) dir-list)) (setq all-list (cdr all-list))) dir-list)) (cdr path-list-1)))) (string-match "\\(-r \\)?\\(.*\\)[/\\].*" dir) (when (file-directory-p (match-string 2 dir)) - (setq path-list-2 (cons dir path-list-2))) + (push dir path-list-2)) (setq path-list-1 (cdr path-list-1)))) (nreverse path-list-2))) @@ -15527,8 +15710,7 @@ (let ((buffer (get-file-buffer (car token)))) (speedbar-find-file-in-frame (car token)) (when (or vhdl-speedbar-jump-to-unit buffer) - (goto-char (point-min)) - (forward-line (1- (cdr token))) + (vhdl-goto-line (cdr token)) (recenter)) (vhdl-speedbar-update-current-unit t t) (speedbar-set-timer dframe-update-speed) @@ -15546,8 +15728,7 @@ (let ((token (get-text-property (match-beginning 3) 'speedbar-token))) (vhdl-visit-file (car token) t - (progn (goto-char (point-min)) - (forward-line (1- (cdr token))) + (progn (vhdl-goto-line (cdr token)) (end-of-line) (if is-entity (vhdl-port-copy) @@ -16000,7 +16181,7 @@ (or (aget generic-alist (match-string 2) t) (error "ERROR: Formal generic \"%s\" mismatch for instance \"%s\"" (match-string 2) inst-name)) (cdar generic-alist)))) - (setq constant-alist (cons constant-entry constant-alist)) + (push constant-entry constant-alist) (setq constant-name (downcase constant-name)) (if (or (member constant-name single-list) (member constant-name multi-list)) @@ -16020,7 +16201,7 @@ (or (aget port-alist (match-string 2) t) (error "ERROR: Formal port \"%s\" mismatch for instance \"%s\"" (match-string 2) inst-name)) (cdar port-alist)))) - (setq signal-alist (cons signal-entry signal-alist)) + (push signal-entry signal-alist) (setq signal-name (downcase signal-name)) (if (equal (upcase (nth 2 signal-entry)) "IN") ;; input signal @@ -16054,8 +16235,8 @@ (unless (match-string 1) (setq port-alist (cdr port-alist))) (vhdl-forward-syntactic-ws)) - (setq inst-alist (cons (list inst-name (nreverse constant-alist) - (nreverse signal-alist)) inst-alist))) + (push (list inst-name (nreverse constant-alist) + (nreverse signal-alist)) inst-alist)) ;; prepare signal insertion (vhdl-goto-marker arch-decl-pos) (forward-line 1) @@ -16122,6 +16303,7 @@ (while constant-alist (setq constant-name (downcase (caar constant-alist)) constant-entry (car constant-alist)) + (unless (string-match "^[0-9]+" constant-name) (cond ((member constant-name written-list) nil) ((member constant-name multi-list) @@ -16138,7 +16320,7 @@ (setq generic-end-pos (vhdl-compose-insert-generic constant-entry)) (setq generic-inst-pos (point-marker)) - (add-to-list 'written-list constant-name))) + (add-to-list 'written-list constant-name)))) (setq constant-alist (cdr constant-alist))) (when (/= constant-temp-pos generic-inst-pos) (vhdl-goto-marker (vhdl-max-marker constant-temp-pos generic-pos)) @@ -16298,8 +16480,7 @@ ;; insert component declarations (while ent-alist (vhdl-visit-file (nth 2 (car ent-alist)) nil - (progn (goto-char (point-min)) - (forward-line (1- (nth 3 (car ent-alist)))) + (progn (vhdl-goto-line (nth 3 (car ent-alist))) (end-of-line) (vhdl-port-copy))) (goto-char component-pos) @@ -16555,12 +16736,12 @@ (setq sublist (nth 11 (car commands-alist))) (unless (or (equal "" (car sublist)) (assoc (car sublist) regexp-alist)) - (setq regexp-alist (cons (list (nth 0 sublist) - (if (= 0 (nth 1 sublist)) - (if (featurep 'xemacs) 9 nil) + (push (list (nth 0 sublist) + (if (and (featurep 'xemacs) (not (nth 1 sublist))) + 9 (nth 1 sublist)) (nth 2 sublist) (nth 3 sublist)) - regexp-alist))) + regexp-alist)) (setq commands-alist (cdr commands-alist))) (setq compilation-error-regexp-alist (append compilation-error-regexp-alist (nreverse regexp-alist)))) @@ -16573,7 +16754,7 @@ (setq sublist (nth 12 (car commands-alist))) (unless (or (equal "" (car sublist)) (assoc (car sublist) regexp-alist)) - (setq regexp-alist (cons sublist regexp-alist))) + (push sublist regexp-alist)) (setq commands-alist (cdr commands-alist))) (setq compilation-file-regexp-alist (append compilation-file-regexp-alist (nreverse regexp-alist)))))) @@ -16702,6 +16883,42 @@ (compile (concat (if (equal command "") "make" command) " " options " " vhdl-make-target)))) +;; Emacs 22+ setup +(defvar vhdl-error-regexp-emacs-alist + ;; Get regexps from `vhdl-compiler-alist' + (let ((compiler-alist vhdl-compiler-alist) + (error-regexp-alist '((vhdl-directory "^ *Compiling \"\\(.+\\)\"" 1)))) + (while compiler-alist + ;; add error message regexps + (setq error-regexp-alist + (cons (append (list (make-symbol (concat "vhdl-" (subst-char-in-string ? ?- (downcase (nth 0 (car compiler-alist))))))) + (nth 11 (car compiler-alist))) + error-regexp-alist)) + ;; add filename regexps + (when (/= 0 (nth 1 (nth 12 (car compiler-alist)))) + (setq error-regexp-alist + (cons (append (list (make-symbol (concat "vhdl-" (subst-char-in-string ? ?- (downcase (nth 0 (car compiler-alist)))) "-file"))) + (nth 12 (car compiler-alist))) + error-regexp-alist))) + (setq compiler-alist (cdr compiler-alist))) + error-regexp-alist) + "List of regexps for VHDL compilers. For Emacs 22+.") + +;; Add error regexps using compilation-mode-hook. +(defun vhdl-error-regexp-add-emacs () + "Set up Emacs compile for VHDL." + (interactive) + (when (and (boundp 'compilation-error-regexp-alist-alist) + (not (assoc 'vhdl-modelsim compilation-error-regexp-alist-alist))) + (mapcar + (lambda (item) + (push (car item) compilation-error-regexp-alist) + (push item compilation-error-regexp-alist-alist)) + vhdl-error-regexp-emacs-alist))) + +(when vhdl-emacs-22 + (add-hook 'compilation-mode-hook 'vhdl-error-regexp-add-emacs)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Makefile generation @@ -16724,7 +16941,7 @@ (let (pack-list) (while lib-alist (when (equal (downcase (caar lib-alist)) (downcase work-library)) - (setq pack-list (cons (cdar lib-alist) pack-list))) + (push (cdar lib-alist) pack-list)) (setq lib-alist (cdr lib-alist))) pack-list)) @@ -16776,8 +16993,10 @@ (setq ent-entry (car ent-alist) ent-key (nth 0 ent-entry)) (when (nth 2 ent-entry) - (setq ent-file-name (file-relative-name - (nth 2 ent-entry) compile-directory) + (setq ent-file-name (if vhdl-compile-absolute-path + (nth 2 ent-entry) + (file-relative-name (nth 2 ent-entry) + compile-directory)) arch-alist (nth 4 ent-entry) lib-alist (nth 6 ent-entry) rule (aget rule-alist ent-file-name) @@ -16787,9 +17006,9 @@ subcomp-list nil) (setq tmp-key (vhdl-replace-string ent-regexp (funcall adjust-case ent-key))) - (setq unit-list (cons (cons ent-key tmp-key) unit-list)) + (push (cons ent-key tmp-key) unit-list) ;; rule target for this entity - (setq target-list (cons ent-key target-list)) + (push ent-key target-list) ;; rule dependencies for all used packages (setq pack-list (vhdl-get-packages lib-alist work-library)) (setq depend-list (append depend-list pack-list)) @@ -16801,8 +17020,10 @@ (setq arch-entry (car arch-alist) arch-key (nth 0 arch-entry) ent-arch-key (concat ent-key "-" arch-key) - arch-file-name (file-relative-name (nth 2 arch-entry) - compile-directory) + arch-file-name (if vhdl-compile-absolute-path + (nth 2 arch-entry) + (file-relative-name (nth 2 arch-entry) + compile-directory)) inst-alist (nth 4 arch-entry) lib-alist (nth 5 arch-entry) rule (aget rule-alist arch-file-name) @@ -16813,11 +17034,11 @@ (funcall adjust-case (concat arch-key " " ent-key)))) (setq unit-list (cons (cons ent-arch-key tmp-key) unit-list)) - (setq second-list (cons ent-arch-key second-list)) + (push ent-arch-key second-list) ;; rule target for this architecture - (setq target-list (cons ent-arch-key target-list)) + (push ent-arch-key target-list) ;; rule dependency for corresponding entity - (setq depend-list (cons ent-key depend-list)) + (push ent-key depend-list) ;; rule dependencies for contained component instantiations (while inst-alist (setq inst-entry (car inst-alist)) @@ -16835,9 +17056,8 @@ ;; add rule (aput 'rule-alist arch-file-name (list target-list depend-list)) (setq arch-alist (cdr arch-alist))) - (setq prim-list (cons (list ent-key second-list - (append subcomp-list all-pack-list)) - prim-list))) + (push (list ent-key second-list (append subcomp-list all-pack-list)) + prim-list)) (setq ent-alist (cdr ent-alist))) (setq ent-alist tmp-list) ;; rules for all configurations @@ -16845,8 +17065,10 @@ (while conf-alist (setq conf-entry (car conf-alist) conf-key (nth 0 conf-entry) - conf-file-name (file-relative-name - (nth 2 conf-entry) compile-directory) + conf-file-name (if vhdl-compile-absolute-path + (nth 2 conf-entry) + (file-relative-name (nth 2 conf-entry) + compile-directory)) ent-key (nth 4 conf-entry) arch-key (nth 5 conf-entry) inst-alist (nth 6 conf-entry) @@ -16857,9 +17079,9 @@ subcomp-list (list ent-key)) (setq tmp-key (vhdl-replace-string conf-regexp (funcall adjust-case conf-key))) - (setq unit-list (cons (cons conf-key tmp-key) unit-list)) + (push (cons conf-key tmp-key) unit-list) ;; rule target for this configuration - (setq target-list (cons conf-key target-list)) + (push conf-key target-list) ;; rule dependency for corresponding entity and architecture (setq depend-list (cons ent-key (cons (concat ent-key "-" arch-key) depend-list))) @@ -16877,16 +17099,14 @@ (setq depend-list (cons inst-ent-key depend-list) subcomp-list (cons inst-ent-key subcomp-list))) ; (when comp-arch-key -; (setq depend-list (cons (concat comp-ent-key "-" comp-arch-key) -; depend-list))) +; (push (concat comp-ent-key "-" comp-arch-key) depend-list)) (when inst-conf-key (setq depend-list (cons inst-conf-key depend-list) subcomp-list (cons inst-conf-key subcomp-list)))) (setq inst-alist (cdr inst-alist))) ;; add rule (aput 'rule-alist conf-file-name (list target-list depend-list)) - (setq prim-list (cons (list conf-key nil (append subcomp-list pack-list)) - prim-list)) + (push (list conf-key nil (append subcomp-list pack-list)) prim-list) (setq conf-alist (cdr conf-alist))) (setq conf-alist tmp-list) ;; rules for all packages @@ -16896,16 +17116,18 @@ pack-key (nth 0 pack-entry) pack-body-key nil) (when (nth 2 pack-entry) - (setq pack-file-name (file-relative-name (nth 2 pack-entry) - compile-directory) + (setq pack-file-name (if vhdl-compile-absolute-path + (nth 2 pack-entry) + (file-relative-name (nth 2 pack-entry) + compile-directory)) lib-alist (nth 6 pack-entry) lib-body-alist (nth 10 pack-entry) rule (aget rule-alist pack-file-name) target-list (nth 0 rule) depend-list (nth 1 rule)) (setq tmp-key (vhdl-replace-string pack-regexp (funcall adjust-case pack-key))) - (setq unit-list (cons (cons pack-key tmp-key) unit-list)) + (push (cons pack-key tmp-key) unit-list) ;; rule target for this package - (setq target-list (cons pack-key target-list)) + (push pack-key target-list) ;; rule dependencies for all used packages (setq pack-list (vhdl-get-packages lib-alist work-library)) (setq depend-list (append depend-list pack-list)) @@ -16915,8 +17137,10 @@ ;; rules for this package's body (when (nth 7 pack-entry) (setq pack-body-key (concat pack-key "-body") - pack-body-file-name (file-relative-name (nth 7 pack-entry) - compile-directory) + pack-body-file-name (if vhdl-compile-absolute-path + (nth 7 pack-entry) + (file-relative-name (nth 7 pack-entry) + compile-directory)) rule (aget rule-alist pack-body-file-name) target-list (nth 0 rule) depend-list (nth 1 rule)) @@ -16925,9 +17149,9 @@ (setq unit-list (cons (cons pack-body-key tmp-key) unit-list)) ;; rule target for this package's body - (setq target-list (cons pack-body-key target-list)) + (push pack-body-key target-list) ;; rule dependency for corresponding package declaration - (setq depend-list (cons pack-key depend-list)) + (push pack-key depend-list) ;; rule dependencies for all used packages (setq pack-list (vhdl-get-packages lib-body-alist work-library)) (setq depend-list (append depend-list pack-list)) @@ -17050,16 +17274,16 @@ (unless (equal unit-key unit-name) (insert " \\\n" unit-name)) (insert " :" - " \\\n\t\t" (nth 2 vhdl-makefile-default-targets) - " \\\n\t\t$(UNIT-" work-library "-" unit-key ")") - (while second-list - (insert " \\\n\t\t$(UNIT-" work-library "-" (car second-list) ")") - (setq second-list (cdr second-list))) + " \\\n\t\t" (nth 2 vhdl-makefile-default-targets)) (while subcomp-list (when (and (assoc (car subcomp-list) unit-list) (not (equal unit-key (car subcomp-list)))) (insert " \\\n\t\t" (car subcomp-list))) (setq subcomp-list (cdr subcomp-list))) + (insert " \\\n\t\t$(UNIT-" work-library "-" unit-key ")") + (while second-list + (insert " \\\n\t\t$(UNIT-" work-library "-" (car second-list) ")") + (setq second-list (cdr second-list))) (insert "\n") (setq prim-list (cdr prim-list))) ;; insert rule for each library unit file @@ -17198,6 +17422,7 @@ 'vhdl-include-direction-comments 'vhdl-include-type-comments 'vhdl-include-group-comments + 'vhdl-actual-generic-name 'vhdl-actual-port-name 'vhdl-instance-name 'vhdl-testbench-entity-name @@ -17280,13 +17505,21 @@ (defconst vhdl-doc-release-notes nil "\ +Release Notes for VHDL Mode 3.34 +================================ + +- Added support for GNU Emacs 22/23/24: + - Compilation error parsing fixed for new `compile.el' package. + +- Port translation: Derive actual generic name from formal generic name. + +- New user options: + `vhdl-actual-generic-name': Specify how actual generic names are obtained. + + Release Notes for VHDL Mode 3.33 ================================ - - New Features - - User Options - - New Features ------------ ------------------------------------------------------------ revno: 112600 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-05-16 00:10:39 -0700 message: Merge from gnulib. 2013-05-15 manywarnings: update for GCC 4.8.0 2013-05-15 stdio: use __REDIRECT for fwrite, fwrite_unlocked 2013-05-15 sig2str, stdio, warnings: port to clang diff: === modified file 'ChangeLog' --- ChangeLog 2013-05-15 20:12:53 +0000 +++ ChangeLog 2013-05-16 07:10:39 +0000 @@ -1,3 +1,10 @@ +2013-05-16 Paul Eggert + + Merge from gnulib, incorporating: + 2013-05-15 manywarnings: update for GCC 4.8.0 + 2013-05-15 stdio: use __REDIRECT for fwrite, fwrite_unlocked + 2013-05-15 sig2str, stdio, warnings: port to clang + 2013-05-15 Stefan Monnier * Makefile.in (install-doc): DOC file is not version specific any more. === modified file 'lib/sig2str.c' --- lib/sig2str.c 2013-01-02 16:37:04 +0000 +++ lib/sig2str.c 2013-05-16 07:10:39 +0000 @@ -325,21 +325,25 @@ { int rtmin = SIGRTMIN; int rtmax = SIGRTMAX; + int base, delta; if (! (rtmin <= signum && signum <= rtmax)) return -1; if (signum <= rtmin + (rtmax - rtmin) / 2) { - int delta = signum - rtmin; - sprintf (signame, delta ? "RTMIN+%d" : "RTMIN", delta); + strcpy (signame, "RTMIN"); + base = rtmin; } else { - int delta = rtmax - signum; - sprintf (signame, delta ? "RTMAX-%d" : "RTMAX", delta); + strcpy (signame, "RTMAX"); + base = rtmax; } + delta = signum - base; + if (delta != 0) + sprintf (signame + 5, "%+d", delta); return 0; } } === modified file 'lib/stdio.in.h' --- lib/stdio.in.h 2013-01-04 02:17:49 +0000 +++ lib/stdio.in.h 2013-05-16 07:10:39 +0000 @@ -579,13 +579,23 @@ , which sometimes causes an unwanted diagnostic for fwrite calls. This affects only function declaration attributes under certain - versions of gcc, and is not needed for C++. */ + versions of gcc and clang, and is not needed for C++. */ # if (0 < __USE_FORTIFY_LEVEL \ && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \ && 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \ && !defined __cplusplus) # undef fwrite -# define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; }) +# undef fwrite_unlocked +extern size_t __REDIRECT (rpl_fwrite, + (const void *__restrict, size_t, size_t, + FILE *__restrict), + fwrite); +extern size_t __REDIRECT (rpl_fwrite_unlocked, + (const void *__restrict, size_t, size_t, + FILE *__restrict), + fwrite_unlocked); +# define fwrite rpl_fwrite +# define fwrite_unlocked rpl_fwrite_unlocked # endif # endif _GL_CXXALIASWARN (fwrite); === modified file 'm4/manywarnings.m4' --- m4/manywarnings.m4 2013-01-01 09:11:05 +0000 +++ m4/manywarnings.m4 2013-05-16 07:10:39 +0000 @@ -98,6 +98,7 @@ -W \ -Wabi \ -Waddress \ + -Waggressive-loop-optimizations \ -Wall \ -Warray-bounds \ -Wattributes \ @@ -125,7 +126,6 @@ -Wformat-security \ -Wformat-y2k \ -Wformat-zero-length \ - -Wformat=2 \ -Wfree-nonheap-object \ -Wignored-qualifiers \ -Wimplicit \ @@ -143,9 +143,7 @@ -Wmissing-braces \ -Wmissing-declarations \ -Wmissing-field-initializers \ - -Wmissing-format-attribute \ -Wmissing-include-dirs \ - -Wmissing-noreturn \ -Wmissing-parameter-type \ -Wmissing-prototypes \ -Wmudflap \ @@ -166,6 +164,7 @@ -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-local-addr \ -Wreturn-type \ -Wsequence-point \ -Wshadow \ @@ -187,7 +186,6 @@ -Wtype-limits \ -Wuninitialized \ -Wunknown-pragmas \ - -Wunreachable-code \ -Wunsafe-loop-optimizations \ -Wunused \ -Wunused-but-set-parameter \ === modified file 'm4/warnings.m4' --- m4/warnings.m4 2013-01-01 09:11:05 +0000 +++ m4/warnings.m4 2013-05-16 07:10:39 +0000 @@ -1,4 +1,4 @@ -# warnings.m4 serial 7 +# warnings.m4 serial 8 dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -27,7 +27,7 @@ AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ gl_save_compiler_FLAGS="$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $1"]) + gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors $1"]) AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], [AS_VAR_SET(gl_Warn, [yes])], [AS_VAR_SET(gl_Warn, [no])]) @@ -38,6 +38,14 @@ AS_VAR_POPDEF([gl_Warn])dnl ]) +# gl_UNKNOWN_WARNINGS_ARE_ERRORS +# ------------------------------ +# Clang doesn't complain about unknown warning options unless one also +# specifies -Wunknown-warning-option -Werror. Detect this. +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], +[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], + [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], + [gl_unknown_warnings_are_errors=])]) # gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS], # [PROGRAM = AC_LANG_PROGRAM()]) @@ -47,7 +55,8 @@ # # If VARIABLE is a variable name, AC_SUBST it. AC_DEFUN([gl_WARN_ADD], -[gl_COMPILER_OPTION_IF([$1], +[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS]) +gl_COMPILER_OPTION_IF([$1], [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])], [], [$3]) ------------------------------------------------------------ revno: 112599 committer: Leo Liu branch nick: trunk timestamp: Thu 2013-05-16 11:41:52 +0800 message: * simple.el (prog-indent-sexp): Indent enclosing defun. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-15 23:55:41 +0000 +++ lisp/ChangeLog 2013-05-16 03:41:52 +0000 @@ -1,3 +1,7 @@ +2013-05-16 Leo Liu + + * simple.el (prog-indent-sexp): Indent enclosing defun. + 2013-05-15 Glenn Morris * cus-start.el (show-trailing-whitespace): Move to editing basics. === modified file 'lisp/simple.el' --- lisp/simple.el 2013-05-08 18:05:40 +0000 +++ lisp/simple.el 2013-05-16 03:41:52 +0000 @@ -380,12 +380,18 @@ map) "Keymap used for programming modes.") -(defun prog-indent-sexp () - "Indent the expression after point." - (interactive) - (let ((start (point)) - (end (save-excursion (forward-sexp 1) (point)))) - (indent-region start end nil))) +(defun prog-indent-sexp (&optional defun) + "Indent the expression after point. +When interactively called with prefix, indent the enclosing defun +instead." + (interactive "P") + (save-excursion + (when defun + (end-of-line) + (beginning-of-defun)) + (let ((start (point)) + (end (progn (forward-sexp 1) (point)))) + (indent-region start end nil)))) (define-derived-mode prog-mode fundamental-mode "Prog" "Major mode for editing programming language source code." ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.