X Strike Force Xcursor SVN commit: r57 - in trunk: . debian
Author: branden
Date: 2004-04-19 14:57:17 -0500 (Mon, 19 Apr 2004)
New Revision: 57
Modified:
trunk/configure
trunk/configure.ac
trunk/debian/changelog
Log:
Modify AC_PATH_XTRA invocation to take advantage of Debian's enhancements
(from autoconf 2.59-3); don't use the macro's defaults, which look for the
Xt library which we don't use. Instead search for the X11 library, the
Xlib.h header file, and the XInternAtom() function, all of which are
actually used by the Xcursor library. Regenerate related files with the
autogen.sh script.
Modified: trunk/configure
===================================================================
--- trunk/configure 2004-04-19 19:16:33 UTC (rev 56)
+++ trunk/configure 2004-04-19 19:57:17 UTC (rev 57)
@@ -19258,7 +19258,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -19285,7 +19285,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -19299,18 +19299,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XInternAtom ()
;
return 0;
}
@@ -19348,7 +19348,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2004-04-19 19:16:33 UTC (rev 56)
+++ trunk/configure.ac 2004-04-19 19:57:17 UTC (rev 57)
@@ -67,7 +67,7 @@
if test "$x_found_with_pkgconfig" = "no"
then
- AC_PATH_XTRA
+ AC_PATH_XTRA([X11], [X11/Xlib.h], [XInternAtom ()])
X_LIBS="$X_LIBS -lX11"
if test "x$no_x" = "xyes"
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-19 19:16:33 UTC (rev 56)
+++ trunk/debian/changelog 2004-04-19 19:57:17 UTC (rev 57)
@@ -12,8 +12,15 @@
be buildable without it). Regenerate related files with autogen.sh
script.
- -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 14:13:13 -0500
+ * Modify AC_PATH_XTRA invocation to take advantage of Debian's enhancements
+ (from autoconf 2.59-3); don't use the macro's defaults, which look for the
+ Xt library which we don't use. Instead search for the X11 library, the
+ Xlib.h header file, and the XInternAtom() function, all of which are
+ actually used by the Xcursor library. Regenerate related files with the
+ autogen.sh script.
+ -- Branden Robinson <branden@debian.org> Mon, 19 Apr 2004 14:56:33 -0500
+
xcursor (1.0.2-5) unstable; urgency=low
* Make package compatible with the XFree86 4.3.0 package reorganization.
Reply to: