Fix for build failure on ppc,ppc64,ia64
This commit is contained in:
parent
bdbacf0a91
commit
0320a7c9b6
@ -35,13 +35,13 @@ EXTRA_DIST = include include/*.h \
|
|||||||
doc/*txt doc/*.pdf \
|
doc/*txt doc/*.pdf \
|
||||||
Readme*.txt autogen.sh
|
Readme*.txt autogen.sh
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = lib64
|
CASALIBDIR = lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = lib
|
CASALIBDIR = lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASABINDIR = bin64
|
CASABINDIR = bin64
|
||||||
else
|
else
|
||||||
CASABINDIR = bin
|
CASABINDIR = bin
|
||||||
|
@ -33,7 +33,7 @@ DIST_SUBDIRS =
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -59,7 +59,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
|
|||||||
LIBS = -lpthread -lc -lpam -lcasa_auth_token
|
LIBS = -lpthread -lc -lpam -lcasa_auth_token
|
||||||
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG)
|
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ DIST_SUBDIRS =
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -64,7 +64,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
|
|||||||
LIBS = -lpthread -lc -lgssapi
|
LIBS = -lpthread -lc -lgssapi
|
||||||
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ DIST_SUBDIRS =
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -59,7 +59,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
|
|||||||
LIBS = -lpthread -lc -ldl
|
LIBS = -lpthread -lc -ldl
|
||||||
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -32,7 +32,7 @@ DIST_SUBDIRS = ad_kw ad_gk ad_ff
|
|||||||
|
|
||||||
CASAROOT = ..
|
CASAROOT = ..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -71,7 +71,7 @@ CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/ad_gk/$(TARGET_CFG) $(srcdir)
|
|||||||
$(srcdir)/ad_ff/$(TARGET_CFG)
|
$(srcdir)/ad_ff/$(TARGET_CFG)
|
||||||
|
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -58,7 +58,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =
|
CS_LIBS =
|
||||||
CS_LIBPATH =
|
CS_LIBPATH =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = $(CXXFILES) *.h
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -72,13 +72,13 @@ LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
|
|||||||
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
|
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
|
||||||
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
|
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64
|
EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64
|
||||||
else
|
else
|
||||||
EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib
|
EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -57,7 +57,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =
|
CS_LIBS =
|
||||||
CS_LIBPATH =
|
CS_LIBPATH =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -32,7 +32,7 @@ DIST_SUBDIRS =
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -51,7 +51,7 @@ MODULE_EXT = so
|
|||||||
|
|
||||||
CFILES = $(srcdir)/ad_gk.c
|
CFILES = $(srcdir)/ad_gk.c
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
LIBDIR = lib64
|
LIBDIR = lib64
|
||||||
else
|
else
|
||||||
LIBDIR = lib
|
LIBDIR = lib
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -59,7 +59,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =
|
CS_LIBS =
|
||||||
CS_LIBPATH =
|
CS_LIBPATH =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = $(CXXFILES) $(CXX_MOC_FILES) *.h
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -70,7 +70,7 @@ LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
|
|||||||
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
|
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
|
||||||
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
|
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
EXTRA_LDFLAGS = -L/usr/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \
|
EXTRA_LDFLAGS = -L/usr/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \
|
||||||
-lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -lqt-mt
|
-lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -lqt-mt
|
||||||
else
|
else
|
||||||
@ -78,7 +78,7 @@ EXTRA_LDFLAGS = -L/usr/lib -lpthread -lc -ldl -L/opt/kde3/lib -lkwalletclient \
|
|||||||
-lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib -lqt-mt
|
-lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib -lqt-mt
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = $(CFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -58,7 +58,7 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
|
|||||||
LIBS = -lpthread -lc -ldl
|
LIBS = -lpthread -lc -ldl
|
||||||
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -40,13 +40,13 @@ EXTRA_DIST = $(CSFILES) *.sh CASAManager.* help/en/*.htm help/en/*.gif \
|
|||||||
|
|
||||||
CASAROOT = ..
|
CASAROOT = ..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64/$(TARGET_CFG)
|
CASALIBDIR = $(CASAROOT)/lib64/$(TARGET_CFG)
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib/$(TARGET_CFG)
|
CASALIBDIR = $(CASAROOT)/lib/$(TARGET_CFG)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASABINDIR = $(CASAROOT)/bin64
|
CASABINDIR = $(CASAROOT)/bin64
|
||||||
else
|
else
|
||||||
CASABINDIR = $(CASAROOT)/bin
|
CASABINDIR = $(CASAROOT)/bin
|
||||||
@ -87,7 +87,7 @@ CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \
|
|||||||
CS_LIBPATH = ../c_micasad/test/dependencies \
|
CS_LIBPATH = ../c_micasad/test/dependencies \
|
||||||
$(CASALIBDIR)
|
$(CASALIBDIR)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = *.exp
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -62,7 +62,7 @@ LIBS = -lpthread -lc -ldl
|
|||||||
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp -Wl,-rpath -Wl,/usr/lib \
|
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp -Wl,-rpath -Wl,/usr/lib \
|
||||||
-L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1
|
-L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST =$(JAVAFILES) com/novell/casa/*.java
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -66,7 +66,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
|
|||||||
LIBS =
|
LIBS =
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = $(CFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -60,7 +60,7 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
|
|||||||
LIBS = -lpthread -lc -ldl
|
LIBS = -lpthread -lc -ldl
|
||||||
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -41,13 +41,13 @@ startup/micasad* startup/casacfgpam startup/casaucfgpam
|
|||||||
|
|
||||||
CASAROOT = ..
|
CASAROOT = ..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASABINDIR = $(CASAROOT)/bin64
|
CASABINDIR = $(CASAROOT)/bin64
|
||||||
else
|
else
|
||||||
CASABINDIR = $(CASAROOT)/bin
|
CASABINDIR = $(CASAROOT)/bin
|
||||||
@ -137,7 +137,7 @@ CS_LIBS =Mono.Posix.dll \
|
|||||||
|
|
||||||
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies
|
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -68,7 +68,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =
|
CS_LIBS =
|
||||||
CS_LIBPATH =
|
CS_LIBPATH =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -33,7 +33,7 @@ EXTRA_DIST = *.exp
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
OBJDIR = $(TARGET_CFG)/lib64
|
OBJDIR = $(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ..
|
CASAROOT = ..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -64,7 +64,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =
|
CS_LIBS =
|
||||||
CS_LIBPATH =
|
CS_LIBPATH =
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
|
|||||||
|
|
||||||
CASAROOT = ../..
|
CASAROOT = ../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -63,7 +63,7 @@ CS_RESOURCES =
|
|||||||
CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll
|
CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll
|
||||||
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG)
|
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG)
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
19
configure.in
19
configure.in
@ -90,7 +90,7 @@ AC_SUBST(EMPTY)
|
|||||||
AC_SUBST(SPACE)
|
AC_SUBST(SPACE)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Check for a valid operating system
|
# Check for operating system and set TARGET_OS
|
||||||
#
|
#
|
||||||
case $host_os in
|
case $host_os in
|
||||||
cygwin*)
|
cygwin*)
|
||||||
@ -105,21 +105,22 @@ AC_SUBST(TARGET_OS)
|
|||||||
AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
|
AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
|
||||||
AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
|
AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Check for architecture
|
# Check for architecture and set TARGET_ARCH
|
||||||
|
# ia64 needs to be treated as non64.
|
||||||
|
|
||||||
case $target_cpu in
|
case $target_cpu in
|
||||||
*64*)
|
x86_64|p*pc64|s390x)
|
||||||
TARGET_ARCH='X86'
|
TARGET_ARCH='cpu_64'
|
||||||
;;
|
;;
|
||||||
*)
|
ia64|*)
|
||||||
TARGET_ARCH='I586'
|
TARGET_ARCH='cpu_non64'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_SUBST(TARGET_ARCH)
|
AC_SUBST(TARGET_ARCH)
|
||||||
AM_CONDITIONAL(X86, test "$TARGET_ARCH" = "X86")
|
AM_CONDITIONAL(cpu_64, test "$TARGET_ARCH" = "cpu_64")
|
||||||
AM_CONDITIONAL(I586, test "$TARGET_ARCH" = "I586")
|
AM_CONDITIONAL(cpu_non64, test "$TARGET_ARCH" = "cpu_non64")
|
||||||
|
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
@ -34,7 +34,7 @@ EXTRA_DIST = *.exp
|
|||||||
|
|
||||||
CASAROOT = ../../..
|
CASAROOT = ../../..
|
||||||
|
|
||||||
if X86
|
if cpu_64
|
||||||
CASALIBDIR = $(CASAROOT)/lib64
|
CASALIBDIR = $(CASAROOT)/lib64
|
||||||
else
|
else
|
||||||
CASALIBDIR = $(CASAROOT)/lib
|
CASALIBDIR = $(CASAROOT)/lib
|
||||||
@ -62,7 +62,7 @@ LIBS =
|
|||||||
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=pam_micasa_lux.exp \
|
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=pam_micasa_lux.exp \
|
||||||
-Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread -lc -ldl \
|
-Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread -lc -ldl \
|
||||||
-lpam -Wl,-soname -Wl,pam_micasa.so
|
-lpam -Wl,-soname -Wl,pam_micasa.so
|
||||||
if X86
|
if cpu_64
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||||
else
|
else
|
||||||
OBJDIR = ./$(TARGET_CFG)/lib
|
OBJDIR = ./$(TARGET_CFG)/lib
|
||||||
|
Loading…
Reference in New Issue
Block a user