include -DWXUSINGDLL in wx-config output under all platforms and not only Cygwin/Mingw32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
263
configure
vendored
263
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 48824 2007-09-20 00:01:33Z VZ .
|
||||
# From configure.in Id: configure.in 49043 2007-10-04 15:59:09Z MW .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -36725,7 +36725,6 @@ EOF
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
|
||||
;;
|
||||
|
||||
*-*-hpux* )
|
||||
@@ -36736,6 +36735,8 @@ EOF
|
||||
esac
|
||||
fi
|
||||
|
||||
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
|
||||
|
||||
if test $wxUSE_RPATH = "no"; then
|
||||
SAMPLES_RPATH_FLAG=''
|
||||
SAMPLES_RPATH_POSTLINK=''
|
||||
@@ -41270,6 +41271,254 @@ _ACEOF
|
||||
done
|
||||
|
||||
|
||||
if test "$wxUSE_TARSTREAM" = "yes"; then
|
||||
|
||||
for wx_func in sysconf
|
||||
do
|
||||
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
|
||||
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
|
||||
if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
$ac_includes_default
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#ifndef $wx_func
|
||||
&$wx_func;
|
||||
#endif
|
||||
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
eval wx_cv_func_$wx_func=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval wx_cv_func_$wx_func=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
|
||||
if eval test \$wx_cv_func_$wx_func = yes
|
||||
then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
else
|
||||
:
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
for wx_func in getpwuid_r
|
||||
do
|
||||
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
|
||||
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
|
||||
if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#define _REENTRANT
|
||||
#include <pwd.h>
|
||||
$ac_includes_default
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#ifndef $wx_func
|
||||
&$wx_func;
|
||||
#endif
|
||||
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
eval wx_cv_func_$wx_func=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval wx_cv_func_$wx_func=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
|
||||
if eval test \$wx_cv_func_$wx_func = yes
|
||||
then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
else
|
||||
:
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
for wx_func in getgrgid_r
|
||||
do
|
||||
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
|
||||
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
|
||||
if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#define _REENTRANT
|
||||
#include <grp.h>
|
||||
$ac_includes_default
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#ifndef $wx_func
|
||||
&$wx_func;
|
||||
#endif
|
||||
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
eval wx_cv_func_$wx_func=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval wx_cv_func_$wx_func=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
|
||||
if eval test \$wx_cv_func_$wx_func = yes
|
||||
then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
else
|
||||
:
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@@ -49301,9 +49550,6 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
fi
|
||||
else
|
||||
SAMPLES_SUBDIRS="console"
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -53067,12 +53313,7 @@ for subdir in `echo $SUBDIRS`; do
|
||||
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
|
||||
fi
|
||||
else if test ${subdir} = "samples"; then
|
||||
makefiles="samples/Makefile.in $makefiles"
|
||||
for sample in `echo $SAMPLES_SUBDIRS`; do
|
||||
if test -d $srcdir/samples/$sample; then
|
||||
makefiles="samples/$sample/Makefile.in $makefiles"
|
||||
fi
|
||||
done
|
||||
makefiles="samples/Makefile.in samples/console/Makefile.in"
|
||||
elif test ${subdir} = "utils"; then
|
||||
makefiles=""
|
||||
for util in HelpGen tex2rtf ; do
|
||||
|
||||
@@ -3854,9 +3854,6 @@ EOF
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
dnl this one shouldn't be used for the library build so put it in a
|
||||
dnl separate variable from WXCONFIG_CPPFLAGS
|
||||
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
|
||||
;;
|
||||
|
||||
*-*-hpux* )
|
||||
@@ -3867,6 +3864,10 @@ EOF
|
||||
esac
|
||||
fi
|
||||
|
||||
dnl this one shouldn't be used for the library build so put it in a
|
||||
dnl separate variable from WXCONFIG_CPPFLAGS
|
||||
WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
|
||||
|
||||
if test $wxUSE_RPATH = "no"; then
|
||||
SAMPLES_RPATH_FLAG=''
|
||||
SAMPLES_RPATH_POSTLINK=''
|
||||
|
||||
Reference in New Issue
Block a user