Index: /trunk/FACT++/Makefile.in =================================================================== --- /trunk/FACT++/Makefile.in (revision 10206) +++ /trunk/FACT++/Makefile.in (revision 10207) @@ -50,5 +50,6 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/libtool.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_find_motif.m4 \ + $(top_srcdir)/.macro_dir/libtool.m4 \ $(top_srcdir)/.macro_dir/ltoptions.m4 \ $(top_srcdir)/.macro_dir/ltsugar.m4 \ @@ -137,5 +138,6 @@ dim_v19r15/src/did/did-dui_util.$(OBJEXT) did_OBJECTS = $(am_did_OBJECTS) -did_DEPENDENCIES = libDim.la +am__DEPENDENCIES_1 = +did_DEPENDENCIES = $(am__DEPENDENCIES_1) libDim.la am_dns_OBJECTS = dim_v19r15/src/dns.$(OBJEXT) dns_OBJECTS = $(am_dns_OBJECTS) @@ -304,6 +306,11 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_HAVE_XP = @LT_HAVE_XP@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MOTIF_CFLAGS = @MOTIF_CFLAGS@ +MOTIF_INCL = @MOTIF_INCL@ +MOTIF_LDFLAGS = @MOTIF_LDFLAGS@ +MOTIF_LIBS = @MOTIF_LIBS@ MYSQLPP_INC_DIR = @MYSQLPP_INC_DIR@ MYSQLPP_LIB_DIR = @MYSQLPP_LIB_DIR@ @@ -334,4 +341,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -418,5 +430,5 @@ AM_CPPFLAGS = \ -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \ - -Idim_v19r15/dim $(DIM_FLAGS) $(PTHREAD_CFLAGS) + -Idim_v19r15/dim $(DIM_FLAGS) $(PTHREAD_CFLAGS) $(MOTIF_CFLAGS) AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x @@ -459,6 +471,6 @@ dns_SOURCES = dim_v19r15/src/dns.c #dns_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS) -did_LDADD = -lXm libDim.la -did_CPPFLAGS = $(AM_CPPFLAGS) -Idim_v19r15/src/did +did_LDADD = $(MOTIF_LDFLAGS) libDim.la +did_CPPFLAGS = $(AM_CPPFLAGS) $(MOTIF_INCL) -Idim_v19r15/src/did did_SOURCES = dim_v19r15/src/did/did.c dim_v19r15/src/did/dui_util.c Index: /trunk/FACT++/configure =================================================================== --- /trunk/FACT++/configure (revision 10206) +++ /trunk/FACT++/configure (revision 10207) @@ -761,4 +761,16 @@ MYSQL_C_LIB_DIR MYSQL_C_INC_DIR +MOTIF_LIBS +MOTIF_CFLAGS +MOTIF_INCL +MOTIF_LDFLAGS +LT_HAVE_XP +Have_Libxp_FALSE +Have_Libxp_TRUE +X_EXTRA_LIBS +X_LIBS +X_PRE_LIBS +X_CFLAGS +XMKMF PTHREAD_CFLAGS PTHREAD_LIBS @@ -946,4 +958,7 @@ enable_doxygen_ps enable_doxygen_pdf +with_x +with_motif_includes +with_motif_libraries with_mysql_include with_mysqlpp @@ -973,5 +988,6 @@ CPP CXXCPP -DOXYGEN_PAPER_SIZE' +DOXYGEN_PAPER_SIZE +XMKMF' @@ -1578,4 +1594,8 @@ --program-transform-name=PROGRAM run sed PROGRAM on installed program names +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR + System types: --build=BUILD configure for building on BUILD [guessed] @@ -1621,4 +1641,7 @@ both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-x use the X Window System + --with-motif-includes=DIR Motif include files are in DIR + --with-motif-libraries=DIR Motif libraries are in DIR --with-mysql-include= directory path of MySQL header installation --with-mysqlpp= path containing MySQL++ header and library subdirs @@ -1678,4 +1701,5 @@ DOXYGEN_PAPER_SIZE a4wide (default), a4, letter, legal or executive + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help @@ -2232,4 +2256,71 @@ } # ac_fn_c_check_header_mongrel + +# ac_fn_cxx_check_func LINENO FUNC VAR +# ------------------------------------ +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_cxx_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while @@ -4154,11 +4245,11 @@ lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4156: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4247: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4159: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4250: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4162: output\"" >&5) + (eval echo "\"\$as_me:4253: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then @@ -5366,5 +5457,5 @@ *-*-irix6*) # Find out which ABI we are using. - echo '#line 5368 "configure"' > conftest.$ac_ext + echo '#line 5459 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -7294,9 +7385,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7296: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7387: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7300: \$? = $ac_status" >&5 + echo "$as_me:7391: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -7633,9 +7724,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7635: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7726: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7639: \$? = $ac_status" >&5 + echo "$as_me:7730: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -7738,9 +7829,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7831: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7744: \$? = $ac_status" >&5 + echo "$as_me:7835: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -7793,9 +7884,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7795: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7886: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7799: \$? = $ac_status" >&5 + echo "$as_me:7890: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -10177,5 +10268,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10179 "configure" +#line 10270 "configure" #include "confdefs.h" @@ -10273,5 +10364,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10275 "configure" +#line 10366 "configure" #include "confdefs.h" @@ -12229,9 +12320,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12322: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12235: \$? = $ac_status" >&5 + echo "$as_me:12326: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized @@ -12328,9 +12419,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12330: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12421: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12334: \$? = $ac_status" >&5 + echo "$as_me:12425: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -12380,9 +12471,9 @@ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12382: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12473: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12386: \$? = $ac_status" >&5 + echo "$as_me:12477: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then @@ -16763,42 +16854,279 @@ ###################################################################### -# Xm.h (lesstif/motif) +# Xm.h (lesstif/motif, needed by did) ###################################################################### -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -for ac_header in Mrm/MrmAppl.h Xm/Xm.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } + + +# Check whether --with-x was given. +if test "${with_x+set}" = set; then : + withval=$with_x; +fi + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + case $x_includes,$x_libraries in #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF - -else - - echo "Error! Mrm/MrmAppl.h, Xm/Xm.h not properly installed, needed to compile did (you need most probably lesstif2-dev)." - exit -1 - - -fi - + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /usr/lib64 | /lib | /lib64) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir +fi + +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R7/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R7 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R7/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R7 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # We can compile using X headers with no special include directory. +ac_x_includes= +else + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi done - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtToolkitInitialize in -lXm" >&5 -$as_echo_n "checking for XtToolkitInitialize in -lXm... " >&6; } -if test "${ac_cv_lib_Xm_XtToolkitInitialize+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +fi +rm -f conftest.err conftest.i conftest.$ac_ext +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= +else + LIBS=$ac_save_LIBS +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no + +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac +fi +;; #( + *) have_x=yes;; + esac + eval "$ac_cv_have_x" +fi # $with_x != no + +if test "$have_x" != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +$as_echo "$have_x" >&6; } + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } +fi + +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= +else + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" + fi + + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +$as_echo_n "checking whether -R must be followed by a space... " >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" +else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +$as_echo "neither works" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_cxx_werror_flag=$ac_xsave_cxx_werror_flag + LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. + + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16809,17 +17137,45 @@ extern "C" #endif -char XtToolkitInitialize (); +char XOpenDisplay (); int main () { -return XtToolkitInitialize (); +return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xm_XtToolkitInitialize=yes -else - ac_cv_lib_Xm_XtToolkitInitialize=no +if ac_fn_cxx_try_link "$LINENO"; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_ntoa (); +int +main () +{ +return dnet_ntoa (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_dnet_dnet_ntoa=yes +else + ac_cv_lib_dnet_dnet_ntoa=no fi rm -f core conftest.err conftest.$ac_objext \ @@ -16827,27 +17183,720 @@ LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XtToolkitInitialize" >&5 -$as_echo "$ac_cv_lib_Xm_XtToolkitInitialize" >&6; } -if test "x$ac_cv_lib_Xm_XtToolkitInitialize" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXM 1 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet_stub $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dnet_ntoa (); +int +main () +{ +return dnet_ntoa (); + ; + return 0; +} _ACEOF - - LIBS="-lXm $LIBS" - -else - - echo "Error! libXm (lesstif2) not properly installed in the default library path (needed by dim to link did)." - exit -1 - - -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_dnet_stub_dnet_ntoa=yes +else + ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +fi + + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = x""yes; then : + +fi + + if test $ac_cv_func_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_nsl_gethostbyname=yes +else + ac_cv_lib_nsl_gethostbyname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_bsd_gethostbyname=yes +else + ac_cv_lib_bsd_gethostbyname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +fi + + fi + fi + + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" +if test "x$ac_cv_func_connect" = x""yes; then : + +fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char connect (); +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes +else + ac_cv_lib_socket_connect=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" +if test "x$ac_cv_func_remove" = x""yes; then : + +fi + + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char remove (); +int +main () +{ +return remove (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_posix_remove=yes +else + ac_cv_lib_posix_remove=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +if test "x$ac_cv_func_shmat" = x""yes; then : + +fi + + if test $ac_cv_func_shmat = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +$as_echo_n "checking for shmat in -lipc... " >&6; } +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lipc $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shmat (); +int +main () +{ +return shmat (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_ipc_shmat=yes +else + ac_cv_lib_ipc_shmat=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +fi + + fi + fi + + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char IceConnectionNumber (); +int +main () +{ +return IceConnectionNumber (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_ICE_IceConnectionNumber=yes +else + ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +fi + + LDFLAGS=$ac_save_LDFLAGS + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libXp is available" >&5 +$as_echo_n "checking whether libXp is available... " >&6; } +if test "${lt_cv_libxp+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_save_CFLAGS="$CFLAGS" +lt_save_CPPFLAGS="$CPPFLAGS" +lt_save_LIBS="$LIBS" +LIBS="$X_LIBS -lXp -lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + +int main() { +Display *display=NULL; +short major_version, minor_version; +Status rc; +rc=XpQueryVersion(display, &major_version, &minor_version); +exit(0); +} + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + lt_cv_libxp=yes +else + lt_cv_libxp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_libxp" >&5 +$as_echo "$lt_cv_libxp" >&6; } +if test "$lt_cv_libxp" = "yes"; then +# remove this until we find a use for it +# a.lacey@man.ac.uk +# AC_DEFINE(HAVE_LIB_XP) + LT_HAVE_XP="yes" +else + LT_HAVE_XP="no" +fi + if test "$lt_cv_libxp" = "yes"; then + Have_Libxp_TRUE= + Have_Libxp_FALSE='#' +else + Have_Libxp_TRUE='#' + Have_Libxp_FALSE= +fi + + +CFLAGS="$lt_save_CFLAGS" +CPPFLAGS="$lt_save_CPPFLAGS" +LIBS="$lt_save_LIBS" + + + + + +motif_includes= +motif_libraries= + + + +# Check whether --with-motif-includes was given. +if test "${with_motif_includes+set}" = set; then : + withval=$with_motif_includes; motif_includes="$withval" +fi + + + +# Check whether --with-motif-libraries was given. +if test "${with_motif_libraries+set}" = set; then : + withval=$with_motif_libraries; motif_libraries="$withval" +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif" >&5 +$as_echo_n "checking for Motif... " >&6; } + +# +# +# Search the include files. +# +if test "$motif_includes" = ""; then +if test "${ac_cv_motif_includes+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + +ac_motif_save_LIBS="$LIBS" +ac_motif_save_INCLUDES="$INCLUDES" +ac_motif_save_CPPFLAGS="$CPPFLAGS" +ac_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +INCLUDES="$X_CFLAGS $INCLUDES" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +ac_cv_motif_includes="none" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int a; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +# Xm/Xm.h is in the standard search path. +ac_cv_motif_includes= + +else + +# Xm/Xm.h is not in the standard search path. +# Locate it and put its directory in `motif_includes' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Athena). +# /sw/include is used for fink under OSX +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.1 /usr/include/Motif2.0 /usr/include/Motif1.2 \ + /usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 \ + /usr/X11/include /usr/X11R6/include /usr/X11R5/include \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/* \ + /sw/include; do +if test -f "$dir/Xm/Xm.h"; then +ac_cv_motif_includes="$dir" +break +fi +done + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# +LIBS="$ac_motif_save_LIBS" +INCLUDES="$ac_motif_save_INCLUDES" +CPPFLAGS="$ac_motif_save_CPPFLAGS" +LDFLAGS="$ac_motif_save_LDFLAGS" + +fi + +motif_includes="$ac_cv_motif_includes" +fi +# +# +# Now for the libraries. +# +if test "$motif_libraries" = ""; then +if test "${ac_cv_motif_libraries+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + +ac_motif_save_LIBS="$LIBS" +ac_motif_save_INCLUDES="$INCLUDES" +ac_motif_save_CPPFLAGS="$CPPFLAGS" +ac_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +INCLUDES="$X_CFLAGS $INCLUDES" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +ac_cv_motif_libraries="none" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +XtToolkitInitialize(); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + +# libXm.a is in the standard search path. +ac_cv_motif_libraries= + +else + +# libXm.a is not in the standard search path. +# Locate it and put its directory in `motif_libraries' +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/lesstif is used on Linux (Lesstif). +# /usr/openwin is used on Solaris (X and Athena). +# /sw/lib is used under fink on OSX +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \ + /usr/lib/X11 /usr/lib/X11R6 /usr/lib/X11R5 \ + /usr/X11/lib /usr/X11R6/lib /usr/X11R5/lib \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/lesstif*/lib /usr/lib/Lesstif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* \ + /sw/lib; do +if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then +ac_cv_motif_libraries="$dir" +break +fi +done + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +# +LIBS="$ac_motif_save_LIBS" +INCLUDES="$ac_motif_save_INCLUDES" +CPPFLAGS="$ac_motif_save_CPPFLAGS" +LDFLAGS="$ac_motif_save_LDFLAGS" + +fi + +# +motif_libraries="$ac_cv_motif_libraries" +fi +# +# Provide an easier way to link +# +if test "$motif_includes" = "none" -o "$motif_libraries" = "none"; then + with_motif="no" +else + with_motif="yes" +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libXp is available" >&5 +$as_echo_n "checking whether libXp is available... " >&6; } +if test "${lt_cv_libxp+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_save_CFLAGS="$CFLAGS" +lt_save_CPPFLAGS="$CPPFLAGS" +lt_save_LIBS="$LIBS" +LIBS="$X_LIBS -lXp -lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + +int main() { +Display *display=NULL; +short major_version, minor_version; +Status rc; +rc=XpQueryVersion(display, &major_version, &minor_version); +exit(0); +} + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + lt_cv_libxp=yes +else + lt_cv_libxp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_libxp" >&5 +$as_echo "$lt_cv_libxp" >&6; } +if test "$lt_cv_libxp" = "yes"; then +# remove this until we find a use for it +# a.lacey@man.ac.uk +# AC_DEFINE(HAVE_LIB_XP) + LT_HAVE_XP="yes" +else + LT_HAVE_XP="no" +fi + if test "$lt_cv_libxp" = "yes"; then + Have_Libxp_TRUE= + Have_Libxp_FALSE='#' +else + Have_Libxp_TRUE='#' + Have_Libxp_FALSE= +fi + + +CFLAGS="$lt_save_CFLAGS" +CPPFLAGS="$lt_save_CPPFLAGS" +LIBS="$lt_save_LIBS" + +if test "$LT_HAVE_XP" = "yes"; then + XPLIB="-lXp -lXext" +else + XPLIB="" +fi + +if test "$with_motif" != "no"; then + if test "$motif_libraries" = ""; then + MOTIF_LDFLAGS="-lXm $XPLIB" + MOTIF_LIBS="-lXm $XPLIB" + else + MOTIF_LDFLAGS="-L$motif_libraries -lXm $XPLIB" + MOTIF_LIBS="-L$motif_libraries -lXm $XPLIB" + fi + if test "$motif_includes" != ""; then + MOTIF_INCL="-I$motif_includes" + MOTIF_CFLAGS="-I$motif_includes" + fi +# remove this until we find a use for it +# a.lacey@man.ac.uk +# AC_DEFINE(HAVE_MOTIF) +else + with_motif="no" +fi +# + + + + +# +# +# +motif_libraries_result="$motif_libraries" +motif_includes_result="$motif_includes" +test "$motif_libraries_result" = "" && motif_libraries_result="in default path" +test "$motif_includes_result" = "" && motif_includes_result="in default path" +test "$motif_libraries_result" = "none" && motif_libraries_result="(none)" +test "$motif_includes_result" = "none" && motif_includes_result="(none)" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $motif_libraries_result, headers $motif_includes_result" >&5 +$as_echo "libraries $motif_libraries_result, headers $motif_includes_result" >&6; } @@ -19176,4 +20225,12 @@ if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then as_fn_error $? "conditional \"DX_COND_latex\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then + as_fn_error $? "conditional \"Have_Libxp\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${Have_Libxp_TRUE}" && test -z "${Have_Libxp_FALSE}"; then + as_fn_error $? "conditional \"Have_Libxp\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi