]>
Commit | Line | Data |
---|---|---|
86749fe7 JB |
1 | --- AfterStep-2.2.3/libAfterBase/configure.in.orig 2006-05-23 19:59:30.000000000 +0200 |
2 | +++ AfterStep-2.2.3/libAfterBase/configure.in 2006-11-04 10:25:18.582773000 +0100 | |
3 | @@ -159,7 +159,7 @@ | |
4 | user_ldflags=$LDFLAGS | |
5 | ||
6 | if test "x$have_x" = "xyes"; then | |
7 | - x_libs="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" | |
8 | + x_libs="$X_LIBS $X_EXTRA_LIBS" | |
9 | if test "x$user_ldflags" = "x"; then | |
10 | full_x_libs=$x_libs | |
11 | else | |
12 | --- AfterStep-2.2.3/libAfterImage/configure.in.orig 2006-05-23 19:59:30.000000000 +0200 | |
13 | +++ AfterStep-2.2.3/libAfterImage/configure.in 2006-11-04 10:25:03.885854500 +0100 | |
14 | @@ -201,7 +201,7 @@ | |
15 | user_ldflags=$LDFLAGS | |
16 | ||
17 | if test "x$have_x" = "xyes"; then | |
18 | - x_libs="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" | |
19 | + x_libs="$X_LIBS $X_EXTRA_LIBS" | |
20 | if test "x$user_ldflags" = "x"; then | |
21 | full_x_libs=$x_libs | |
22 | else | |
23 | --- AfterStep-2.2.3/autoconf/configure.in.orig 2006-11-04 09:47:48.362143000 +0100 | |
24 | +++ AfterStep-2.2.3/autoconf/configure.in 2006-11-04 10:25:38.011987250 +0100 | |
25 | @@ -235,7 +235,7 @@ | |
26 | ||
27 | user_ldflags=$LDFLAGS | |
28 | ||
29 | -x_libs="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" | |
30 | +x_libs="$X_LIBS $X_EXTRA_LIBS" | |
31 | if test "x$user_ldflags" = "x"; then | |
32 | full_x_libs=$x_libs | |
33 | else | |
34 | --- AfterStep-2.2.3/autoconf/configure.libs.in.orig 2006-11-04 09:47:48.362143000 +0100 | |
35 | +++ AfterStep-2.2.3/autoconf/configure.libs.in 2006-11-04 10:25:48.296630000 +0100 | |
36 | @@ -174,7 +174,7 @@ | |
37 | ||
38 | dnl# Check for X : | |
39 | AC_PATH_XTRA | |
40 | -x_libs="$LDFLAGS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" | |
41 | +x_libs="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" | |
42 | AC_CHECK_LIB(X11, XOpenDisplay, [x_libs="-lX11 $x_libs"],,$x_libs) | |
43 | ||
44 | PATH_XTRA_CHECKED=yes | |
45 | --- AfterStep-2.2.3/libAfterImage/Makefile.in.orig 2006-08-16 20:58:41.000000000 +0200 | |
46 | +++ AfterStep-2.2.3/libAfterImage/Makefile.in 2006-11-04 10:28:10.389510250 +0100 | |
47 | @@ -342,7 +342,7 @@ | |
48 | ||
49 | $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h | |
50 | $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ | |
51 | - $(LIB_OBJS) | |
52 | + $(LIB_OBJS) $(LIBS_AFTERIMAGE) | |
53 | ||
54 | install.man: | |
55 | @if [ -d doc/man ] ; then \ |