move SDL_LIBS to LIBS, SDL_CFLAGS to CFLAGS

Makefile.am

@@ -44,12 +44,12 @@ d2x_LDADD = ${LD_KLUDGE} main/libmain.a ${EDITOR_LIBS} 3d/lib3d.a 2d/lib2d.a ${A
 
 if MINGW32
 if USE_NETWORK
-d2x_sdl_LDADD = ${d2x_LDADD} ${SDL_LIBS} -lwsock32
+d2x_sdl_LDADD = ${d2x_LDADD} -lwsock32
 else
-d2x_sdl_LDADD = ${d2x_LDADD} ${SDL_LIBS}
+d2x_sdl_LDADD = ${d2x_LDADD}
 endif
 else
-d2x_sdl_LDADD = ${d2x_LDADD} -lm -ldl -lpthread ${SDL_LIBS}
+d2x_sdl_LDADD = ${d2x_LDADD} -lm -ldl -lpthread
 endif
 d2x_ogl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS}
 d2x_svga_LDADD = ${d2x_sdl_LDADD} ${SVGA_LIBS}

arch/ogl/Makefile.am

@@ -2,8 +2,6 @@ noinst_LIBRARIES = libarch_ogl.a
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include
 
-CFLAGS += ${SDL_CFLAGS}
-
 libarch_ogl_a_SOURCES = gr.c ogl.c sdlgl.c
 
 # Not currently used

arch/sdl/Makefile.am

@@ -4,8 +4,6 @@ noinst_LIBRARIES = libarch_sdl.a
 
 INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/includes -I$(top_srcdir)/main
 
-CFLAGS += ${SDL_CFLAGS}
-
 if USE_OPENGL
 if MINGW32
 libarch_sdl_a_SOURCES = cdrom.c digi.c event.c init.c joy.c joydefs.c key.c mouse.c timer.c

configure.ac

@@ -17,6 +17,7 @@ AC_PROG_MAKE_SET
 AC_ISC_POSIX
 AC_CHECK_TOOL(CC, gcc, :)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
 AC_CHECK_TOOL(AR, ar, :)
 AC_PROG_CC
 AC_STDC_HEADERS
@@ -104,7 +105,8 @@ else
     :,
     AC_MSG_ERROR(SDL not found. Make sure sdl-config is in your PATH, or specify with --with-sdl-prefix)
   )
-  AC_SUBST(SDL_LIBS)
+  CFLAGS="$SDL_CFLAGS $CFLAGS"
+  LIBS="$SDL_LIBS $LIBS"
 
   TARGETS=d2x-sdl
   D2X_ARCH_SUBDIRS=sdl

main/Makefile.am

@@ -8,7 +8,7 @@ noinst_LIBRARIES = libmain.a
 
 INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/arch/include
 
-CFLAGS += -fwritable-strings ${SDL_CFLAGS}
+CFLAGS += -fwritable-strings
 
 if USE_NETWORK
 NETWORK_SRCS = ipx_drv.c kmatrix.c multi.c multibot.c network.c