From 20f62411a86e07cecf55b826ebb0112cd279f52c Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 4 Nov 2004 15:18:51 +0000 Subject: [PATCH] Portability Alpha_OSF(CCRT) --- salome_adm/unix/config_files/check_Kernel.m4 | 7 ++++--- salome_adm/unix/make_conclude.in | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/salome_adm/unix/config_files/check_Kernel.m4 b/salome_adm/unix/config_files/check_Kernel.m4 index ce2e458c9..9b675118c 100644 --- a/salome_adm/unix/config_files/check_Kernel.m4 +++ b/salome_adm/unix/config_files/check_Kernel.m4 @@ -13,7 +13,7 @@ AC_ARG_WITH(kernel, [ --with-kernel=DIR root directory path of KERNEL installation ], KERNEL_DIR="$withval",KERNEL_DIR="") -if test "x$KERNEL_DIR" == "x" ; then +if test "x$KERNEL_DIR" = "x" ; then # no --with-kernel-dir option used @@ -38,11 +38,12 @@ fi if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then Kernel_ok=yes AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR}) + AC_MSG_RESULT(Using STDLIB as ${STDLIB}) - if test "x$KERNEL_ROOT_DIR" == "x" ; then + if test "x$KERNEL_ROOT_DIR" = "x" ; then KERNEL_ROOT_DIR=${KERNEL_DIR} fi - if test "x$KERNEL_SITE_DIR" == "x" ; then + if test "x$KERNEL_SITE_DIR" = "x" ; then KERNEL_SITE_DIR=${KERNEL_ROOT_DIR} fi AC_SUBST(KERNEL_ROOT_DIR) diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index cc2fb2be6..510407cf5 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -58,8 +58,8 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ $(patsubst %.la, %.so, $@).0 || true - if ! test -z $(LIB_SWIG) ; then \ - ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\ + if test "X$(LIB_SWIG)" != X; then \ + ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true; \ fi; $(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a @@ -144,7 +144,7 @@ install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ fi; \ done - @if ! test -z $(LIB_SWIG) ; then \ + @if test "X$(LIB_SWIG)" != X; then \ (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ fi; @for f in X $(BIN); do \ -- 2.39.2