Browse code

sync configure script with configure.ac

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@79209 bc3139a8-67e5-0310-9ffc-ced21a209358

Michael Lawrence authored on 02/08/2013 18:53:05
Showing 5 changed files

... ...
@@ -596,6 +596,42 @@ fi
596 596
 rmdir .tst 2>/dev/null
597 597
 AC_SUBST([am__leading_dot])])
598 598
 
599
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
600
+# From Jim Meyering
601
+
602
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
603
+#
604
+# This file is free software; the Free Software Foundation
605
+# gives unlimited permission to copy and/or distribute it,
606
+# with or without modifications, as long as this notice is preserved.
607
+
608
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
609
+# ----------------------------------
610
+# Control maintainer-specific portions of Makefiles.
611
+# Default is to disable them, unless 'enable' is passed literally.
612
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
613
+# can override the default with the --enable/--disable switch.
614
+AC_DEFUN([AM_MAINTAINER_MODE],
615
+[m4_case(m4_default([$1], [disable]),
616
+       [enable], [m4_define([am_maintainer_other], [disable])],
617
+       [disable], [m4_define([am_maintainer_other], [enable])],
618
+       [m4_define([am_maintainer_other], [enable])
619
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
620
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
621
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
622
+  AC_ARG_ENABLE([maintainer-mode],
623
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
624
+      am_maintainer_other[ make rules and dependencies not useful
625
+      (and sometimes confusing) to the casual installer])],
626
+    [USE_MAINTAINER_MODE=$enableval],
627
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
628
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
629
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
630
+  MAINT=$MAINTAINER_MODE_TRUE
631
+  AC_SUBST([MAINT])dnl
632
+]
633
+)
634
+
599 635
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
600 636
 
601 637
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
... ...
@@ -676,6 +676,9 @@ MAINTAINER_FALSE
676 676
 MAINTAINER_TRUE
677 677
 FULLDIST_FALSE
678 678
 FULLDIST_TRUE
679
+MAINT
680
+MAINTAINER_MODE_FALSE
681
+MAINTAINER_MODE_TRUE
679 682
 AM_BACKSLASH
680 683
 AM_DEFAULT_VERBOSITY
681 684
 AM_DEFAULT_V
... ...
@@ -776,6 +779,7 @@ enable_option_checking
776 779
 enable_largefile
777 780
 enable_dependency_tracking
778 781
 enable_silent_rules
782
+enable_maintainer_mode
779 783
 enable_fulldist
780 784
 enable_maintainer
781 785
 enable_shared
... ...
@@ -1429,6 +1433,9 @@ Optional Features:
1429 1433
                           speeds up one-time build
1430 1434
   --enable-silent-rules   less verbose build output (undo: "make V=1")
1431 1435
   --disable-silent-rules  verbose build output (undo: "make V=0")
1436
+  --disable-maintainer-mode
1437
+                          disable make rules and dependencies not useful (and
1438
+                          sometimes confusing) to the casual installer
1432 1439
   --enable-fulldist       For use by program maintainer
1433 1440
   --enable-maintainer     For use by program maintainer
1434 1441
   --enable-shared[=PKGS]  build shared libraries [default=yes]
... ...
@@ -4421,6 +4428,29 @@ fi
4421 4428
 
4422 4429
 
4423 4430
 
4431
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
4432
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
4433
+    # Check whether --enable-maintainer-mode was given.
4434
+if test "${enable_maintainer_mode+set}" = set; then :
4435
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
4436
+else
4437
+  USE_MAINTAINER_MODE=yes
4438
+fi
4439
+
4440
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
4441
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
4442
+   if test $USE_MAINTAINER_MODE = yes; then
4443
+  MAINTAINER_MODE_TRUE=
4444
+  MAINTAINER_MODE_FALSE='#'
4445
+else
4446
+  MAINTAINER_MODE_TRUE='#'
4447
+  MAINTAINER_MODE_FALSE=
4448
+fi
4449
+
4450
+  MAINT=$MAINTAINER_MODE_TRUE
4451
+
4452
+
4453
+
4424 4454
  if test "x$enable_fulldist" = xyes; then
4425 4455
   FULLDIST_TRUE=
4426 4456
   FULLDIST_FALSE='#'
... ...
@@ -16597,6 +16627,10 @@ else
16597 16627
   am__EXEEXT_FALSE=
16598 16628
 fi
16599 16629
 
16630
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
16631
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
16632
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
16633
+fi
16600 16634
 if test -z "${FULLDIST_TRUE}" && test -z "${FULLDIST_FALSE}"; then
16601 16635
   as_fn_error $? "conditional \"FULLDIST\" was never defined.
16602 16636
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -596,6 +596,42 @@ fi
596 596
 rmdir .tst 2>/dev/null
597 597
 AC_SUBST([am__leading_dot])])
