]>
Commit | Line | Data |
---|---|---|
82e65189 JB |
1 | --- Xbae-4.50.2/examples/draw/Makefile.am.orig 2002-08-20 18:21:09.000000000 +0200 |
2 | +++ Xbae-4.50.2/examples/draw/Makefile.am 2003-12-29 17:37:00.292220752 +0100 | |
3 | @@ -16,5 +16,5 @@ | |
20838466 | 4 | endif |
5 | ||
6 | LDADD= ../../src/libXbae.la \ | |
82e65189 JB |
7 | - $(link_motif) @X_LIBS@ $(XMU) -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS} |
8 | + $(link_motif) $(XPM_LIB) @X_LIBS@ $(XMU) -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS} | |
20838466 | 9 | endif |
82e65189 JB |
10 | --- Xbae-4.50.2/configure.in.orig 2003-03-12 20:55:48.000000000 +0100 |
11 | +++ Xbae-4.50.2/configure.in 2003-12-29 17:36:27.704174888 +0100 | |
12 | @@ -165,8 +165,9 @@ | |
13 | dnl | |
14 | if test "x$ac_cv_header_X11_xpm_h" = "xyes" -o "x$ac_cv_header_xpm_h" = "xyes" | |
15 | then | |
16 | - AC_CHECK_LIB(Xpm, XpmLibraryVersion, , , | |
17 | + AC_CHECK_LIB(Xpm, XpmLibraryVersion, [XPM_LIB="-lXpm"], [XPM_LIB=], | |
18 | $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS) | |
19 | + AC_SUBST(XPM_LIB) | |
20 | AM_CONDITIONAL(HaveXpm, test x$ac_cv_lib_Xpm_XpmLibraryVersion = xyes) | |
21 | else | |
22 | AM_CONDITIONAL(HaveXpm, false) |