← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libsdl2/trusty-proposed

« back to all changes in this revision

Viewing changes to test/configure.in

  • Committer: Package Import Robot
  • Author(s): Manuel A. Fernandez Montecelo
  • Date: 2013-12-28 12:31:19 UTC
  • mto: (7.1.3 sid)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: package-import@ubuntu.com-20131228123119-wehupm72qsjvh6vz
Tags: upstream-2.0.1+dfsg1
Import upstream version 2.0.1+dfsg1

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/configure.in
91
91
dnl Check for X11 path, needed for OpenGL on some systems
92
92
AC_PATH_X
93
93
if test x$have_x = xyes; then
94
 
    if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
 
94
    if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
95
95
        :
96
96
    else
97
97
        CFLAGS="$CFLAGS -I$ac_x_includes"
98
98
    fi
99
 
    if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
 
99
    if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
100
100
        :
101
101
    else
102
 
        XPATH="-L$ac_x_libraries"
103
 
        XLIB="-L$ac_x_libraries -lX11"
 
102
        if test "x$ac_x_libraries" = x; then
 
103
            XPATH=""
 
104
            XLIB="-lX11"
 
105
        else
 
106
            XPATH="-L$ac_x_libraries"
 
107
            XLIB="-L$ac_x_libraries -lX11"
 
108
        fi
104
109
    fi
105
110
fi
106
111
 
131
136
AC_MSG_RESULT($have_opengles)
132
137
 
133
138
GLLIB=""
 
139
GLESLIB=""
134
140
if test x$have_opengles = xyes; then
135
141
    CFLAGS="$CFLAGS -DHAVE_OPENGLES"
136
 
    GLLIB="$XPATH -lGLESv1_CM"
137
 
elif test x$have_opengl = xyes; then
 
142
    GLESLIB="$XPATH -lGLESv1_CM"
 
143
fi
 
144
if test x$have_opengl = xyes; then
138
145
    CFLAGS="$CFLAGS -DHAVE_OPENGL"
139
146
    GLLIB="$XPATH $SYS_GL_LIBS"
140
 
else
141
 
    GLLIB=""
142
147
fi
143
148
 
144
149
AC_SUBST(GLLIB)
 
150
AC_SUBST(GLESLIB)
145
151
AC_SUBST(XLIB)
146
152
 
147
153
dnl Check for SDL_ttf