mirror of
https://github.com/gnustep/libs-back.git
synced 2025-06-01 09:42:17 +00:00
pick up gnustep make configured CC, CPP, CXX and check they are consistent with how make was configured
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@38489 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola
parent
0bb695efa7
commit
ff79cb92cf
3 changed files with 221 additions and 175 deletions
|
|
@ -1,3 +1,10 @@
|
||||||
|
2015-05-12 Riccardo Mottola <rm@gnu.org>
|
||||||
|
|
||||||
|
* configure.ac
|
||||||
|
pick up gnustep make configured CC, CPP, CXX and check they are consistent with how make was configured
|
||||||
|
* configure
|
||||||
|
regenerated
|
||||||
|
|
||||||
2015-03-31 Germán Arias <germanandre@gmx.es>
|
2015-03-31 Germán Arias <germanandre@gmx.es>
|
||||||
|
|
||||||
* Source/win32/WIN32Server.m (-windowEventProc:, -process_mouse_event:):
|
* Source/win32/WIN32Server.m (-windowEventProc:, -process_mouse_event:):
|
||||||
|
|
|
||||||
363
configure
vendored
363
configure
vendored
|
|
@ -665,6 +665,13 @@ XMKMF
|
||||||
EGREP
|
EGREP
|
||||||
GREP
|
GREP
|
||||||
CPP
|
CPP
|
||||||
|
OBJEXT
|
||||||
|
EXEEXT
|
||||||
|
ac_ct_CC
|
||||||
|
CPPFLAGS
|
||||||
|
LDFLAGS
|
||||||
|
CFLAGS
|
||||||
|
CC
|
||||||
target_os
|
target_os
|
||||||
target_vendor
|
target_vendor
|
||||||
target_cpu
|
target_cpu
|
||||||
|
|
@ -677,13 +684,6 @@ build_os
|
||||||
build_vendor
|
build_vendor
|
||||||
build_cpu
|
build_cpu
|
||||||
build
|
build
|
||||||
OBJEXT
|
|
||||||
EXEEXT
|
|
||||||
ac_ct_CC
|
|
||||||
CPPFLAGS
|
|
||||||
LDFLAGS
|
|
||||||
CFLAGS
|
|
||||||
CC
|
|
||||||
target_alias
|
target_alias
|
||||||
host_alias
|
host_alias
|
||||||
build_alias
|
build_alias
|
||||||
|
|
@ -2217,6 +2217,129 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# Determine the host, build, and target systems
|
# Determine the host, build, and target systems
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
|
# Make sure we can run config.sub.
|
||||||
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||||
|
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
||||||
|
$as_echo_n "checking build system type... " >&6; }
|
||||||
|
if ${ac_cv_build+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_build_alias=$build_alias
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
|
||||||
|
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||||||
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
||||||
|
$as_echo "$ac_cv_build" >&6; }
|
||||||
|
case $ac_cv_build in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
|
||||||
|
esac
|
||||||
|
build=$ac_cv_build
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_build
|
||||||
|
shift
|
||||||
|
build_cpu=$1
|
||||||
|
build_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
build_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
||||||
|
$as_echo_n "checking host system type... " >&6; }
|
||||||
|
if ${ac_cv_host+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
if test "x$host_alias" = x; then
|
||||||
|
ac_cv_host=$ac_cv_build
|
||||||
|
else
|
||||||
|
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||||||
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
||||||
|
$as_echo "$ac_cv_host" >&6; }
|
||||||
|
case $ac_cv_host in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
|
||||||
|
esac
|
||||||
|
host=$ac_cv_host
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_host
|
||||||
|
shift
|
||||||
|
host_cpu=$1
|
||||||
|
host_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
host_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
|
||||||
|
$as_echo_n "checking target system type... " >&6; }
|
||||||
|
if ${ac_cv_target+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
if test "x$target_alias" = x; then
|
||||||
|
ac_cv_target=$ac_cv_host
|
||||||
|
else
|
||||||
|
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
||||||
|
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
|
||||||
|
$as_echo "$ac_cv_target" >&6; }
|
||||||
|
case $ac_cv_target in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
|
||||||
|
esac
|
||||||
|
target=$ac_cv_target
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_target
|
||||||
|
shift
|
||||||
|
target_cpu=$1
|
||||||
|
target_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
target_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
# The aliases save the names the user supplied, while $host etc.
|
||||||
|
# will get canonicalized.
|
||||||
|
test -n "$target_alias" &&
|
||||||
|
test "$program_prefix$program_suffix$program_transform_name" = \
|
||||||
|
NONENONEs,x,x, &&
|
||||||
|
program_prefix=${target_alias}-
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# Find the compiler
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
if test "$CC" = ""; then
|
||||||
|
CC=`gnustep-config --variable=CC`
|
||||||
|
fi
|
||||||
|
if test "$CPP" = ""; then
|
||||||
|
CPP=`gnustep-config --variable=CPP`
|
||||||
|
fi
|
||||||
|
if test "$CXX" = ""; then
|
||||||
|
CXX=`gnustep-config --variable=CXX`
|
||||||
|
fi
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
|
|
@ -3006,171 +3129,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
# Make sure we can run config.sub.
|
|
||||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
||||||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
|
||||||
$as_echo_n "checking build system type... " >&6; }
|
|
||||||
if ${ac_cv_build+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_build_alias=$build_alias
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
|
|
||||||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
||||||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
|
||||||
$as_echo "$ac_cv_build" >&6; }
|
|
||||||
case $ac_cv_build in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
|
|
||||||
esac
|
|
||||||
build=$ac_cv_build
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_build
|
|
||||||
shift
|
|
||||||
build_cpu=$1
|
|
||||||
build_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
build_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
|
||||||
$as_echo_n "checking host system type... " >&6; }
|
|
||||||
if ${ac_cv_host+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test "x$host_alias" = x; then
|
|
||||||
ac_cv_host=$ac_cv_build
|
|
||||||
else
|
|
||||||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
||||||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
|
||||||
$as_echo "$ac_cv_host" >&6; }
|
|
||||||
case $ac_cv_host in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
|
|
||||||
esac
|
|
||||||
host=$ac_cv_host
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_host
|
|
||||||
shift
|
|
||||||
host_cpu=$1
|
|
||||||
host_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
host_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
|
|
||||||
$as_echo_n "checking target system type... " >&6; }
|
|
||||||
if ${ac_cv_target+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test "x$target_alias" = x; then
|
|
||||||
ac_cv_target=$ac_cv_host
|
|
||||||
else
|
|
||||||
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
|
||||||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
|
|
||||||
$as_echo "$ac_cv_target" >&6; }
|
|
||||||
case $ac_cv_target in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
|
|
||||||
esac
|
|
||||||
target=$ac_cv_target
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_target
|
|
||||||
shift
|
|
||||||
target_cpu=$1
|
|
||||||
target_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
target_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
# The aliases save the names the user supplied, while $host etc.
|
|
||||||
# will get canonicalized.
|
|
||||||
test -n "$target_alias" &&
|
|
||||||
test "$program_prefix$program_suffix$program_transform_name" = \
|
|
||||||
NONENONEs,x,x, &&
|
|
||||||
program_prefix=${target_alias}-
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
# The following is so that headers and custom libraries
|
|
||||||
# in the GNUstep root are used before the standard ones
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
GRAPHIC_CFLAGS="$CPPFLAGS"
|
|
||||||
GRAPHIC_LFLAGS="$LDFLAGS"
|
|
||||||
|
|
||||||
#
|
|
||||||
# It looks like we ought to source the whole GNUstep.sh here, and even
|
|
||||||
# ask it to output all variables! That way we have access to (eg)
|
|
||||||
# GNUSTEP_SYSTEM_HEADERS below.
|
|
||||||
#
|
|
||||||
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
|
|
||||||
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
|
|
||||||
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
|
||||||
|
|
||||||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
|
||||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
|
||||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
|
||||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
|
||||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
|
||||||
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
|
||||||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
|
||||||
obj_dir=$clean_target_cpu/$clean_target_os
|
|
||||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
|
||||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
|
||||||
else
|
|
||||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
|
||||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
|
||||||
fi
|
|
||||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
|
||||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
# Add target OS directories as necessary
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
case "$target_os" in
|
|
||||||
freebsd* | openbsd* )
|
|
||||||
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
|
||||||
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
|
|
||||||
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
|
||||||
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
|
||||||
esac
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
# These headers/functions needed by gpbs.m
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
|
|
@ -3309,6 +3267,67 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
||||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
|
|
||||||
|
MAKECC=`gnustep-config --variable=CC`
|
||||||
|
if test "$CC" != "$MAKECC"; then
|
||||||
|
as_fn_error $? "You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). Please run configure again with your environment set to match your gnustep-make" "$LINENO" 5
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# The following is so that headers and custom libraries
|
||||||
|
# in the GNUstep root are used before the standard ones
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
GRAPHIC_CFLAGS="$CPPFLAGS"
|
||||||
|
GRAPHIC_LFLAGS="$LDFLAGS"
|
||||||
|
|
||||||
|
#
|
||||||
|
# It looks like we ought to source the whole GNUstep.sh here, and even
|
||||||
|
# ask it to output all variables! That way we have access to (eg)
|
||||||
|
# GNUSTEP_SYSTEM_HEADERS below.
|
||||||
|
#
|
||||||
|
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
|
||||||
|
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
|
||||||
|
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
||||||
|
|
||||||
|
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||||
|
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||||
|
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||||
|
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||||
|
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
||||||
|
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
||||||
|
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||||
|
obj_dir=$clean_target_cpu/$clean_target_os
|
||||||
|
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
||||||
|
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
||||||
|
else
|
||||||
|
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
||||||
|
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
||||||
|
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# Add target OS directories as necessary
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
case "$target_os" in
|
||||||
|
freebsd* | openbsd* )
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
||||||
|
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
|
||||||
|
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
||||||
|
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||||
|
esac
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# These headers/functions needed by gpbs.m
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||||||
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||||||
if ${ac_cv_path_GREP+:} false; then :
|
if ${ac_cv_path_GREP+:} false; then :
|
||||||
|
|
|
||||||
26
configure.ac
26
configure.ac
|
|
@ -1,7 +1,7 @@
|
||||||
# configure.in for GNUstep GUI Backend
|
# configure.ac for GNUstep GUI Backend
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996-2002 Free Software Foundation, Inc.
|
# Copyright (C) 1996-2015 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# Author: Adam Fedor <fedor@gnu.org>
|
# Author: Adam Fedor <fedor@gnu.org>
|
||||||
#
|
#
|
||||||
|
|
@ -47,9 +47,29 @@ AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# Determine the host, build, and target systems
|
# Determine the host, build, and target systems
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
AC_PROG_CC
|
|
||||||
AC_CANONICAL_TARGET([])
|
AC_CANONICAL_TARGET([])
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# Find the compiler
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
if test "$CC" = ""; then
|
||||||
|
CC=`gnustep-config --variable=CC`
|
||||||
|
fi
|
||||||
|
if test "$CPP" = ""; then
|
||||||
|
CPP=`gnustep-config --variable=CPP`
|
||||||
|
fi
|
||||||
|
if test "$CXX" = ""; then
|
||||||
|
CXX=`gnustep-config --variable=CXX`
|
||||||
|
fi
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CPP
|
||||||
|
|
||||||
|
MAKECC=`gnustep-config --variable=CC`
|
||||||
|
if test "$CC" != "$MAKECC"; then
|
||||||
|
AC_MSG_ERROR([You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC). Please run configure again with your environment set to match your gnustep-make])
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# The following is so that headers and custom libraries
|
# The following is so that headers and custom libraries
|
||||||
# in the GNUstep root are used before the standard ones
|
# in the GNUstep root are used before the standard ones
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue