X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=a2998411dfe01611ac1ee14685146efe174e572f;hp=df1636d2f576a4031f9b2e8d6cec9e2846120410;hb=c857b970e5cd53ae78543961735680c9b8e14341;hpb=c20be126e5e52af9b8cdff5685124e4a867e375a

diff --git a/configure b/configure
index df1636d2..a2998411 100755
--- a/configure
+++ b/configure
@@ -69,6 +69,11 @@ Fine tuning of some installation directories is available:
 
 	--libdir=DIR	Install libraries in LIBDIR [PREFIX/lib]
 
+Additional options are accepted for compatibility with other
+configure-script calling conventions, but don't do anything yet:
+
+	--build=<cpu>-<vendor>-<os>	Currently ignored
+
 EOF
 }
 
@@ -81,8 +86,24 @@ for option; do
 	PREFIX="${option#*=}"
     elif [ "${option%%=*}" = '--libdir' ] ; then
 	LIBDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--build' ] ; then
+	build_option="${option#*=}"
+	case ${build_option} in
+	    *-*-*) ;;
+	    *)
+		echo "Unrecognized value for --build option: ${build_option}"
+		echo "Should be: <cpu>-<vendor>-<os>"
+		echo "See:"
+		echo "	$0 --help"
+		echo ""
+		exit 1
+	esac
+	build_cpu=${build_option%%-*}
+	build_option=${build_option#*-}
+	build_vendor=${build_option%%-*}
+	build_os=${build_option#*-}
     else
-	echo "Unrecognized option: ${option}."
+	echo "Unrecognized option: ${option}"
 	echo "See:"
 	echo "	$0 --help"
 	echo ""
@@ -175,6 +196,15 @@ else
     emacs_lispdir='$(prefix)/share/emacs/site-lisp'
 fi
 
+printf "Checking if emacs is available... "
+if emacs --quick --batch > /dev/null 2>&1; then
+    printf "Yes.\n"
+    have_emacs=1
+else
+    printf "No (so will not byte-compile emacs code)\n"
+    have_emacs=0
+fi
+
 if [ $errors -gt 0 ]; then
     cat <<EOF
 
@@ -241,7 +271,7 @@ EOF
 fi
 
 printf "Checking for getline... "
-if ${CC} -o config/have_getline config/have_getline.c > /dev/null 2>&1
+if ${CC} -o compat/have_getline compat/have_getline.c > /dev/null 2>&1
 then
     printf "Yes.\n"
     have_getline=1
@@ -249,7 +279,7 @@ else
     printf "No (will use our own instead).\n"
     have_getline=0
 fi
-rm -f config/have_getline
+rm -f compat/have_getline
 
 cat <<EOF
 
@@ -279,21 +309,6 @@ CXX = ${CXX}
 # Command to execute emacs from Makefiles
 EMACS = emacs --quick
 
-# Command to execute gzip from Makefiles
-gzip = gzip
-
-# Command to create a directory
-MKDIR = install -d
-
-# Command to install an executable
-INSTALL-BIN = install
-
-# Command to install a non-executable file (documentation, etc.)
-INSTALL-DATA = install -m0644
-
-# Command to create a symbolic link
-SYMLINK = ln -sf
-
 # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS = ${CFLAGS}
 
@@ -315,6 +330,9 @@ libdir = ${LIBDIR:=\$(prefix)/lib}
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
+# Whether there's an emacs binary available for byte-compiling
+HAVE_EMACS = ${have_emacs}
+
 # The directory to which desktop files should be installed
 desktop_dir = \$(prefix)/share/applications