Commit 314d3de2eaff797fa3dea81ca8ab9c546cb15698
1 parent
1063c27b
Exists in
master
and in
1 other branch
Adding lib3270 options on the v3270 configuration.
Showing
4 changed files
with
32 additions
and
49 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | #---[ Library configuration ]------------------------------------------------------------ |
| 28 | 28 | |
| 29 | 29 | SONAME=@SONAME@ |
| 30 | -LIBNAME=libv@LIB3270_NAME@ | |
| 30 | +LIBNAME=libv3270 | |
| 31 | 31 | |
| 32 | 32 | SOURCES= \ |
| 33 | 33 | $(wildcard src/terminal/*.c) \ |
| ... | ... | @@ -320,7 +320,7 @@ install-dev: \ |
| 320 | 320 | # Install PKG-CONFIG files |
| 321 | 321 | @mkdir -p $(DESTDIR)$(libdir)/pkgconfig |
| 322 | 322 | @$(INSTALL_DATA) \ |
| 323 | - libv3270.pc \ | |
| 323 | + sdk/libv3270.pc \ | |
| 324 | 324 | $(DESTDIR)$(libdir)/pkgconfig/libv3270.pc |
| 325 | 325 | |
| 326 | 326 | # Install translation files | ... | ... |
configure.ac
| ... | ... | @@ -178,6 +178,21 @@ AC_SUBST(RPQ_REVISION,$rpq_revision) |
| 178 | 178 | AC_SUBST(SCCS_USER,$USER) |
| 179 | 179 | AC_SUBST(SCCS_DATE,$sccs_date) |
| 180 | 180 | |
| 181 | +case "$host" in | |
| 182 | + *-mingw32|*-pc-msys) | |
| 183 | + AC_SUBST(SONAME,libv3270.dll) | |
| 184 | + ;; | |
| 185 | + | |
| 186 | + s390x-*) | |
| 187 | + AC_SUBST(SONAME,libv3270.so) | |
| 188 | + ;; | |
| 189 | + | |
| 190 | + *) | |
| 191 | + AC_SUBST(SONAME,libv3270.so.$app_vrs_major.$app_vrs_minor) | |
| 192 | + | |
| 193 | +esac | |
| 194 | + | |
| 195 | + | |
| 181 | 196 | dnl --------------------------------------------------------------------------- |
| 182 | 197 | dnl Check for libm (Required for spinner) |
| 183 | 198 | dnl --------------------------------------------------------------------------- |
| ... | ... | @@ -285,36 +300,6 @@ if test "$app_cv_pic" == "yes"; then |
| 285 | 300 | fi |
| 286 | 301 | |
| 287 | 302 | dnl --------------------------------------------------------------------------- |
| 288 | -dnl Lib3270 flags | |
| 289 | -dnl --------------------------------------------------------------------------- | |
| 290 | - | |
| 291 | - | |
| 292 | -AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ]) | |
| 293 | - | |
| 294 | -AC_DEFINE(LIB3270_NAME,$app_cv_libname) | |
| 295 | -AC_SUBST(LIB3270_NAME,$app_cv_libname) | |
| 296 | - | |
| 297 | - | |
| 298 | -case "$host" in | |
| 299 | - *-mingw32|*-pc-msys) | |
| 300 | - AC_SUBST(SONAME,libv$app_cv_libname.dll) | |
| 301 | - ;; | |
| 302 | - | |
| 303 | - s390x-*) | |
| 304 | - AC_SUBST(SONAME,libv$app_cv_libname.so) | |
| 305 | - ;; | |
| 306 | - | |
| 307 | - *) | |
| 308 | - AC_SUBST(SONAME,libv$app_cv_libname.so.$app_vrs_major.$app_vrs_minor) | |
| 309 | - | |
| 310 | -esac | |
| 311 | - | |
| 312 | -AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ]) | |
| 313 | - | |
| 314 | -AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion) | |
| 315 | -AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) | |
| 316 | - | |
| 317 | -dnl --------------------------------------------------------------------------- | |
| 318 | 303 | dnl Check for headers |
| 319 | 304 | dnl --------------------------------------------------------------------------- |
| 320 | 305 | |
| ... | ... | @@ -356,7 +341,7 @@ dnl Configure which files to generate. |
| 356 | 341 | dnl --------------------------------------------------------------------------- |
| 357 | 342 | |
| 358 | 343 | AC_CONFIG_FILES(Makefile) |
| 359 | -AC_CONFIG_FILES(libv3270.pc) | |
| 344 | +AC_CONFIG_FILES(sdk/libv3270.pc) | |
| 360 | 345 | AC_CONFIG_FILES(glade/v3270.xml) |
| 361 | 346 | |
| 362 | 347 | dnl --------------------------------------------------------------------------- | ... | ... |
libv3270.pc.in
| ... | ... | @@ -1,16 +0,0 @@ |
| 1 | -prefix=@prefix@ | |
| 2 | -exec_prefix=@exec_prefix@ | |
| 3 | -libdir=@libdir@ | |
| 4 | -includedir=@includedir@ | |
| 5 | - | |
| 6 | -version_major=@PACKAGE_MAJOR_VERSION@ | |
| 7 | -version_minor=@PACKAGE_MINOR_VERSION@ | |
| 8 | -sdk_version=@LIB3270_SDK_VERSION@ | |
| 9 | - | |
| 10 | -Name: @PACKAGE_NAME@ | |
| 11 | -Description: @PACKAGE_DESCRIPTION@ | |
| 12 | -Version: @PACKAGE_VERSION@ | |
| 13 | -Libs: -L\@libdir@ -lv@LIB3270_NAME@ | |
| 14 | -Libs.private: -l@LIB3270_NAME@ | |
| 15 | -Cflags: -I@includedir@ | |
| 16 | - |
| ... | ... | @@ -0,0 +1,14 @@ |
| 1 | +prefix=@prefix@ | |
| 2 | +exec_prefix=@exec_prefix@ | |
| 3 | +libdir=@libdir@ | |
| 4 | +includedir=@includedir@ | |
| 5 | + | |
| 6 | +version_major=@PACKAGE_MAJOR_VERSION@ | |
| 7 | +version_minor=@PACKAGE_MINOR_VERSION@ | |
| 8 | + | |
| 9 | +Name: @PACKAGE_NAME@ | |
| 10 | +Description: @PACKAGE_DESCRIPTION@ | |
| 11 | +Version: @PACKAGE_VERSION@ | |
| 12 | +Libs: -L\@libdir@ -lv3270 @LIB3270_LIBS@ | |
| 13 | +Cflags: -I@includedir@ | |
| 14 | + | ... | ... |