Commit 191163d794f5e6fc57001bebfc4a50d2445520ec
1 parent
de2e8e26
Exists in
master
and in
5 other branches
Iniciando atualização dos Makefiles.
Showing
2 changed files
with
230 additions
and
906 deletions
Show diff stats
configure.ac
@@ -32,9 +32,6 @@ dnl Process this file with autoconf to produce a configure script. | @@ -32,9 +32,6 @@ dnl Process this file with autoconf to produce a configure script. | ||
32 | dnl The minimum version of autoconf required. | 32 | dnl The minimum version of autoconf required. |
33 | AC_PREREQ(2.61) | 33 | AC_PREREQ(2.61) |
34 | 34 | ||
35 | -dnl Load svn revision file info | ||
36 | -m4_include([revision.m4]) | ||
37 | - | ||
38 | dnl Initialise automake with the package name, version and | 35 | dnl Initialise automake with the package name, version and |
39 | dnl bug-reporting address. | 36 | dnl bug-reporting address. |
40 | AC_INIT([pw3270], [5.1], [perry.werneck@gmail.com]) | 37 | AC_INIT([pw3270], [5.1], [perry.werneck@gmail.com]) |
@@ -54,204 +51,142 @@ AM_INIT_AUTOMAKE | @@ -54,204 +51,142 @@ AM_INIT_AUTOMAKE | ||
54 | dnl Check for iconv | 51 | dnl Check for iconv |
55 | AM_ICONV | 52 | AM_ICONV |
56 | 53 | ||
57 | -#--[ Check for tools & Libraries ]---------------------------------------------------------------------------------------------------------------------------- | ||
58 | - | 54 | +dnl Checks for programs. |
59 | AC_PROG_CXX | 55 | AC_PROG_CXX |
60 | AC_PROG_CC | 56 | AC_PROG_CC |
61 | -AC_PROG_INSTALL | ||
62 | -AC_PROG_MKDIR_P | 57 | +AC_PROG_SED |
63 | AC_PROG_LN_S | 58 | AC_PROG_LN_S |
64 | 59 | ||
65 | -AC_PATH_TOOL([VALGRIND], [valgrind], [no]) | ||
66 | -AC_PATH_TOOL([AR], [ar], [ar]) | ||
67 | - | ||
68 | -AC_PATH_TOOL([MAKENSIS], [makensis], [no]) | ||
69 | -AC_PATH_TOOL([WINDRES], [windres], [no]) | ||
70 | -AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no]) | ||
71 | - | ||
72 | -AC_PATH_TOOL([MACBUNDLER],[gtk-mac-bundler], [no]) | ||
73 | - | ||
74 | -AC_CHECK_PROGS(GZIP,[gzip],no) | ||
75 | -export GZIP; | ||
76 | -if test $GZIP = "no" ; then | ||
77 | - AC_MSG_ERROR([Unable to find the gzip application]); | ||
78 | -fi | ||
79 | -AC_SUBST(GZIP) | ||
80 | - | ||
81 | -AC_CHECK_PROGS(ZIP,[zip],no) | ||
82 | -export ZIP; | ||
83 | -if test $GZIP = "no" ; then | ||
84 | - AC_MSG_ERROR([Unable to find the gzip application]); | ||
85 | -fi | ||
86 | -AC_SUBST(ZIP) | ||
87 | - | ||
88 | -AC_CHECK_PROGS(CONVERT,[rsvg-convert],no) | ||
89 | -AC_SUBST(CONVERT) | ||
90 | - | ||
91 | - | ||
92 | -#--[ Version & Revision ]------------------------------------------------------------------------------------------------------------------------------------- | ||
93 | - | ||
94 | -AC_DEFINE(PACKAGE_REVISION,"SVN_REVISION") | ||
95 | -AC_SUBST(PACKAGE_REVISION,"SVN_REVISION") | ||
96 | - | ||
97 | -AC_DEFINE(PACKAGE_SOURCE,"SVN_URL") | ||
98 | -AC_SUBST(PACKAGE_SOURCE,"SVN_URL") | ||
99 | - | ||
100 | -AC_DEFINE(PACKAGE_LEVEL,"APP_LEVEL") | ||
101 | -AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL") | ||
102 | - | ||
103 | -#--[ Set host based options ]--------------------------------------------------------------------------------------------------------------------------------- | 60 | +AC_LANG([C]) |
104 | 61 | ||
105 | -CFLAGS="$CFLAGS -Wno-deprecated-declarations" | ||
106 | -DLL_CFLAGS="" | ||
107 | -DLL_FLAGS="-shared" | ||
108 | -SYSDLL_FLAGS="-shared" | ||
109 | -SOCKET_LIBS="" | ||
110 | -LIB3270_REQUIRES="" | 62 | +dnl --------------------------------------------------------------------------- |
63 | +dnl Initialize defaults | ||
64 | +dnl --------------------------------------------------------------------------- | ||
111 | 65 | ||
112 | -DLLEXT=".so" | ||
113 | -OBJEXT=".o" | ||
114 | -EXEEXT="" | ||
115 | -DLLPREFIX="lib" | ||
116 | -PLUGINS="" | ||
117 | -APP_GUI_SRC="" | ||
118 | -LDLIBFLAGS="" | ||
119 | -EXTENSIONS="" | 66 | +DBG_CFLAGS="-g -fstack-check -DDEBUG=1" |
67 | +RLS_CFLAGS="-DNDEBUG=1" | ||
120 | 68 | ||
121 | -if test $host != $build; then | ||
122 | - AC_CHECK_PROGS(HOST_CC, gcc cc) | ||
123 | -else | ||
124 | - HOST_CC=$CC | ||
125 | -fi | 69 | +dnl --------------------------------------------------------------------------- |
70 | +dnl Check for OS specifics | ||
71 | +dnl --------------------------------------------------------------------------- | ||
126 | 72 | ||
127 | case "$host" in | 73 | case "$host" in |
128 | *-mingw32) | 74 | *-mingw32) |
129 | - DBG_LDFLAGS="-L.bin/Debug/lib" | ||
130 | - RLS_LDFLAGS="-L.bin/Release/lib -Wl,--strip-all" | ||
131 | - DLLEXT=".dll" | ||
132 | - EXEEXT=".exe" | ||
133 | - SOCKET_LIBS="-lws2_32" | ||
134 | - CFLAGS="$CFLAGS -mms-bitfields" | ||
135 | - localedir="locale" | ||
136 | - DLLPREFIX="" | ||
137 | 75 | ||
138 | - # http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code | ||
139 | - DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup,--enable-auto-import" | ||
140 | - SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup,--enable-auto-import" | ||
141 | - | ||
142 | - LDSOFLAGS="-Wl,-soname,\`basename \$@\`" | ||
143 | - LDAPPFLAGS="-mwindows" | ||
144 | - LDLIBFLAGS="-Wl,--output-def,\$@.def" | ||
145 | - DBGRPATH="" | ||
146 | - DLLDIR="" | ||
147 | - DBGCMDPREFIX="" | ||
148 | - LDARCH="" | ||
149 | - PLUGINS="hllapi" | ||
150 | - APP_GUI_SRC="resources.rc" | 76 | + EXEEXT=".exe" |
151 | DLLPREFIX="" | 77 | DLLPREFIX="" |
152 | - LIBS="$LIBS -lcomdlg32" | ||
153 | - | ||
154 | - if test $host_cpu = "x86_64" ; then | ||
155 | - PROGRAMFILES="PROGRAMFILES64" | ||
156 | - else | ||
157 | - PROGRAMFILES="PROGRAMFILES" | ||
158 | - fi | ||
159 | - | ||
160 | - AC_SUBST(PROGRAMFILES) | ||
161 | - | ||
162 | - AC_CONFIG_FILES(nsi/header-$host_cpu-no-gtk.nsi) | ||
163 | - AC_CONFIG_FILES(nsi/header-$host_cpu.nsi) | ||
164 | - AC_CONFIG_FILES(nsi/main-begin-$host_cpu.nsi) | ||
165 | - AC_CONFIG_FILES(nsi/main-end.nsi) | ||
166 | - AC_CONFIG_FILES(nsi/runtime.nsi) | ||
167 | - AC_CONFIG_FILES(nsi/sdk.nsi) | ||
168 | - AC_CONFIG_FILES(nsi/uninstall-$host_cpu.nsi) | ||
169 | - AC_CONFIG_FILES(nsi/oninit-$host_cpu.nsi) | ||
170 | - AC_CONFIG_FILES(nsi/Makefile) | ||
171 | - | ||
172 | - AC_CONFIG_FILES(nsi/hllapi.nsi) | ||
173 | - AC_CONFIG_FILES(nsi/j3270.nsi) | ||
174 | - AC_CONFIG_FILES(nsi/rx3270.nsi) | ||
175 | - | ||
176 | - AC_CONFIG_FILES(nsi/runtime-init.nsi) | 78 | + DLLEXT=".dll" |
177 | 79 | ||
178 | - AC_CONFIG_FILES(makegtkruntime.sh) | 80 | + CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" |
81 | + LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" | ||
179 | 82 | ||
180 | ;; | 83 | ;; |
181 | 84 | ||
182 | *-apple-*) | 85 | *-apple-*) |
183 | - DBG_LDFLAGS="-L.bin/Debug/lib" | ||
184 | - RLS_LDFLAGS="-L.bin/Release/lib" | ||
185 | - LDSOFLAGS="" | ||
186 | - DLLDIR="/lib" | ||
187 | - DBGRPATH="" | ||
188 | - DBGCMDPREFIX="DYLD_LIBRARY_PATH=\$(BINDIR)/Debug/lib" | ||
189 | - LDSOFLAGS="-Wl,-install_name,\`basename \$@\`" | ||
190 | - LDARCH="-arch $build_cpu" | ||
191 | - LDAPPFLAGS="" | 86 | + EXEEXT="" |
192 | DLLPREFIX="lib" | 87 | DLLPREFIX="lib" |
88 | + DLLEXT=".so" | ||
193 | 89 | ||
194 | - AC_CONFIG_FILES(mac/pw3270.bundle) | 90 | + CFLAGS="$CFLAGS -Wall -Werror" |
195 | 91 | ||
92 | + LIBS="-pthread $LIBS" | ||
196 | ;; | 93 | ;; |
197 | 94 | ||
198 | - *) | ||
199 | - DLLDIR="/lib" | ||
200 | - DBG_LDFLAGS="-L.bin/Debug/$DLLDIR" | ||
201 | - RLS_LDFLAGS="-Wl,-rpath,\$(libdir)" | ||
202 | - LDARCH="" | ||
203 | - LDSOFLAGS="-Wl,-soname,\`basename \$@\`" | ||
204 | - LDAPPFLAGS="" | ||
205 | - DBGRPATH="-Wl,--rpath,.bin/Debug/lib" | ||
206 | - DBGCMDPREFIX="LD_LIBRARY_PATH=\$(BINDIR)/Debug/lib" | 95 | + *) |
96 | + EXEEXT="" | ||
207 | DLLPREFIX="lib" | 97 | DLLPREFIX="lib" |
98 | + DLLEXT=".so" | ||
99 | + | ||
100 | + CFLAGS="$CFLAGS -Wall -Werror" | ||
208 | 101 | ||
209 | - AC_CONFIG_FILES(pw3270.spec) | 102 | + # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS" |
103 | + LIBS="-pthread $LIBS" | ||
210 | 104 | ||
211 | esac | 105 | esac |
212 | 106 | ||
213 | -# It's easier to test hllapi on linux | ||
214 | -AC_CONFIG_FILES(src/plugins/hllapi/Makefile) | 107 | +AC_SUBST(DBG_CFLAGS) |
108 | +AC_SUBST(RLS_CFLAGS) | ||
109 | +AC_SUBST(EXEEXT) | ||
110 | +AC_SUBST(DLLPREFIX) | ||
111 | +AC_SUBST(DLLEXT) | ||
215 | 112 | ||
216 | -#--[ lib3270 defines ]---------------------------------------------------------------------------------------------------------------------------------------- | 113 | +dnl --------------------------------------------------------------------------- |
114 | +dnl Check for other programs | ||
115 | +dnl --------------------------------------------------------------------------- | ||
217 | 116 | ||
218 | -LIB3270_CFLAGS="-I$ac_pwd/src/include" | ||
219 | -LIB3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -l3270" | 117 | +AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no]) |
118 | +AC_PATH_TOOL([MAKENSIS], [makensis], [no]) | ||
119 | +AC_PATH_TOOL([AR], [ar], [ar]) | ||
220 | 120 | ||
221 | -PW3270_CFLAGS="-I$ac_pwd/src/pw3270/include -I$ac_pwd/src/include" | ||
222 | -PW3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -l$PACKAGE_TARNAME" | 121 | +PKG_CHECK_EXISTS |
223 | 122 | ||
224 | -AC_SUBST(LIB3270_CFLAGS) | ||
225 | -AC_SUBST(LIB3270_LIBS) | 123 | +dnl --------------------------------------------------------------------------- |
124 | +dnl Version info | ||
125 | +dnl --------------------------------------------------------------------------- | ||
226 | 126 | ||
227 | -AC_SUBST(PW3270_CFLAGS) | ||
228 | -AC_SUBST(PW3270_LIBS) | 127 | +app_vrs_major=$(echo $VERSION | cut -d. -f1) |
128 | +app_vrs_minor=$(echo $VERSION | cut -d. -f2) | ||
229 | 129 | ||
230 | -#--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------ | 130 | +AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) |
131 | +AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) | ||
132 | + | ||
133 | +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major) | ||
134 | +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) | ||
135 | + | ||
136 | +AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) | ||
137 | +AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) | ||
138 | + | ||
139 | +dnl --------------------------------------------------------------------------- | ||
140 | +dnl Check for D-Bus | ||
141 | +dnl --------------------------------------------------------------------------- | ||
142 | + | ||
143 | +PKG_CHECK_MODULES( [DBUS], [dbus-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([ No DBUS support.]) ) | ||
144 | +AC_SUBST(DBUS_LIBS) | ||
145 | +AC_SUBST(DBUS_CFLAGS) | ||
146 | + | ||
147 | +dnl --------------------------------------------------------------------------- | ||
148 | +dnl Check for libintl | ||
149 | +dnl --------------------------------------------------------------------------- | ||
231 | 150 | ||
232 | AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) | 151 | AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) |
233 | AC_PATH_TOOL([MSGCAT], [msgcat], [no]) | 152 | AC_PATH_TOOL([MSGCAT], [msgcat], [no]) |
234 | AC_PATH_TOOL([MSGINIT], [msginit], [no]) | 153 | AC_PATH_TOOL([MSGINIT], [msginit], [no]) |
235 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) | 154 | AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) |
236 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) | 155 | AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) |
237 | -AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no]) | ||
238 | -AC_PATH_TOOL([DPKGBUILD], [dpkg-buildpackage], [no]) | ||
239 | -AC_PATH_TOOL([GENMARSHAL], [glib-genmarshal]) | ||
240 | 156 | ||
241 | -AC_CHECK_HEADER(libintl.h, AC_DEFINE(HAVE_LIBINTL)) | ||
242 | -AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG)) | ||
243 | -AC_CHECK_LIB(intl, gettext,[INTL_LIBS="-lintl"]) | ||
244 | - | ||
245 | -AC_SUBST(INTL_LIBS) | ||
246 | - | ||
247 | -#--[ Check for ELF symbol visibility support ]---------------------------------------------------------------------------------------------------------------- | 157 | +AC_CHECK_HEADER(libintl.h, [ |
158 | + AC_DEFINE(HAVE_LIBINTL, 1) | ||
159 | +]) | ||
248 | 160 | ||
249 | -# Try to compile PROGRAM, check for warnings | 161 | +dnl --------------------------------------------------------------------------- |
162 | +dnl Check for C++ 2011 support | ||
163 | +dnl --------------------------------------------------------------------------- | ||
164 | +AC_DEFUN([AX_CHECK_COMPILE_FLAG], | ||
165 | +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX | ||
166 | +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl | ||
167 | +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ | ||
168 | + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS | ||
169 | + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" | ||
170 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], | ||
171 | + [AS_VAR_SET(CACHEVAR,[yes])], | ||
172 | + [AS_VAR_SET(CACHEVAR,[no])]) | ||
173 | + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) | ||
174 | +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], | ||
175 | + [m4_default([$2], :)], | ||
176 | + [m4_default([$3], :)]) | ||
177 | +AS_VAR_POPDEF([CACHEVAR])dnl | ||
178 | +])dnl AX_CHECK_COMPILE_FLAGS | ||
179 | + | ||
180 | +AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CFLAGS="$CFLAGS -std=gnu++11"]) | ||
181 | + | ||
182 | +dnl --------------------------------------------------------------------------- | ||
183 | +dnl Check for ELF symbol visibility support | ||
184 | +dnl --------------------------------------------------------------------------- | ||
250 | m4_define([GLIB_CHECK_COMPILE_WARNINGS], | 185 | m4_define([GLIB_CHECK_COMPILE_WARNINGS], |
251 | [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl | 186 | [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl |
252 | rm -f conftest.$ac_objext | 187 | rm -f conftest.$ac_objext |
253 | glib_ac_compile_save="$ac_compile" | 188 | glib_ac_compile_save="$ac_compile" |
254 | -ac_compile='$CC -c conftest.$ac_ext' | 189 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext' |
255 | AS_IF([_AC_EVAL_STDERR($ac_compile) && | 190 | AS_IF([_AC_EVAL_STDERR($ac_compile) && |
256 | AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])], | 191 | AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])], |
257 | [$2], | 192 | [$2], |
@@ -263,31 +198,44 @@ rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl | @@ -263,31 +198,44 @@ rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl | ||
263 | ])# GLIB_CHECK_COMPILE_WARNINGS | 198 | ])# GLIB_CHECK_COMPILE_WARNINGS |
264 | 199 | ||
265 | AC_MSG_CHECKING(for GNUC visibility attribute) | 200 | AC_MSG_CHECKING(for GNUC visibility attribute) |
266 | -GLIB_CHECK_COMPILE_WARNINGS([AC_LANG_SOURCE([ | ||
267 | - | ||
268 | -#define LIB3270_INTERNAL __attribute__((visibility("hidden"))) extern | ||
269 | -#define LIB3270_EXPORT __attribute__((visibility("default"))) extern | ||
270 | - | ||
271 | -LIB3270_INTERNAL void f_hidden(void); | ||
272 | -LIB3270_EXPORT void f_export(void); | ||
273 | - | ||
274 | -void f_hidden (void) { } | ||
275 | - | ||
276 | -void f_export (void) { } | ||
277 | - | 201 | +GLIB_CHECK_COMPILE_WARNINGS([ |
202 | +void | ||
203 | +__attribute__ ((visibility ("hidden"))) | ||
204 | + f_hidden (void) | ||
205 | +{ | ||
206 | +} | ||
207 | +void | ||
208 | +__attribute__ ((visibility ("internal"))) | ||
209 | + f_internal (void) | ||
210 | +{ | ||
211 | +} | ||
212 | +void | ||
213 | +__attribute__ ((visibility ("protected"))) | ||
214 | + f_protected (void) | ||
215 | +{ | ||
216 | +} | ||
217 | +void | ||
218 | +__attribute__ ((visibility ("default"))) | ||
219 | + f_default (void) | ||
220 | +{ | ||
221 | +} | ||
278 | int main (int argc, char **argv) | 222 | int main (int argc, char **argv) |
279 | { | 223 | { |
280 | f_hidden(); | 224 | f_hidden(); |
281 | - f_export(); | 225 | + f_internal(); |
226 | + f_protected(); | ||
227 | + f_default(); | ||
282 | return 0; | 228 | return 0; |
283 | } | 229 | } |
284 | -])],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no) | 230 | +],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no) |
285 | AC_MSG_RESULT($g_have_gnuc_visibility) | 231 | AC_MSG_RESULT($g_have_gnuc_visibility) |
286 | if test x$g_have_gnuc_visibility = xyes; then | 232 | if test x$g_have_gnuc_visibility = xyes; then |
287 | AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes]) | 233 | AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes]) |
288 | fi | 234 | fi |
289 | 235 | ||
290 | -# Check for compiler visibility flag | 236 | +dnl --------------------------------------------------------------------------- |
237 | +dnl Check for compiler visibility flag | ||
238 | +dnl --------------------------------------------------------------------------- | ||
291 | AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden) | 239 | AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden) |
292 | AC_CACHE_VAL(app_cv_fvisibility_ok, | 240 | AC_CACHE_VAL(app_cv_fvisibility_ok, |
293 | [ac_save_cc="$CC" | 241 | [ac_save_cc="$CC" |
@@ -300,231 +248,46 @@ CC="$ac_save_cc"]) | @@ -300,231 +248,46 @@ CC="$ac_save_cc"]) | ||
300 | AC_MSG_RESULT($app_cv_fvisibility_ok) | 248 | AC_MSG_RESULT($app_cv_fvisibility_ok) |
301 | if test $app_cv_fvisibility_ok = yes; then | 249 | if test $app_cv_fvisibility_ok = yes; then |
302 | CFLAGS="$CFLAGS -fvisibility=hidden" | 250 | CFLAGS="$CFLAGS -fvisibility=hidden" |
303 | - OO_CXXFLAGS="$OO_CXXFLAGS -fvisibility=hidden" | ||
304 | CXXFLAGS="$CXXFLAGS -fvisibility=hidden" | 251 | CXXFLAGS="$CXXFLAGS -fvisibility=hidden" |
305 | fi | 252 | fi |
306 | 253 | ||
307 | -#--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------ | ||
308 | - | 254 | +dnl --------------------------------------------------------------------------- |
255 | +dnl Check for pic | ||
256 | +dnl --------------------------------------------------------------------------- | ||
309 | AC_ARG_ENABLE([pic], | 257 | AC_ARG_ENABLE([pic], |
310 | - [AS_HELP_STRING([--disable-pic], [disable support for PIC libraries (required to compile PW3270 on some systems)])], | 258 | + [AS_HELP_STRING([--disable-pic], [disable support for PIC libraries (required to compile on 64bits)])], |
311 | [ | 259 | [ |
312 | app_cv_pic="$enableval" | 260 | app_cv_pic="$enableval" |
313 | ],[ | 261 | ],[ |
314 | - case "$host-$host_cpu" in | ||
315 | - *-mingw32-*) | ||
316 | - app_cv_pic="no" | ||
317 | - ;; | ||
318 | - | ||
319 | - *-x86_64) | ||
320 | - app_cv_pic="yes" | ||
321 | - ;; | ||
322 | - | ||
323 | - *) | ||
324 | - app_cv_pic="no" | ||
325 | - esac | ||
326 | - | ||
327 | -]) | ||
328 | - | ||
329 | -AC_ARG_ENABLE([registry], | ||
330 | - [AS_HELP_STRING([--disable-registry], [disable configurations in windows registry])], | ||
331 | -[ | ||
332 | - app_cv_registry="$enableval" | ||
333 | -],[ | ||
334 | - case "$host" in | ||
335 | - *-mingw32) | ||
336 | - app_cv_registry="yes" | ||
337 | - ;; | ||
338 | - | ||
339 | - *) | ||
340 | - app_cv_registry="no" | ||
341 | - esac | ||
342 | - | ||
343 | -]) | ||
344 | - | ||
345 | - | ||
346 | -if test "$app_cv_pic" == "yes"; then | ||
347 | - DLL_CFLAGS="$DLL_CFLAGS -fPIC" | ||
348 | - OO_CXXFLAGS="-fPIC $OO_CXXFLAGS" | ||
349 | -fi | ||
350 | - | ||
351 | -AC_ARG_ENABLE([strip],[AS_HELP_STRING([--disable-strip], [disable stripping of binaries])], [ app_cv_strip="$enableval" ],[ app_cv_strip="yes" ]) | ||
352 | - | ||
353 | -if test "$app_cv_strip" == "yes"; then | ||
354 | - AC_PATH_TOOL([STRIP], [strip], "true") | ||
355 | - AC_SUBST(STRIP) | ||
356 | -else | ||
357 | - AC_SUBST(STRIP,"true") | ||
358 | -fi | ||
359 | - | ||
360 | - | ||
361 | -#--[ Check For Java ]----------------------------------------------------------------------------------------------------------------------------------------- | ||
362 | - | ||
363 | -AC_ARG_VAR([JAVA_HOME], [JAVA home directory]) | ||
364 | -AC_ARG_VAR([JDK_HOME], [JDK home directory]) | ||
365 | -AC_ARG_VAR([JRE_HOME], [JRE home directory]) | ||
366 | - | ||
367 | -AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ]) | ||
368 | -AC_ARG_WITH([javadocdir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ]) | ||
369 | - | ||
370 | -AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ]) | ||
371 | - | ||
372 | -AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) | ||
373 | - | ||
374 | -if test "$app_cv_java" = "yes" ; then | ||
375 | - | ||
376 | - # Check for JAVA_HOME | ||
377 | - if test "_$JAVA_HOME" = "_" ; then | ||
378 | - JAVA_HOME=$libdir/jvm/java | ||
379 | - fi | ||
380 | - | ||
381 | - # Check for JDK_HOME | ||
382 | - if test "_$JDK_HOME" = "_" ; then | ||
383 | - JDK_HOME=$JAVA_HOME | ||
384 | - fi | ||
385 | - | ||
386 | - # Check for JRE_HOME | ||
387 | - if test "_$JRE_HOME" = "_" ; then | ||
388 | - JRE_HOME=$JAVA_HOME/jre | ||
389 | - fi | ||
390 | -fi | ||
391 | - | ||
392 | -if test "$app_cv_java" = "yes" ; then | ||
393 | - | ||
394 | - AC_PATH_TOOL([JAVA], [java], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) | ||
395 | - if test "$JAVA" = "no" ; then | ||
396 | - app_cv_java="no" | ||
397 | - fi | ||
398 | - | ||
399 | - AC_PATH_TOOL([JAVAC], [javac], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) | ||
400 | - if test "$JAVAC" = "no" ; then | ||
401 | - app_cv_java="no" | ||
402 | - fi | ||
403 | - | ||
404 | - AC_PATH_TOOL([JAVAH], [javah], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) | ||
405 | - if test "$JAVAH" = "no" ; then | ||
406 | - app_cv_java="no" | ||
407 | - fi | ||
408 | - | ||
409 | - AC_PATH_TOOL([JAR], [jar], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) | ||
410 | - if test "$JAVA" = "no" ; then | ||
411 | - app_cv_java="no" | ||
412 | - fi | ||
413 | - | ||
414 | - AC_PATH_TOOL([JAVADOC], [javadoc], [no], [$JDK_HOME/bin:$JRE_HOME/bin:$PATH]) | ||
415 | - if test "$JAVADOC" = "no" ; then | ||
416 | - app_cv_java="no" | ||
417 | - fi | ||
418 | - | ||
419 | -fi | ||
420 | - | ||
421 | -# Set JVM arch | ||
422 | -case $host_cpu in | ||
423 | - | ||
424 | -x86_64) | ||
425 | - jvm_arch=amd64 | ||
426 | - ;; | ||
427 | - | ||
428 | -i?86) | ||
429 | - jvm_arch=i386 | ||
430 | - ;; | ||
431 | -powerpc64le) | ||
432 | - jvm_arch=ppc64le | ||
433 | - ;; | ||
434 | -powerpc64) | ||
435 | - jvm_arch=ppc64 | ||
436 | - ;; | ||
437 | - | ||
438 | -*) | ||
439 | - jvm_arch="$host_cpu" | ||
440 | - ;; | ||
441 | - | ||
442 | -esac | ||
443 | - | ||
444 | -# JVMDIR | ||
445 | -if test "_$JVMDIR" = "_" ; then | ||
446 | 262 | ||
447 | case "$host" in | 263 | case "$host" in |
448 | *-mingw32) | 264 | *-mingw32) |
449 | - jniinc=$JDK_HOME/include/win32 | ||
450 | - JVMDIR="\$(JRE_HOME)/bin" | ||
451 | - ;; | ||
452 | - | ||
453 | - *-apple-*) | ||
454 | - jniinc=$JDK_HOME/include/apple | ||
455 | - JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server" | 265 | + app_cv_pic="no" |
456 | ;; | 266 | ;; |
457 | 267 | ||
458 | - *) | ||
459 | - jniinc=$JDK_HOME/include/linux | ||
460 | - JVMDIR="\$(JRE_HOME)/lib/$jvm_arch/server" | ||
461 | - esac | ||
462 | - | ||
463 | -fi | ||
464 | - | ||
465 | - | ||
466 | -# Java link options depends on OS | ||
467 | -case "$host" in | ||
468 | - *-mingw32) | ||
469 | - | ||
470 | - if test -e "$JRE_HOME/bin/client/jvm.dll"; then | ||
471 | - AC_MSG_NOTICE(Found $JRE_HOME/bin/client/jvm.dll) | ||
472 | - jvm_libs="-L\"\$(JRE_HOME)/bin/client\" -ljvm" | ||
473 | - elif test -e "$JRE_HOME/bin/server/jvm.dll"; then | ||
474 | - AC_MSG_NOTICE(Found $JRE_HOME/bin/server/jvm.dll) | ||
475 | - jvm_libs="-L\"\$(JRE_HOME)/bin/server\" -ljvm" | 268 | + *) |
269 | + if test "$host_cpu" = "x86_64"; then | ||
270 | + app_cv_pic="yes" | ||
476 | else | 271 | else |
477 | - AC_MSG_NOTICE([Can't find jvm.dll.]) | ||
478 | - app_cv_java="no" | 272 | + app_cv_pic="no" |
479 | fi | 273 | fi |
480 | - ;; | ||
481 | - | ||
482 | - *-apple-*) | ||
483 | - jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm" | ||
484 | - ;; | ||
485 | - | ||
486 | - *) | ||
487 | - jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm" | ||
488 | -esac | ||
489 | - | ||
490 | -if test -d "$jniinc"; then | ||
491 | - AC_MSG_NOTICE([Found $jniinc.]) | ||
492 | -else | ||
493 | - AC_MSG_NOTICE([Can't find $jniinc.]) | ||
494 | - app_cv_java="no" | ||
495 | -fi | ||
496 | - | ||
497 | -if test "$app_cv_java" = "yes" ; then | ||
498 | - | ||
499 | - EXTENSIONS="$EXTENSIONS java" | ||
500 | - PLUGINS="$PLUGINS j3270" | ||
501 | - AC_MSG_NOTICE([jdk is present and enabled.]) | ||
502 | - | ||
503 | - AC_CONFIG_FILES(src/java/Makefile) | ||
504 | - | ||
505 | -else | ||
506 | - | ||
507 | - AC_MSG_NOTICE([jdk is NOT present or disabled.]) | 274 | + esac |
275 | +]) | ||
508 | 276 | ||
277 | +if test "$app_cv_pic" == "yes"; then | ||
278 | + CFLAGS="$CFLAGS -fPIC" | ||
279 | + CXXFLAGS="$CXXFLAGS -fPIC" | ||
509 | fi | 280 | fi |
510 | 281 | ||
282 | +dnl --------------------------------------------------------------------------- | ||
283 | +dnl Lib3270 flags | ||
284 | +dnl --------------------------------------------------------------------------- | ||
511 | 285 | ||
512 | -AC_SUBST(JVM_LIBS,$jvm_libs) | 286 | +AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/src/include) |
513 | 287 | ||
514 | -AC_SUBST(JAVAC) | ||
515 | -AC_SUBST(JAVAH) | ||
516 | -AC_SUBST(JAVADOC) | ||
517 | -AC_SUBST(JVMDIR) | ||
518 | -AC_SUBST(jnidir) | ||
519 | -AC_SUBST(jvmjardir) | ||
520 | -AC_SUBST(javadocdir) | ||
521 | -AC_SUBST(JAR) | ||
522 | -AC_SUBST(jvm_arch) | ||
523 | -AC_SUBST(JDK_HOME) | ||
524 | -AC_SUBST(JRE_HOME) | ||
525 | -AC_SUBST(JNI_CPPFLAGS,"-I$JDK_HOME/include -I$jniinc") | ||
526 | - | ||
527 | -#--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ | 288 | +dnl --------------------------------------------------------------------------- |
289 | +dnl Check for headers | ||
290 | +dnl --------------------------------------------------------------------------- | ||
528 | 291 | ||
529 | AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) | 292 | AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) |
530 | 293 | ||
@@ -532,30 +295,11 @@ AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) ) | @@ -532,30 +295,11 @@ AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) ) | ||
532 | AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) | 295 | AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) |
533 | AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) ) | 296 | AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) ) |
534 | 297 | ||
535 | - | ||
536 | - | ||
537 | PKG_CHECK_EXISTS | 298 | PKG_CHECK_EXISTS |
538 | 299 | ||
539 | -#--[ Python ]----------------------------------------------------------------------------------------------------------------------------------------------- | ||
540 | - | ||
541 | -AC_ARG_ENABLE([python],[AS_HELP_STRING([--disable-python], [Disable python integration])],[ app_cv_python="$enableval" ],[ app_cv_python="yes" ]) | ||
542 | - | ||
543 | -if test "$app_cv_python" == "yes"; then | ||
544 | - | ||
545 | - PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1 ) | ||
546 | - | ||
547 | -fi | ||
548 | - | ||
549 | -AC_SUBST(PYTHON_LIBS) | ||
550 | -AC_SUBST(PYTHON_CFLAGS) | ||
551 | - | ||
552 | -if test "$app_have_python" == "1"; then | ||
553 | - AC_DEFINE(HAVE_PYTHON) | ||
554 | - EXTENSIONS="$EXTENSIONS python" | ||
555 | - AC_CONFIG_FILES(src/python/Makefile) | ||
556 | -fi | ||
557 | - | ||
558 | -#--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------ | 300 | +dnl --------------------------------------------------------------------------- |
301 | +dnl Check for GTK | ||
302 | +dnl --------------------------------------------------------------------------- | ||
559 | 303 | ||
560 | PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] ) | 304 | PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] ) |
561 | 305 | ||
@@ -564,375 +308,41 @@ AC_SUBST(GTK_CFLAGS) | @@ -564,375 +308,41 @@ AC_SUBST(GTK_CFLAGS) | ||
564 | AC_SUBST(GTK_VERSION) | 308 | AC_SUBST(GTK_VERSION) |
565 | AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`) | 309 | AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`) |
566 | 310 | ||
567 | -#--[ GLIB check ]--------------------------------------------------------------------------------------------------------------------------------------------- | 311 | +dnl --------------------------------------------------------------------------- |
312 | +dnl Check for GLIB | ||
313 | +dnl --------------------------------------------------------------------------- | ||
568 | 314 | ||
569 | PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB) ) | 315 | PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB) ) |
570 | AC_SUBST(GLIB_LIBS) | 316 | AC_SUBST(GLIB_LIBS) |
571 | AC_SUBST(GLIB_CFLAGS) | 317 | AC_SUBST(GLIB_CFLAGS) |
572 | 318 | ||
573 | -#--[ Check DBUS ]--------------------------------------------------------------------------------------------------------------------------------------------- | ||
574 | - | ||
575 | -PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) ) | ||
576 | -AC_SUBST(DBUS_LIBS) | ||
577 | -AC_SUBST(DBUS_CFLAGS) | ||
578 | - | ||
579 | -PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.]) ) | ||
580 | -AC_SUBST(GDBUS_LIBS) | ||
581 | -AC_SUBST(GDBUS_CFLAGS) | ||
582 | - | ||
583 | -if test "$app_cv_dbus" == "yes"; then | 319 | +dnl --------------------------------------------------------------------------- |
320 | +dnl Check for Libraries | ||
321 | +dnl --------------------------------------------------------------------------- | ||
584 | 322 | ||
585 | - AC_DEFINE(HAVE_DBUS) | ||
586 | - AC_CONFIG_FILES(src/plugins/dbus3270/Makefile) | ||
587 | - PLUGINS="$PLUGINS dbus3270" | ||
588 | - | ||
589 | -fi | ||
590 | - | ||
591 | -#--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- | ||
592 | - | ||
593 | -PKG_CHECK_MODULES( [LIBSSL], [openssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) | 323 | +PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) |
594 | 324 | ||
595 | AC_SUBST(LIBSSL_LIBS) | 325 | AC_SUBST(LIBSSL_LIBS) |
596 | AC_SUBST(LIBSSL_CFLAGS) | 326 | AC_SUBST(LIBSSL_CFLAGS) |
597 | 327 | ||
598 | -#--[ Libraries ]---------------------------------------------------------------------------------------------------------------------------------------------- | ||
599 | -PKG_CHECK_MODULES( [GTKMAC], [gtk-mac-integration], AC_DEFINE(HAVE_GTKMAC), AC_MSG_NOTICE([macosx integration not present.]) ) | ||
600 | -AC_SUBST(GTKMAC_LIBS) | ||
601 | -AC_SUBST(GTKMAC_CFLAGS) | ||
602 | - | ||
603 | -AC_SEARCH_LIBS( [sin], [m], AC_DEFINE(HAVE_LIBM), AC_MSG_NOTICE([libm not present.])) | ||
604 | -AC_SUBST(SOCKET_LIBS) | ||
605 | - | ||
606 | AC_SEARCH_LIBS([dlopen], [dl], AC_DEFINE(HAVE_LIBDL), AC_MSG_NOTICE([libdl not present.])) | 328 | AC_SEARCH_LIBS([dlopen], [dl], AC_DEFINE(HAVE_LIBDL), AC_MSG_NOTICE([libdl not present.])) |
607 | 329 | ||
608 | -#--[ PHP ]-------------------------------------------------------------------------------------------------------------------------------------------------- | ||
609 | - | ||
610 | -AC_ARG_WITH([php-config], [AS_HELP_STRING([--with-php-config], [Path to php-config tool])], [ PHPCONFIG="$withval" ],[ AC_PATH_TOOL(PHPCONFIG, php-config, , $PATH) ]) | ||
611 | - | ||
612 | -case "$host" in | ||
613 | - *-mingw32) | ||
614 | - AC_MSG_NOTICE([PHP disabled on windows platforms.]) | ||
615 | - ;; | ||
616 | - | ||
617 | - *-apple-*) | ||
618 | - AC_MSG_NOTICE([PHP disabled on apple platforms.]) | ||
619 | - ;; | ||
620 | - | ||
621 | - *) | ||
622 | - if test -z "${PHPCONFIG}"; then | ||
623 | - | ||
624 | - AC_MSG_NOTICE([Program php-config not found. Use --with-php-config=path to specify absolute path to the php-config tool.]) | ||
625 | - | ||
626 | - else | ||
627 | - | ||
628 | - AC_DEFINE(HAVE_PHP) | ||
629 | - EXTENSIONS="$EXTENSIONS php" | ||
630 | - PHPMAJOR=`$PHPCONFIG --version | cut -d. -f1` | ||
631 | - | ||
632 | - PHPCONFDIR=`$PHPCONFIG | sed "s@ @\n@g" | grep "^--with-config-file-scan-dir=" | cut -d= -f2` | ||
633 | - | ||
634 | - if test -z "${PHPCONFDIR}"; then | ||
635 | - | ||
636 | - if test -d /etc/php${PHPMAJOR}/conf.d; then | ||
637 | - PHPCONFDIR=/etc/php${PHPMAJOR}/conf.d | ||
638 | - elif test -d /etc/php/conf.d; then | ||
639 | - PHPCONFDIR=/etc/php/conf.d | ||
640 | - else | ||
641 | - PHPCONFDIR=/etc/php${PHPMAJOR}/cli | ||
642 | - fi | ||
643 | - | ||
644 | - AC_MSG_NOTICE([Using $PHPCONFDIR for PHP config files.]) | ||
645 | - | ||
646 | - else | ||
647 | - | ||
648 | - AC_MSG_NOTICE([Detected $PHPCONFDIR for PHP config files.]) | ||
649 | - | ||
650 | - fi | ||
651 | - | ||
652 | - AC_CONFIG_FILES(src/php/Makefile) | ||
653 | - AC_CONFIG_FILES(src/php/php3270.h) | ||
654 | - | ||
655 | - fi | ||
656 | - | ||
657 | -esac | ||
658 | - | ||
659 | -AC_SUBST(PHPCONFIG) | ||
660 | -AC_SUBST(PHPMAJOR) | ||
661 | -AC_SUBST(PHPCONFDIR) | ||
662 | - | ||
663 | - | ||
664 | -#--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- | ||
665 | - | ||
666 | -AC_PATH_TOOL([REXXC], [rexxc], [cp] ) | ||
667 | - | ||
668 | -AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx integration])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ]) | ||
669 | - | ||
670 | -if test "$app_cv_rexx" == "yes"; then | ||
671 | - | ||
672 | - AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) | ||
673 | - | ||
674 | - if test "$REXXCONFIG" != "no"; then | ||
675 | - app_cv_rexx='yes' | ||
676 | - REXX_CFLAGS=`$REXXCONFIG --cflags` | ||
677 | - REXX_LIBS=`$REXXCONFIG --libs` | ||
678 | - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx | ||
679 | - AC_MSG_NOTICE([Got settings from oorexx-config.]) | ||
680 | - else | ||
681 | - AC_MSG_NOTICE([Can't find oorexx-config.]) | ||
682 | - app_cv_rexx='no' | ||
683 | - fi | ||
684 | - | ||
685 | -fi | 330 | +dnl --------------------------------------------------------------------------- |
331 | +dnl Output config | ||
332 | +dnl --------------------------------------------------------------------------- | ||
686 | 333 | ||
687 | -if test "$app_cv_rexx" == "yes"; then | 334 | +AC_SUBST(BASEDIR,$ac_pwd) |
688 | 335 | ||
689 | - AC_DEFINE(HAVE_REXX) | ||
690 | - AC_DEFINE(HAVE_OOREXXAPI_H) | ||
691 | - | ||
692 | - PLUGINS="$PLUGINS rx3270" | ||
693 | - EXTENSIONS="$EXTENSIONS rexx" | ||
694 | - | ||
695 | - AC_CONFIG_FILES(src/plugins/rx3270/Makefile) | ||
696 | - | ||
697 | - AC_MSG_NOTICE([ooRexx plugin & extension are enabled.]) | ||
698 | -else | ||
699 | - AC_MSG_NOTICE([ooRexx is NOT present or disabled.]) | ||
700 | -fi | ||
701 | - | ||
702 | -AC_ARG_WITH([rexxlibdir], [AS_HELP_STRING([--with-rexxlibdir], [Path to rexx extension libs])], [ REXX_LIBDIR=$withval ],[ REXX_LIBDIR=$libdir ]) | ||
703 | - | ||
704 | -AC_SUBST(REXXC) | ||
705 | -AC_SUBST(REXXCONFIG) | ||
706 | -AC_SUBST(REXX_CFLAGS) | ||
707 | -AC_SUBST(REXX_LIBS) | ||
708 | -AC_SUBST(REXX_HOME) | ||
709 | -AC_SUBST(REXX_LIBDIR) | ||
710 | - | ||
711 | -#--[ Libreoffice ]-------------------------------------------------------------------------------------------------------------------------------------------- | ||
712 | - | ||
713 | -AC_ARG_ENABLE([office],[AS_HELP_STRING([--disable-office], [Disable libreoffice extension])],[ app_cv_office="$enableval" ],[ app_cv_office="yes" ]) | ||
714 | - | ||
715 | -AC_ARG_VAR([OFFICE_HOME], [Libreoffice home]) | ||
716 | -AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home]) | ||
717 | -AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home]) | ||
718 | - | ||
719 | -# Disabled due to problems with the latest libreoffice API. | ||
720 | -app_cv_office="no" | ||
721 | - | ||
722 | -#case "$host" in | ||
723 | -# *-mingw32) | ||
724 | -# app_cv_office="no" | ||
725 | -# ;; | ||
726 | -# | ||
727 | -# *-apple-*) | ||
728 | -# app_cv_office="no" | ||
729 | -# ;; | ||
730 | -# | ||
731 | -# *) | ||
732 | -# OO_LDFLAGS="-luno_cppu -luno_cppuhelpergcc3 -luno_salhelpergcc3" | ||
733 | -# | ||
734 | -# if test "_$OFFICE_HOME" == "_" ; then | ||
735 | -# if test "$host_cpu" = "x86_64"; then | ||
736 | -# OFFICE_HOME="/usr/lib64/libreoffice" | ||
737 | -# else | ||
738 | -# OFFICE_HOME="/usr/lib/libreoffice" | ||
739 | -# fi | ||
740 | -# fi | ||
741 | -# | ||
742 | -# if test "_$OO_SDK_HOME" == "_" ; then | ||
743 | -# OO_SDK_HOME=$OFFICE_HOME/sdk | ||
744 | -# fi | ||
745 | -# | ||
746 | -# if test "_$OO_SDK_URE_HOME" == "_" ; then | ||
747 | -# if test -d $OFFICE_HOME/ure; then | ||
748 | -# OO_SDK_URE_HOME="$OFFICE_HOME/ure" | ||
749 | -# elif test -d $OFFICE_HOME/program/types.rdb; then | ||
750 | -# OO_SDK_URE_HOME="$OFFICE_HOME/program" | ||
751 | -# else | ||
752 | -# if test "$host_cpu" = "x86_64"; then | ||
753 | -# OO_SDK_URE_HOME="/usr/lib64/ure" | ||
754 | -# else | ||
755 | -# OO_SDK_URE_HOME="/usr/lib/ure" | ||
756 | -# fi | ||
757 | -# fi | ||
758 | -# fi | ||
759 | -# | ||
760 | -#esac | ||
761 | - | ||
762 | -# Setup c++ compiler flags | ||
763 | -if test -d "$prefix/include/libreoffice"; then | ||
764 | - OO_CXXFLAGS="$OO_CXXFLAGS -I$prefix/include/libreoffice" | ||
765 | - AC_MSG_NOTICE([Found libreoffice includes at $prefix/include/libreoffice]) | ||
766 | -elif test -d "/usr/include/libreoffice"; then | ||
767 | - OO_CXXFLAGS="$OO_CXXFLAGS -I/usr/include/libreoffice" | ||
768 | - AC_MSG_NOTICE([Found libreoffice includes at /usr/include/libreoffice]) | ||
769 | -elif test -d "$OO_SDK_HOME/include"; then | ||
770 | - OO_CXXFLAGS="$OO_CXXFLAGS -I$OO_SDK_HOME/include" | ||
771 | - AC_MSG_NOTICE([Found libreoffice includes at $OO_SDK_HOME/include]) | ||
772 | -else | ||
773 | - app_cv_office="no" | ||
774 | - AC_MSG_NOTICE([Can't libreoffice includes]) | ||
775 | -fi | ||
776 | - | ||
777 | -OO_CXXFLAGS="-DCPPU_ENV=gcc3 -Wno-strict-aliasing $OO_CXXFLAGS" | ||
778 | - | ||
779 | -# Test for IDL files | ||
780 | -if test -d "$OO_SDK_HOME/idl"; then | ||
781 | - IDLDIR="$OO_SDK_HOME/idl" | ||
782 | - AC_MSG_NOTICE([Found idl at $IDLDIR]) | ||
783 | -elif test -d "/usr/share/idl/libreoffice"; then | ||
784 | - IDLDIR="/usr/share/idl/libreoffice" | ||
785 | - AC_MSG_NOTICE([Found idl at $IDLDIR]) | ||
786 | -elif test -d "$libdir/libreoffice/sdk/idl"; then | ||
787 | - IDLDIR="$libdir/libreoffice/sdk/idl" | ||
788 | - AC_MSG_NOTICE([Found idl at $IDLDIR]) | ||
789 | -else | ||
790 | - app_cv_office="no" | ||
791 | - AC_MSG_NOTICE([Can't find idl path]) | ||
792 | -fi | ||
793 | - | ||
794 | -AC_PATH_TOOL([IDLC], idlc, "no", path=$PATH:$OO_SDK_HOME/bin) | ||
795 | -if test "$IDLC" == "no" ; then | ||
796 | - app_cv_office="no" | ||
797 | -fi | ||
798 | - | ||
799 | -AC_PATH_TOOL([UNOPKG], unopkg, "no", path=$PATH:$OO_SDK_HOME/bin) | ||
800 | -if test "$UNOPKG" == "no" ; then | ||
801 | - app_cv_office="no" | ||
802 | -fi | ||
803 | - | ||
804 | -AC_PATH_TOOL([REGMERGE], regmerge, "no", path=$PATH:$OO_SDK_URE_HOME/bin:$OFFICE_HOME/program) | ||
805 | -if test "$REGMERGE" == "no" ; then | ||
806 | - app_cv_office="no" | ||
807 | -fi | ||
808 | - | ||
809 | -AC_PATH_TOOL([CPPUMAKER], cppumaker, "no", path=$PATH:$OO_SDK_HOME/bin) | ||
810 | -if test "$CPPUMAKER" == "no" ; then | ||
811 | - app_cv_office="no" | ||
812 | -fi | ||
813 | - | ||
814 | -AC_PATH_TOOL([UNO], uno, "no", path=$PATH:$OO_SDK_URE_HOME/bin:$OFFICE_HOME/program) | ||
815 | -if test "$UNO" == "no" ; then | ||
816 | - app_cv_office="no" | ||
817 | -fi | ||
818 | - | ||
819 | -# Check for OO_SDK_HOME | ||
820 | -if test "_$OO_SDK_HOME" == "_" ; then | ||
821 | - app_cv_office="no" | ||
822 | -fi | ||
823 | - | ||
824 | -# Check for OFFICE_HOME | ||
825 | -if test "_$OFFICE_HOME" == "_" ; then | ||
826 | - app_cv_office="no" | ||
827 | -fi | ||
828 | - | ||
829 | -# Find types.rdb | ||
830 | -if test -e "$OO_SDK_URE_HOME/share/misc/types.rdb"; then | ||
831 | - OO_TYPES=$OO_SDK_URE_HOME/share/misc/types.rdb | ||
832 | -elif test -e "$OFFICE_HOME/program/types.rdb"; then | ||
833 | - OO_TYPES=$OFFICE_HOME/program/types.rdb | ||
834 | -else | ||
835 | - app_cv_office="no" | ||
836 | - AC_MSG_NOTICE([Can't find types.rdb]) | ||
837 | -fi | ||
838 | - | ||
839 | -# Set targets | ||
840 | -if test "$app_cv_office" == "yes" ; then | ||
841 | - | ||
842 | - AC_MSG_NOTICE([Found $OO_TYPES]) | ||
843 | - | ||
844 | - AC_MSG_NOTICE([libreoffice sdk is present.]) | ||
845 | - EXTENSIONS="$EXTENSIONS oxt" | ||
846 | - | ||
847 | - AC_CONFIG_FILES(src/loffice/Makefile) | ||
848 | - AC_CONFIG_FILES(src/loffice/description.xml) | ||
849 | - AC_CONFIG_FILES(src/loffice/manifest.xml) | ||
850 | - | ||
851 | - | ||
852 | -else | ||
853 | - | ||
854 | - AC_MSG_NOTICE([libreoffice sdk is NOT present or disabled.]) | ||
855 | - | ||
856 | -fi | ||
857 | - | ||
858 | -AC_SUBST(OFFICE_HOME) | ||
859 | -AC_SUBST(OO_SDK_HOME) | ||
860 | -AC_SUBST(OO_SDK_URE_HOME) | ||
861 | -AC_SUBST(IDLDIR) | ||
862 | -AC_SUBST(OO_CXXFLAGS) | ||
863 | -AC_SUBST(OO_LDFLAGS) | ||
864 | -AC_SUBST(OO_TYPES) | ||
865 | - | ||
866 | -#--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- | ||
867 | -AC_SUBST(LIB3270_REQUIRES) | ||
868 | - | ||
869 | -#--[ Misc options ]------------------------------------------------------------------------------------------------------------------------------------------- | ||
870 | - | ||
871 | -if test "$app_cv_registry" == "yes"; then | ||
872 | - AC_DEFINE(HAVE_WIN_REGISTRY) | ||
873 | -fi | ||
874 | - | ||
875 | -AC_SUBST(MAJOR_VERSION,"$(echo $PACKAGE_VERSION | cut -d. -f1)") | ||
876 | -AC_SUBST(MINOR_VERSION,"$(echo $PACKAGE_VERSION | cut -d. -f2)") | ||
877 | -AC_SUBST(HOST_CC) | ||
878 | -AC_SUBST(EXEEXT) | ||
879 | -AC_SUBST(DLLPREFIX) | ||
880 | -AC_SUBST(DLLEXT) | ||
881 | -AC_SUBST(DLL_FLAGS) | ||
882 | -AC_SUBST(SYSDLL_FLAGS) | ||
883 | -AC_SUBST(DLL_CFLAGS) | ||
884 | -AC_SUBST(DLLDIR) | ||
885 | -AC_SUBST(DLLPREFIX) | ||
886 | -AC_SUBST(LDSOFLAGS) | ||
887 | -AC_SUBST(LDAPPFLAGS) | ||
888 | -AC_SUBST(LDLIBFLAGS) | ||
889 | -AC_SUBST(DBGRPATH) | ||
890 | -AC_SUBST(DBGCMDPREFIX) | ||
891 | -AC_SUBST(LDARCH) | ||
892 | -AC_SUBST(PLUGINS) | ||
893 | -AC_SUBST(EXTENSIONS) | ||
894 | -AC_SUBST(APP_GUI_SRC) | ||
895 | - | ||
896 | -AC_SUBST(RLS_LDFLAGS) | ||
897 | -AC_SUBST(CLASS_LIBS) | ||
898 | - | ||
899 | -#--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- | ||
900 | - | ||
901 | -AC_CONFIG_FILES(Makefile) | ||
902 | -AC_CONFIG_FILES(lib3270.pc) | ||
903 | -AC_CONFIG_FILES(pw3270.pc) | ||
904 | -AC_CONFIG_FILES(versions) | ||
905 | - | ||
906 | -AC_CONFIG_FILES(src/include/rules.mak) | ||
907 | -AC_CONFIG_FILES(src/include/plugin.mak) | ||
908 | - | ||
909 | -AC_CONFIG_FILES(src/lib3270/mkversion.sh) | 336 | +dnl --------------------------------------------------------------------------- |
337 | +dnl Configure which files to generate. | ||
338 | +dnl --------------------------------------------------------------------------- | ||
910 | 339 | ||
911 | AC_CONFIG_FILES(src/lib3270/Makefile) | 340 | AC_CONFIG_FILES(src/lib3270/Makefile) |
912 | -AC_CONFIG_FILES(src/pw3270/Makefile) | ||
913 | -AC_CONFIG_FILES(src/pw3270/uiparser/Makefile) | ||
914 | -AC_CONFIG_FILES(src/pw3270/v3270ft/Makefile) | ||
915 | -AC_CONFIG_FILES(src/tools/Makefile) | ||
916 | - | ||
917 | -AC_CONFIG_FILES(src/classlib/Makefile) | ||
918 | -AC_CONFIG_FILES(src/classlib/class.mak) | ||
919 | - | ||
920 | -AC_CONFIG_FILES(man/Makefile) | ||
921 | -AC_CONFIG_FILES(src/sample/Makefile) | ||
922 | - | ||
923 | - | ||
924 | -case "$host" in | ||
925 | - *-mingw32) | ||
926 | - ;; | ||
927 | - | ||
928 | - *-apple-*) | ||
929 | - ;; | ||
930 | - | ||
931 | - *) | ||
932 | - ;; | ||
933 | -esac | ||
934 | - | ||
935 | - | 341 | +dnl AC_CONFIG_FILES(Makefile) |
936 | 342 | ||
343 | +dnl --------------------------------------------------------------------------- | ||
937 | dnl Output the generated config.status script. | 344 | dnl Output the generated config.status script. |
345 | +dnl --------------------------------------------------------------------------- | ||
938 | AC_OUTPUT | 346 | AC_OUTPUT |
347 | + | ||
348 | + |
src/lib3270/Makefile.in
@@ -22,201 +22,115 @@ | @@ -22,201 +22,115 @@ | ||
22 | # | 22 | # |
23 | # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) | 23 | # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) |
24 | # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) | 24 | # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) |
25 | -# licinio@bb.com.br (Licínio Luis Branco) | ||
26 | -# kraucer@bb.com.br (Kraucer Fernandes Mazuco) | ||
27 | # | 25 | # |
28 | 26 | ||
29 | -PACKAGE=@PACKAGE_NAME@ | ||
30 | -PACKAGE_VERSION=@PACKAGE_VERSION@ | 27 | +LIBNAME=lib3270@DLLEXT@ |
28 | + | ||
29 | +SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ | ||
30 | + iocalls.c connect.c \ | ||
31 | + host.c sf.c ansi.c resolver.c charset.c \ | ||
32 | + version.c session.c state.c html.c trace_ds.c see.c \ | ||
33 | + paste.c ssl.c actions.c \ | ||
34 | + ft.c ft_cut.c ft_dft.c glue.c resources.c \ | ||
35 | + rpq.c macros.c fallbacks.c log.c options.c | ||
31 | 36 | ||
32 | -DEBUG_CFLAGS=-DDEBUG=1 -g -Wall | ||
33 | -DEPENDS ?= *.h ../include/*.h ../include/lib3270/*.h Makefile | 37 | +#---[ Configuration values ]------------------------------------------------------------- |
34 | 38 | ||
35 | -#---[ Paths ]------------------------------------------------------------------ | 39 | +PACKAGE_NAME=@PACKAGE_NAME@ |
40 | +PACKAGE_VERSION=@PACKAGE_VERSION@ | ||
41 | +PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
36 | 42 | ||
37 | prefix=@prefix@ | 43 | prefix=@prefix@ |
38 | exec_prefix=@exec_prefix@ | 44 | exec_prefix=@exec_prefix@ |
45 | +bindir=@bindir@ | ||
46 | +sbindir=@sbindir@ | ||
39 | libdir=@libdir@ | 47 | libdir=@libdir@ |
40 | -includedir=@includedir@ | ||
41 | -localedir=@localedir@ | ||
42 | -datarootdir=@datarootdir@ | ||
43 | -sysconfdir=@sysconfdir@ | ||
44 | 48 | ||
45 | -#---[ Tools ]------------------------------------------------------------------ | 49 | +BASEDIR=@BASEDIR@ |
46 | 50 | ||
47 | -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -I../include | ||
48 | -SSL_CFLAGS=@LIBSSL_CFLAGS@ | 51 | +OBJDIR=$(BASEDIR)/.obj/lib3270 |
52 | +OBJDBG=$(OBJDIR)/Debug | ||
53 | +OBJRLS=$(OBJDIR)/Release | ||
49 | 54 | ||
50 | -DLL_FLAGS=@DLL_FLAGS@ | ||
51 | -LDFLAGS=@LDFLAGS@ | 55 | +BINDIR=$(BASEDIR)/.bin |
56 | +BINDBG=$(BINDIR)/Debug | ||
57 | +BINRLS=$(BINDIR)/Release | ||
52 | 58 | ||
53 | -LIBS=@LIBS@ @LIBSSL_LIBS@ @INTL_LIBS@ @SOCKET_LIBS@ @LIBICONV@ | 59 | +INSTALL=@INSTALL@ |
60 | +INSTALL_DATA=@INSTALL_DATA@ | ||
61 | +INSTALL_PROGRAM=@INSTALL_PROGRAM@ | ||
54 | 62 | ||
55 | -#---[ Tools ]------------------------------------------------------------------ | 63 | +LN_S=@LN_S@ |
56 | 64 | ||
65 | +AMTAR=@AMTAR@ | ||
66 | +SHELL=@SHELL@ | ||
57 | MKDIR=@MKDIR_P@ | 67 | MKDIR=@MKDIR_P@ |
68 | + | ||
58 | CC=@CC@ | 69 | CC=@CC@ |
59 | LD=@CC@ | 70 | LD=@CC@ |
60 | -HOST_CC=@HOST_CC@ | ||
61 | -STRIP=@STRIP@ | ||
62 | -INSTALL=@INSTALL@ | ||
63 | -INSTALL_PROGRAM=$(INSTALL) -m 755 | ||
64 | -INSTALL_DATA=$(INSTALL) -m 644 | ||
65 | -VALGRIND=@VALGRIND@ | ||
66 | -XGETTEXT=@XGETTEXT@ | ||
67 | -MSGCAT=@MSGCAT@ | ||
68 | -LN_S=@LN_S@ -f | ||
69 | - | ||
70 | -#---[ ]------------------------------------------------------------------ | ||
71 | - | ||
72 | -OBJEXT=.o | ||
73 | 71 | ||
74 | -#---[ Paths ]------------------------------------------------------------------ | ||
75 | - | ||
76 | -ROOTDIR ?= . | ||
77 | -OBJDIR ?= $(ROOTDIR)/.obj | ||
78 | -BINDIR ?= $(ROOTDIR)/.bin | ||
79 | -TMPDIR ?= $(ROOTDIR)/.tmp | ||
80 | -DEPENDS ?= *.h Makefile | 72 | +CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@ |
73 | +LIBS=@LIBS@ @LIBSSL_LIBS@ | ||
74 | +LDFLAGS=@LDFLAGS@ | ||
81 | 75 | ||
82 | -BINDBG ?= $(BINDIR)/Debug | ||
83 | -BINRLS ?= $(BINDIR)/Release | ||
84 | -LIBDBG ?= $(BINDIR)/Debug@DLLDIR@ | 76 | +#---[ Rules ]---------------------------------------------------------------------------- |
85 | 77 | ||
86 | -OBJDBG = $(OBJDIR)/Debug | ||
87 | -OBJRLS = $(OBJDIR)/Release | ||
88 | -LIBRLS = $(OBJDIR)/Release@DLLDIR@ | 78 | +DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h *.h Makefile |
89 | 79 | ||
90 | -#---[ Rules ]------------------------------------------------------------------ | 80 | +$(OBJDBG)/%.o: \ |
81 | + %.c \ | ||
82 | + $(DEPENDS) | ||
91 | 83 | ||
92 | -$(OBJDBG)/%.o: %.c $(DEPENDS) | ||
93 | - @echo " CC `basename $@`" | 84 | + @echo $< ... |
94 | @$(MKDIR) `dirname $@` | 85 | @$(MKDIR) `dirname $@` |
95 | - @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< | 86 | + @$(CC) $(CFLAGS) \ |
87 | + @DBG_CFLAGS@ \ | ||
88 | + -DBUILD_DATE=`date +"0x%Y%m%d"`\ | ||
89 | + -o $@ -c $< | ||
96 | 90 | ||
97 | -$(OBJRLS)/%.o: %.c $(DEPENDS) | ||
98 | - @echo " CC `basename $@`" | ||
99 | - @$(MKDIR) `dirname $@` | ||
100 | - @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< | 91 | +$(OBJRLS)/%.o: \ |
92 | + %.cc \ | ||
93 | + $(DEPENDS) | ||
101 | 94 | ||
102 | -$(TMPDIR)/pot/%.pot: %.c | ||
103 | - @echo " TEXT `basename $@`" | 95 | + @echo $< ... |
104 | @$(MKDIR) `dirname $@` | 96 | @$(MKDIR) `dirname $@` |
105 | - @$(XGETTEXT) --default-domain=$(PACKAGE) --language=C \ | ||
106 | - --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $< | ||
107 | - @touch $@ | 97 | + @$(CXX) $(CFLAGS) \ |
98 | + @RLS_CFLAGS@ \ | ||
99 | + -DBUILD_DATE=`date +"0x%Y%m%d"` \ | ||
100 | + -o $@ -c $< | ||
108 | 101 | ||
109 | 102 | ||
110 | -#---[ Sources ]---------------------------------------------------------------- | 103 | +#---[ Release Targets ]------------------------------------------------------------------ |
111 | 104 | ||
112 | -include sources.mak | ||
113 | - | ||
114 | -#---[ Misc targets ]----------------------------------------------------------- | 105 | +all: \ |
106 | + $(BINRLS)/$(LIBNAME) | ||
115 | 107 | ||
116 | Release: \ | 108 | Release: \ |
117 | - $(BINRLS)/lib3270@DLLEXT@ | ||
118 | - | ||
119 | -install: \ | ||
120 | - Release | 109 | + $(BINRLS)/$(LIBNAME) |
121 | 110 | ||
122 | - $(MKDIR) $(DESTDIR)$(libdir) | ||
123 | - $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir) | ||
124 | - $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@ | ||
125 | - $(LN_S) lib3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@ | 111 | +#---[ Debug Targets ]-------------------------------------------------------------------- |
126 | 112 | ||
127 | Debug: \ | 113 | Debug: \ |
128 | - $(BINDBG)/lib3270@DLLEXT@ | 114 | + $(BINDBG)/$(LIBNAME) |
129 | 115 | ||
130 | -$(BINDBG)/lib3270@DLLEXT@: \ | ||
131 | - $(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION) | 116 | +$(BINDBG)/$(LIBNAME): \ |
117 | + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ | ||
132 | 118 | ||
133 | - @rm -f $@ | ||
134 | - @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@ | ||
135 | - | ||
136 | -$(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION): \ | ||
137 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) | ||
138 | - | ||
139 | - @echo " CCLD `basename $@`" | 119 | + @echo $(basename $@) ... |
140 | @$(MKDIR) `dirname $@` | 120 | @$(MKDIR) `dirname $@` |
141 | - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) | ||
142 | - | ||
143 | -$(BINRLS)/lib3270@DLLEXT@: \ | ||
144 | - $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) | ||
145 | - | ||
146 | - @rm -f $@ | ||
147 | - @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@ | 121 | + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $@ |
148 | 122 | ||
149 | -$(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION): \ | ||
150 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) | 123 | +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ |
124 | + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ | ||
151 | 125 | ||
152 | - @echo " CCLD `basename $@`" | 126 | + @echo $(basename $@) ... |
153 | @$(MKDIR) `dirname $@` | 127 | @$(MKDIR) `dirname $@` |
154 | - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS) | ||
155 | - @$(STRIP) $@ | 128 | + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@ |
156 | 129 | ||
157 | -$(BINDBG)/testprogram$(EXEEXT): \ | ||
158 | - $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) | 130 | +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ |
131 | + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) | ||
159 | 132 | ||
160 | - @echo " CCLD `basename $@`" | 133 | + @echo $(basename $@) ... |
161 | @$(MKDIR) `dirname $@` | 134 | @$(MKDIR) `dirname $@` |
162 | - @$(LD) -o $@ $^ $(LIBS) | ||
163 | - | ||
164 | -$(BINDIR)/pot/lib3270.pot: \ | ||
165 | - $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot) | ||
166 | - | ||
167 | - @rm -f $@ | ||
168 | - @mkdir -p `dirname $@` | ||
169 | - @$(MSGCAT) --sort-output $^ > $@ | ||
170 | - | ||
171 | -test: \ | ||
172 | - $(BINDBG)/testprogram$(EXEEXT) | ||
173 | - | ||
174 | -run: \ | ||
175 | - $(BINDBG)/testprogram$(EXEEXT) | ||
176 | - | ||
177 | -ifeq ($(VALGRIND),no) | ||
178 | - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDBG)/testprogram$(EXEEXT)" | ||
179 | -else | ||
180 | - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=valgrind.suppression --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT) | ||
181 | -endif | ||
182 | - | ||
183 | -memchk: \ | ||
184 | - $(BINDBG)/testprogram$(EXEEXT) | ||
185 | - | ||
186 | -ifeq ($(VALGRIND),no) | ||
187 | - @cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT) | ||
188 | -else | ||
189 | - @cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT) | ||
190 | -endif | ||
191 | - | ||
192 | -version.c: \ | ||
193 | - ./mkversion.sh | ||
194 | - | ||
195 | - @echo " GEN $@" | ||
196 | - @chmod +x ./mkversion.sh | ||
197 | - @./mkversion.sh | ||
198 | - | ||
199 | -fallbacks.c: \ | ||
200 | - X3270.xad mkfb.c | ||
201 | - | ||
202 | - @echo " GEN $@" | ||
203 | - @$(MKDIR) $(BINDIR) | ||
204 | - @$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c | ||
205 | - @$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ | ||
206 | - | ||
207 | -cleantest: \ | ||
208 | - clean | ||
209 | - | ||
210 | -cleanDebug: \ | ||
211 | - clean | ||
212 | - | ||
213 | -clean: | ||
214 | - @rm -fr .obj | ||
215 | - @rm -fr .bin | ||
216 | - @rm -fr .tmp | ||
217 | - @rm -f *.log | ||
218 | - @rm -f version.c | ||
219 | - @rm -f fallbacks.c | ||
220 | - @rm -f lib3270.pot | ||
221 | - @rm -fr debian | 135 | + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) |
222 | 136 |