Bring some 'configure' script improvements over from Non-DAW.

This commit is contained in:
Jonathan Moore Liles 2012-02-20 02:54:34 -08:00
parent 6a09ce1c9c
commit a84e6b8aca
1 changed files with 22 additions and 5 deletions

View File

@ -1,11 +1,26 @@
#!/bin/sh
# Copyright (C) 2008 Jonathan Moore Liles #
# #
# This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the #
# Free Software Foundation; either version 2 of the License, or (at your #
# option) any later version. #
# #
# This program is distributed in the hope that it will be useful, but WITHOUT #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
# more details. #
# #
# You should have received a copy of the GNU General Public License along #
# with This program; see the file COPYING. If not,write to the Free Software #
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #
#
# Copyright (C) 2008 Jonathan Moore Liles
# This file is licensed under version 2 of the GPL.
. scripts/colors
# support functions for 'configure' scripts.
#####
## support functions for 'configure' scripts.
fatal ()
{
@ -106,6 +121,8 @@ ask ()
fi
append "${2}=${A:-$D}"
eval "${2}='${A:-$D}'"
}
ok ()
@ -256,7 +273,7 @@ require_package ()
fi
name="`upcase \"$1\"`"
append "${name}_LIBS=`pkg-config --libs $3`"
append "${name}_LIBS=`pkg-config --libs $3 | sed 's/,\\?--as-needed//g'`"
append "${name}_CFLAGS=-DHAVE_${1} `pkg-config --cflags $3`"
ok `pkg-config --modversion "$3"`
@ -310,6 +327,6 @@ require_FLTK ()
use="$use --use-$1"
done
append "FLTK_LIBS=`fltk-config $use --ldflags`"
append "FLTK_LIBS=`fltk-config $use --ldflags | sed 's/,\\?--as-needed//g'`"
append "FLTK_CFLAGS=`fltk-config $use --cflags`"
}