From 7bffc7bd3be1cc3e5c27c3a45e7002ed3711bbc6 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 13 Dec 2013 10:19:54 +0000 Subject: [PATCH] Add an autogen.sh script as is customary for autoconf based projects. Also update the documentation to steer people to use this scripts. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10029 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- README.MSWindows.txt | 11 +++++------ README.OSX.txt | 11 +++++------ README.Unix.txt | 11 +++++------ autogen.sh | 16 ++++++++++++++++ 4 files changed, 31 insertions(+), 18 deletions(-) create mode 100755 autogen.sh diff --git a/README.MSWindows.txt b/README.MSWindows.txt index b2356914d4..4aefe5b46e 100644 --- a/README.MSWindows.txt +++ b/README.MSWindows.txt @@ -214,12 +214,11 @@ in my dev directory: Configuring FLTK ------------------ -If you got FLTK via subversion then you need two extra steps. Otherwise skip -over this part. Stay in your FLTK source-code directory. Type the following -but ignore any errors from the second command: - - autoconf - automake --add-missing +If you got FLTK via subversion then you need one extra step. Otherwise skip +over this part. Stay in your FLTK source-code directory and type the +following: + + NOCONFIGURE=1 ./autogen.sh Now configure your FLTK installation: diff --git a/README.OSX.txt b/README.OSX.txt index 77ddf878b2..ce720c3e4a 100644 --- a/README.OSX.txt +++ b/README.OSX.txt @@ -91,12 +91,11 @@ dev directory: 2.3 Configuring FLTK ----------------------- -If you got FLTK via subversion then you need two extra steps. Otherwise skip -over this part. Stay in your FLTK source-code directory. Type the following -but ignore any errors from the second command: - - autoconf - automake --add-missing +If you got FLTK via subversion then you need one extra step. Otherwise skip +over this part. Stay in your FLTK source-code directory and type the +following: + + NOCONFIGURE=1 ./autogen.sh Now configure your FLTK installation: diff --git a/README.Unix.txt b/README.Unix.txt index 1e54e45add..096d017262 100644 --- a/README.Unix.txt +++ b/README.Unix.txt @@ -293,12 +293,11 @@ dev directory: 3.2 Configuring FLTK ----------------------- -If you got FLTK via subversion then you need two extra steps. Otherwise skip -over this part. Stay in your FLTK source-code directory. Type the following -but ignore any errors from the second command: - - autoconf - automake --add-missing +If you got FLTK via subversion then you need one extra step. Otherwise skip +over this part. Stay in your FLTK source-code directory and type the +following: + + NOCONFIGURE=1 ./autogen.sh Now configure your FLTK installation: diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000000..e27ae85af6 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. +srcdir=`cd $srcdir && pwd` + +ORIGDIR=`pwd` +cd $srcdir + +autoconf --force || exit 1 +automake --add-missing +if test ! -e config.sub; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi +if test ! -e config.guess; then echo NOTE: Using frozen copy of config.guess; cp misc/config.guess . ; fi +cd $ORIGDIR || exit $? + +test -n "$NOCONFIGURE" || $srcdir/configure "$@"