Remove linking to libgnomeprint since we
load it at runtime now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
58
configure
vendored
58
configure
vendored
@@ -35000,7 +35000,6 @@ echo "${ECHO_T}$LIBGNOMEPRINTUI_LIBS" >&6
|
||||
|
||||
if test $succeeded = yes; then
|
||||
|
||||
EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_LIBGNOMEPRINT 1
|
||||
@@ -41859,6 +41858,63 @@ else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
;;
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
if test "$wxUSE_STL" = "yes"; then
|
||||
echo "$as_me:$LINENO: checking if this gcc version needs -DNO_GCC_PRAGMA" >&5
|
||||
echo $ECHO_N "checking if this gcc version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
|
||||
#error "Not GCC 3.2 or greater"
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 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); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
@@ -4662,7 +4662,7 @@ if test "$WXGTK20" = 1; then
|
||||
PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
|
||||
[libgnomeprintui-2.2 >= 2.8],
|
||||
[
|
||||
EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
|
||||
dnl EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
|
||||
AC_DEFINE(wxUSE_LIBGNOMEPRINT)
|
||||
],
|
||||
|
Reference in New Issue
Block a user