Tijl Coosemans : configure: Remove check for libxpg4.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 9 08:23:17 CDT 2007
Module: wine
Branch: master
Commit: af78fa7b683464e328b62b61723a89b86169115f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=af78fa7b683464e328b62b61723a89b86169115f
Author: Tijl Coosemans <tijl at ulyssis.org>
Date: Wed Aug 8 00:23:45 2007 +0200
configure: Remove check for libxpg4.
---
configure | 71 ---------------------------------------------------
configure.ac | 2 -
include/config.h.in | 3 --
3 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/configure b/configure
index 2175a09..d64ad13 100755
--- a/configure
+++ b/configure
@@ -6316,77 +6316,6 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5
-echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6; }
-if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxpg4 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _xpg4_setrunelocale ();
-int
-main ()
-{
-return _xpg4_setrunelocale ();
- ;
- 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
- ac_cv_lib_xpg4__xpg4_setrunelocale=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_xpg4__xpg4_setrunelocale=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
-echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
-if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXPG4 1
-_ACEOF
-
- LIBS="-lxpg4 $LIBS"
-
-fi
-
{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
diff --git a/configure.ac b/configure.ac
index 6adff61..3e22c28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,8 +143,6 @@ dnl Check for -li386 for NetBSD and OpenBSD
AC_CHECK_LIB(i386,i386_set_ldt)
dnl Check for -lossaudio for NetBSD
AC_CHECK_LIB(ossaudio,_oss_ioctl)
-dnl Check for -lxpg4 for FreeBSD
-AC_CHECK_LIB(xpg4,_xpg4_setrunelocale)
dnl Check for -lpthread
AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread"))
diff --git a/include/config.h.in b/include/config.h.in
index c95abd0..cf99681 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -306,9 +306,6 @@
/* Define to 1 if you have the <libxml/parser.h> header file. */
#undef HAVE_LIBXML_PARSER_H
-/* Define to 1 if you have the `xpg4' library (-lxpg4). */
-#undef HAVE_LIBXPG4
-
/* Define if you have the X Shape extension */
#undef HAVE_LIBXSHAPE
More information about the wine-cvs
mailing list