View | Details | Raw Unified | Return to ticket 806
Collapse All | Expand All

(-)a/aclocal.m4 (-375 / +285 lines)
Lines 1-7 Link Here
1
# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
1
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
2
3
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4
2
3
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
5
# This file is free software; the Free Software Foundation
5
# This file is free software; the Free Software Foundation
6
# gives unlimited permission to copy and/or distribute it,
6
# gives unlimited permission to copy and/or distribute it,
7
# with or without modifications, as long as this notice is preserved.
7
# with or without modifications, as long as this notice is preserved.
Lines 11-24 Link Here
11
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12
# PARTICULAR PURPOSE.
12
# PARTICULAR PURPOSE.
13
13
14
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15
m4_ifndef([AC_AUTOCONF_VERSION],
14
m4_ifndef([AC_AUTOCONF_VERSION],
16
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
15
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
18
[m4_warning([this file was generated for autoconf 2.69.
17
[m4_warning([this file was generated for autoconf 2.63.
19
You have another version of autoconf.  It may work, but is not guaranteed to.
18
You have another version of autoconf.  It may work, but is not guaranteed to.
20
If you have problems, you may need to regenerate the build system entirely.
19
If you have problems, you may need to regenerate the build system entirely.
21
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
22
21
23
# Configure paths for GLIB
22
# Configure paths for GLIB
24
# Owen Taylor     1997-2001
23
# Owen Taylor     1997-2001
Lines 86-92 AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run Link Here
86
    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
85
    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
87
    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
86
    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
88
    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
87
    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
89
    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
90
88
91
    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
89
    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
92
    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
90
    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
Lines 114-127 dnl Link Here
114
int 
112
int 
115
main ()
113
main ()
116
{
114
{
117
  unsigned int major, minor, micro;
115
  int major, minor, micro;
118
  char *tmp_version;
116
  char *tmp_version;
117
  int ignored;
119
118
120
  fclose (fopen ("conf.glibtest", "w"));
119
  ignored = system ("touch conf.glibtest");
121
120
122
  /* HP/UX 9 (%@#!) writes to sscanf strings */
121
  /* HP/UX 9 (%@#!) writes to sscanf strings */
123
  tmp_version = g_strdup("$min_glib_version");
122
  tmp_version = g_strdup("$min_glib_version");
124
  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
123
  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
125
     printf("%s, bad version string\n", "$min_glib_version");
124
     printf("%s, bad version string\n", "$min_glib_version");
126
     exit(1);
125
     exit(1);
127
   }
126
   }
Lines 160-168 main () Link Here
160
       }
159
       }
161
     else
160
     else
162
      {
161
      {
163
        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
162
        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
164
               glib_major_version, glib_minor_version, glib_micro_version);
163
               glib_major_version, glib_minor_version, glib_micro_version);
165
        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
164
        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
166
	       major, minor, micro);
165
	       major, minor, micro);
167
        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
166
        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
168
        printf("***\n");
167
        printf("***\n");
Lines 223-229 main () Link Here
223
     GLIB_GENMARSHAL=""
222
     GLIB_GENMARSHAL=""
224
     GOBJECT_QUERY=""
223
     GOBJECT_QUERY=""
225
     GLIB_MKENUMS=""
224
     GLIB_MKENUMS=""
226
     GLIB_COMPILE_RESOURCES=""
227
     ifelse([$3], , :, [$3])
225
     ifelse([$3], , :, [$3])
228
  fi
226
  fi
229
  AC_SUBST(GLIB_CFLAGS)
227
  AC_SUBST(GLIB_CFLAGS)
Lines 231-237 main () Link Here
231
  AC_SUBST(GLIB_GENMARSHAL)
229
  AC_SUBST(GLIB_GENMARSHAL)
232
  AC_SUBST(GOBJECT_QUERY)
230
  AC_SUBST(GOBJECT_QUERY)
233
  AC_SUBST(GLIB_MKENUMS)
231
  AC_SUBST(GLIB_MKENUMS)
234
  AC_SUBST(GLIB_COMPILE_RESOURCES)
235
  rm -f conf.glibtest
232
  rm -f conf.glibtest
236
])
233
])
237
234
Lines 322-328 main () Link Here
322
  int major, minor, micro;
319
  int major, minor, micro;
323
  char *tmp_version;
320
  char *tmp_version;
324
321
325
  fclose (fopen ("conf.gtktest", "w"));
322
  system ("touch conf.gtktest");
326
323
327
  /* HP/UX 9 (%@#!) writes to sscanf strings */
324
  /* HP/UX 9 (%@#!) writes to sscanf strings */
328
  tmp_version = g_strdup("$min_gtk_version");
325
  tmp_version = g_strdup("$min_gtk_version");
Lines 433-439 main () Link Here
433
])
430
])
434
431
435
# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
432
# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
436
# serial 1 (pkg-config-0.24)
437
# 
433
# 
438
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
434
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
439
#
435
#
Lines 460-471 main () Link Here
460
# ----------------------------------
456
# ----------------------------------
461
AC_DEFUN([PKG_PROG_PKG_CONFIG],
457
AC_DEFUN([PKG_PROG_PKG_CONFIG],
462
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
458
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
463
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
459
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
464
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
460
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
465
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
466
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
467
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
468
469
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
461
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
470
	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
462
	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
471
fi
463
fi
Lines 478-483 if test -n "$PKG_CONFIG"; then Link Here
478
		AC_MSG_RESULT([no])
470
		AC_MSG_RESULT([no])
479
		PKG_CONFIG=""
471
		PKG_CONFIG=""
480
	fi
472
	fi
473
		
481
fi[]dnl
474
fi[]dnl
482
])# PKG_PROG_PKG_CONFIG
475
])# PKG_PROG_PKG_CONFIG
483
476
Lines 486-505 fi[]dnl Link Here
486
# Check to see whether a particular set of modules exists.  Similar
479
# Check to see whether a particular set of modules exists.  Similar
487
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
480
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
488
#
481
#
489
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
482
#
490
# only at the first occurence in configure.ac, so if the first place
483
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
491
# it's called might be skipped (such as if it is within an "if", you
484
# this or PKG_CHECK_MODULES is called, or make sure to call
492
# have to call PKG_CHECK_EXISTS manually
485
# PKG_CHECK_EXISTS manually
493
# --------------------------------------------------------------
486
# --------------------------------------------------------------
494
AC_DEFUN([PKG_CHECK_EXISTS],
487
AC_DEFUN([PKG_CHECK_EXISTS],
495
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
488
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
496
if test -n "$PKG_CONFIG" && \
489
if test -n "$PKG_CONFIG" && \
497
    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
490
    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
498
  m4_default([$2], [:])
491
  m4_ifval([$2], [$2], [:])
499
m4_ifvaln([$3], [else
492
m4_ifvaln([$3], [else
500
  $3])dnl
493
  $3])dnl
501
fi])
494
fi])
502
495
496
503
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
497
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
504
# ---------------------------------------------
498
# ---------------------------------------------
505
m4_define([_PKG_CONFIG],
499
m4_define([_PKG_CONFIG],
Lines 507-514 m4_define([_PKG_CONFIG], Link Here
507
    pkg_cv_[]$1="$$1"
501
    pkg_cv_[]$1="$$1"
508
 elif test -n "$PKG_CONFIG"; then
502
 elif test -n "$PKG_CONFIG"; then
509
    PKG_CHECK_EXISTS([$3],
503
    PKG_CHECK_EXISTS([$3],
510
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
504
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
511
		      test "x$?" != "x0" && pkg_failed=yes ],
512
		     [pkg_failed=yes])
505
		     [pkg_failed=yes])
513
 else
506
 else
514
    pkg_failed=untried
507
    pkg_failed=untried
Lines 553-569 and $1[]_LIBS to avoid the need to call pkg-config. Link Here
553
See the pkg-config man page for more details.])
546
See the pkg-config man page for more details.])
554
547
555
if test $pkg_failed = yes; then
548
if test $pkg_failed = yes; then
556
   	AC_MSG_RESULT([no])
557
        _PKG_SHORT_ERRORS_SUPPORTED
549
        _PKG_SHORT_ERRORS_SUPPORTED
558
        if test $_pkg_short_errors_supported = yes; then
550
        if test $_pkg_short_errors_supported = yes; then
559
	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
551
	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
560
        else 
552
        else 
561
	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
553
	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
562
        fi
554
        fi
563
	# Put the nasty error message in config.log where it belongs
555
	# Put the nasty error message in config.log where it belongs
564
	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
556
	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
565
557
566
	m4_default([$4], [AC_MSG_ERROR(
558
	ifelse([$4], , [AC_MSG_ERROR(dnl
567
[Package requirements ($2) were not met:
559
[Package requirements ($2) were not met:
568
560
569
$$1_PKG_ERRORS
561
$$1_PKG_ERRORS
Lines 571-598 $$1_PKG_ERRORS Link Here
571
Consider adjusting the PKG_CONFIG_PATH environment variable if you
563
Consider adjusting the PKG_CONFIG_PATH environment variable if you
572
installed software in a non-standard prefix.
564
installed software in a non-standard prefix.
573
565
574
_PKG_TEXT])[]dnl
566
_PKG_TEXT
575
        ])
567
])],
568
		[AC_MSG_RESULT([no])
569
                $4])
576
elif test $pkg_failed = untried; then
570
elif test $pkg_failed = untried; then
577
     	AC_MSG_RESULT([no])
571
	ifelse([$4], , [AC_MSG_FAILURE(dnl
578
	m4_default([$4], [AC_MSG_FAILURE(
579
[The pkg-config script could not be found or is too old.  Make sure it
572
[The pkg-config script could not be found or is too old.  Make sure it
580
is in your PATH or set the PKG_CONFIG environment variable to the full
573
is in your PATH or set the PKG_CONFIG environment variable to the full
581
path to pkg-config.
574
path to pkg-config.
582
575
583
_PKG_TEXT
576
_PKG_TEXT
584
577
585
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
578
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
586
        ])
579
		[$4])
587
else
580
else
588
	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
581
	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
589
	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
582
	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
590
        AC_MSG_RESULT([yes])
583
        AC_MSG_RESULT([yes])
591
	$3
584
	ifelse([$3], , :, [$3])
592
fi[]dnl
585
fi[]dnl
593
])# PKG_CHECK_MODULES
586
])# PKG_CHECK_MODULES
594
587
595
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
588
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
596
#
589
#
597
# This file is free software; the Free Software Foundation
590
# This file is free software; the Free Software Foundation
598
# gives unlimited permission to copy and/or distribute it,
591
# gives unlimited permission to copy and/or distribute it,
Lines 604-613 fi[]dnl Link Here
604
# generated from the m4 files accompanying Automake X.Y.
597
# generated from the m4 files accompanying Automake X.Y.
605
# (This private macro should not be called outside this file.)
598
# (This private macro should not be called outside this file.)
606
AC_DEFUN([AM_AUTOMAKE_VERSION],
599
AC_DEFUN([AM_AUTOMAKE_VERSION],
607
[am__api_version='1.13'
600
[am__api_version='1.11'
608
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
601
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
609
dnl require some minimum version.  Point them to the right macro.
602
dnl require some minimum version.  Point them to the right macro.
610
m4_if([$1], [1.13.3], [],
603
m4_if([$1], [1.11.1], [],
611
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
604
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
612
])
605
])
613
606
Lines 623-644 m4_define([_AM_AUTOCONF_VERSION], []) Link Here
623
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
616
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
624
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
617
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
625
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
618
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
626
[AM_AUTOMAKE_VERSION([1.13.3])dnl
619
[AM_AUTOMAKE_VERSION([1.11.1])dnl
627
m4_ifndef([AC_AUTOCONF_VERSION],
620
m4_ifndef([AC_AUTOCONF_VERSION],
628
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
621
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
629
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
622
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
630
623
631
# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
624
# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
632
625
633
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
626
# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
634
#
627
#
635
# This file is free software; the Free Software Foundation
628
# This file is free software; the Free Software Foundation
636
# gives unlimited permission to copy and/or distribute it,
629
# gives unlimited permission to copy and/or distribute it,
637
# with or without modifications, as long as this notice is preserved.
630
# with or without modifications, as long as this notice is preserved.
638
631
639
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
632
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
640
# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
633
# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
641
# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
634
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
642
#
635
#
643
# Of course, Automake must honor this variable whenever it calls a
636
# Of course, Automake must honor this variable whenever it calls a
644
# tool from the auxiliary directory.  The problem is that $srcdir (and
637
# tool from the auxiliary directory.  The problem is that $srcdir (and
Lines 657-663 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) Link Here
657
#
650
#
658
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
651
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
659
# are both prefixed by $srcdir.  In an in-source build this is usually
652
# are both prefixed by $srcdir.  In an in-source build this is usually
660
# harmless because $srcdir is '.', but things will broke when you
653
# harmless because $srcdir is `.', but things will broke when you
661
# start a VPATH build or use an absolute $srcdir.
654
# start a VPATH build or use an absolute $srcdir.
662
#
655
#
663
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
656
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
Lines 683-701 am_aux_dir=`cd $ac_aux_dir && pwd` Link Here
683
676
684
# AM_CONDITIONAL                                            -*- Autoconf -*-
677
# AM_CONDITIONAL                                            -*- Autoconf -*-
685
678
686
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
679
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
680
# Free Software Foundation, Inc.
687
#
681
#
688
# This file is free software; the Free Software Foundation
682
# This file is free software; the Free Software Foundation
689
# gives unlimited permission to copy and/or distribute it,
683
# gives unlimited permission to copy and/or distribute it,
690
# with or without modifications, as long as this notice is preserved.
684
# with or without modifications, as long as this notice is preserved.
691
685
686
# serial 9
687
692
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
688
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
693
# -------------------------------------
689
# -------------------------------------
694
# Define a conditional.
690
# Define a conditional.
695
AC_DEFUN([AM_CONDITIONAL],
691
AC_DEFUN([AM_CONDITIONAL],
696
[AC_PREREQ([2.52])dnl
692
[AC_PREREQ(2.52)dnl
697
 m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
693
 ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
698
       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
694
	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
699
AC_SUBST([$1_TRUE])dnl
695
AC_SUBST([$1_TRUE])dnl
700
AC_SUBST([$1_FALSE])dnl
696
AC_SUBST([$1_FALSE])dnl
701
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
697
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
Lines 714-727 AC_CONFIG_COMMANDS_PRE( Link Here
714
Usually this means the macro was only invoked conditionally.]])
710
Usually this means the macro was only invoked conditionally.]])
715
fi])])
711
fi])])
716
712
717
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
713
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
714
# Free Software Foundation, Inc.
718
#
715
#
719
# This file is free software; the Free Software Foundation
716
# This file is free software; the Free Software Foundation
720
# gives unlimited permission to copy and/or distribute it,
717
# gives unlimited permission to copy and/or distribute it,
721
# with or without modifications, as long as this notice is preserved.
718
# with or without modifications, as long as this notice is preserved.
722
719
720
# serial 10
723
721
724
# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
722
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
725
# written in clear, in which case automake, when reading aclocal.m4,
723
# written in clear, in which case automake, when reading aclocal.m4,
726
# will think it sees a *use*, and therefore will trigger all it's
724
# will think it sees a *use*, and therefore will trigger all it's
727
# C support machinery.  Also note that it means that autoscan, seeing
725
# C support machinery.  Also note that it means that autoscan, seeing
Lines 731-737 fi])]) Link Here
731
# _AM_DEPENDENCIES(NAME)
729
# _AM_DEPENDENCIES(NAME)
732
# ----------------------
730
# ----------------------
733
# See how the compiler implements dependency checking.
731
# See how the compiler implements dependency checking.
734
# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
732
# NAME is "CC", "CXX", "GCJ", or "OBJC".
735
# We try a few techniques and use that to set a single cache variable.
733
# We try a few techniques and use that to set a single cache variable.
736
#
734
#
737
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
735
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
Lines 744-756 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl Link Here
744
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
742
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
745
AC_REQUIRE([AM_DEP_TRACK])dnl
743
AC_REQUIRE([AM_DEP_TRACK])dnl
746
744
747
m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
745
ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
748
      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
746
       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
749
      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
747
       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
750
      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
748
       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
751
      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
749
       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
752
      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
750
                   [depcc="$$1"   am_compiler_list=])
753
                    [depcc="$$1"   am_compiler_list=])
754
751
755
AC_CACHE_CHECK([dependency style of $depcc],
752
AC_CACHE_CHECK([dependency style of $depcc],
756
               [am_cv_$1_dependencies_compiler_type],
753
               [am_cv_$1_dependencies_compiler_type],
Lines 758-766 AC_CACHE_CHECK([dependency style of $depcc], Link Here
758
  # We make a subdir and do the tests there.  Otherwise we can end up
755
  # We make a subdir and do the tests there.  Otherwise we can end up
759
  # making bogus files that we don't know about and never remove.  For
756
  # making bogus files that we don't know about and never remove.  For
760
  # instance it was reported that on HP-UX the gcc test will end up
757
  # instance it was reported that on HP-UX the gcc test will end up
761
  # making a dummy file named 'D' -- because '-MD' means "put the output
758
  # making a dummy file named `D' -- because `-MD' means `put the output
762
  # in D".
759
  # in D'.
763
  rm -rf conftest.dir
764
  mkdir conftest.dir
760
  mkdir conftest.dir
765
  # Copy depcomp to subdir because otherwise we won't find it if we're
761
  # Copy depcomp to subdir because otherwise we won't find it if we're
766
  # using a relative directory.
762
  # using a relative directory.
Lines 799-814 AC_CACHE_CHECK([dependency style of $depcc], Link Here
799
    : > sub/conftest.c
795
    : > sub/conftest.c
800
    for i in 1 2 3 4 5 6; do
796
    for i in 1 2 3 4 5 6; do
801
      echo '#include "conftst'$i'.h"' >> sub/conftest.c
797
      echo '#include "conftst'$i'.h"' >> sub/conftest.c
802
      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
798
      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
803
      # Solaris 10 /bin/sh.
799
      # Solaris 8's {/usr,}/bin/sh.
804
      echo '/* dummy */' > sub/conftst$i.h
800
      touch sub/conftst$i.h
805
    done
801
    done
806
    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
802
    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
807
803
808
    # We check with '-c' and '-o' for the sake of the "dashmstdout"
804
    # We check with `-c' and `-o' for the sake of the "dashmstdout"
809
    # mode.  It turns out that the SunPro C++ compiler does not properly
805
    # mode.  It turns out that the SunPro C++ compiler does not properly
810
    # handle '-M -o', and we need to detect this.  Also, some Intel
806
    # handle `-M -o', and we need to detect this.  Also, some Intel
811
    # versions had trouble with output in subdirs.
807
    # versions had trouble with output in subdirs
812
    am__obj=sub/conftest.${OBJEXT-o}
808
    am__obj=sub/conftest.${OBJEXT-o}
813
    am__minus_obj="-o $am__obj"
809
    am__minus_obj="-o $am__obj"
814
    case $depmode in
810
    case $depmode in
Lines 817-832 AC_CACHE_CHECK([dependency style of $depcc], Link Here
817
      test "$am__universal" = false || continue
813
      test "$am__universal" = false || continue
818
      ;;
814
      ;;
819
    nosideeffect)
815
    nosideeffect)
820
      # After this tag, mechanisms are not by side-effect, so they'll
816
      # after this tag, mechanisms are not by side-effect, so they'll
821
      # only be used when explicitly requested.
817
      # only be used when explicitly requested
822
      if test "x$enable_dependency_tracking" = xyes; then
818
      if test "x$enable_dependency_tracking" = xyes; then
823
	continue
819
	continue
824
      else
820
      else
825
	break
821
	break
826
      fi
822
      fi
827
      ;;
823
      ;;
828
    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
824
    msvisualcpp | msvcmsys)
829
      # This compiler won't grok '-c -o', but also, the minuso test has
825
      # This compiler won't grok `-c -o', but also, the minuso test has
830
      # not run yet.  These depmodes are late enough in the game, and
826
      # not run yet.  These depmodes are late enough in the game, and
831
      # so weak that their functioning should not be impacted.
827
      # so weak that their functioning should not be impacted.
832
      am__obj=conftest.${OBJEXT-o}
828
      am__obj=conftest.${OBJEXT-o}
Lines 874-880 AM_CONDITIONAL([am__fastdep$1], [ Link Here
874
# AM_SET_DEPDIR
870
# AM_SET_DEPDIR
875
# -------------
871
# -------------
876
# Choose a directory name for dependency files.
872
# Choose a directory name for dependency files.
877
# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
873
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
878
AC_DEFUN([AM_SET_DEPDIR],
874
AC_DEFUN([AM_SET_DEPDIR],
879
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
875
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
880
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
876
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
Lines 884-922 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl Link Here
884
# AM_DEP_TRACK
880
# AM_DEP_TRACK
885
# ------------
881
# ------------
886
AC_DEFUN([AM_DEP_TRACK],
882
AC_DEFUN([AM_DEP_TRACK],
887
[AC_ARG_ENABLE([dependency-tracking], [dnl
883
[AC_ARG_ENABLE(dependency-tracking,
888
AS_HELP_STRING(
884
[  --disable-dependency-tracking  speeds up one-time build
889
  [--enable-dependency-tracking],
885
  --enable-dependency-tracking   do not reject slow dependency extractors])
890
  [do not reject slow dependency extractors])
891
AS_HELP_STRING(
892
  [--disable-dependency-tracking],
893
  [speeds up one-time build])])
894
if test "x$enable_dependency_tracking" != xno; then
886
if test "x$enable_dependency_tracking" != xno; then
895
  am_depcomp="$ac_aux_dir/depcomp"
887
  am_depcomp="$ac_aux_dir/depcomp"
896
  AMDEPBACKSLASH='\'
888
  AMDEPBACKSLASH='\'
897
  am__nodep='_no'
898
fi
889
fi
899
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
890
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
900
AC_SUBST([AMDEPBACKSLASH])dnl
891
AC_SUBST([AMDEPBACKSLASH])dnl
901
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
892
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
902
AC_SUBST([am__nodep])dnl
903
_AM_SUBST_NOTMAKE([am__nodep])dnl
904
])
893
])
905
894
906
# Generate code to set up dependency tracking.              -*- Autoconf -*-
895
# Generate code to set up dependency tracking.              -*- Autoconf -*-
907
896
908
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
897
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
898
# Free Software Foundation, Inc.
909
#
899
#
910
# This file is free software; the Free Software Foundation
900
# This file is free software; the Free Software Foundation
911
# gives unlimited permission to copy and/or distribute it,
901
# gives unlimited permission to copy and/or distribute it,
912
# with or without modifications, as long as this notice is preserved.
902
# with or without modifications, as long as this notice is preserved.
913
903
904
#serial 5
914
905
915
# _AM_OUTPUT_DEPENDENCY_COMMANDS
906
# _AM_OUTPUT_DEPENDENCY_COMMANDS
916
# ------------------------------
907
# ------------------------------
917
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
908
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
918
[{
909
[{
919
  # Older Autoconf quotes --file arguments for eval, but not when files
910
  # Autoconf 2.62 quotes --file arguments for eval, but not when files
920
  # are listed without --file.  Let's play safe and only enable the eval
911
  # are listed without --file.  Let's play safe and only enable the eval
921
  # if we detect the quoting.
912
  # if we detect the quoting.
922
  case $CONFIG_FILES in
913
  case $CONFIG_FILES in
Lines 929-935 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], Link Here
929
    # Strip MF so we end up with the name of the file.
920
    # Strip MF so we end up with the name of the file.
930
    mf=`echo "$mf" | sed -e 's/:.*$//'`
921
    mf=`echo "$mf" | sed -e 's/:.*$//'`
931
    # Check whether this is an Automake generated Makefile or not.
922
    # Check whether this is an Automake generated Makefile or not.
932
    # We used to match only the files named 'Makefile.in', but
923
    # We used to match only the files named `Makefile.in', but
933
    # some people rename them; so instead we look at the file content.
924
    # some people rename them; so instead we look at the file content.
934
    # Grep'ing the first line is not enough: some people post-process
925
    # Grep'ing the first line is not enough: some people post-process
935
    # each Makefile.in and add a new line on top of each file to say so.
926
    # each Makefile.in and add a new line on top of each file to say so.
Lines 941-959 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], Link Here
941
      continue
932
      continue
942
    fi
933
    fi
943
    # Extract the definition of DEPDIR, am__include, and am__quote
934
    # Extract the definition of DEPDIR, am__include, and am__quote
944
    # from the Makefile without running 'make'.
935
    # from the Makefile without running `make'.
945
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
936
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
946
    test -z "$DEPDIR" && continue
937
    test -z "$DEPDIR" && continue
947
    am__include=`sed -n 's/^am__include = //p' < "$mf"`
938
    am__include=`sed -n 's/^am__include = //p' < "$mf"`
948
    test -z "$am__include" && continue
939
    test -z "am__include" && continue
949
    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
940
    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
941
    # When using ansi2knr, U may be empty or an underscore; expand it
942
    U=`sed -n 's/^U = //p' < "$mf"`
950
    # Find all dependency output files, they are included files with
943
    # Find all dependency output files, they are included files with
951
    # $(DEPDIR) in their names.  We invoke sed twice because it is the
944
    # $(DEPDIR) in their names.  We invoke sed twice because it is the
952
    # simplest approach to changing $(DEPDIR) to its actual value in the
945
    # simplest approach to changing $(DEPDIR) to its actual value in the
953
    # expansion.
946
    # expansion.
954
    for file in `sed -n "
947
    for file in `sed -n "
955
      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
948
      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
956
	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
949
	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
957
      # Make sure the directory exists.
950
      # Make sure the directory exists.
958
      test -f "$dirpart/$file" && continue
951
      test -f "$dirpart/$file" && continue
959
      fdir=`AS_DIRNAME(["$file"])`
952
      fdir=`AS_DIRNAME(["$file"])`
Lines 971-977 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], Link Here
971
# This macro should only be invoked once -- use via AC_REQUIRE.
964
# This macro should only be invoked once -- use via AC_REQUIRE.
972
#
965
#
973
# This code is only required when automatic dependency tracking
966
# This code is only required when automatic dependency tracking
974
# is enabled.  FIXME.  This creates each '.P' file that we will
967
# is enabled.  FIXME.  This creates each `.P' file that we will
975
# need in order to bootstrap the dependency handling code.
968
# need in order to bootstrap the dependency handling code.
976
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
969
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
977
[AC_CONFIG_COMMANDS([depfiles],
970
[AC_CONFIG_COMMANDS([depfiles],
Lines 981-992 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], Link Here
981
974
982
# Do all the work for Automake.                             -*- Autoconf -*-
975
# Do all the work for Automake.                             -*- Autoconf -*-
983
976
984
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
977
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
978
# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
985
#
979
#
986
# This file is free software; the Free Software Foundation
980
# This file is free software; the Free Software Foundation
987
# gives unlimited permission to copy and/or distribute it,
981
# gives unlimited permission to copy and/or distribute it,
988
# with or without modifications, as long as this notice is preserved.
982
# with or without modifications, as long as this notice is preserved.
989
983
984
# serial 16
985
990
# This macro actually does too much.  Some checks are only needed if
986
# This macro actually does too much.  Some checks are only needed if
991
# your package does certain things.  But this isn't really a big deal.
987
# your package does certain things.  But this isn't really a big deal.
992
988
Lines 1002-1008 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], Link Here
1002
# arguments mandatory, and then we can depend on a new Autoconf
998
# arguments mandatory, and then we can depend on a new Autoconf
1003
# release and drop the old call support.
999
# release and drop the old call support.
1004
AC_DEFUN([AM_INIT_AUTOMAKE],
1000
AC_DEFUN([AM_INIT_AUTOMAKE],
1005
[AC_PREREQ([2.65])dnl
1001
[AC_PREREQ([2.62])dnl
1006
dnl Autoconf wants to disallow AM_ names.  We explicitly allow
1002
dnl Autoconf wants to disallow AM_ names.  We explicitly allow
1007
dnl the ones we care about.
1003
dnl the ones we care about.
1008
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1004
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
Lines 1031-1070 AC_SUBST([CYGPATH_W]) Link Here
1031
# Define the identity of the package.
1027
# Define the identity of the package.
1032
dnl Distinguish between old-style and new-style calls.
1028
dnl Distinguish between old-style and new-style calls.
1033
m4_ifval([$2],
1029
m4_ifval([$2],
1034
[AC_DIAGNOSE([obsolete],
1030
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1035
             [$0: two- and three-arguments forms are deprecated.])
1036
m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1037
 AC_SUBST([PACKAGE], [$1])dnl
1031
 AC_SUBST([PACKAGE], [$1])dnl
1038
 AC_SUBST([VERSION], [$2])],
1032
 AC_SUBST([VERSION], [$2])],
1039
[_AM_SET_OPTIONS([$1])dnl
1033
[_AM_SET_OPTIONS([$1])dnl
1040
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1034
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1041
m4_if(
1035
m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
1042
  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
1043
  [ok:ok],,
1044
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1036
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1045
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1037
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1046
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1038
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1047
1039
1048
_AM_IF_OPTION([no-define],,
1040
_AM_IF_OPTION([no-define],,
1049
[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
1041
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1050
 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
1042
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
1051
1043
1052
# Some tools Automake needs.
1044
# Some tools Automake needs.
1053
AC_REQUIRE([AM_SANITY_CHECK])dnl
1045
AC_REQUIRE([AM_SANITY_CHECK])dnl
1054
AC_REQUIRE([AC_ARG_PROGRAM])dnl
1046
AC_REQUIRE([AC_ARG_PROGRAM])dnl
1055
AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
1047
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1056
AM_MISSING_PROG([AUTOCONF], [autoconf])
1048
AM_MISSING_PROG(AUTOCONF, autoconf)
1057
AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
1049
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1058
AM_MISSING_PROG([AUTOHEADER], [autoheader])
1050
AM_MISSING_PROG(AUTOHEADER, autoheader)
1059
AM_MISSING_PROG([MAKEINFO], [makeinfo])
1051
AM_MISSING_PROG(MAKEINFO, makeinfo)
1060
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1052
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1061
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1053
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1062
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1054
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
1063
# For better backward compatibility.  To be removed once Automake 1.9.x
1064
# dies out for good.  For more background, see:
1065
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1066
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1067
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1068
# We need awk for the "check" target.  The system "awk" is bad on
1055
# We need awk for the "check" target.  The system "awk" is bad on
1069
# some platforms.
1056
# some platforms.
1070
AC_REQUIRE([AC_PROG_AWK])dnl
1057
AC_REQUIRE([AC_PROG_AWK])dnl
Lines 1075-1106 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], Link Here
1075
			     [_AM_PROG_TAR([v7])])])
1062
			     [_AM_PROG_TAR([v7])])])
1076
_AM_IF_OPTION([no-dependencies],,
1063
_AM_IF_OPTION([no-dependencies],,
1077
[AC_PROVIDE_IFELSE([AC_PROG_CC],
1064
[AC_PROVIDE_IFELSE([AC_PROG_CC],
1078
		  [_AM_DEPENDENCIES([CC])],
1065
		  [_AM_DEPENDENCIES(CC)],
1079
		  [m4_define([AC_PROG_CC],
1066
		  [define([AC_PROG_CC],
1080
			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
1067
			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
1081
AC_PROVIDE_IFELSE([AC_PROG_CXX],
1068
AC_PROVIDE_IFELSE([AC_PROG_CXX],
1082
		  [_AM_DEPENDENCIES([CXX])],
1069
		  [_AM_DEPENDENCIES(CXX)],
1083
		  [m4_define([AC_PROG_CXX],
1070
		  [define([AC_PROG_CXX],
1084
			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
1071
			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
1085
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1072
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1086
		  [_AM_DEPENDENCIES([OBJC])],
1073
		  [_AM_DEPENDENCIES(OBJC)],
1087
		  [m4_define([AC_PROG_OBJC],
1074
		  [define([AC_PROG_OBJC],
1088
			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
1075
			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
1089
AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
1090
		  [_AM_DEPENDENCIES([OBJCXX])],
1091
		  [m4_define([AC_PROG_OBJCXX],
1092
			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
1093
])
1076
])
1094
AC_REQUIRE([AM_SILENT_RULES])dnl
1077
_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
1095
dnl The testsuite driver may need to know about EXEEXT, so add the
1078
dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
1096
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
1079
dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
1097
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
1080
dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
1098
AC_CONFIG_COMMANDS_PRE(dnl
1081
AC_CONFIG_COMMANDS_PRE(dnl
1099
[m4_provide_if([_AM_COMPILER_EXEEXT],
1082
[m4_provide_if([_AM_COMPILER_EXEEXT],
1100
  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1083
  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1101
])
1084
])
1102
1085
1103
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
1086
dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
1104
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1087
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1105
dnl mangled by Autoconf and run in a shell conditional statement.
1088
dnl mangled by Autoconf and run in a shell conditional statement.
1106
m4_define([_AC_COMPILER_EXEEXT],
1089
m4_define([_AC_COMPILER_EXEEXT],
Lines 1128-1134 for _am_header in $config_headers :; do Link Here
1128
done
1111
done
1129
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1112
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1130
1113
1131
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1114
# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
1132
#
1115
#
1133
# This file is free software; the Free Software Foundation
1116
# This file is free software; the Free Software Foundation
1134
# gives unlimited permission to copy and/or distribute it,
1117
# gives unlimited permission to copy and/or distribute it,
Lines 1147-1160 if test x"${install_sh}" != xset; then Link Here
1147
    install_sh="\${SHELL} $am_aux_dir/install-sh"
1130
    install_sh="\${SHELL} $am_aux_dir/install-sh"
1148
  esac
1131
  esac
1149
fi
1132
fi
1150
AC_SUBST([install_sh])])
1133
AC_SUBST(install_sh)])
1151
1134
1152
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
1135
# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
1153
#
1136
#
1154
# This file is free software; the Free Software Foundation
1137
# This file is free software; the Free Software Foundation
1155
# gives unlimited permission to copy and/or distribute it,
1138
# gives unlimited permission to copy and/or distribute it,
1156
# with or without modifications, as long as this notice is preserved.
1139
# with or without modifications, as long as this notice is preserved.
1157
1140
1141
# serial 2
1142
1158
# Check whether the underlying file-system supports filenames
1143
# Check whether the underlying file-system supports filenames
1159
# with a leading dot.  For instance MS-DOS doesn't.
1144
# with a leading dot.  For instance MS-DOS doesn't.
1160
AC_DEFUN([AM_SET_LEADING_DOT],
1145
AC_DEFUN([AM_SET_LEADING_DOT],
Lines 1171-1187 AC_SUBST([am__leading_dot])]) Link Here
1171
# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
1156
# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
1172
# From Jim Meyering
1157
# From Jim Meyering
1173
1158
1174
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1159
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
1160
# Free Software Foundation, Inc.
1175
#
1161
#
1176
# This file is free software; the Free Software Foundation
1162
# This file is free software; the Free Software Foundation
1177
# gives unlimited permission to copy and/or distribute it,
1163
# gives unlimited permission to copy and/or distribute it,
1178
# with or without modifications, as long as this notice is preserved.
1164
# with or without modifications, as long as this notice is preserved.
1179
1165
1166
# serial 5
1167
1180
# AM_MAINTAINER_MODE([DEFAULT-MODE])
1168
# AM_MAINTAINER_MODE([DEFAULT-MODE])
1181
# ----------------------------------
1169
# ----------------------------------
1182
# Control maintainer-specific portions of Makefiles.
1170
# Control maintainer-specific portions of Makefiles.
1183
# Default is to disable them, unless 'enable' is passed literally.
1171
# Default is to disable them, unless `enable' is passed literally.
1184
# For symmetry, 'disable' may be passed as well.  Anyway, the user
1172
# For symmetry, `disable' may be passed as well.  Anyway, the user
1185
# can override the default with the --enable/--disable switch.
1173
# can override the default with the --enable/--disable switch.
1186
AC_DEFUN([AM_MAINTAINER_MODE],
1174
AC_DEFUN([AM_MAINTAINER_MODE],
1187
[m4_case(m4_default([$1], [disable]),
1175
[m4_case(m4_default([$1], [disable]),
Lines 1189-1202 AC_DEFUN([AM_MAINTAINER_MODE], Link Here
1189
       [disable], [m4_define([am_maintainer_other], [enable])],
1177
       [disable], [m4_define([am_maintainer_other], [enable])],
1190
       [m4_define([am_maintainer_other], [enable])
1178
       [m4_define([am_maintainer_other], [enable])
1191
        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
1179
        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
1192
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1180
AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
1193
  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
1181
  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
1194
  AC_ARG_ENABLE([maintainer-mode],
1182
  AC_ARG_ENABLE([maintainer-mode],
1195
    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
1183
[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
1196
      am_maintainer_other[ make rules and dependencies not useful
1184
			  (and sometimes confusing) to the casual installer],
1197
      (and sometimes confusing) to the casual installer])],
1185
      [USE_MAINTAINER_MODE=$enableval],
1198
    [USE_MAINTAINER_MODE=$enableval],
1186
      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
1199
    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
1200
  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
1187
  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
1201
  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
1188
  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
1202
  MAINT=$MAINTAINER_MODE_TRUE
1189
  MAINT=$MAINTAINER_MODE_TRUE
Lines 1204-1217 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) Link Here
1204
]
1191
]
1205
)
1192
)
1206
1193
1194
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
1195
1207
# Check to see how 'make' treats includes.	            -*- Autoconf -*-
1196
# Check to see how 'make' treats includes.	            -*- Autoconf -*-
1208
1197
1209
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1198
# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
1210
#
1199
#
1211
# This file is free software; the Free Software Foundation
1200
# This file is free software; the Free Software Foundation
1212
# gives unlimited permission to copy and/or distribute it,
1201
# gives unlimited permission to copy and/or distribute it,
1213
# with or without modifications, as long as this notice is preserved.
1202
# with or without modifications, as long as this notice is preserved.
1214
1203
1204
# serial 4
1205
1215
# AM_MAKE_INCLUDE()
1206
# AM_MAKE_INCLUDE()
1216
# -----------------
1207
# -----------------
1217
# Check to see how make treats includes.
1208
# Check to see how make treats includes.
Lines 1229-1235 am__quote= Link Here
1229
_am_result=none
1220
_am_result=none
1230
# First try GNU make style include.
1221
# First try GNU make style include.
1231
echo "include confinc" > confmf
1222
echo "include confinc" > confmf
1232
# Ignore all kinds of additional output from 'make'.
1223
# Ignore all kinds of additional output from `make'.
1233
case `$am_make -s -f confmf 2> /dev/null` in #(
1224
case `$am_make -s -f confmf 2> /dev/null` in #(
1234
*the\ am__doit\ target*)
1225
*the\ am__doit\ target*)
1235
  am__include=include
1226
  am__include=include
Lines 1256-1267 rm -f confinc confmf Link Here
1256
1247
1257
# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
1248
# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
1258
1249
1259
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
1250
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1251
# Free Software Foundation, Inc.
1260
#
1252
#
1261
# This file is free software; the Free Software Foundation
1253
# This file is free software; the Free Software Foundation
1262
# gives unlimited permission to copy and/or distribute it,
1254
# gives unlimited permission to copy and/or distribute it,
1263
# with or without modifications, as long as this notice is preserved.
1255
# with or without modifications, as long as this notice is preserved.
1264
1256
1257
# serial 6
1258
1265
# AM_MISSING_PROG(NAME, PROGRAM)
1259
# AM_MISSING_PROG(NAME, PROGRAM)
1266
# ------------------------------
1260
# ------------------------------
1267
AC_DEFUN([AM_MISSING_PROG],
1261
AC_DEFUN([AM_MISSING_PROG],
Lines 1269-1278 AC_DEFUN([AM_MISSING_PROG], Link Here
1269
$1=${$1-"${am_missing_run}$2"}
1263
$1=${$1-"${am_missing_run}$2"}
1270
AC_SUBST($1)])
1264
AC_SUBST($1)])
1271
1265
1266
1272
# AM_MISSING_HAS_RUN
1267
# AM_MISSING_HAS_RUN
1273
# ------------------
1268
# ------------------
1274
# Define MISSING if not defined so far and test if it is modern enough.
1269
# Define MISSING if not defined so far and test if it supports --run.
1275
# If it is, set am_missing_run to use it, otherwise, to nothing.
1270
# If it does, set am_missing_run to use it, otherwise, to nothing.
1276
AC_DEFUN([AM_MISSING_HAS_RUN],
1271
AC_DEFUN([AM_MISSING_HAS_RUN],
1277
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1272
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1278
AC_REQUIRE_AUX_FILE([missing])dnl
1273
AC_REQUIRE_AUX_FILE([missing])dnl
Lines 1285-1319 if test x"${MISSING+set}" != xset; then Link Here
1285
  esac
1280
  esac
1286
fi
1281
fi
1287
# Use eval to expand $SHELL
1282
# Use eval to expand $SHELL
1288
if eval "$MISSING --is-lightweight"; then
1283
if eval "$MISSING --run true"; then
1289
  am_missing_run="$MISSING "
1284
  am_missing_run="$MISSING --run "
1290
else
1285
else
1291
  am_missing_run=
1286
  am_missing_run=
1292
  AC_MSG_WARN(['missing' script is too old or missing])
1287
  AC_MSG_WARN([`missing' script is too old or missing])
1293
fi
1288
fi
1294
])
1289
])
1295
1290
1291
# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
1292
#
1293
# This file is free software; the Free Software Foundation
1294
# gives unlimited permission to copy and/or distribute it,
1295
# with or without modifications, as long as this notice is preserved.
1296
1297
# AM_PROG_MKDIR_P
1298
# ---------------
1299
# Check for `mkdir -p'.
1300
AC_DEFUN([AM_PROG_MKDIR_P],
1301
[AC_PREREQ([2.60])dnl
1302
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1303
dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
1304
dnl while keeping a definition of mkdir_p for backward compatibility.
1305
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1306
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1307
dnl Makefile.ins that do not define MKDIR_P, so we do our own
1308
dnl adjustment using top_builddir (which is defined more often than
1309
dnl MKDIR_P).
1310
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1311
case $mkdir_p in
1312
  [[\\/$]]* | ?:[[\\/]]*) ;;
1313
  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1314
esac
1315
])
1316
1296
# Helper functions for option handling.                     -*- Autoconf -*-
1317
# Helper functions for option handling.                     -*- Autoconf -*-
1297
1318
1298
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1319
# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
1299
#
1320
#
1300
# This file is free software; the Free Software Foundation
1321
# This file is free software; the Free Software Foundation
1301
# gives unlimited permission to copy and/or distribute it,
1322
# gives unlimited permission to copy and/or distribute it,
1302
# with or without modifications, as long as this notice is preserved.
1323
# with or without modifications, as long as this notice is preserved.
1303
1324
1325
# serial 4
1326
1304
# _AM_MANGLE_OPTION(NAME)
1327
# _AM_MANGLE_OPTION(NAME)
1305
# -----------------------
1328
# -----------------------
1306
AC_DEFUN([_AM_MANGLE_OPTION],
1329
AC_DEFUN([_AM_MANGLE_OPTION],
1307
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1330
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1308
1331
1309
# _AM_SET_OPTION(NAME)
1332
# _AM_SET_OPTION(NAME)
1310
# --------------------
1333
# ------------------------------
1311
# Set option NAME.  Presently that only means defining a flag for this option.
1334
# Set option NAME.  Presently that only means defining a flag for this option.
1312
AC_DEFUN([_AM_SET_OPTION],
1335
AC_DEFUN([_AM_SET_OPTION],
1313
[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
1336
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1314
1337
1315
# _AM_SET_OPTIONS(OPTIONS)
1338
# _AM_SET_OPTIONS(OPTIONS)
1316
# ------------------------
1339
# ----------------------------------
1317
# OPTIONS is a space-separated list of Automake options.
1340
# OPTIONS is a space-separated list of Automake options.
1318
AC_DEFUN([_AM_SET_OPTIONS],
1341
AC_DEFUN([_AM_SET_OPTIONS],
1319
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1342
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
Lines 1326-1341 AC_DEFUN([_AM_IF_OPTION], Link Here
1326
1349
1327
# Check to make sure that the build environment is sane.    -*- Autoconf -*-
1350
# Check to make sure that the build environment is sane.    -*- Autoconf -*-
1328
1351
1329
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1352
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
1353
# Free Software Foundation, Inc.
1330
#
1354
#
1331
# This file is free software; the Free Software Foundation
1355
# This file is free software; the Free Software Foundation
1332
# gives unlimited permission to copy and/or distribute it,
1356
# gives unlimited permission to copy and/or distribute it,
1333
# with or without modifications, as long as this notice is preserved.
1357
# with or without modifications, as long as this notice is preserved.
1334
1358
1359
# serial 5
1360
1335
# AM_SANITY_CHECK
1361
# AM_SANITY_CHECK
1336
# ---------------
1362
# ---------------
1337
AC_DEFUN([AM_SANITY_CHECK],
1363
AC_DEFUN([AM_SANITY_CHECK],
1338
[AC_MSG_CHECKING([whether build environment is sane])
1364
[AC_MSG_CHECKING([whether build environment is sane])
1365
# Just in case
1366
sleep 1
1367
echo timestamp > conftest.file
1339
# Reject unsafe characters in $srcdir or the absolute working directory
1368
# Reject unsafe characters in $srcdir or the absolute working directory
1340
# name.  Accept space and tab only in the latter.
1369
# name.  Accept space and tab only in the latter.
1341
am_lf='
1370
am_lf='
Lines 1346-1385 case `pwd` in Link Here
1346
esac
1375
esac
1347
case $srcdir in
1376
case $srcdir in
1348
  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
1377
  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
1349
    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
1378
    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
1350
esac
1379
esac
1351
1380
1352
# Do 'set' in a subshell so we don't clobber the current shell's
1381
# Do `set' in a subshell so we don't clobber the current shell's
1353
# arguments.  Must try -L first in case configure is actually a
1382
# arguments.  Must try -L first in case configure is actually a
1354
# symlink; some systems play weird games with the mod time of symlinks
1383
# symlink; some systems play weird games with the mod time of symlinks
1355
# (eg FreeBSD returns the mod time of the symlink's containing
1384
# (eg FreeBSD returns the mod time of the symlink's containing
1356
# directory).
1385
# directory).
1357
if (
1386
if (
1358
   am_has_slept=no
1387
   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1359
   for am_try in 1 2; do
1388
   if test "$[*]" = "X"; then
1360
     echo "timestamp, slept: $am_has_slept" > conftest.file
1389
      # -L didn't work.
1361
     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1390
      set X `ls -t "$srcdir/configure" conftest.file`
1362
     if test "$[*]" = "X"; then
1391
   fi
1363
	# -L didn't work.
1392
   rm -f conftest.file
1364
	set X `ls -t "$srcdir/configure" conftest.file`
1393
   if test "$[*]" != "X $srcdir/configure conftest.file" \
1365
     fi
1394
      && test "$[*]" != "X conftest.file $srcdir/configure"; then
1366
     if test "$[*]" != "X $srcdir/configure conftest.file" \
1395
1367
	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
1396
      # If neither matched, then we have a broken ls.  This can happen
1368
1397
      # if, for instance, CONFIG_SHELL is bash and it inherits a
1369
	# If neither matched, then we have a broken ls.  This can happen
1398
      # broken ls alias from the environment.  This has actually
1370
	# if, for instance, CONFIG_SHELL is bash and it inherits a
1399
      # happened.  Such a system could not be considered "sane".
1371
	# broken ls alias from the environment.  This has actually
1400
      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
1372
	# happened.  Such a system could not be considered "sane".
1401
alias in your environment])
1373
	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
1402
   fi
1374
  alias in your environment])
1403
1375
     fi
1376
     if test "$[2]" = conftest.file || test $am_try -eq 2; then
1377
       break
1378
     fi
1379
     # Just in case.
1380
     sleep 1
1381
     am_has_slept=yes
1382
   done
1383
   test "$[2]" = conftest.file
1404
   test "$[2]" = conftest.file
1384
   )
1405
   )
1385
then
1406
then
Lines 1389-1473 else Link Here
1389
   AC_MSG_ERROR([newly created file is older than distributed files!
1410
   AC_MSG_ERROR([newly created file is older than distributed files!
1390
Check your system clock])
1411
Check your system clock])
1391
fi
1412
fi
1392
AC_MSG_RESULT([yes])
1413
AC_MSG_RESULT(yes)])
1393
# If we didn't sleep, we still need to ensure time stamps of config.status and
1394
# generated files are strictly newer.
1395
am_sleep_pid=
1396
if grep 'slept: no' conftest.file >/dev/null 2>&1; then
1397
  ( sleep 1 ) &
1398
  am_sleep_pid=$!
1399
fi
1400
AC_CONFIG_COMMANDS_PRE(
1401
  [AC_MSG_CHECKING([that generated files are newer than configure])
1402
   if test -n "$am_sleep_pid"; then
1403
     # Hide warnings about reused PIDs.
1404
     wait $am_sleep_pid 2>/dev/null
1405
   fi
1406
   AC_MSG_RESULT([done])])
1407
rm -f conftest.file
1408
])
1409
1410
# Copyright (C) 2009-2013 Free Software Foundation, Inc.
1411
#
1412
# This file is free software; the Free Software Foundation
1413
# gives unlimited permission to copy and/or distribute it,
1414
# with or without modifications, as long as this notice is preserved.
1415
1416
# AM_SILENT_RULES([DEFAULT])
1417
# --------------------------
1418
# Enable less verbose build rules; with the default set to DEFAULT
1419
# ("yes" being less verbose, "no" or empty being verbose).
1420
AC_DEFUN([AM_SILENT_RULES],
1421
[AC_ARG_ENABLE([silent-rules], [dnl
1422
AS_HELP_STRING(
1423
  [--enable-silent-rules],
1424
  [less verbose build output (undo: "make V=1")])
1425
AS_HELP_STRING(
1426
  [--disable-silent-rules],
1427
  [verbose build output (undo: "make V=0")])dnl
1428
])
1429
case $enable_silent_rules in @%:@ (((
1430
  yes) AM_DEFAULT_VERBOSITY=0;;
1431
   no) AM_DEFAULT_VERBOSITY=1;;
1432
    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1433
esac
1434
dnl
1435
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1436
dnl do not support nested variable expansions.
1437
dnl See automake bug#9928 and bug#10237.
1438
am_make=${MAKE-make}
1439
AC_CACHE_CHECK([whether $am_make supports nested variables],
1440
   [am_cv_make_support_nested_variables],
1441
   [if AS_ECHO([['TRUE=$(BAR$(V))
1442
BAR0=false
1443
BAR1=true
1444
V=1
1445
am__doit:
1446
	@$(TRUE)
1447
.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
1448
  am_cv_make_support_nested_variables=yes
1449
else
1450
  am_cv_make_support_nested_variables=no
1451
fi])
1452
if test $am_cv_make_support_nested_variables = yes; then
1453
  dnl Using '$V' instead of '$(V)' breaks IRIX make.
1454
  AM_V='$(V)'
1455
  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1456
else
1457
  AM_V=$AM_DEFAULT_VERBOSITY
1458
  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1459
fi
1460
AC_SUBST([AM_V])dnl
1461
AM_SUBST_NOTMAKE([AM_V])dnl
1462
AC_SUBST([AM_DEFAULT_V])dnl
1463
AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
1464
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
1465
AM_BACKSLASH='\'
1466
AC_SUBST([AM_BACKSLASH])dnl
1467
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1468
])
1469
1414
1470
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1415
# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
1471
#
1416
#
1472
# This file is free software; the Free Software Foundation
1417
# This file is free software; the Free Software Foundation
1473
# gives unlimited permission to copy and/or distribute it,
1418
# gives unlimited permission to copy and/or distribute it,
Lines 1475-1506 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl Link Here
1475
1420
1476
# AM_PROG_INSTALL_STRIP
1421
# AM_PROG_INSTALL_STRIP
1477
# ---------------------
1422
# ---------------------
1478
# One issue with vendor 'install' (even GNU) is that you can't
1423
# One issue with vendor `install' (even GNU) is that you can't
1479
# specify the program used to strip binaries.  This is especially
1424
# specify the program used to strip binaries.  This is especially
1480
# annoying in cross-compiling environments, where the build's strip
1425
# annoying in cross-compiling environments, where the build's strip
1481
# is unlikely to handle the host's binaries.
1426
# is unlikely to handle the host's binaries.
1482
# Fortunately install-sh will honor a STRIPPROG variable, so we
1427
# Fortunately install-sh will honor a STRIPPROG variable, so we
1483
# always use install-sh in "make install-strip", and initialize
1428
# always use install-sh in `make install-strip', and initialize
1484
# STRIPPROG with the value of the STRIP variable (set by the user).
1429
# STRIPPROG with the value of the STRIP variable (set by the user).
1485
AC_DEFUN([AM_PROG_INSTALL_STRIP],
1430
AC_DEFUN([AM_PROG_INSTALL_STRIP],
1486
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1431
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1487
# Installed binaries are usually stripped using 'strip' when the user
1432
# Installed binaries are usually stripped using `strip' when the user
1488
# run "make install-strip".  However 'strip' might not be the right
1433
# run `make install-strip'.  However `strip' might not be the right
1489
# tool to use in cross-compilation environments, therefore Automake
1434
# tool to use in cross-compilation environments, therefore Automake
1490
# will honor the 'STRIP' environment variable to overrule this program.
1435
# will honor the `STRIP' environment variable to overrule this program.
1491
dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1436
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1492
if test "$cross_compiling" != no; then
1437
if test "$cross_compiling" != no; then
1493
  AC_CHECK_TOOL([STRIP], [strip], :)
1438
  AC_CHECK_TOOL([STRIP], [strip], :)
1494
fi
1439
fi
1495
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1440
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1496
AC_SUBST([INSTALL_STRIP_PROGRAM])])
1441
AC_SUBST([INSTALL_STRIP_PROGRAM])])
1497
1442
1498
# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1443
# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
1499
#
1444
#
1500
# This file is free software; the Free Software Foundation
1445
# This file is free software; the Free Software Foundation
1501
# gives unlimited permission to copy and/or distribute it,
1446
# gives unlimited permission to copy and/or distribute it,
1502
# with or without modifications, as long as this notice is preserved.
1447
# with or without modifications, as long as this notice is preserved.
1503
1448
1449
# serial 2
1450
1504
# _AM_SUBST_NOTMAKE(VARIABLE)
1451
# _AM_SUBST_NOTMAKE(VARIABLE)
1505
# ---------------------------
1452
# ---------------------------
1506
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
1453
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
Lines 1508-1529 AC_SUBST([INSTALL_STRIP_PROGRAM])]) Link Here
1508
AC_DEFUN([_AM_SUBST_NOTMAKE])
1455
AC_DEFUN([_AM_SUBST_NOTMAKE])
1509
1456
1510
# AM_SUBST_NOTMAKE(VARIABLE)
1457
# AM_SUBST_NOTMAKE(VARIABLE)
1511
# --------------------------
1458
# ---------------------------
1512
# Public sister of _AM_SUBST_NOTMAKE.
1459
# Public sister of _AM_SUBST_NOTMAKE.
1513
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1460
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1514
1461
1515
# Check how to create a tarball.                            -*- Autoconf -*-
1462
# Check how to create a tarball.                            -*- Autoconf -*-
1516
1463
1517
# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1464
# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
1518
#
1465
#
1519
# This file is free software; the Free Software Foundation
1466
# This file is free software; the Free Software Foundation
1520
# gives unlimited permission to copy and/or distribute it,
1467
# gives unlimited permission to copy and/or distribute it,
1521
# with or without modifications, as long as this notice is preserved.
1468
# with or without modifications, as long as this notice is preserved.
1522
1469
1470
# serial 2
1471
1523
# _AM_PROG_TAR(FORMAT)
1472
# _AM_PROG_TAR(FORMAT)
1524
# --------------------
1473
# --------------------
1525
# Check how to create a tarball in format FORMAT.
1474
# Check how to create a tarball in format FORMAT.
1526
# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1475
# FORMAT should be one of `v7', `ustar', or `pax'.
1527
#
1476
#
1528
# Substitute a variable $(am__tar) that is a command
1477
# Substitute a variable $(am__tar) that is a command
1529
# writing to stdout a FORMAT-tarball containing the directory
1478
# writing to stdout a FORMAT-tarball containing the directory
Lines 1533-1646 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Link Here
1533
# Substitute a variable $(am__untar) that extract such
1482
# Substitute a variable $(am__untar) that extract such
1534
# a tarball read from stdin.
1483
# a tarball read from stdin.
1535
#     $(am__untar) < result.tar
1484
#     $(am__untar) < result.tar
1536
#
1537
AC_DEFUN([_AM_PROG_TAR],
1485
AC_DEFUN([_AM_PROG_TAR],
1538
[# Always define AMTAR for backward compatibility.  Yes, it's still used
1486
[# Always define AMTAR for backward compatibility.
1539
# in the wild :-(  We should find a proper way to deprecate it ...
1487
AM_MISSING_PROG([AMTAR], [tar])
1540
AC_SUBST([AMTAR], ['$${TAR-tar}'])
1488
m4_if([$1], [v7],
1541
1489
     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
1542
# We'll loop over all known methods to create a tar archive until one works.
1490
     [m4_case([$1], [ustar],, [pax],,
1491
              [m4_fatal([Unknown tar format])])
1492
AC_MSG_CHECKING([how to create a $1 tar archive])
1493
# Loop over all known methods to create a tar archive until one works.
1543
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1494
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1495
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1496
# Do not fold the above two line into one, because Tru64 sh and
1497
# Solaris sh will not grok spaces in the rhs of `-'.
1498
for _am_tool in $_am_tools
1499
do
1500
  case $_am_tool in
1501
  gnutar)
1502
    for _am_tar in tar gnutar gtar;
1503
    do
1504
      AM_RUN_LOG([$_am_tar --version]) && break
1505
    done
1506
    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1507
    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1508
    am__untar="$_am_tar -xf -"
1509
    ;;
1510
  plaintar)
1511
    # Must skip GNU tar: if it does not support --format= it doesn't create
1512
    # ustar tarball either.
1513
    (tar --version) >/dev/null 2>&1 && continue
1514
    am__tar='tar chf - "$$tardir"'
1515
    am__tar_='tar chf - "$tardir"'
1516
    am__untar='tar xf -'
1517
    ;;
1518
  pax)
1519
    am__tar='pax -L -x $1 -w "$$tardir"'
1520
    am__tar_='pax -L -x $1 -w "$tardir"'
1521
    am__untar='pax -r'
1522
    ;;
1523
  cpio)
1524
    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1525
    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1526
    am__untar='cpio -i -H $1 -d'
1527
    ;;
1528
  none)
1529
    am__tar=false
1530
    am__tar_=false
1531
    am__untar=false
1532
    ;;
1533
  esac
1544
1534
1545
m4_if([$1], [v7],
1535
  # If the value was cached, stop now.  We just wanted to have am__tar
1546
  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1536
  # and am__untar set.
1547
1537
  test -n "${am_cv_prog_tar_$1}" && break
1548
  [m4_case([$1],
1549
    [ustar],
1550
     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1551
      # There is notably a 21 bits limit for the UID and the GID.  In fact,
1552
      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1553
      # and bug#13588).
1554
      am_max_uid=2097151 # 2^21 - 1
1555
      am_max_gid=$am_max_uid
1556
      # The $UID and $GID variables are not portable, so we need to resort
1557
      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
1558
      # below are definitely unexpected, so allow the users to see them
1559
      # (that is, avoid stderr redirection).
1560
      am_uid=`id -u || echo unknown`
1561
      am_gid=`id -g || echo unknown`
1562
      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1563
      if test $am_uid -le $am_max_uid; then
1564
         AC_MSG_RESULT([yes])
1565
      else
1566
         AC_MSG_RESULT([no])
1567
         _am_tools=none
1568
      fi
1569
      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1570
      if test $am_gid -le $am_max_gid; then
1571
         AC_MSG_RESULT([yes])
1572
      else
1573
        AC_MSG_RESULT([no])
1574
        _am_tools=none
1575
      fi],
1576
1577
  [pax],
1578
    [],
1579
1580
  [m4_fatal([Unknown tar format])])
1581
1582
  AC_MSG_CHECKING([how to create a $1 tar archive])
1583
1584
  # Go ahead even if we have the value already cached.  We do so because we
1585
  # need to set the values for the 'am__tar' and 'am__untar' variables.
1586
  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1587
1588
  for _am_tool in $_am_tools; do
1589
    case $_am_tool in
1590
    gnutar)
1591
      for _am_tar in tar gnutar gtar; do
1592
        AM_RUN_LOG([$_am_tar --version]) && break
1593
      done
1594
      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1595
      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1596
      am__untar="$_am_tar -xf -"
1597
      ;;
1598
    plaintar)
1599
      # Must skip GNU tar: if it does not support --format= it doesn't create
1600
      # ustar tarball either.
1601
      (tar --version) >/dev/null 2>&1 && continue
1602
      am__tar='tar chf - "$$tardir"'
1603
      am__tar_='tar chf - "$tardir"'
1604
      am__untar='tar xf -'
1605
      ;;
1606
    pax)
1607
      am__tar='pax -L -x $1 -w "$$tardir"'
1608
      am__tar_='pax -L -x $1 -w "$tardir"'
1609
      am__untar='pax -r'
1610
      ;;
1611
    cpio)
1612
      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1613
      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1614
      am__untar='cpio -i -H $1 -d'
1615
      ;;
1616
    none)
1617
      am__tar=false
1618
      am__tar_=false
1619
      am__untar=false
1620
      ;;
1621
    esac
1622
1538
1623
    # If the value was cached, stop now.  We just wanted to have am__tar
1539
  # tar/untar a dummy directory, and stop if the command works
1624
    # and am__untar set.
1625
    test -n "${am_cv_prog_tar_$1}" && break
1626
1627
    # tar/untar a dummy directory, and stop if the command works.
1628
    rm -rf conftest.dir
1629
    mkdir conftest.dir
1630
    echo GrepMe > conftest.dir/file
1631
    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1632
    rm -rf conftest.dir
1633
    if test -s conftest.tar; then
1634
      AM_RUN_LOG([$am__untar <conftest.tar])
1635
      AM_RUN_LOG([cat conftest.dir/file])
1636
      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1637
    fi
1638
  done
1639
  rm -rf conftest.dir
1540
  rm -rf conftest.dir
1541
  mkdir conftest.dir
1542
  echo GrepMe > conftest.dir/file
1543
  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1544
  rm -rf conftest.dir
1545
  if test -s conftest.tar; then
1546
    AM_RUN_LOG([$am__untar <conftest.tar])
1547
    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1548
  fi
1549
done
1550
rm -rf conftest.dir
1640
1551
1641
  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1552
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1642
  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1553
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1643
1644
AC_SUBST([am__tar])
1554
AC_SUBST([am__tar])
1645
AC_SUBST([am__untar])
1555
AC_SUBST([am__untar])
1646
]) # _AM_PROG_TAR
1556
]) # _AM_PROG_TAR
(-)a/config.h.in (-8 lines)
Lines 412-420 Link Here
412
/* Define to the one symbol short name of this package. */
412
/* Define to the one symbol short name of this package. */
413
#undef PACKAGE_TARNAME
413
#undef PACKAGE_TARNAME
414
414
415
/* Define to the home page for this package. */
416
#undef PACKAGE_URL
417
418
/* Define to the version of this package. */
415
/* Define to the version of this package. */
419
#undef PACKAGE_VERSION
416
#undef PACKAGE_VERSION
420
417
Lines 545-555 Link Here
545
/* Define location of XCPU directory */
542
/* Define location of XCPU directory */
546
#undef XCPU_DIR
543
#undef XCPU_DIR
547
544
548
/* Enable large inode numbers on Mac OS X 10.5.  */
549
#ifndef _DARWIN_USE_64_BIT_INODE
550
# define _DARWIN_USE_64_BIT_INODE 1
551
#endif
552
553
/* Number of bits in a file offset, on hosts where this is settable. */
545
/* Number of bits in a file offset, on hosts where this is settable. */
554
#undef _FILE_OFFSET_BITS
546
#undef _FILE_OFFSET_BITS
555
547
(-)a/configure (-1 / +2 lines)
Lines 23558-23564 fi Link Here
23558
23558
23559
23559
23560
23560
23561
ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/opt_modulefiles_slurm contribs/cray/slurmconfgen.py contribs/lua/Makefile contribs/mic/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/init.d.slurm etc/init.d.slurmdbd src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/smap/Makefile src/smd/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/srun_cr/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/poe/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray/Makefile src/plugins/core_spec/none/Makefile src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_infiniband/Makefile src/plugins/acct_gather_infiniband/ofed/Makefile src/plugins/acct_gather_infiniband/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/cray/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/aprun/Makefile src/plugins/launch/poe/Makefile src/plugins/launch/runjob/Makefile src/plugins/launch/slurm/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cray/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/alps/Makefile src/plugins/select/alps/libalps/Makefile src/plugins/select/alps/libemulate/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/select/serial/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/dynalloc/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/slurmd/Makefile src/plugins/switch/Makefile src/plugins/switch/cray/Makefile src/plugins/switch/generic/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
23561
ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/opt_modulefiles_slurm contribs/cray/slurmconfgen.py contribs/lua/Makefile contribs/mic/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/init.d.slurm etc/init.d.slurmdbd src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/smap/Makefile src/smd/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/srun_cr/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/poe/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray/Makefile src/plugins/core_spec/none/Makefile src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_infiniband/Makefile src/plugins/acct_gather_infiniband/ofed/Makefile src/plugins/acct_gather_infiniband/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/cray/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/aprun/Makefile src/plugins/launch/poe/Makefile src/plugins/launch/runjob/Makefile src/plugins/launch/slurm/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/priority/dug/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cray/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/alps/Makefile src/plugins/select/alps/libalps/Makefile src/plugins/select/alps/libemulate/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/select/serial/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/dynalloc/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/slurmd/Makefile src/plugins/switch/Makefile src/plugins/switch/cray/Makefile src/plugins/switch/generic/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
23562
23562
23563
23563
23564
cat >confcache <<\_ACEOF
23564
cat >confcache <<\_ACEOF
Lines 24996-25001 do Link Here
24996
    "src/plugins/priority/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/Makefile" ;;
24996
    "src/plugins/priority/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/Makefile" ;;
24997
    "src/plugins/priority/basic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/basic/Makefile" ;;
24997
    "src/plugins/priority/basic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/basic/Makefile" ;;
24998
    "src/plugins/priority/multifactor/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/multifactor/Makefile" ;;
24998
    "src/plugins/priority/multifactor/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/multifactor/Makefile" ;;
24999
    "src/plugins/priority/dug/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/priority/dug/Makefile" ;;
24999
    "src/plugins/proctrack/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/Makefile" ;;
25000
    "src/plugins/proctrack/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/Makefile" ;;
25000
    "src/plugins/proctrack/aix/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/aix/Makefile" ;;
25001
    "src/plugins/proctrack/aix/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/aix/Makefile" ;;
25001
    "src/plugins/proctrack/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cray/Makefile" ;;
25002
    "src/plugins/proctrack/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/cray/Makefile" ;;
(-)a/configure.ac (+1 lines)
Lines 555-560 AC_CONFIG_FILES([Makefile Link Here
555
		 src/plugins/priority/Makefile
555
		 src/plugins/priority/Makefile
556
		 src/plugins/priority/basic/Makefile
556
		 src/plugins/priority/basic/Makefile
557
		 src/plugins/priority/multifactor/Makefile
557
		 src/plugins/priority/multifactor/Makefile
558
                 src/plugins/priority/dug/Makefile
558
		 src/plugins/proctrack/Makefile
559
		 src/plugins/proctrack/Makefile
559
		 src/plugins/proctrack/aix/Makefile
560
		 src/plugins/proctrack/aix/Makefile
560
		 src/plugins/proctrack/cray/Makefile
561
		 src/plugins/proctrack/cray/Makefile
(-)a/slurm.spec (+1 lines)
Lines 894-899 rm -rf $RPM_BUILD_ROOT Link Here
894
%{_libdir}/slurm/preempt_qos.so
894
%{_libdir}/slurm/preempt_qos.so
895
%{_libdir}/slurm/priority_basic.so
895
%{_libdir}/slurm/priority_basic.so
896
%{_libdir}/slurm/priority_multifactor.so
896
%{_libdir}/slurm/priority_multifactor.so
897
%{_libdir}/slurm/priority_dug.so
897
%{_libdir}/slurm/proctrack_cgroup.so
898
%{_libdir}/slurm/proctrack_cgroup.so
898
%{_libdir}/slurm/proctrack_linuxproc.so
899
%{_libdir}/slurm/proctrack_linuxproc.so
899
%{_libdir}/slurm/proctrack_pgid.so
900
%{_libdir}/slurm/proctrack_pgid.so
(-)a/src/common/slurm_jobacct_gather.c (-2 / +2 lines)
Lines 558-564 extern void jobacct_gather_handle_mem_limit( Link Here
558
			      total_job_mem, jobacct_mem_limit);
558
			      total_job_mem, jobacct_mem_limit);
559
		}
559
		}
560
	}
560
	}
561
	if (jobacct_job_id && jobacct_mem_limit &&
561
/*	if (jobacct_job_id && jobacct_mem_limit &&
562
	    (total_job_mem > jobacct_mem_limit)) {
562
	    (total_job_mem > jobacct_mem_limit)) {
563
		if (jobacct_step_id == NO_VAL) {
563
		if (jobacct_step_id == NO_VAL) {
564
			error("Job %u exceeded memory limit "
564
			error("Job %u exceeded memory limit "
Lines 587-593 extern void jobacct_gather_handle_mem_limit( Link Here
587
			      jobacct_vmem_limit);
587
			      jobacct_vmem_limit);
588
		}
588
		}
589
		_acct_kill_step();
589
		_acct_kill_step();
590
	}
590
	} */
591
}
591
}
592
592
593
/********************* jobacctinfo functions ******************************/
593
/********************* jobacctinfo functions ******************************/
(-)a/src/plugins/priority/Makefile.am (-1 / +1 lines)
Line 1 Link Here
1
SUBDIRS = basic multifactor
1
SUBDIRS = basic multifactor dug
(-)a/src/plugins/priority/Makefile.in (-1 / +1 lines)
Lines 444-450 target_vendor = @target_vendor@ Link Here
444
top_build_prefix = @top_build_prefix@
444
top_build_prefix = @top_build_prefix@
445
top_builddir = @top_builddir@
445
top_builddir = @top_builddir@
446
top_srcdir = @top_srcdir@
446
top_srcdir = @top_srcdir@
447
SUBDIRS = basic multifactor
447
SUBDIRS = basic multifactor dug
448
all: all-recursive
448
all: all-recursive
449
449
450
.SUFFIXES:
450
.SUFFIXES:
(-)a/src/plugins/priority/dug/Makefile.am (+13 lines)
Line 0 Link Here
1
# Makefile for priority/dug plugin
2
3
AUTOMAKE_OPTIONS = foreign
4
5
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
6
7
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
8
9
pkglib_LTLIBRARIES = priority_dug.la
10
11
# dug priority logging plugin.
12
priority_dug_la_SOURCES = priority_dug.c
13
priority_dug_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
(-)a/src/plugins/priority/dug/Makefile.in (+797 lines)
Line 0 Link Here
1
# Makefile.in generated by automake 1.13.3 from Makefile.am.
2
# @configure_input@
3
4
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
6
# This Makefile.in is free software; the Free Software Foundation
7
# gives unlimited permission to copy and/or distribute it,
8
# with or without modifications, as long as this notice is preserved.
9
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13
# PARTICULAR PURPOSE.
14
15
@SET_MAKE@
16
17
# Makefile for priority/dug plugin
18
19
VPATH = @srcdir@
20
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
21
am__make_running_with_option = \
22
  case $${target_option-} in \
23
      ?) ;; \
24
      *) echo "am__make_running_with_option: internal error: invalid" \
25
              "target option '$${target_option-}' specified" >&2; \
26
         exit 1;; \
27
  esac; \
28
  has_opt=no; \
29
  sane_makeflags=$$MAKEFLAGS; \
30
  if $(am__is_gnu_make); then \
31
    sane_makeflags=$$MFLAGS; \
32
  else \
33
    case $$MAKEFLAGS in \
34
      *\\[\ \	]*) \
35
        bs=\\; \
36
        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
37
          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
38
    esac; \
39
  fi; \
40
  skip_next=no; \
41
  strip_trailopt () \
42
  { \
43
    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
44
  }; \
45
  for flg in $$sane_makeflags; do \
46
    test $$skip_next = yes && { skip_next=no; continue; }; \
47
    case $$flg in \
48
      *=*|--*) continue;; \
49
        -*I) strip_trailopt 'I'; skip_next=yes;; \
50
      -*I?*) strip_trailopt 'I';; \
51
        -*O) strip_trailopt 'O'; skip_next=yes;; \
52
      -*O?*) strip_trailopt 'O';; \
53
        -*l) strip_trailopt 'l'; skip_next=yes;; \
54
      -*l?*) strip_trailopt 'l';; \
55
      -[dEDm]) skip_next=yes;; \
56
      -[JT]) skip_next=yes;; \
57
    esac; \
58
    case $$flg in \
59
      *$$target_option*) has_opt=yes; break;; \
60
    esac; \
61
  done; \
62
  test $$has_opt = yes
63
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
64
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
65
pkgdatadir = $(datadir)/@PACKAGE@
66
pkgincludedir = $(includedir)/@PACKAGE@
67
pkglibdir = $(libdir)/@PACKAGE@
68
pkglibexecdir = $(libexecdir)/@PACKAGE@
69
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
70
install_sh_DATA = $(install_sh) -c -m 644
71
install_sh_PROGRAM = $(install_sh) -c
72
install_sh_SCRIPT = $(install_sh) -c
73
INSTALL_HEADER = $(INSTALL_DATA)
74
transform = $(program_transform_name)
75
NORMAL_INSTALL = :
76
PRE_INSTALL = :
77
POST_INSTALL = :
78
NORMAL_UNINSTALL = :
79
PRE_UNINSTALL = :
80
POST_UNINSTALL = :
81
build_triplet = @build@
82
host_triplet = @host@
83
target_triplet = @target@
84
subdir = src/plugins/priority/dug
85
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
86
	$(top_srcdir)/auxdir/depcomp
87
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
88
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_lib_hdf5.m4 \
89
	$(top_srcdir)/auxdir/ax_pthread.m4 \
90
	$(top_srcdir)/auxdir/libtool.m4 \
91
	$(top_srcdir)/auxdir/ltoptions.m4 \
92
	$(top_srcdir)/auxdir/ltsugar.m4 \
93
	$(top_srcdir)/auxdir/ltversion.m4 \
94
	$(top_srcdir)/auxdir/lt~obsolete.m4 \
95
	$(top_srcdir)/auxdir/slurm.m4 \
96
	$(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
97
	$(top_srcdir)/auxdir/x_ac_affinity.m4 \
98
	$(top_srcdir)/auxdir/x_ac_aix.m4 \
99
	$(top_srcdir)/auxdir/x_ac_blcr.m4 \
100
	$(top_srcdir)/auxdir/x_ac_bluegene.m4 \
101
	$(top_srcdir)/auxdir/x_ac_cflags.m4 \
102
	$(top_srcdir)/auxdir/x_ac_cray.m4 \
103
	$(top_srcdir)/auxdir/x_ac_databases.m4 \
104
	$(top_srcdir)/auxdir/x_ac_debug.m4 \
105
	$(top_srcdir)/auxdir/x_ac_dlfcn.m4 \
106
	$(top_srcdir)/auxdir/x_ac_env.m4 \
107
	$(top_srcdir)/auxdir/x_ac_freeipmi.m4 \
108
	$(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
109
	$(top_srcdir)/auxdir/x_ac_hwloc.m4 \
110
	$(top_srcdir)/auxdir/x_ac_iso.m4 \
111
	$(top_srcdir)/auxdir/x_ac_lua.m4 \
112
	$(top_srcdir)/auxdir/x_ac_man2html.m4 \
113
	$(top_srcdir)/auxdir/x_ac_munge.m4 \
114
	$(top_srcdir)/auxdir/x_ac_ncurses.m4 \
115
	$(top_srcdir)/auxdir/x_ac_nrt.m4 \
116
	$(top_srcdir)/auxdir/x_ac_ofed.m4 \
117
	$(top_srcdir)/auxdir/x_ac_pam.m4 \
118
	$(top_srcdir)/auxdir/x_ac_printf_null.m4 \
119
	$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
120
	$(top_srcdir)/auxdir/x_ac_readline.m4 \
121
	$(top_srcdir)/auxdir/x_ac_rrdtool.m4 \
122
	$(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
123
	$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
124
	$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
125
	$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
126
	$(top_srcdir)/auxdir/x_ac_sun_const.m4 \
127
	$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
128
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
129
	$(ACLOCAL_M4)
130
mkinstalldirs = $(install_sh) -d
131
CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
132
CONFIG_CLEAN_FILES =
133
CONFIG_CLEAN_VPATH_FILES =
134
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
135
am__vpath_adj = case $$p in \
136
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
137
    *) f=$$p;; \
138
  esac;
139
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
140
am__install_max = 40
141
am__nobase_strip_setup = \
142
  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
143
am__nobase_strip = \
144
  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
145
am__nobase_list = $(am__nobase_strip_setup); \
146
  for p in $$list; do echo "$$p $$p"; done | \
147
  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
148
  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
149
    if (++n[$$2] == $(am__install_max)) \
150
      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
151
    END { for (dir in files) print dir, files[dir] }'
152
am__base_list = \
153
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
154
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
155
am__uninstall_files_from_dir = { \
156
  test -z "$$files" \
157
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
158
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
159
         $(am__cd) "$$dir" && rm -f $$files; }; \
160
  }
161
am__installdirs = "$(DESTDIR)$(pkglibdir)"
162
LTLIBRARIES = $(pkglib_LTLIBRARIES)
163
priority_dug_la_LIBADD =
164
am_priority_dug_la_OBJECTS = priority_dug.lo
165
priority_dug_la_OBJECTS = $(am_priority_dug_la_OBJECTS)
166
AM_V_lt = $(am__v_lt_@AM_V@)
167
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
168
am__v_lt_0 = --silent
169
am__v_lt_1 = 
170
priority_dug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
171
	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
172
	$(AM_CFLAGS) $(CFLAGS) $(priority_dug_la_LDFLAGS) $(LDFLAGS) \
173
	-o $@
174
AM_V_P = $(am__v_P_@AM_V@)
175
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
176
am__v_P_0 = false
177
am__v_P_1 = :
178
AM_V_GEN = $(am__v_GEN_@AM_V@)
179
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
180
am__v_GEN_0 = @echo "  GEN     " $@;
181
am__v_GEN_1 = 
182
AM_V_at = $(am__v_at_@AM_V@)
183
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
184
am__v_at_0 = @
185
am__v_at_1 = 
186
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
187
depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
188
am__depfiles_maybe = depfiles
189
am__mv = mv -f
190
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
191
	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
192
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
193
	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
194
	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
195
	$(AM_CFLAGS) $(CFLAGS)
196
AM_V_CC = $(am__v_CC_@AM_V@)
197
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
198
am__v_CC_0 = @echo "  CC      " $@;
199
am__v_CC_1 = 
200
CCLD = $(CC)
201
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
202
	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
203
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
204
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
205
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
206
am__v_CCLD_0 = @echo "  CCLD    " $@;
207
am__v_CCLD_1 = 
208
SOURCES = $(priority_dug_la_SOURCES)
209
DIST_SOURCES = $(priority_dug_la_SOURCES)
210
am__can_run_installinfo = \
211
  case $$AM_UPDATE_INFO_DIR in \
212
    n|no|NO) false;; \
213
    *) (install-info --version) >/dev/null 2>&1;; \
214
  esac
215
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
216
# Read a list of newline-separated strings from the standard input,
217
# and print each of them once, without duplicates.  Input order is
218
# *not* preserved.
219
am__uniquify_input = $(AWK) '\
220
  BEGIN { nonempty = 0; } \
221
  { items[$$0] = 1; nonempty = 1; } \
222
  END { if (nonempty) { for (i in items) print i; }; } \
223
'
224
# Make sure the list of sources is unique.  This is necessary because,
225
# e.g., the same source file might be shared among _SOURCES variables
226
# for different programs/libraries.
227
am__define_uniq_tagged_files = \
228
  list='$(am__tagged_files)'; \
229
  unique=`for i in $$list; do \
230
    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
231
  done | $(am__uniquify_input)`
232
ETAGS = etags
233
CTAGS = ctags
234
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
235
ACLOCAL = @ACLOCAL@
236
AMTAR = @AMTAR@
237
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
238
AR = @AR@
239
AUTHD_CFLAGS = @AUTHD_CFLAGS@
240
AUTHD_LIBS = @AUTHD_LIBS@
241
AUTOCONF = @AUTOCONF@
242
AUTOHEADER = @AUTOHEADER@
243
AUTOMAKE = @AUTOMAKE@
244
AWK = @AWK@
245
BGL_LOADED = @BGL_LOADED@
246
BGQ_LOADED = @BGQ_LOADED@
247
BG_INCLUDES = @BG_INCLUDES@
248
BG_LDFLAGS = @BG_LDFLAGS@
249
BG_L_P_LOADED = @BG_L_P_LOADED@
250
BLCR_CPPFLAGS = @BLCR_CPPFLAGS@
251
BLCR_HOME = @BLCR_HOME@
252
BLCR_LDFLAGS = @BLCR_LDFLAGS@
253
BLCR_LIBS = @BLCR_LIBS@
254
BLUEGENE_LOADED = @BLUEGENE_LOADED@
255
CC = @CC@
256
CCDEPMODE = @CCDEPMODE@
257
CFLAGS = @CFLAGS@
258
CHECK_CFLAGS = @CHECK_CFLAGS@
259
CHECK_LIBS = @CHECK_LIBS@
260
CMD_LDFLAGS = @CMD_LDFLAGS@
261
CPP = @CPP@
262
CPPFLAGS = @CPPFLAGS@
263
CRAY_JOB_CPPFLAGS = @CRAY_JOB_CPPFLAGS@
264
CRAY_JOB_LDFLAGS = @CRAY_JOB_LDFLAGS@
265
CRAY_SELECT_CPPFLAGS = @CRAY_SELECT_CPPFLAGS@
266
CRAY_SELECT_LDFLAGS = @CRAY_SELECT_LDFLAGS@
267
CRAY_SWITCH_CPPFLAGS = @CRAY_SWITCH_CPPFLAGS@
268
CRAY_SWITCH_LDFLAGS = @CRAY_SWITCH_LDFLAGS@
269
CRAY_TASK_CPPFLAGS = @CRAY_TASK_CPPFLAGS@
270
CRAY_TASK_LDFLAGS = @CRAY_TASK_LDFLAGS@
271
CXX = @CXX@
272
CXXCPP = @CXXCPP@
273
CXXDEPMODE = @CXXDEPMODE@
274
CXXFLAGS = @CXXFLAGS@
275
CYGPATH_W = @CYGPATH_W@
276
DEFS = @DEFS@
277
DEPDIR = @DEPDIR@
278
DLLTOOL = @DLLTOOL@
279
DL_LIBS = @DL_LIBS@
280
DSYMUTIL = @DSYMUTIL@
281
DUMPBIN = @DUMPBIN@
282
ECHO_C = @ECHO_C@
283
ECHO_N = @ECHO_N@
284
ECHO_T = @ECHO_T@
285
EGREP = @EGREP@
286
EXEEXT = @EXEEXT@
287
FGREP = @FGREP@
288
FREEIPMI_CPPFLAGS = @FREEIPMI_CPPFLAGS@
289
FREEIPMI_LDFLAGS = @FREEIPMI_LDFLAGS@
290
FREEIPMI_LIBS = @FREEIPMI_LIBS@
291
GLIB_CFLAGS = @GLIB_CFLAGS@
292
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
293
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
294
GLIB_LIBS = @GLIB_LIBS@
295
GLIB_MKENUMS = @GLIB_MKENUMS@
296
GOBJECT_QUERY = @GOBJECT_QUERY@
297
GREP = @GREP@
298
GTK_CFLAGS = @GTK_CFLAGS@
299
GTK_LIBS = @GTK_LIBS@
300
H5CC = @H5CC@
301
H5FC = @H5FC@
302
HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
303
HAVE_AIX = @HAVE_AIX@
304
HAVE_MAN2HTML = @HAVE_MAN2HTML@
305
HAVE_NRT = @HAVE_NRT@
306
HAVE_OPENSSL = @HAVE_OPENSSL@
307
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
308
HDF5_CC = @HDF5_CC@
309
HDF5_CFLAGS = @HDF5_CFLAGS@
310
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
311
HDF5_FC = @HDF5_FC@
312
HDF5_FFLAGS = @HDF5_FFLAGS@
313
HDF5_FLIBS = @HDF5_FLIBS@
314
HDF5_LDFLAGS = @HDF5_LDFLAGS@
315
HDF5_LIBS = @HDF5_LIBS@
316
HDF5_VERSION = @HDF5_VERSION@
317
HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
318
HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
319
HWLOC_LIBS = @HWLOC_LIBS@
320
INSTALL = @INSTALL@
321
INSTALL_DATA = @INSTALL_DATA@
322
INSTALL_PROGRAM = @INSTALL_PROGRAM@
323
INSTALL_SCRIPT = @INSTALL_SCRIPT@
324
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
325
LD = @LD@
326
LDFLAGS = @LDFLAGS@
327
LIBOBJS = @LIBOBJS@
328
LIBS = @LIBS@
329
LIBTOOL = @LIBTOOL@
330
LIB_LDFLAGS = @LIB_LDFLAGS@
331
LIPO = @LIPO@
332
LN_S = @LN_S@
333
LTLIBOBJS = @LTLIBOBJS@
334
MAINT = @MAINT@
335
MAKEINFO = @MAKEINFO@
336
MANIFEST_TOOL = @MANIFEST_TOOL@
337
MKDIR_P = @MKDIR_P@
338
MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
339
MUNGE_DIR = @MUNGE_DIR@
340
MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
341
MUNGE_LIBS = @MUNGE_LIBS@
342
MYSQL_CFLAGS = @MYSQL_CFLAGS@
343
MYSQL_LIBS = @MYSQL_LIBS@
344
NCURSES = @NCURSES@
345
NM = @NM@
346
NMEDIT = @NMEDIT@
347
NRT_CPPFLAGS = @NRT_CPPFLAGS@
348
NUMA_LIBS = @NUMA_LIBS@
349
OBJDUMP = @OBJDUMP@
350
OBJEXT = @OBJEXT@
351
OFED_CPPFLAGS = @OFED_CPPFLAGS@
352
OFED_LDFLAGS = @OFED_LDFLAGS@
353
OFED_LIBS = @OFED_LIBS@
354
OTOOL = @OTOOL@
355
OTOOL64 = @OTOOL64@
356
PACKAGE = @PACKAGE@
357
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
358
PACKAGE_NAME = @PACKAGE_NAME@
359
PACKAGE_STRING = @PACKAGE_STRING@
360
PACKAGE_TARNAME = @PACKAGE_TARNAME@
361
PACKAGE_URL = @PACKAGE_URL@
362
PACKAGE_VERSION = @PACKAGE_VERSION@
363
PAM_DIR = @PAM_DIR@
364
PAM_LIBS = @PAM_LIBS@
365
PATH_SEPARATOR = @PATH_SEPARATOR@
366
PKG_CONFIG = @PKG_CONFIG@
367
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
368
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
369
PROCTRACKDIR = @PROCTRACKDIR@
370
PROJECT = @PROJECT@
371
PTHREAD_CC = @PTHREAD_CC@
372
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
373
PTHREAD_LIBS = @PTHREAD_LIBS@
374
RANLIB = @RANLIB@
375
READLINE_LIBS = @READLINE_LIBS@
376
REAL_BGQ_LOADED = @REAL_BGQ_LOADED@
377
REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
378
RELEASE = @RELEASE@
379
RRDTOOL_CPPFLAGS = @RRDTOOL_CPPFLAGS@
380
RRDTOOL_LDFLAGS = @RRDTOOL_LDFLAGS@
381
RRDTOOL_LIBS = @RRDTOOL_LIBS@
382
RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
383
SED = @SED@
384
SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
385
SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
386
SET_MAKE = @SET_MAKE@
387
SHELL = @SHELL@
388
SLURMCTLD_PORT = @SLURMCTLD_PORT@
389
SLURMCTLD_PORT_COUNT = @SLURMCTLD_PORT_COUNT@
390
SLURMDBD_PORT = @SLURMDBD_PORT@
391
SLURMD_PORT = @SLURMD_PORT@
392
SLURM_API_AGE = @SLURM_API_AGE@
393
SLURM_API_CURRENT = @SLURM_API_CURRENT@
394
SLURM_API_MAJOR = @SLURM_API_MAJOR@
395
SLURM_API_REVISION = @SLURM_API_REVISION@
396
SLURM_API_VERSION = @SLURM_API_VERSION@
397
SLURM_MAJOR = @SLURM_MAJOR@
398
SLURM_MICRO = @SLURM_MICRO@
399
SLURM_MINOR = @SLURM_MINOR@
400
SLURM_PREFIX = @SLURM_PREFIX@
401
SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
402
SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
403
SO_LDFLAGS = @SO_LDFLAGS@
404
SSL_CPPFLAGS = @SSL_CPPFLAGS@
405
SSL_LDFLAGS = @SSL_LDFLAGS@
406
SSL_LIBS = @SSL_LIBS@
407
STRIP = @STRIP@
408
UTIL_LIBS = @UTIL_LIBS@
409
VERSION = @VERSION@
410
abs_builddir = @abs_builddir@
411
abs_srcdir = @abs_srcdir@
412
abs_top_builddir = @abs_top_builddir@
413
abs_top_srcdir = @abs_top_srcdir@
414
ac_ct_AR = @ac_ct_AR@
415
ac_ct_CC = @ac_ct_CC@
416
ac_ct_CXX = @ac_ct_CXX@
417
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
418
ac_have_man2html = @ac_have_man2html@
419
am__include = @am__include@
420
am__leading_dot = @am__leading_dot@
421
am__quote = @am__quote@
422
am__tar = @am__tar@
423
am__untar = @am__untar@
424
ax_pthread_config = @ax_pthread_config@
425
bindir = @bindir@
426
build = @build@
427
build_alias = @build_alias@
428
build_cpu = @build_cpu@
429
build_os = @build_os@
430
build_vendor = @build_vendor@
431
builddir = @builddir@
432
datadir = @datadir@
433
datarootdir = @datarootdir@
434
docdir = @docdir@
435
dvidir = @dvidir@
436
exec_prefix = @exec_prefix@
437
host = @host@
438
host_alias = @host_alias@
439
host_cpu = @host_cpu@
440
host_os = @host_os@
441
host_vendor = @host_vendor@
442
htmldir = @htmldir@
443
includedir = @includedir@
444
infodir = @infodir@
445
install_sh = @install_sh@
446
libdir = @libdir@
447
libexecdir = @libexecdir@
448
localedir = @localedir@
449
localstatedir = @localstatedir@
450
lua_CFLAGS = @lua_CFLAGS@
451
lua_LIBS = @lua_LIBS@
452
mandir = @mandir@
453
mkdir_p = @mkdir_p@
454
oldincludedir = @oldincludedir@
455
pdfdir = @pdfdir@
456
prefix = @prefix@
457
program_transform_name = @program_transform_name@
458
psdir = @psdir@
459
sbindir = @sbindir@
460
sharedstatedir = @sharedstatedir@
461
srcdir = @srcdir@
462
sysconfdir = @sysconfdir@
463
target = @target@
464
target_alias = @target_alias@
465
target_cpu = @target_cpu@
466
target_os = @target_os@
467
target_vendor = @target_vendor@
468
top_build_prefix = @top_build_prefix@
469
top_builddir = @top_builddir@
470
top_srcdir = @top_srcdir@
471
AUTOMAKE_OPTIONS = foreign
472
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
473
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
474
pkglib_LTLIBRARIES = priority_dug.la
475
476
# dug priority logging plugin.
477
priority_dug_la_SOURCES = priority_dug.c
478
priority_dug_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
479
all: all-am
480
481
.SUFFIXES:
482
.SUFFIXES: .c .lo .o .obj
483
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
484
	@for dep in $?; do \
485
	  case '$(am__configure_deps)' in \
486
	    *$$dep*) \
487
	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
488
	        && { if test -f $@; then exit 0; else break; fi; }; \
489
	      exit 1;; \
490
	  esac; \
491
	done; \
492
	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/priority/dug/Makefile'; \
493
	$(am__cd) $(top_srcdir) && \
494
	  $(AUTOMAKE) --foreign src/plugins/priority/dug/Makefile
495
.PRECIOUS: Makefile
496
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
497
	@case '$?' in \
498
	  *config.status*) \
499
	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
500
	  *) \
501
	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
502
	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
503
	esac;
504
505
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
506
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
507
508
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
509
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
510
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
511
	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
512
$(am__aclocal_m4_deps):
513
514
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
515
	@$(NORMAL_INSTALL)
516
	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
517
	list2=; for p in $$list; do \
518
	  if test -f $$p; then \
519
	    list2="$$list2 $$p"; \
520
	  else :; fi; \
521
	done; \
522
	test -z "$$list2" || { \
523
	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
524
	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
525
	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
526
	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
527
	}
528
529
uninstall-pkglibLTLIBRARIES:
530
	@$(NORMAL_UNINSTALL)
531
	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
532
	for p in $$list; do \
533
	  $(am__strip_dir) \
534
	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
535
	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
536
	done
537
538
clean-pkglibLTLIBRARIES:
539
	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
540
	@list='$(pkglib_LTLIBRARIES)'; \
541
	locs=`for p in $$list; do echo $$p; done | \
542
	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
543
	      sort -u`; \
544
	test -z "$$locs" || { \
545
	  echo rm -f $${locs}; \
546
	  rm -f $${locs}; \
547
	}
548
549
priority_dug.la: $(priority_dug_la_OBJECTS) $(priority_dug_la_DEPENDENCIES) $(EXTRA_priority_dug_la_DEPENDENCIES) 
550
	$(AM_V_CCLD)$(priority_dug_la_LINK) -rpath $(pkglibdir) $(priority_dug_la_OBJECTS) $(priority_dug_la_LIBADD) $(LIBS)
551
552
mostlyclean-compile:
553
	-rm -f *.$(OBJEXT)
554
555
distclean-compile:
556
	-rm -f *.tab.c
557
558
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/priority_dug.Plo@am__quote@
559
560
.c.o:
561
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
562
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
563
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
564
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
565
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
566
567
.c.obj:
568
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
569
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
570
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
571
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
572
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
573
574
.c.lo:
575
@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
576
@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
577
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
578
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
579
@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
580
581
mostlyclean-libtool:
582
	-rm -f *.lo
583
584
clean-libtool:
585
	-rm -rf .libs _libs
586
587
ID: $(am__tagged_files)
588
	$(am__define_uniq_tagged_files); mkid -fID $$unique
589
tags: tags-am
590
TAGS: tags
591
592
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
593
	set x; \
594
	here=`pwd`; \
595
	$(am__define_uniq_tagged_files); \
596
	shift; \
597
	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
598
	  test -n "$$unique" || unique=$$empty_fix; \
599
	  if test $$# -gt 0; then \
600
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
601
	      "$$@" $$unique; \
602
	  else \
603
	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
604
	      $$unique; \
605
	  fi; \
606
	fi
607
ctags: ctags-am
608
609
CTAGS: ctags
610
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
611
	$(am__define_uniq_tagged_files); \
612
	test -z "$(CTAGS_ARGS)$$unique" \
613
	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
614
	     $$unique
615
616
GTAGS:
617
	here=`$(am__cd) $(top_builddir) && pwd` \
618
	  && $(am__cd) $(top_srcdir) \
619
	  && gtags -i $(GTAGS_ARGS) "$$here"
620
cscopelist: cscopelist-am
621
622
cscopelist-am: $(am__tagged_files)
623
	list='$(am__tagged_files)'; \
624
	case "$(srcdir)" in \
625
	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
626
	  *) sdir=$(subdir)/$(srcdir) ;; \
627
	esac; \
628
	for i in $$list; do \
629
	  if test -f "$$i"; then \
630
	    echo "$(subdir)/$$i"; \
631
	  else \
632
	    echo "$$sdir/$$i"; \
633
	  fi; \
634
	done >> $(top_builddir)/cscope.files
635
636
distclean-tags:
637
	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
638
639
distdir: $(DISTFILES)
640
	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
641
	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
642
	list='$(DISTFILES)'; \
643
	  dist_files=`for file in $$list; do echo $$file; done | \
644
	  sed -e "s|^$$srcdirstrip/||;t" \
645
	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
646
	case $$dist_files in \
647
	  */*) $(MKDIR_P) `echo "$$dist_files" | \
648
			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
649
			   sort -u` ;; \
650
	esac; \
651
	for file in $$dist_files; do \
652
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
653
	  if test -d $$d/$$file; then \
654
	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
655
	    if test -d "$(distdir)/$$file"; then \
656
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
657
	    fi; \
658
	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
659
	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
660
	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
661
	    fi; \
662
	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
663
	  else \
664
	    test -f "$(distdir)/$$file" \
665
	    || cp -p $$d/$$file "$(distdir)/$$file" \
666
	    || exit 1; \
667
	  fi; \
668
	done
669
check-am: all-am
670
check: check-am
671
all-am: Makefile $(LTLIBRARIES)
672
installdirs:
673
	for dir in "$(DESTDIR)$(pkglibdir)"; do \
674
	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
675
	done
676
install: install-am
677
install-exec: install-exec-am
678
install-data: install-data-am
679
uninstall: uninstall-am
680
681
install-am: all-am
682
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
683
684
installcheck: installcheck-am
685
install-strip:
686
	if test -z '$(STRIP)'; then \
687
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
688
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
689
	      install; \
690
	else \
691
	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
692
	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
693
	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
694
	fi
695
mostlyclean-generic:
696
697
clean-generic:
698
699
distclean-generic:
700
	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
701
	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
702
703
maintainer-clean-generic:
704
	@echo "This command is intended for maintainers to use"
705
	@echo "it deletes files that may require special tools to rebuild."
706
clean: clean-am
707
708
clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
709
	mostlyclean-am
710
711
distclean: distclean-am
712
	-rm -rf ./$(DEPDIR)
713
	-rm -f Makefile
714
distclean-am: clean-am distclean-compile distclean-generic \
715
	distclean-tags
716
717
dvi: dvi-am
718
719
dvi-am:
720
721
html: html-am
722
723
html-am:
724
725
info: info-am
726
727
info-am:
728
729
install-data-am:
730
731
install-dvi: install-dvi-am
732
733
install-dvi-am:
734
735
install-exec-am: install-pkglibLTLIBRARIES
736
737
install-html: install-html-am
738
739
install-html-am:
740
741
install-info: install-info-am
742
743
install-info-am:
744
745
install-man:
746
747
install-pdf: install-pdf-am
748
749
install-pdf-am:
750
751
install-ps: install-ps-am
752
753
install-ps-am:
754
755
installcheck-am:
756
757
maintainer-clean: maintainer-clean-am
758
	-rm -rf ./$(DEPDIR)
759
	-rm -f Makefile
760
maintainer-clean-am: distclean-am maintainer-clean-generic
761
762
mostlyclean: mostlyclean-am
763
764
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
765
	mostlyclean-libtool
766
767
pdf: pdf-am
768
769
pdf-am:
770
771
ps: ps-am
772
773
ps-am:
774
775
uninstall-am: uninstall-pkglibLTLIBRARIES
776
777
.MAKE: install-am install-strip
778
779
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
780
	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
781
	ctags-am distclean distclean-compile distclean-generic \
782
	distclean-libtool distclean-tags distdir dvi dvi-am html \
783
	html-am info info-am install install-am install-data \
784
	install-data-am install-dvi install-dvi-am install-exec \
785
	install-exec-am install-html install-html-am install-info \
786
	install-info-am install-man install-pdf install-pdf-am \
787
	install-pkglibLTLIBRARIES install-ps install-ps-am \
788
	install-strip installcheck installcheck-am installdirs \
789
	maintainer-clean maintainer-clean-generic mostlyclean \
790
	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
791
	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
792
	uninstall-pkglibLTLIBRARIES
793
794
795
# Tell versions [3.59,3.63) of GNU make to not export all variables.
796
# Otherwise a system limit (for SysV at least) may be exceeded.
797
.NOEXPORT:
(-)a/src/plugins/priority/dug/priority_dug.c (+226 lines)
Line 0 Link Here
1
/*****************************************************************************\
2
 *  priority_pure.c - Pure priority scheduling (no nice)
3
 *****************************************************************************
4
 *  Copyright (C) 2008 Lawrence Livermore National Security.
5
 *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
6
 *  Written by Danny Auble <da@llnl.gov>
7
 *  CODE-OCEC-09-009. All rights reserved.
8
 *
9
 *  This file is part of SLURM, a resource management program.
10
 *  For details, see <http://slurm.schedmd.com/>.
11
 *  Please also read the included file: DISCLAIMER.
12
 *
13
 *  SLURM is free software; you can redistribute it and/or modify it under
14
 *  the terms of the GNU General Public License as published by the Free
15
 *  Software Foundation; either version 2 of the License, or (at your option)
16
 *  any later version.
17
 *
18
 *  In addition, as a special exception, the copyright holders give permission
19
 *  to link the code of portions of this program with the OpenSSL library under
20
 *  certain conditions as described in each individual source file, and
21
 *  distribute linked combinations including the two. You must obey the GNU
22
 *  General Public License in all respects for all of the code used other than
23
 *  OpenSSL. If you modify file(s) with this exception, you may extend this
24
 *  exception to your version of the file(s), but you are not obligated to do
25
 *  so. If you do not wish to do so, delete this exception statement from your
26
 *  version.  If you delete this exception statement from all source files in
27
 *  the program, then also delete it here.
28
 *
29
 *  SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
30
 *  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
31
 *  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
32
 *  details.
33
 *
34
 *  You should have received a copy of the GNU General Public License along
35
 *  with SLURM; if not, write to the Free Software Foundation, Inc.,
36
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
37
\*****************************************************************************/
38
39
#ifdef HAVE_CONFIG_H
40
#  include "config.h"
41
#endif
42
43
#if HAVE_STDINT_H
44
#  include <stdint.h>
45
#endif
46
#if HAVE_INTTYPES_H
47
#  include <inttypes.h>
48
#endif
49
50
#include <stdio.h>
51
#include <math.h>
52
53
#include "slurm/slurm.h"
54
#include "slurm/slurm_errno.h"
55
56
#include "src/common/slurm_priority.h"
57
#include "src/common/assoc_mgr.h"
58
59
/*
60
 * These variables are required by the generic plugin interface.  If they
61
 * are not found in the plugin, the plugin loader will ignore it.
62
 *
63
 * plugin_name - a string giving a human-readable description of the
64
 * plugin.  There is no maximum length, but the symbol must refer to
65
 * a valid string.
66
 *
67
 * plugin_type - a string suggesting the type of the plugin or its
68
 * applicability to a particular form of data or method of data handling.
69
 * If the low-level plugin API is used, the contents of this string are
70
 * unimportant and may be anything.  SLURM uses the higher-level plugin
71
 * interface which requires this string to be of the form
72
 *
73
 *	<application>/<method>
74
 *
75
 * where <application> is a description of the intended application of
76
 * the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
77
 * is a description of how this plugin satisfies that application.  SLURM will
78
 * only load job completion logging plugins if the plugin_type string has a
79
 * prefix of "jobcomp/".
80
 *
81
 * plugin_version - an unsigned 32-bit integer giving the version number
82
 * of the plugin.  If major and minor revisions are desired, the major
83
 * version number may be multiplied by a suitable magnitude constant such
84
 * as 100 or 1000.  Various SLURM versions will likely require a certain
85
 * minimum version for their plugins as the job completion logging API
86
 * matures.
87
 */
88
const char plugin_name[]       	= "Priority PURE plugin";
89
const char plugin_type[]       	= "priority/pure";
90
const uint32_t plugin_version	= 100;
91
92
/*
93
 * init() is called when the plugin is loaded, before any other functions
94
 * are called.  Put global initialization here.
95
 */
96
int init ( void )
97
{
98
	debug("%s loaded", plugin_name);
99
	return SLURM_SUCCESS;
100
}
101
102
int fini ( void )
103
{
104
	return SLURM_SUCCESS;
105
}
106
107
/*
108
 * The remainder of this file implements the standard SLURM priority API.
109
 */
110
111
extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr)
112
{
113
	/* System hold is priority 0
114
	 * 0xfffffffe is NO_VAL
115
	 * 0xffffffff is INFINITE
116
	 * TOP_PRIORITY=0xffff0000 */
117
118
#define TOP_PRIORITY 0xffff0000
119
120
    uint32_t new_prio=100; /* DUG default priority */
121
    uint32_t dug_max_priority=1024; /* DUG max user priority */
122
123
    error("priority=%u top=%u",job_ptr->priority,TOP_PRIORITY);
124
    /* set the priority if its not one of the reserved values */
125
	if (job_ptr->priority <= TOP_PRIORITY && job_ptr->priority != 0) {
126
		new_prio=MIN(job_ptr->priority, dug_max_priority); /* truncate all priorities to DUG max user priority */
127
	}
128
	error("new_prio=%u",new_prio);
129
130
	job_ptr->direct_set_prio=1;
131
132
	return new_prio;
133
}
134
135
extern void priority_p_reconfig(bool assoc_clear)
136
{
137
	return;
138
}
139
140
extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
141
{
142
	return;
143
}
144
145
extern double priority_p_calc_fs_factor(long double usage_efctv,
146
					long double shares_norm)
147
{
148
	/* This calculation is needed for sshare when ran from a
149
	 * non-multifactor machine to a multifactor machine.  It
150
	 * doesn't do anything on regular systems, it should always
151
	 * return 0 since shares_norm will always be NO_VAL. */
152
	double priority_fs;
153
154
	xassert(!fuzzy_equal(usage_efctv, NO_VAL));
155
156
	if ((shares_norm <= 0.0) || fuzzy_equal(shares_norm, NO_VAL))
157
		priority_fs = 0.0;
158
	else
159
		priority_fs = pow(2.0, -(usage_efctv / shares_norm));
160
161
	return priority_fs;
162
}
163
164
extern List priority_p_get_priority_factors_list(
165
	priority_factors_request_msg_t *req_msg, uid_t uid)
166
{
167
	return(list_create(NULL));
168
}
169
170
extern void priority_p_job_end(struct job_record *job_ptr)
171
{
172
	uint64_t unused_cpu_run_secs = 0;
173
	uint64_t time_limit_secs = (uint64_t)job_ptr->time_limit * 60;
174
	slurmdb_association_rec_t *assoc_ptr;
175
	assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
176
				   WRITE_LOCK, NO_LOCK, NO_LOCK };
177
178
	/* No unused cpu_run_secs if job ran past its time limit */
179
	if (job_ptr->end_time >= job_ptr->start_time + time_limit_secs)
180
		return;
181
182
	unused_cpu_run_secs = job_ptr->total_cpus *
183
		(job_ptr->start_time + time_limit_secs - job_ptr->end_time);
184
185
	assoc_mgr_lock(&locks);
186
	if (job_ptr->qos_ptr) {
187
		slurmdb_qos_rec_t *qos_ptr =
188
			(slurmdb_qos_rec_t *)job_ptr->qos_ptr;
189
		if (unused_cpu_run_secs >
190
		    qos_ptr->usage->grp_used_cpu_run_secs) {
191
			qos_ptr->usage->grp_used_cpu_run_secs = 0;
192
			debug2("acct_policy_job_fini: "
193
			       "grp_used_cpu_run_secs "
194
			       "underflow for qos %s", qos_ptr->name);
195
		} else
196
			qos_ptr->usage->grp_used_cpu_run_secs -=
197
				unused_cpu_run_secs;
198
	}
199
	assoc_ptr = (slurmdb_association_rec_t *)job_ptr->assoc_ptr;
200
	while (assoc_ptr) {
201
		/* If the job finished early remove the extra time now. */
202
		if (unused_cpu_run_secs >
203
		    assoc_ptr->usage->grp_used_cpu_run_secs) {
204
			assoc_ptr->usage->grp_used_cpu_run_secs = 0;
205
			debug2("acct_policy_job_fini: "
206
			       "grp_used_cpu_run_secs "
207
			       "underflow for account %s",
208
			       assoc_ptr->acct);
209
		} else {
210
			assoc_ptr->usage->grp_used_cpu_run_secs -=
211
				unused_cpu_run_secs;
212
			debug4("acct_policy_job_fini: job %u. "
213
			       "Removed %"PRIu64" unused seconds "
214
			       "from assoc %s "
215
			       "grp_used_cpu_run_secs = %"PRIu64"",
216
			       job_ptr->job_id, unused_cpu_run_secs,
217
			       assoc_ptr->acct,
218
			       assoc_ptr->usage->grp_used_cpu_run_secs);
219
		}
220
		/* now handle all the group limits of the parents */
221
		assoc_ptr = assoc_ptr->usage->parent_assoc_ptr;
222
	}
223
	assoc_mgr_unlock(&locks);
224
225
	return;
226
}
(-)a/src/slurmctld/job_mgr.c (-8 / +10 lines)
Lines 4438-4445 static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run, Link Here
4438
	 * (both restricted to SlurmUser) before running the job_submit plugin.
4438
	 * (both restricted to SlurmUser) before running the job_submit plugin.
4439
	 */
4439
	 */
4440
	if ((submit_uid != 0) && (submit_uid != slurmctld_conf.slurm_user_id)) {
4440
	if ((submit_uid != 0) && (submit_uid != slurmctld_conf.slurm_user_id)) {
4441
		if (job_desc->priority != 0)
4441
	        if (job_desc->priority != 0 &&
4442
			job_desc->priority = NO_VAL;
4442
	        	(strncmp(slurmctld_conf.priority_type, "priority/dug",12)!=0 || job_desc->priority > 1024)) /* dug priority plugin handles priorities - priority_dug.c */
4443
	        	job_desc->priority = NO_VAL;
4443
		if (job_desc->nice < NICE_OFFSET)
4444
		if (job_desc->nice < NICE_OFFSET)
4444
			job_desc->nice = NICE_OFFSET;
4445
			job_desc->nice = NICE_OFFSET;
4445
	}
4446
	}
Lines 7638-7645 int update_job(job_desc_msg_t * job_specs, uid_t uid) Link Here
7638
	authorized = admin || assoc_mgr_is_user_acct_coord(
7639
	authorized = admin || assoc_mgr_is_user_acct_coord(
7639
		acct_db_conn, uid, job_ptr->account);
7640
		acct_db_conn, uid, job_ptr->account);
7640
	if ((job_ptr->user_id != uid) && !authorized) {
7641
	if ((job_ptr->user_id != uid) && !authorized) {
7641
		error("Security violation, JOB_UPDATE RPC from uid %d",
7642
		error("Security violation, JOB_UPDATE RPC from uid %d for job %u with uid %d",
7642
		      uid);
7643
		      uid, job_ptr->job_id, job_ptr->user_id);
7643
		return ESLURM_USER_ID_MISSING;
7644
		return ESLURM_USER_ID_MISSING;
7644
	}
7645
	}
7645
7646
Lines 8467-8474 int update_job(job_desc_msg_t * job_specs, uid_t uid) Link Here
8467
			    (job_ptr->state_reason == WAIT_HELD_USER))) {
8468
			    (job_ptr->state_reason == WAIT_HELD_USER))) {
8468
			job_ptr->direct_set_prio = 0;
8469
			job_ptr->direct_set_prio = 0;
8469
			set_job_prio(job_ptr);
8470
			set_job_prio(job_ptr);
8470
			info("sched: update_job: releasing hold for job_id %u",
8471
			info("sched: update_job: releasing hold for job_id %u, new priority is %u",
8471
			     job_specs->job_id);
8472
			     job_specs->job_id, job_ptr->priority);
8472
			job_ptr->state_reason = WAIT_NO_REASON;
8473
			job_ptr->state_reason = WAIT_NO_REASON;
8473
			job_ptr->job_state &= ~JOB_SPECIAL_EXIT;
8474
			job_ptr->job_state &= ~JOB_SPECIAL_EXIT;
8474
			xfree(job_ptr->state_desc);
8475
			xfree(job_ptr->state_desc);
Lines 8477-8482 int update_job(job_desc_msg_t * job_specs, uid_t uid) Link Here
8477
			info("ignore priority reset request on held job %u",
8478
			info("ignore priority reset request on held job %u",
8478
			     job_specs->job_id);
8479
			     job_specs->job_id);
8479
		} else if (authorized ||
8480
		} else if (authorized ||
8481
			( strncmp(slurmctld_conf.priority_type, "priority/dug", 12)==0 && job_specs->priority <= 1024 ) || /* dug_max_priority=1024 see priority_dug.c */
8480
			 (job_ptr->priority > job_specs->priority)) {
8482
			 (job_ptr->priority > job_specs->priority)) {
8481
			if (job_specs->priority != 0)
8483
			if (job_specs->priority != 0)
8482
				job_ptr->details->nice = NICE_OFFSET;
8484
				job_ptr->details->nice = NICE_OFFSET;
Lines 8516-8522 int update_job(job_desc_msg_t * job_specs, uid_t uid) Link Here
8516
	if (error_code != SLURM_SUCCESS)
8518
	if (error_code != SLURM_SUCCESS)
8517
		goto fini;
8519
		goto fini;
8518
8520
8519
	if (job_specs->nice != (uint16_t) NO_VAL) {
8521
	if (strncmp(slurmctld_conf.priority_type, "priority/dug", 12)!=0 && job_specs->nice != (uint16_t) NO_VAL) {
8520
		if (IS_JOB_FINISHED(job_ptr) || (job_ptr->details == NULL))
8522
		if (IS_JOB_FINISHED(job_ptr) || (job_ptr->details == NULL))
8521
			error_code = ESLURM_DISABLED;
8523
			error_code = ESLURM_DISABLED;
8522
		else if (job_ptr->details &&
8524
		else if (job_ptr->details &&
Lines 9274-9280 fini: Link Here
9274
	 * many factors of an update may affect priority considerations.
9276
	 * many factors of an update may affect priority considerations.
9275
	 * If job has a hold then do nothing */
9277
	 * If job has a hold then do nothing */
9276
	if ((error_code == SLURM_SUCCESS) && (job_ptr->priority != 0) &&
9278
	if ((error_code == SLURM_SUCCESS) && (job_ptr->priority != 0) &&
9277
	    strcmp(slurmctld_conf.priority_type, "priority/basic"))
9279
	    strcmp(slurmctld_conf.priority_type, "priority/basic") && strncmp(slurmctld_conf.priority_type, "priority/dug", 12)!=0)
9278
		set_job_prio(job_ptr);
9280
		set_job_prio(job_ptr);
9279
9281
9280
	return error_code;
9282
	return error_code;
(-)a/src/slurmd/slurmd/req.c (-2 / +2 lines)
Lines 2177-2183 _rpc_ping(slurm_msg_t *msg) Link Here
2177
	}
2177
	}
2178
2178
2179
	/* Take this opportunity to enforce any job memory limits */
2179
	/* Take this opportunity to enforce any job memory limits */
2180
	_enforce_job_mem_limit();
2180
	/* _enforce_job_mem_limit(); */
2181
	return rc;
2181
	return rc;
2182
}
2182
}
2183
2183
Lines 2212-2218 _rpc_health_check(slurm_msg_t *msg) Link Here
2212
	}
2212
	}
2213
2213
2214
	/* Take this opportunity to enforce any job memory limits */
2214
	/* Take this opportunity to enforce any job memory limits */
2215
	_enforce_job_mem_limit();
2215
	/* _enforce_job_mem_limit(); */
2216
	return rc;
2216
	return rc;
2217
}
2217
}
2218
2218

Return to ticket 806