From 246892d6921f1fdd1081d7c911e2554f95d24ebb Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Wed, 7 Mar 2018 18:20:29 +0100 Subject: [PATCH] Fixes in configure.ac --- configure.ac | 16 ++++++++-------- src/mercenary/Makefile.am | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 06a906f..0c82872 100644 --- a/configure.ac +++ b/configure.ac @@ -29,26 +29,26 @@ AC_CHECK_LIB([pthread], [main]) AC_ARG_WITH([sdl2], [AS_HELP_STRING([--with-sdl2], [compile with SDL2 library @<:@default=check@:>@]) ], [], [with_sdl2="check"]) AC_ARG_WITH([glew], [AS_HELP_STRING([--with-glew], [compile with GLEW library @<:@default=check@:>@]) ], [], [with_glew="check"]) -AS_IF([test "x$with_sdl2" != xno], [PKG_CHECK_MODULES(sdl2, sdl2 >= 2.0, with_sdl2=yes, with_sdl2=no)]) -AS_IF([test "x$with_glew" != xno], [PKG_CHECK_MODULES(glew, glew >= 1.13, with_glew=yes, with_glew=no)]) +AS_IF([test "x$with_sdl2" != xno], [PKG_CHECK_MODULES([SDL2], sdl2 >= 2.0, with_sdl2=yes, with_sdl2=no)]) +AS_IF([test "x$with_glew" != xno], [PKG_CHECK_MODULES([GLEW], glew >= 1.13, with_glew=yes, with_glew=no)]) AM_CONDITIONAL(HAVE_SDL2, test "x$with_sdl2" == "xyes" ) AM_CONDITIONAL(HAVE_GLEW, test "x$with_glew" == "xyes" ) -AS_IF([test "x$with_sdl2" == "xyes"],[AC_MSG_NOTICE( Compiling with SDL2 support )], [AC_MSG_NOTICE( SDL2 not supported. +AS_IF([test "x$with_sdl2" == "xyes"],[AC_MSG_NOTICE( Compiling with SDL2 support )], [AC_MSG_NOTICE( [ SDL2 not supported. -Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. +Consider adjusting the PKG_CONFIG_PATH environment variable, if you installed software in a non-standard prefix. ********************************************************************** NOTE: This package is manatory. The games will not compile without it. ********************************************************************** -)]) -AS_IF([test "x$with_glew" == "xyes"],[AC_MSG_NOTICE( Compiling with GLEW support )], [AC_MSG_NOTICE( GLEW not supported. +] )]) +AS_IF([test "x$with_glew" == "xyes"],[AC_MSG_NOTICE( Compiling with GLEW support )], [AC_MSG_NOTICE( [GLEW not supported. -Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. +Consider adjusting the PKG_CONFIG_PATH environment variable, if you installed software in a non-standard prefix. ********************************************************************** NOTE: This package is manatory. The games will not compile without it. ********************************************************************** -)]) +] )]) AC_OUTPUT( src/libcpu/Makefile diff --git a/src/mercenary/Makefile.am b/src/mercenary/Makefile.am index 0091e4d..1cfc712 100644 --- a/src/mercenary/Makefile.am +++ b/src/mercenary/Makefile.am @@ -24,8 +24,8 @@ mercenary2_LDADD = \ $(top_builddir)/src/libdisk/libdisk.a \ $(top_builddir)/src/libkeyboard/libkeyboard.a \ $(top_builddir)/src/libsdl/libsdl.a \ - $(sdl2_LIBS) \ - $(glew_LIBS) + $(SDL2_LIBS) \ + $(GLEW_LIBS) mercenary3_SOURCES = \ mercenary3.c \ @@ -41,8 +41,8 @@ mercenary3_LDADD = \ $(top_builddir)/src/libdisk/libdisk.a \ $(top_builddir)/src/libkeyboard/libkeyboard.a \ $(top_builddir)/src/libsdl/libsdl.a \ - $(sdl2_LIBS) \ - $(glew_LIBS) + $(SDL2_LIBS) \ + $(GLEW_LIBS) AM_CPPFLAGS += -DHAVE_SDL2 -DHAVE_GLEW endif -- 2.13.6