diff --git a/configure b/configure index 586cb4d..bec7e25 100755 --- a/configure +++ b/configure @@ -9,7 +9,6 @@ cd `dirname "$0"` -CFLAGS="" PREFIX=/usr while [ ! -z "$*" ] ; do @@ -32,7 +31,7 @@ US=`uname -s` UM=`uname -m | sed 's#^i.86$#i386#' | sed 's#^armv.l$#arm#'` case "$US" in Linux|FreeBSD) - CFLAGS="-fPIC" + CFLAGS="$CFLAGS -fPIC" ;; CYGWIN*) US="CYGWIN" @@ -40,13 +39,15 @@ case "$US" in SunOS|AIX) UM=`uname -p` ;; - OS390) - UM="s390x" # guessing! since both "s390x" and "s390" are viable - ;; esac SYSTEM="$US-$UM" +cp makefile.in makefile +vim makefile -c "%s#%CFLAGS%#$CFLAGS#g" -c "%s#%PREFIX%#$PREFIX#g" -c "%s#%SYSTEM%#$SYSTEM#g" -c "%s#%LDFLAGS%#$LDFLAGS#g" -c wq + +exit + cat makefile.in \ | sed "s#%CFLAGS%#$CFLAGS#g" \ | sed "s#%PREFIX%#$PREFIX#g" \ diff --git a/makefile.in b/makefile.in index fec4bc2..5b2bcae 100644 --- a/makefile.in +++ b/makefile.in @@ -17,6 +17,7 @@ SOURCEURL = https://raw.githubusercontent.com/trothr/xmitmsgx/master ##### configuration ##### CFLAGS = %CFLAGS% +LDFLAGS = %LDFLAGS% PREFIX = %PREFIX% ##### configuration ##### @@ -41,7 +42,7 @@ libxmitmsgx.a: xmitmsgx.o libxmitmsgxdyn.so: xmitmsgx.o # $(LD) -shared -o $@ $+ # $(CC) -shared -o $@ $+ - $(CC) -shared -o libxmitmsgxdyn.so xmitmsgx.o + $(CC) $(LDFLAGS) -shared -o libxmitmsgxdyn.so xmitmsgx.o # this object is the library xmitmsgx.o: makefile xmitmsgx.c xmitmsgx.h @@ -60,7 +61,7 @@ xmitmsgx.h: # this target is left over from the original POSIX implementation xmitmsg: makefile xmitmsg.o xmitmsgx.o # $(CC) -o xmitmsg xmitmsg.o -L. -lxmitmsgx - $(CC) -o xmitmsg xmitmsg.o xmitmsgx.o + $(CC) $(LDFLAGS) -o xmitmsg xmitmsg.o xmitmsgx.o # strip xmitmsg xmitmsg.o: makefile xmitmsg.c xmitmsgx.h @@ -74,7 +75,7 @@ xmitmsg.c: # 'xmiterr' is a utility program which reports ERRNO messages xmiterr: makefile xmiterr.o xmitmsgx.o # $(CC) -o xmiterr xmiterr.o -L. -lxmitmsgx - $(CC) -o xmiterr xmiterr.o xmitmsgx.o + $(CC) $(LDFLAGS) -o xmiterr xmiterr.o xmitmsgx.o # object deck for the 'xmiterr' program xmiterr.o: makefile xmiterr.c xmitmsgx.h @@ -90,7 +91,7 @@ libraries: libxmitmsgx.a libxmitmsgxdyn.so xmsgtest: makefile xmsgtest.o xmitmsgx.o # $(CC) -o xmsgtest xmsgtest.o -L. -lxmitmsgx - $(CC) -o xmsgtest xmsgtest.o xmitmsgx.o + $(CC) $(LDFLAGS) -o xmsgtest xmsgtest.o xmitmsgx.o xmsgtest.o: makefile xmsgtest.c xmitmsgx.h $(CC) $(CFLAGS) -o xmsgtest.o -c xmsgtest.c @@ -120,10 +121,10 @@ test-xmsgtest: xmsgtest test-libraries: libxmitmsgx.a libxmitmsgxdyn.so xmsgtest.o @echo "$(MAKE): testing static library" - $(CC) -o xmsgtest xmsgtest.o -L. -lxmitmsgx + $(CC) $(LDFLAGS) -o xmsgtest xmsgtest.o -L. -lxmitmsgx ./xmsgtest @echo "$(MAKE): testing shared library" - $(CC) -o xmsgtest xmsgtest.o -L. -lxmitmsgxdyn + $(CC) $(LDFLAGS) -o xmsgtest xmsgtest.o -L. -lxmitmsgxdyn sh -c ' LD_LIBRARY_PATH=. ; export LD_LIBRARY_PATH ; exec ./xmsgtest ' # --- a/config.sh 2023-04-04 19:50:34 -0500 +++ b/config.sh 2023-04-04 19:50:34 -0500 @@ -0,0 +1,44 @@ +#!/rocket/conda/bin/bash + +######################### VARIABLES ########################################## +PREFIX="/usr/local/" + + +OFLAGS="-O" +QFLAGS="-qlanglvl=extended:extc89:extc99 -qxplink -qdll -qenum=int -qexportall \ + -qfloat=ieee -qlongname -q32 -qseverity=e=CCN3296 -qcpluscmt" +DFLAGS="-D_ALL_SOURCE -D_EXT -D_UNIX03_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 \ + -D_ISOC99_SOURCE -DEBCDIC -D_OE_SOCKETS -D_OPEN_MSGQ_EXT -D_OPEN_SYS \ + -D_OPEN_THREADS -D_POSIX_SOURCE -D_UNIX03_SOURCE \ + -D_UNIX03_WITHDRAWN -D_XOPEN_SOURCE=600" + +CFLAGS="${OFLAGS} ${QFLAGS} ${DFLAGS}" +CC="xlc" +CXX="xlc" +CPP="xlc -E" +QXXFLAGS="-qlanglvl=extended -qxplink -qdll -qenum=int -qexportall -qascii \ + -qfloat=ieee -qlongname" +CXXFLAGS="-+ ${OFLAGS} ${QXXFLAGS} ${DFLAGS}" + +QLFLAGS="-qxplink -qdll" +LDFLAGS="${OFLAGS} ${QLFLAGS} ${QLFLAGS}" +CPPFLAGS="${DFLAGS}" + +X_INCLUDES='/usr/lpp/tcpip/X11R66/include' +X_LIBRARIES='/usr/lpp/tcpip/X11R66/lib' + +########################## OVERRIDES ######################################### +export ac_cv_prog_GREP="grep -W filecodeset=ISO8859-1,pgmcodeset=IBM-1047" +export CONFIG_SHELL='/rocket/conda/bin/bash' + +######################### MAIN ############################################### +export CFLAGS CC CXX CPP LDFLAGS CPPFLAGS CXXFLAGS + +./configure --prefix=${PREFIX} + +chtag -R -h -t -cISO8859-1 . + +make + +exit 0 +##############################################################################