We no longer need libXpm.

This commit is contained in:
Alexandre Julliard 2002-01-04 18:52:40 +00:00
parent 8850a5fc32
commit 18e4b5e293
4 changed files with 231 additions and 385 deletions

567
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -151,35 +151,6 @@ then
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
dnl *** Check for -lXpm
AC_CHECK_HEADERS(X11/xpm.h,
[ dnl *** If X11/xpm.h exists...
AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData,
[ AC_DEFINE(HAVE_LIBXXPM, 1, [Define if you have the Xpm library])
X_PRE_LIBS="$X_PRE_LIBS -lXpm"],,
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
)
],
[ dnl *** If X11/xpm.h does not exist...
dnl NOTE: autoconf does not allow commas inside the third
dnl parameter to AC_CHECK_HEADERS, due to some quoting
dnl magic it does.
echo "Couldn't find the xpm development header X11/xpm.h"
echo "Install the following packages:"
echo "Red Hat < 7.1 : xpm xpm-devel"
echo "Red Hat >= 7.1 : XFree86-devel"
echo "Caldera OpenLinux : xpm xpm-devel xpm-devel-static"
echo "SuSE : xpm"
echo "Debian/Corel Linux: xpm4g xpm4g-dev"
echo "Solaris 8 : SFWxpm"
echo
echo "Or get the sources from ftp.x.org and all its mirror sites from "
echo "the directory /contrib/libraries."
echo
exit 1
]
)
dnl *** All of the following tests require X11/Xlib.h dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS(X11/Xlib.h, AC_CHECK_HEADERS(X11/Xlib.h,
[ [
@ -1380,13 +1351,7 @@ then
echo "*** Warning: X development files not found. Wine will be built without" echo "*** Warning: X development files not found. Wine will be built without"
echo "*** X support, which currently does not work, and would probably not be" echo "*** X support, which currently does not work, and would probably not be"
echo "*** what you want anyway. You will need to install devel packages of" echo "*** what you want anyway. You will need to install devel packages of"
echo "*** Xlib/Xfree86 and Xpm at the very least." echo "*** Xlib/Xfree86 at the very least."
elif test "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = "no"
then
echo
echo "*** Warning: Xpm development files not found. Wine will be built without"
echo "*** Xpm support, which currently does not work. You will need to install"
echo "*** devel packages of Xpm."
fi fi
if test "$ac_cv_lib_ncurses_resizeterm" = "no" -a "$ac_cv_lib_ncurses_waddch" = "yes" if test "$ac_cv_lib_ncurses_resizeterm" = "no" -a "$ac_cv_lib_ncurses_waddch" = "yes"

View File

@ -202,9 +202,6 @@
/* Define if you have the <X11/extensions/xf86vmode.h> header file. */ /* Define if you have the <X11/extensions/xf86vmode.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H #undef HAVE_X11_EXTENSIONS_XF86VMODE_H
/* Define if you have the <X11/xpm.h> header file. */
#undef HAVE_X11_XPM_H
/* Define if you have the <arpa/inet.h> header file. */ /* Define if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H #undef HAVE_ARPA_INET_H
@ -427,9 +424,6 @@
/* Define if you have libjpeg including devel headers */ /* Define if you have libjpeg including devel headers */
#undef HAVE_LIBJPEG #undef HAVE_LIBJPEG
/* Define if you have the Xpm library */
#undef HAVE_LIBXXPM
/* Define if you have the XKB extension */ /* Define if you have the XKB extension */
#undef HAVE_XKB #undef HAVE_XKB

View File

@ -221,12 +221,6 @@ else {
rm -f config.cache rm -f config.cache
exit 1 exit 1
} }
elif [ "$ac_cv_header_X11_xpm_h" != "yes" ]
then {
echo "Install the Xpm development headers and try again."
rm -f config.cache
exit 1
}
fi fi
} }
fi fi