Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072
Modified Files:
Makefile.in configure
Log Message:
fixed things related to library names
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in 27 Jan 2006 21:57:05 -0000 1.7
--- Makefile.in 28 Jan 2006 21:01:06 -0000 1.8
***************
*** 13,17 ****
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
- srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
--- 13,16 ----
***************
*** 39,43 ****
install: all $(__install_utils___depname) install_modules $(__install_apps___depname)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig
! (cd $(srcdir)/ ; $(INSTALL_DATA) build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig)
uninstall: $(__uninstall_utils___depname) uninstall_modules $(__uninstall_apps___depname)
--- 38,42 ----
install: all $(__install_utils___depname) install_modules $(__install_apps___depname)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig
! (cd .$(top_builddir)/ ; $(INSTALL_DATA) build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig)
uninstall: $(__uninstall_utils___depname) uninstall_modules $(__uninstall_apps___depname)
Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure 27 Jan 2006 21:57:05 -0000 1.6
--- configure 28 Jan 2006 21:01:06 -0000 1.7
***************
*** 274,278 ****
PACKAGE_BUGREPORT='fr...@us...'
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 274,278 ----
PACKAGE_BUGREPORT='fr...@us...'
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 4508,4511 ****
--- 4508,4512 ----
+
if test -n "" ; then
***************
*** 4537,4540 ****
--- 4538,4591 ----
+ # Produce some useful info for pkg-config:
+
+
+
+ WXLUA_MODNAMES="$WXLUA_MODNAMES wxluasocket"
+ TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluasocket""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+
+ WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+
+ WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+
+
+ WXLUA_MODNAMES="$WXLUA_MODNAMES wxluadebug"
+ TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxluadebug""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+
+ WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+
+ WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+
+
+ WXLUA_MODNAMES="$WXLUA_MODNAMES wxlua"
+ TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxlua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+
+ WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+
+ WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+
+
+ WXLUA_MODNAMES="$WXLUA_MODNAMES wxbind"
+ TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbind""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+
+ WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+
+ WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+
+
+ WXLUA_MODNAMES="$WXLUA_MODNAMES lua"
+ TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_lua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR"
+
+ WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP"
+
+ WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP"
+
+
+
+
+
+
+
+
***************
*** 7272,7275 ****
--- 7323,7330 ----
s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t
s,@WX_PORT@,$WX_PORT,;t t
+ s,@WX_GTKPORT_VERSION@,$WX_GTKPORT_VERSION,;t t
+ s,@WXLUA_MODNAMES@,$WXLUA_MODNAMES,;t t
+ s,@WXLUA_LIBNAMES@,$WXLUA_LIBNAMES,;t t
+ s,@WXLUA_LDFLAGS@,$WXLUA_LDFLAGS,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@MAKE_SET@,$MAKE_SET,;t t
|
