aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure63
1 files changed, 51 insertions, 12 deletions
diff --git a/configure b/configure
index 133194c598..625d2f75ba 100755
--- a/configure
+++ b/configure
@@ -2317,7 +2317,7 @@ else
cat > conftest.c <<\EOF
foo () { }
EOF
-if { ac_try='${CC-cc} -S conftest.c -o - | fgrep '$foo..ng' > /dev/null'; { (eval echo configure:2321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
+if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "\$foo..ng" > /dev/null'; { (eval echo configure:2321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
then
libc_cv_gcc_alpha_ng_prefix=yes
else
@@ -2350,8 +2350,14 @@ else
static char __EH_FRAME_BEGIN__;
_start ()
{
+#ifdef CHECK__register_frame
__register_frame (__EH_FRAME_BEGIN__);
__deregister_frame (__EH_FRAME_BEGIN__);
+#endif
+#ifdef CHECK__register_frame_info
+ __register_frame_info (__EH_FRAME_BEGIN__);
+ __deregister_frame_info (__EH_FRAME_BEGIN__);
+#endif
}
int __eh_pc;
__throw () {}
@@ -2365,23 +2371,44 @@ free () {}
abort () {}
__bzero () {}
EOF
-if { ac_try='${CC-cc} $CFLAGS
+if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame_info
-nostdlib -nostartfiles
- -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
- libc_cv_gcc_dwarf2_unwind_info=yes
+ -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ libc_cv_gcc_dwarf2_unwind_info=static
else
libc_cv_gcc_dwarf2_unwind_info=no
fi
+if test $libc_cv_gcc_dwarf2_unwind_info = no; then
+ if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame
+ -nostdlib -nostartfiles
+ -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ libc_cv_gcc_dwarf2_unwind_info=yes
+ else
+ libc_cv_gcc_dwarf2_unwind_info=no
+ fi
+fi
rm -f conftest*
fi
echo "$ac_t""$libc_cv_gcc_dwarf2_unwind_info" 1>&6
-if test $libc_cv_gcc_dwarf2_unwind_info = yes; then
+case $libc_cv_gcc_dwarf2_unwind_info in
+yes)
cat >> confdefs.h <<\EOF
#define HAVE_DWARF2_UNWIND_INFO 1
EOF
-fi
+ ;;
+static)
+ cat >> confdefs.h <<\EOF
+#define HAVE_DWARF2_UNWIND_INFO 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_DWARF2_UNWIND_INFO_STATIC 1
+EOF
+
+ ;;
+esac
### End of automated tests.
### Now run sysdeps configure fragments.
@@ -2425,7 +2452,7 @@ if test "$uname" = "sysdeps/generic"; then
fi
echo $ac_n "checking OS release for uname""... $ac_c" 1>&6
-echo "configure:2429: checking OS release for uname" >&5
+echo "configure:2456: checking OS release for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2447,7 +2474,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6
uname_release="$libc_cv_uname_release"
echo $ac_n "checking OS version for uname""... $ac_c" 1>&6
-echo "configure:2451: checking OS version for uname" >&5
+echo "configure:2478: checking OS version for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2469,7 +2496,7 @@ else
fi
echo $ac_n "checking stdio selection""... $ac_c" 1>&6
-echo "configure:2473: checking stdio selection" >&5
+echo "configure:2500: checking stdio selection" >&5
case $stdio in
libio) cat >> confdefs.h <<\EOF
@@ -2481,7 +2508,7 @@ esac
echo "$ac_t""$stdio" 1>&6
echo $ac_n "checking ldap selection""... $ac_c" 1>&6
-echo "configure:2485: checking ldap selection" >&5
+echo "configure:2512: checking ldap selection" >&5
case $add_ons in
*ldap*)
@@ -2530,14 +2557,26 @@ if test $shared = default; then
fi
fi
+if test $static = no && test $shared = yes; then
+ case "$host_os" in
+ linux* | gnu*)
+ { echo "configure: error:
+*** You must compile with support for the static library since the shared
+*** library uses it. Restart configure without \`--disable-static'." 1>&2; exit 1; }
+ ;;
+ *)
+ ;;
+ esac
+fi
+
echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6
-echo "configure:2535: checking whether -fPIC is default" >&5
+echo "configure:2574: checking whether -fPIC is default" >&5
if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
pic_default=yes
cat > conftest.c <<EOF
-#if defined(__PIC__) || defined(__pic__) || defined(PIC) || defined(pic)
+#if defined __PIC__ || defined __pic__ || defined PIC || defined pic
# error PIC is default.
#endif
EOF