Menu
▾
▴
[Crystal-cvs] SF.net SVN: crystal: [25358] CS/trunk/configure
|
From: <re...@us...> - 2006-09-15 22:21:15
|
Revision: 25358
http://svn.sourceforge.net/crystal/?rev=25358&view=rev
Author: res2002
Date: 2006-09-15 15:21:05 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Regenerated configure
Modified Paths:
--------------
CS/trunk/configure
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-15 22:17:09 UTC (rev 25357)
+++ CS/trunk/configure 2006-09-15 22:21:05 UTC (rev 25358)
@@ -866,6 +866,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-mno-cygwin Compile with the -mno-cygwin option. (default YES)
--enable-as-needed Utilize --as-needed linker flag, if supported by
linker and if the used binutils version is recent
enough to support it properly (default NO)
@@ -1484,7 +1485,7 @@
PACKAGE_LONGNAME="Crystal Space"
- PACKAGE_COPYRIGHT="Copyright (C)1998-2005 Jorrit Tyberghein and others"
+ PACKAGE_COPYRIGHT="Copyright (C)1998-2006 Jorrit Tyberghein and others"
PACKAGE_HOMEPAGE="http://www.crystalspace3d.org/"
@@ -1568,8 +1569,49 @@
+ echo "$as_me:$LINENO: checking whether to enable -mno-cygwin" >&5
+echo $ECHO_N "checking whether to enable -mno-cygwin... $ECHO_C" >&6
+ # Check whether --enable-mno-cygwin or --disable-mno-cygwin was given.
+if test "${enable_mno_cygwin+set}" = set; then
+ enableval="$enable_mno_cygwin"
+ enable_m_no_cygwin=$enableval
+else
+ enable_m_no_cygwin=yes
+fi;
+ if test "$enable_m_no_cygwin" != "no"; then
+ case $host_os in
+ cygwin*)
+ if test -n "$CC"; then
+ CC="$CC -mno-cygwin"
+else
+ CC="gcc -mno-cygwin"
+fi
+ if test -n "$CXX"; then
+ CXX="$CXX -mno-cygwin"
+else
+ CXX="g++ -mno-cygwin"
+fi
+ CPP="$CC -E"
+ CXXCPP="$CXX -E"
+ cs_mno_cygwin=yes
+ ;;
+ *)
+ cs_mno_cygwin=no
+ ;;
+ esac
+
+else
+ cs_mno_cygwin=no
+fi
+
+ echo "$as_me:$LINENO: result: $cs_mno_cygwin" >&5
+echo "${ECHO_T}$cs_mno_cygwin" >&6
+
+
+
+
#------------------------------------------------------------------------------
# Check for compilers and linker.
#------------------------------------------------------------------------------
@@ -5362,6 +5404,7 @@
fi
+ if test "$cs_mno_cygwin" = "yes"; then
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
@@ -5370,6 +5413,100 @@
fi
if test -n "$ac_tool_prefix"; then
+ for ac_prog in dllwrap --mno-cygwin
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DLLWRAP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DLLWRAP"; then
+ ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLWRAP="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+DLLWRAP=$ac_cv_prog_DLLWRAP
+if test -n "$DLLWRAP"; then
+ echo "$as_me:$LINENO: result: $DLLWRAP" >&5
+echo "${ECHO_T}$DLLWRAP" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$DLLWRAP" && break
+ done
+fi
+if test -z "$DLLWRAP"; then
+ ac_ct_DLLWRAP=$DLLWRAP
+ for ac_prog in dllwrap --mno-cygwin
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_DLLWRAP"; then
+ ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLWRAP="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
+if test -n "$ac_ct_DLLWRAP"; then
+ echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
+echo "${ECHO_T}$ac_ct_DLLWRAP" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$ac_ct_DLLWRAP" && break
+done
+
+ DLLWRAP=$ac_ct_DLLWRAP
+fi
+
+else
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
for ac_prog in dllwrap
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -5455,6 +5592,8 @@
DLLWRAP=$ac_ct_DLLWRAP
fi
+fi
+
cs_build_prop_val="$DLLWRAP"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -7343,7 +7482,12 @@
# users. It saves users the bother of having to install these packages
# manually one at a time.
#------------------------------------------------------------------------------
+PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
+ # ensure PKGCONFIG is set since we may meddle with it
+
+
case $host_os in
mingw*|cygwin*)
@@ -7451,6 +7595,13 @@
else
if test -n "$CSLIBS_CONFIG"; then
cs_cv_cslibs=yes
+ if test "x$cs_mno_cygwin" = "xyes"; then
+ if $CSLIBS_CONFIG -mno-cygwin --cflags >/dev/null 2>&1; then
+ cs_cv_cslibs_compiler="-mno-cygwin $cs_cv_cslibs_compiler"
+fi
+
+fi
+
cs_cv_cslibs_cflags=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --cflags \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --cflags $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
@@ -7466,6 +7617,14 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if $CSLIBS_CONFIG --pcpath >/dev/null 2>&1; then
+ cs_cv_cslibs_pcpath=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --pcpath \$cs_cv_cslibs_compiler") >&5
+ ($CSLIBS_CONFIG --pcpath $cs_cv_cslibs_compiler) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+fi
+
else
cs_cv_cslibs=no
fi
@@ -7478,8 +7637,13 @@
CPPFLAGS="$CPPFLAGS $cs_cv_cslibs_cflags"
LDFLAGS="$LDFLAGS $cs_cv_cslibs_lflags"
PATH="$cs_cv_cslibs_binpath$PATH_SEPARATOR$PATH"
+ if test -n "$cs_cv_cslibs_pcpath"; then
+ PKG_CONFIG_PATH="$cs_cv_cslibs_pcpath$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
fi
+fi
+
;;
esac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|