598 598
 
599
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
600
+# From Jim Meyering
601
+
602
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
603
+#
604
+# This file is free software; the Free Software Foundation
605
+# gives unlimited permission to copy and/or distribute it,
606
+# with or without modifications, as long as this notice is preserved.
607
+
608
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
609
+# ----------------------------------
610
+# Control maintainer-specific portions of Makefiles.
611
+# Default is to disable them, unless 'enable' is passed literally.
612
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
613
+# can override the default with the --enable/--disable switch.
614
+AC_DEFUN([AM_MAINTAINER_MODE],
615
+[m4_case(m4_default([$1], [disable]),
616
+       [enable], [m4_define([am_maintainer_other], [disable])],
617
+       [disable], [m4_define([am_maintainer_other], [enable])],
618
+       [m4_define([am_maintainer_other], [enable])
619
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
620
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
621
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
622
+  AC_ARG_ENABLE([maintainer-mode],
623
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
624
+      am_maintainer_other[ make rules and dependencies not useful
625
+      (and sometimes confusing) to the casual installer])],
626
+    [USE_MAINTAINER_MODE=$enableval],
627
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
628
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
629
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
630
+  MAINT=$MAINTAINER_MODE_TRUE
631
+  AC_SUBST([MAINT])dnl
632
+]
633
+)
634
+
599 635
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
600 636
 
601 637
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
... ...
@@ -684,6 +684,9 @@ MAINTAINER_FALSE
684 684
 MAINTAINER_TRUE
685 685
 FULLDIST_FALSE
686 686
 FULLDIST_TRUE
687
+MAINT
688
+MAINTAINER_MODE_FALSE
689
+MAINTAINER_MODE_TRUE
687 690
 AM_BACKSLASH
688 691
 AM_DEFAULT_VERBOSITY
689 692
 AM_DEFAULT_V
... ...
@@ -786,6 +789,7 @@ enable_option_checking
786 789
 enable_largefile
787 790
 enable_dependency_tracking
788 791
 enable_silent_rules
792
+enable_maintainer_mode
789 793
 enable_fulldist
790 794
 enable_maintainer
791 795
 enable_static_linking
... ...
@@ -1437,6 +1441,9 @@ Optional Features:
1437 1441
                           speeds up one-time build
1438 1442
   --enable-silent-rules   less verbose build output (undo: "make V=1")
1439 1443
   --disable-silent-rules  verbose build output (undo: "make V=0")
1444
+  --disable-maintainer-mode
1445
+                          disable make rules and dependencies not useful (and
1446
+                          sometimes confusing) to the casual installer
1440 1447
   --enable-fulldist       For use by program maintainer
1441 1448
   --enable-maintainer     For use by program maintainer
1442 1449
   --enable-static-linking Link binaries statically (default=no)
... ...
@@ -4425,6 +4432,29 @@ fi
4425 4432
 
4426 4433
 
4427 4434
 
4435
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
4436
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
4437
+    # Check whether --enable-maintainer-mode was given.
4438
+if test "${enable_maintainer_mode+set}" = set; then :
4439
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
4440
+else
4441
+  USE_MAINTAINER_MODE=yes
4442
+fi
4443
+
4444
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
4445
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
4446
+   if test $USE_MAINTAINER_MODE = yes; then
4447
+  MAINTAINER_MODE_TRUE=
4448
+  MAINTAINER_MODE_FALSE='#'
4449
+else
4450
+  MAINTAINER_MODE_TRUE='#'
4451
+  MAINTAINER_MODE_FALSE=
4452
+fi
4453
+
4454
+  MAINT=$MAINTAINER_MODE_TRUE
4455
+
4456
+
4457
+
4428 4458
  if test "x$enable_fulldist" = xyes; then
4429 4459
   FULLDIST_TRUE=
4430 4460
   FULLDIST_FALSE='#'
... ...
@@ -15427,6 +15457,10 @@ else
15427 15457
   am__EXEEXT_FALSE=
15428 15458
 fi
15429 15459
 
15460
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
15461
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
15462
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
15463
+fi
15430 15464
 if test -z "${FULLDIST_TRUE}" && test -z "${FULLDIST_FALSE}"; then
15431 15465
   as_fn_error $? "conditional \"FULLDIST\" was never defined.
15432 15466
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -93,7 +93,7 @@
93 93
 #define HAVE_RINT 1
94 94
 
95 95
 /* Define to 1 if you have a working Samtools library. */
96
-#define HAVE_SAMTOOLS 1
96
+/* #undef HAVE_SAMTOOLS */
97 97
 
98 98
 /* Define to 1 if you have the `sigaction' function. */
99 99
 #define HAVE_SIGACTION 1