Adapted Gentoo patch from version 1.12 diff --git a/configure.ac b/configure.ac index 21f803d..d89b296 100644 --- a/configure.ac +++ b/configure.ac @@ -4,30 +4,21 @@ AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_LEX([noyywrap]) AC_PROG_INSTALL +AM_PROG_AR AC_PROG_RANLIB #AC_PROG_LIBTOOL PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.12]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -CPPFLAGS="-DNDEBUG -O2 -g `pkg-config --cflags glib-2.0`" +CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" case "${host}" in - *i686*) + *-mingw32*) WIN32="yes" - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" - ;; - *x86*) - WIN32="no" - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" + LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" ;; *) WIN32="no" - #LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LDFLAGS="" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" + LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ;; esac AC_CONFIG_FILES([Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile]) -- 2.43.2