diff -r 80967361f257 -r 21e542c15832 configure.ac --- a/configure.ac Thu Mar 14 19:37:53 2024 +0100 +++ b/configure.ac Fri Mar 15 20:57:49 2024 +0100 @@ -41,10 +41,15 @@ fi WIRINGPI=No -AC_CHECK_LIB(wiringPi,wiringPiSetup,result=yes,result=no) -if test "$result" = "yes"; then - LIBS="$LIBS -lwiringPi -lwiringPiDev" - AC_CHECK_HEADERS(wiringPi.h,WIRINGPI=Yes,WIRINGPI=No) +AC_ARG_ENABLE(wiringpi, [ --enable-wiringpi Compile wiringPi code], [ wiringpi=$enableval ], [ wiringpi=yes ]) +if test "$wiringpi" = "yes"; then + AC_CHECK_LIB(wiringPi,wiringPiSetup,result=yes,result=no) + if test "$result" = "yes"; then + LIBS="$LIBS -lwiringPi -lwiringPiDev" + AC_CHECK_HEADERS(wiringPi.h,WIRINGPI=Yes,WIRINGPI=No) + fi +else + AC_MSG_RESULT(check wiringPi disabled) fi AC_CHECK_LIB(json-c,json_object_iter_init_default,result=yes,result=no) @@ -101,40 +106,40 @@ SDL_CFLAGS="" SDL_LIBS="" SDL="No" -AC_MSG_CHECKING(SDL library) +AC_MSG_CHECKING(SDL2 library) pkg-config --exists sdl if test "$?" = "0"; then AC_MSG_RESULT(yes) - AC_MSG_CHECKING(sdl library v1.2.0 or newer) - pkg-config --atleast-version=1.2.0 sdl + AC_MSG_CHECKING(sdl2 library v2.0.0 or newer) + pkg-config --atleast-version=2.0.0 sdl2 if test "$?" = "0"; then AC_MSG_RESULT(found) else AC_MSG_ERROR(not found) fi - SDL_CFLAGS="$(pkg-config --cflags sdl)" - SDL_LIBS="$(pkg-config --libs sdl)" - AC_CHECK_HEADERS(SDL/SDL.h) + SDL_CFLAGS="$(pkg-config --cflags sdl2)" + SDL_LIBS="$(pkg-config --libs sdl2)" + AC_CHECK_HEADERS(SDL2/SDL.h) SDL="Yes" else AC_MSG_RESULT(no) fi # Check for SDL_ttf -AC_MSG_CHECKING(SDL_ttf library) -pkg-config --exists SDL_ttf +AC_MSG_CHECKING(SDL2_ttf library) +pkg-config --exists SDL2_ttf if test "$?" = "0"; then AC_MSG_RESULT(yes) - AC_MSG_CHECKING(sdl library v2.0.0 or newer) - pkg-config --atleast-version=2.0.0 SDL_ttf + AC_MSG_CHECKING(sdl2 library v2.0.0 or newer) + pkg-config --atleast-version=2.0.0 SDL2_ttf if test "$?" = "0"; then AC_MSG_RESULT(found) else AC_MSG_ERROR(not found) fi # Override flags - SDL_CFLAGS="$(pkg-config --cflags SDL_ttf)" - SDL_LIBS="$(pkg-config --libs SDL_ttf)" + SDL_CFLAGS="$(pkg-config --cflags SDL2_ttf)" + SDL_LIBS="$(pkg-config --libs SDL2_ttf)" else AC_MSG_RESULT(no) fi @@ -158,7 +163,7 @@ Version : ............ ${VERSION} Main directory : ..... ${prefix} WiringPi : ........... ${WIRINGPI} - SDL library : ........ ${SDL} + SDL2 library : ....... ${SDL} Simulator : .......... ${SIMULATOR} Now type 'make' and 'sudo make install'