* configure.in (--enable-std-vector): New option.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 68d2ad7baf0431b5c6983a2bd98dcae1e172b728..e9047ff59c52b96d96baf79231a2baef2df0b7f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,12 +30,31 @@ AC_SUBST(DOCUMENTATION)
 
 gui_b=no
 AC_ARG_ENABLE(gui,
-    [  --enable-gui            compile with experimental GNOME output module.  Default: off],
+    [  --enable-gui            compile with experimental GNOME output.  Default: off],
     [gui_b=$enableval])
 
+std_string=yes
+AC_ARG_ENABLE(std-string,
+    [  --enable-std-string     compile with std::string.  Default: on],
+    [std_string=$enableval])
+if test "$std_string" = "yes"; then
+    # Store in config.make rather than in config.hh and have every
+    # source file depend on that.
+    DEFINES="$DEFINES -DSTD_STRING=1"
+fi
+
+std_vector=no
+AC_ARG_ENABLE(std-string,
+    [  --enable-std-vector     compile with experimental std::vector.  Default: off],
+    [std_vector=$enableval])
+if test "$std_vector" = "yes"; then
+    # Store in config.make rather than in config.hh and have every
+    # source file depend on that.
+    DEFINES="$DEFINES -DSTD_VECTOR=1"
+fi
 
 NCSB_DIR=unknown
-AC_ARG_WITH(ncsb,
+AC_ARG_WITH(ncsb-dir,
 [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
                             Default: detect with locate(1)],
     [NCSB_DIR=$withval])
@@ -119,7 +138,8 @@ fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 if test "$NCSB_DIR" = "unknown"; then
-  which locate >& /dev/null
+  # use `type' command rather than external program `which'
+  type locate >& /dev/null
   if test "$?" = "0"; then
       for d in `locate c059033l.pfb `; do
          if test -f `dirname "$d"`/c059033l.afm ; then