diff --git a/configure.ac b/configure.ac
index 6c19b7c..8cfa588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AC_SUBST(PACKAGE_REVISION, "SVN_REV")
#--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
+DLL_CFLAGS=""
DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
SOCKET_LIBS=""
@@ -83,7 +84,6 @@ OBJEXT=".o"
EXEEXT=""
DLLPREFIX="lib"
-
if test $host != $build; then
AC_CHECK_PROGS(HOST_CC, gcc cc)
else
@@ -103,14 +103,6 @@ case "$host" in
esac
-
-AC_SUBST(HOST_CC)
-AC_SUBST(EXEEXT)
-AC_SUBST(DLLPREFIX)
-AC_SUBST(DLLEXT)
-AC_SUBST(DLL_FLAGS)
-AC_SUBST(SOCKET_LIBS)
-
#--[ Debug/Release ]------------------------------------------------------------------------------------------------------------------------------------------
DBG_LDFLAGS="-L.bin/Debug/lib"
@@ -173,6 +165,35 @@ if test $app_cv_fvisibility_ok = yes; then
CFLAGS="$CFLAGS -fvisibility=hidden"
fi
+#--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([pic],
+ [AS_HELP_STRING([--enable-pic], [enable support for PIC libraries (required to compile PW3270 on some systems)])],
+[
+ app_cv_pic="$enableval"
+],[
+
+ if test "$host_cpu" = "x86_64"; then
+ app_cv_pic="yes"
+ else
+ app_cv_pic="no"
+ fi
+])
+
+if test "$app_cv_pic" == "yes"; then
+ DLL_CFLAGS="$DLL_CFLAGS -fPIC"
+fi
+
+#--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_SUBST(HOST_CC)
+AC_SUBST(EXEEXT)
+AC_SUBST(DLLPREFIX)
+AC_SUBST(DLLEXT)
+AC_SUBST(DLL_FLAGS)
+AC_SUBST(DLL_CFLAGS)
+AC_SUBST(SOCKET_LIBS)
+
#--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
diff --git a/pw3270.cbp b/pw3270.cbp
index 9e93dba..92eee83 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -8,8 +8,8 @@
-
-
+
+
@@ -18,8 +18,8 @@
-
-
+
+
@@ -33,280 +33,281 @@
-
+
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 643739e..2a1e32c 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -57,10 +57,10 @@ License: LGPL
Group: System/X11/Terminals
Version: @PACKAGE_VERSION@
Release: %_release
-Summary: IBM 3270 Terminal emulator for gtk.
+Summary: IBM 3270 Terminal emulator for gtk
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: openssl shared-mime-info libgnome libgnomeui
+Requires: openssl shared-mime-info
Distribution: %_distro
BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils
@@ -98,7 +98,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS LICENSE
+
+# Library
%{_libdir}/lib3270.so
+
+# Main application
+%dir %{_datadir}/@PACKAGE_NAME@
+%dir %{_datadir}/@PACKAGE_NAME@/ui
+
%{_bindir}/@PACKAGE_NAME@
%{_datadir}/@PACKAGE_NAME@/ui/00default.xml
%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index a5ad87f..7b255ea 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -28,7 +28,7 @@
PACKAGE=@PACKAGE_NAME@
-CFLAGS=@CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
+CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
SSL_CFLAGS=@LIBSSL_CFLAGS@
DLL_FLAGS=@DLL_FLAGS@
--
libgit2 0.21.2