diff --git a/ChangeLog b/ChangeLog index 91a55725..a0ba5058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ Changes since version 0.70.0: - Disabled window birth animation by default (while it was ok with normal windows, it was very annoying with menus editing in WPrefs.app) - Added ability to shade/unshade a window using the mouse wheel. +- Fixed compilation for systems that required -lintl for WINGs + (Jim Knoble ) +- Removed redundant include/lib paths from the get-*-flags scripts Changes since version 0.65.1: diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am index f3519536..6f74f46d 100644 --- a/WINGs/Examples/Makefile.am +++ b/WINGs/Examples/Makefile.am @@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies noinst_PROGRAMS = connect server fontl puzzle -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la +LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ + @INTLIBS@ fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a @@ -16,11 +17,12 @@ puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ - @NETLIBS@ + @NETLIBS@ @INTLIBS@ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ +server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ + @NETLIBS@ @INTLIBS@ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am index 709319c6..bd1dccfb 100644 --- a/WINGs/Extras/Makefile.am +++ b/WINGs/Extras/Makefile.am @@ -26,7 +26,8 @@ libExtraWINGs_a_SOURCES = \ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la +LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ + @INTLIBS@ test_LDADD = wtableview.o wtabledelegates.o $(LDADD) diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am index f6ac26e0..16935fe9 100644 --- a/WINGs/Tests/Makefile.am +++ b/WINGs/Tests/Makefile.am @@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = no-dependencies noinst_PROGRAMS = wtest wmquery wmfile testmywidget -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la +LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ + @INTLIBS@ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h diff --git a/configure.ac b/configure.ac index 53b27442..c07b3d18 100644 --- a/configure.ac +++ b/configure.ac @@ -840,11 +840,8 @@ dnl parsed by m4 cat <get-wraster-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" +WCFLAGS="$inc_search_path" +WLFLAGS="$lib_search_path" WLIBS="-lwraster $GFXLIBS $XLIBS -lm" usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" @@ -879,12 +876,9 @@ EOF cat <get-wings-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" -WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS" +WCFLAGS="$inc_search_path" +WLFLAGS="$lib_search_path" +WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS $INTLIBS" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" @@ -918,12 +912,9 @@ EOF cat <get-wutil-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" -WLIBS="-lWUtil $NETLIBS" +WCFLAGS="-I`eval echo ${includedir}`" +WLFLAGS="-L${_libdir}" +WLIBS="-lWUtil $NETLIBS $INTLIBS" usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" diff --git a/configure.in b/configure.in index 53b27442..c07b3d18 100644 --- a/configure.in +++ b/configure.in @@ -840,11 +840,8 @@ dnl parsed by m4 cat <get-wraster-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" +WCFLAGS="$inc_search_path" +WLFLAGS="$lib_search_path" WLIBS="-lwraster $GFXLIBS $XLIBS -lm" usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" @@ -879,12 +876,9 @@ EOF cat <get-wings-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" -WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS" +WCFLAGS="$inc_search_path" +WLFLAGS="$lib_search_path" +WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS $INTLIBS" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" @@ -918,12 +912,9 @@ EOF cat <get-wutil-flags #!/bin/sh -prefix="$prefix" -exec_prefix=\$prefix - -WCFLAGS="-I\$prefix/include $inc_search_path" -WLFLAGS="-L\$exec_prefix/lib $lib_search_path" -WLIBS="-lWUtil $NETLIBS" +WCFLAGS="-I`eval echo ${includedir}`" +WLFLAGS="-L${_libdir}" +WLIBS="-lWUtil $NETLIBS $INTLIBS" usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" diff --git a/src/dialog.c b/src/dialog.c index 6b90bf23..1da7ba1e 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1085,8 +1085,9 @@ handleLogoPush(XEvent *event, void *data) "Mooo Canada!!!!", "Hi! My name is bobby...", "AHH! The neurotic monkeys are after me!", - "WHAT YOU SAY??", "WE GET SIGNAL", + "HOW ARE YOU GENTLEMEN?", + "WHAT YOU SAY??", "SOMEBODY SET UP US THE BOMB", "ALL YOUR BASE ARE BELONG TO US!", "Oh My God!!! Larry is back!" diff --git a/util/Makefile.am b/util/Makefile.am index 81d132e6..951dc156 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \ # X_EXTRA_LIBS is for libproplist in systems that need -lsocket # remove after we require lPL 0.10.2 which automatically resolves its # library dependancies using the libPropList.la file -liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ +liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ @INTLIBS@ wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) @@ -41,17 +41,17 @@ geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) wmagnify_LDADD = \ $(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/wrlib/libwraster.la \ - @DLLIBS@ + @INTLIBS@ @DLLIBS@ wmsetup_LDADD = \ $(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/wrlib/libwraster.la \ - @DLLIBS@ + @INTLIBS@ @DLLIBS@ wmsetbg_LDADD = \ $(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/wrlib/libwraster.la \ - @DLLIBS@ + @INTLIBS@ @DLLIBS@ CLEANFILES = wmaker.inst wmchlocale