Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed configure system to use new build-setup mechanism.

  • Loading branch information...
commit 709a26e70d85e652c153a53e97e72c26171d9952 1 parent 05daf9d
@msporny msporny authored
Showing with 48 additions and 17 deletions.
  1. +0 −17 autogen.sh
  2. +48 −0 build-setup
  3. 0  { → setup}/configure.ac
View
17 autogen.sh
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Check and add potential aclocal dirs
-MAYBE_AC_DIRS="
- /usr/local/share/aclocal
- /opt/local/share/aclocal
- /sw/share/aclocal
- "
-ACDIRS=
-for dir in $MAYBE_AC_DIRS; do
- if test -d $dir; then
- ACDIRS="$ACDIRS -I $dir"
- fi
-done
-aclocal $ACDIRS
-autoconf
-autoheader
View
48 build-setup
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# This shell script sets up the software to be built using 'make'. In
+# order to perform a build from a fresh source tree, do the following:
+#
+# 1. ./build-setup
+# 2. make
+#
+# If you don't want ./configure to be run automatically, you can do
+# the following: ./build-setup -s
+
+# Process command line options
+SKIP_CONFIGURE=0
+for arg in "$*"
+do
+ case $arg in
+ "-s" | "--setup-only" ) SKIP_CONFIGURE=1 ;;
+ esac
+done
+
+# Check and add potential aclocal dirs
+MAYBE_AC_DIRS="
+ /usr/local/share/aclocal
+ /opt/local/share/aclocal
+ /sw/share/aclocal
+ "
+ACDIRS="-I ../../monarch/setup/m4"
+for dir in $MAYBE_AC_DIRS; do
+ if test -d $dir; then
+ ACDIRS="$ACDIRS -I $dir"
+ fi
+done
+
+# Run aclocal on the set of local ac scripts
+cd setup
+aclocal $ACDIRS
+# Generate the configure script
+autoconf && mv configure ..
+cd ..
+
+autoheader -I setup setup/configure.ac
+
+# Run the configure script if "-s" isn't a command line option
+if [ $SKIP_CONFIGURE -eq 0 ]; then
+ # Run the configure script in default development mode
+ ./configure
+fi
+
View
0  configure.ac → setup/configure.ac
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.