Magellan Linux

Diff of /trunk/xorg-server/patches/xorg-server-1.7.6-dlopen-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1036 by niro, Thu Apr 29 22:29:31 2010 UTC revision 1037 by niro, Thu Apr 29 22:40:33 2010 UTC
# Line 1  Line 1 
1  diff -Naur xorg-server-1.7.6/configure.ac xorg-server-1.7.6-magellan/configure.ac  diff -Naur xorg-server-1.7.6/configure.ac xorg-server-1.7.6-magellan/configure.ac
2  --- xorg-server-1.7.6/configure.ac 2010-03-17 01:50:41.000000000 +0100  --- xorg-server-1.7.6/configure.ac 2010-03-17 01:50:41.000000000 +0100
3  +++ xorg-server-1.7.6-magellan/configure.ac 2010-04-30 00:32:14.000000000 +0200  +++ xorg-server-1.7.6-magellan/configure.ac 2010-04-30 00:43:50.000000000 +0200
4  @@ -196,6 +196,7 @@  @@ -196,6 +196,7 @@
5   dnl has it in libc), or if libdl is needed to get it.   dnl has it in libc), or if libdl is needed to get it.
6   AC_CHECK_FUNC([dlopen], [],   AC_CHECK_FUNC([dlopen], [],
# Line 9  diff -Naur xorg-server-1.7.6/configure.a Line 9  diff -Naur xorg-server-1.7.6/configure.a
9    
10   dnl Checks for library functions.   dnl Checks for library functions.
11   AC_FUNC_VPRINTF   AC_FUNC_VPRINTF
12    @@ -1978,7 +1979,7 @@
13         KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
14         KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
15         KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
16    -    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"
17    +    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
18    
19         AC_SUBST([XEPHYR_LIBS])
20         AC_SUBST([XEPHYR_INCS])

Legend:
Removed from v.1036  
changed lines
  Added in v.1037