diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
| commit | 5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch) | |
| tree | b7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/configure.ac | |
| parent | 97f357506241a5314de9071befcd01be731f1dbb (diff) | |
| parent | 0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff) | |
| download | vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2 vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 9916a06a9..a686a11aa 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -949,13 +949,6 @@ xyesyes) fi GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" - - # if static, move the external libraries to the programs - # and empty the libraries for libGL - if test "$enable_static" = yes; then - APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS" - GL_LIB_DEPS="" - fi ;; xyesno) # DRI-based GLX @@ -1578,7 +1571,6 @@ if test "x$enable_glu" = xyes; then else GLU_LIB_DEPS="" GLU_MESA_DEPS="" - APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++" fi fi fi @@ -1593,25 +1585,6 @@ AC_SUBST([GLU_PC_REQ_PRIV]) AC_SUBST([GLU_PC_LIB_PRIV]) AC_SUBST([GLU_PC_CFLAGS]) -dnl -dnl Program library dependencies -dnl Only libm is added here if necessary as the libraries should -dnl be pulled in by the linker -dnl -if test "x$APP_LIB_DEPS" = x; then - case "$host_os" in - solaris*) - APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm" - ;; - cygwin*) - APP_LIB_DEPS="-lX11" - ;; - *) - APP_LIB_DEPS="-lm" - ;; - esac -fi -AC_SUBST([APP_LIB_DEPS]) AC_SUBST([PROGRAM_DIRS]) dnl |