From 1b79f4bb351201bca80ee8ffbe4e2eb83c04fa66 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 9 Jan 2012 11:36:55 +0000 Subject: [PATCH] Acertando empacotamento para openSUSE 12.1 --- latest/configure.ac | 5 ++++- latest/pw3270.spec.in | 2 +- latest/src/gtk2/Makefile.in | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/latest/configure.ac b/latest/configure.ac index 4d5e6bb..09602da 100644 --- a/latest/configure.ac +++ b/latest/configure.ac @@ -239,7 +239,7 @@ AC_ARG_ENABLE([macui], [ app_cv_macui="$enableval" ],[ - app_cv_macui="no" + app_cv_macui="no" ]) AC_ARG_ENABLE([rexx], @@ -439,6 +439,9 @@ if test "$app_cv_ssl" == "yes"; then PKG_CHECK_MODULES( [SSL], [libssl],AC_DEFINE(HAVE_SSL),AC_MSG_NOTICE([libssl not present.]) ) fi +# Check for libm +AC_SEARCH_LIBS(sin,m) + #--[ Process options ]---------------------------------------------------------------------------------------------------------------------------------------- # Check for pic diff --git a/latest/pw3270.spec.in b/latest/pw3270.spec.in index c0e8f15..805c206 100644 --- a/latest/pw3270.spec.in +++ b/latest/pw3270.spec.in @@ -76,7 +76,7 @@ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openssl shared-mime-info libgnome libgnomeui %{name}-lib = @PACKAGE_VERSION@ Distribution: %_distro -BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel ImageMagick gettext-devel +BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel %description IBM 3270 terminal emulator gtk. It can be used to communicate with diff --git a/latest/src/gtk2/Makefile.in b/latest/src/gtk2/Makefile.in index 54b9e96..3e8e5b2 100644 --- a/latest/src/gtk2/Makefile.in +++ b/latest/src/gtk2/Makefile.in @@ -79,6 +79,8 @@ IGEMAC_LIBS=@IGEMAC_LIBS@ LIB3270_CFLAGS ?= `pkg-config --cflags pw3270` LIB3270_LIBS ?= `pkg-config --libs pw3270` +LIBS=@LIBS@ + #---[ Sources ]---------------------------------------------------------------- SOURCES = main.c iocallback.c terminal.c screen.c mouse.c \ @@ -130,12 +132,12 @@ $(TMPDIR)/control-gtk2: control $(BINDIR)/Debug/@PROGRAM_NAME@@EXEEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDIR)/Debug/gtk2/$(SRC)@OBJEXT@) @echo $@ ... @mkdir -p `dirname $@` - @$(LD) -o $@ $^ -Wl,-rpath,.bin/Debug/lib $(LIB3270_LIBS) $(GNOME_LIBS) $(IGEMAC_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) + @$(LD) -o $@ $^ -Wl,-rpath,.bin/Debug/lib $(LIB3270_LIBS) $(GNOME_LIBS) $(IGEMAC_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) $(LIBS) $(BINDIR)/Release/@PROGRAM_NAME@@EXEEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDIR)/Release/gtk2/$(SRC)@OBJEXT@) @echo $@ ... @mkdir -p `dirname $@` - @$(LD) $(EXE_LDFLAGS) -o $@ $^ $(LIB3270_LIBS) $(GNOME_LIBS) $(IGEMAC_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) + @$(LD) $(EXE_LDFLAGS) -o $@ $^ $(LIB3270_LIBS) $(GNOME_LIBS) $(IGEMAC_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(GTK_LIBS) $(LIBS) @$(STRIP) $@ $(BINDIR)/pot/$(MODULE_NAME).pot: $(foreach SRC, $(basename $(SOURCES)), $(BINDIR)/pot/$(MODULE_NAME)/$(SRC).pot) -- libgit2 0.21.2