Fixed problem with solaris builds setting MDCPUCFG instead of MDCPUCFG_H
Removed -mt from CFLAGS.
--- a/configure
+++ b/configure
@@ -2887,19 +2887,19 @@ EOF
#define __svr4__ 1
EOF
cat >> confdefs.h <<\EOF
#define SOLARIS 1
EOF
if test -n "$USE_64"; then
- MDCPUCFG=_solaris64.cfg
+ MDCPUCFG_H=_solaris64.cfg
else
- MDCPUCFG=_solaris32.cfg
+ MDCPUCFG_H=_solaris32.cfg
fi
PR_MD_CSRCS=solaris.c
DSO_LDOPTS='-G -h $(notdir $@)'
if test -n "$GNU_CC"; then
DSO_CFLAGS=-fPIC
else
DSO_CFLAGS=-KPIC
fi
@@ -3412,20 +3412,16 @@ echo "configure:3400: checking whether $
case "$target" in
*-mingw*|*-cygwin*|*-uwin*)
;;
*-solaris*)
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
- if test -n "$GNU_CC"; then
- CFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- fi
;;
*-freebsd*)
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
cat >> confdefs.h <<\EOF
#define _THREAD_SAFE 1
@@ -3465,22 +3461,22 @@ EOF
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
;;
esac
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:3474: checking for pthread_create" >&5
+echo "configure:3470: checking for pthread_create" >&5
if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3479 "configure"
+#line 3475 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_create(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char pthread_create();
@@ -3493,17 +3489,17 @@ int main() {
#if defined (__stub_pthread_create) || defined (__stub___pthread_create)
choke me
#else
pthread_create();
#endif
; return 0; }
EOF
-if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_create=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_pthread_create=no"
fi
@@ -3512,36 +3508,36 @@ fi
if eval "test \"`echo '$ac_cv_func_'pthread_create`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:3521: checking for pthread_create in -lpthread" >&5
+echo "configure:3517: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3529 "configure"
+#line 3525 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char pthread_create();
int main() {
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
@@ -3630,22 +3626,22 @@ EOF
PR_MD_ASFILES="$PR_MD_ASFILES os_SunOS_32.s"
fi
fi
fi
;;
esac
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:3639: checking for dlopen" >&5
+echo "configure:3635: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3644 "configure"
+#line 3640 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dlopen();
@@ -3658,17 +3654,17 @@ int main() {
#if defined (__stub_dlopen) || defined (__stub___dlopen)
choke me
#else
dlopen();
#endif
; return 0; }
EOF
-if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_dlopen=no"
fi
@@ -3677,36 +3673,36 @@ fi
if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:3686: checking for dlopen in -ldl" >&5
+echo "configure:3682: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3694 "configure"
+#line 3690 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char dlopen();
int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
--- a/configure.in
+++ b/configure.in
@@ -629,19 +629,19 @@ case "$target" in
*-solaris*)
AC_DEFINE(XP_UNIX)
AC_DEFINE(SVR4)
AC_DEFINE(SYSV)
AC_DEFINE(__svr4)
AC_DEFINE(__svr4__)
AC_DEFINE(SOLARIS)
if test -n "$USE_64"; then
- MDCPUCFG=_solaris64.cfg
+ MDCPUCFG_H=_solaris64.cfg
else
- MDCPUCFG=_solaris32.cfg
+ MDCPUCFG_H=_solaris32.cfg
fi
PR_MD_CSRCS=solaris.c
DSO_LDOPTS='-G -h $(notdir $@)'
if test -n "$GNU_CC"; then
DSO_CFLAGS=-fPIC
else
DSO_CFLAGS=-KPIC
fi
@@ -876,20 +876,16 @@ if test -n "$USE_PTHREADS"; then
rm -f conftest*
AC_MSG_RESULT($ac_cv_have_dash_pthread)
case "$target" in
*-mingw*|*-cygwin*|*-uwin*)
;;
*-solaris*)
AC_DEFINE(_REENTRANT)
- if test -n "$GNU_CC"; then
- CFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- fi
;;
*-freebsd*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
dnl -pthread links in -lc_r, so don't specify it explicitly.
if test "$ac_cv_have_dash_pthread" = "yes"; then
PTHREAD_LDFLAGS=
fi