From: Francesco M. <fr...@us...> - 2006-01-28 21:01:49
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/build/autoconf Modified Files: configure.ac wxlua.pc.in Log Message: fixed things related to library names Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.ac 23 Jan 2006 19:38:29 -0000 1.5 --- configure.ac 28 Jan 2006 21:01:07 -0000 1.6 *************** *** 79,82 **** --- 79,108 ---- + # Produce some useful info for pkg-config: + AC_DEFUN([AC_ADDMODULE], + [ + dnl the set of the module names, comma separed + WXLUA_MODNAMES="$WXLUA_MODNAMES $1" + TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" + + dnl the set of the wxLua library names + WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP" + + dnl the set of the wxLua library names prefixed with -l + WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" + ]) + + AC_ADDMODULE([wxluasocket]) + AC_ADDMODULE([wxluadebug]) + AC_ADDMODULE([wxlua]) + AC_ADDMODULE([wxbind]) + AC_ADDMODULE([lua]) + AC_SUBST([WXLUA_MODNAMES]) + AC_SUBST([WXLUA_LIBNAMES]) + AC_SUBST([WXLUA_LDFLAGS]) + + + + Index: wxlua.pc.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxlua.pc.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.pc.in 23 Jan 2006 19:38:29 -0000 1.1 --- wxlua.pc.in 28 Jan 2006 21:01:07 -0000 1.2 *************** *** 7,16 **** includepaths=${includedir} libpaths=${libdir} ! libs="wxlua" Name: @PACKAGE_NAME@ Description: wxWidgets lua wrappers Version: @PACKAGE_VERSION@ ! Libs: -L${libdir} -lwxlua Cflags: -I${includedir} --- 7,18 ---- includepaths=${includedir} libpaths=${libdir} ! modnames="@WXLUA_MODNAMES@" ! libnames="@WXLUA_LIBNAMES@" ! wxlua_ldflags="@WXLUA_LDFLAGS@" Name: @PACKAGE_NAME@ Description: wxWidgets lua wrappers Version: @PACKAGE_VERSION@ ! Libs: -L${libdir} @WXLUA_LDFLAGS@ Cflags: -I${includedir} |