Mercurial > sdl-ios-xcode
comparison configure.in @ 1170:bb1a52a8d3d6
Use the right libs in dynamic X11 loading.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Tue, 08 Nov 2005 01:34:28 +0000 |
parents | 045f186426e1 |
children | e9cf8c1b4590 |
comparison
equal
deleted
inserted
replaced
1169:4b3e2294782d | 1170:bb1a52a8d3d6 |
---|---|
611 if test x$have_x = xyes; then | 611 if test x$have_x = xyes; then |
612 AC_ARG_ENABLE(x11-shared, | 612 AC_ARG_ENABLE(x11-shared, |
613 [ --enable-x11-shared dynamically load X11 support [default=yes]], | 613 [ --enable-x11-shared dynamically load X11 support [default=yes]], |
614 , enable_x11_shared=yes) | 614 , enable_x11_shared=yes) |
615 | 615 |
616 dnl !!! FIXME: make this work? | 616 dnl !!! FIXME: if a platform needs more than this, fill it in! |
617 dnl x11_lib_spec=`echo $X11_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'` | |
618 dnl x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` | |
619 dnl echo "-- $x11_lib_spec -> $x11_lib" | |
620 dnl x11ext_lib_spec=`echo $X11EXT_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'` | |
621 dnl x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` | |
622 dnl echo "-- $x11ext_lib_spec -> $x11ext_lib" | |
623 | |
624 x11_lib_spec='/usr/X11R6/lib/libX11.so.*' | |
625 x11_lib='libX11.so.6' | 617 x11_lib='libX11.so.6' |
626 echo "-- $x11_lib_spec -> $x11_lib" | 618 x11ext_lib='libXext.so.6' |
627 x11ext_lib_spec='/usr/X11R6/lib/libXext.so.*' | |
628 x11_lib='libXext.so.6' | |
629 echo "-- $x11ext_lib_spec -> $x11_lib" | |
630 | 619 |
631 if test x$use_dlopen != xyes && \ | 620 if test x$use_dlopen != xyes && \ |
632 test x$enable_x11_shared = xyes; then | 621 test x$enable_x11_shared = xyes; then |
633 AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option]) | 622 AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option]) |
634 fi | 623 fi |
635 | 624 |
636 if test x$use_dlopen = xyes && \ | 625 if test x$use_dlopen = xyes && \ |
637 test x$enable_x11_shared = xyes && test x$x11_lib != x; then | 626 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then |
638 CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video" | 627 CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -DXTHREADS -DX11_DYNAMIC=\$(x11_lib) -DX11EXT_DYNAMIC=\$(x11ext_lib) -I$srcdir/include -I$srcdir/src/video" |
639 SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS" | 628 SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS" |
640 AC_SUBST(x11_lib) | 629 AC_SUBST(x11_lib) |
641 AC_SUBST(x11ext_lib) | 630 AC_SUBST(x11ext_lib) |
642 else | 631 else |