Annotation of OpenXM/src/gnuplot/configure.diff, Revision 1.1
1.1 ! ohara 1: $OpenXM$
! 2:
! 3: diff -ubBr Makefile.in.orig Makefile.in
! 4: --- Makefile.in.orig Mon Sep 15 16:09:21 2003
! 5: +++ Makefile.in Sat Mar 27 15:52:55 2004
! 6: @@ -361,9 +361,9 @@
! 7: install: all $(LASERGNU)
! 8: $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
! 9: $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
! 10: - $(INSTALL_PROGRAM) gnuplot $(DESTDIR)$(bindir)/gnuplot
! 11: + $(INSTALL_PROGRAM) gnuplot $(DESTDIR)$(bindir)/gnuplot4ox
! 12: test ! -f gnuplot_x11 || $(INSTALL_PROGRAM) gnuplot_x11 $(DESTDIR)$(bindir)/gnuplot_x11
! 13: - -cd docs && $(MAKE) $(MFLAGS) install
! 14: + -cd docs && echo $(MAKE) $(MFLAGS) install
! 15: @LINUXSUID@
! 16:
! 17: lasergnu_install: lasergnu docs/lasergnu.1
! 18: diff -ubBr configure.orig configure
! 19: --- configure.orig Mon Sep 15 16:09:22 2003
! 20: +++ configure Sat Mar 27 15:56:17 2004
! 21: @@ -65,6 +65,7 @@
! 22: program_transform_name=s,x,x,
! 23: silent=
! 24: site=
! 25: +sitefile=
! 26: srcdir=
! 27: target=NONE
! 28: verbose=
! 29: @@ -179,6 +180,7 @@
! 30: --help print this message
! 31: --no-create do not create output files
! 32: --quiet, --silent do not print \`checking...' messages
! 33: + --site-file=FILE use FILE as the site file
! 34: --version print the version of autoconf that created configure
! 35: Directory and file names:
! 36: --prefix=PREFIX install architecture-independent files in PREFIX
! 37: @@ -349,6 +351,11 @@
! 38: -site=* | --site=* | --sit=*)
! 39: site="$ac_optarg" ;;
! 40:
! 41: + -site-file | --site-file | --site-fil | --site-fi | --site-f)
! 42: + ac_prev=sitefile ;;
! 43: + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
! 44: + sitefile="$ac_optarg" ;;
! 45: +
! 46: -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
! 47: ac_prev=srcdir ;;
! 48: -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
! 49: @@ -514,12 +521,16 @@
! 50: srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
! 51:
! 52: # Prefer explicitly selected file to automatically selected ones.
! 53: -if test -z "$CONFIG_SITE"; then
! 54: +if test -z "$sitefile"; then
! 55: + if test -z "$CONFIG_SITE"; then
! 56: if test "x$prefix" != xNONE; then
! 57: CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
! 58: else
! 59: CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
! 60: fi
! 61: + fi
! 62: +else
! 63: + CONFIG_SITE="$sitefile"
! 64: fi
! 65: for ac_site_file in $CONFIG_SITE; do
! 66: if test -r "$ac_site_file"; then
! 67: @@ -5314,5 +5325,196 @@
! 68: chmod +x $CONFIG_STATUS
! 69: rm -fr confdefs* $ac_clean_files
! 70: test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
! 71: +
! 72: +
! 73: +echo $ac_n "checking for socket""... $ac_c" 1>&6
! 74: +echo "configure:5332: checking for socket" >&5
! 75: +if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
! 76: + echo $ac_n "(cached) $ac_c" 1>&6
! 77: +else
! 78: + cat > conftest.$ac_ext <<EOF
! 79: +#line 5337 "configure"
! 80: +#include "confdefs.h"
! 81: +/* System header to define __stub macros and hopefully few prototypes,
! 82: + which can conflict with char socket(); below. */
! 83: +#include <assert.h>
! 84: +/* Override any gcc2 internal prototype to avoid an error. */
! 85: +/* We use char because int might match the return type of a gcc2
! 86: + builtin and then its argument prototype would still apply. */
! 87: +char socket();
! 88: +
! 89: +int main() {
! 90: +
! 91: +/* The GNU C library defines this for functions which it implements
! 92: + to always fail with ENOSYS. Some functions are actually named
! 93: + something starting with __ and the normal name is an alias. */
! 94: +#if defined (__stub_socket) || defined (__stub___socket)
! 95: +choke me
! 96: +#else
! 97: +socket();
! 98: +#endif
! 99: +
! 100: +; return 0; }
! 101: +EOF
! 102: +if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! 103: + rm -rf conftest*
! 104: + eval "ac_cv_func_socket=yes"
! 105: +else
! 106: + echo "configure: failed program was:" >&5
! 107: + cat conftest.$ac_ext >&5
! 108: + rm -rf conftest*
! 109: + eval "ac_cv_func_socket=no"
! 110: +fi
! 111: +rm -f conftest*
! 112: +fi
! 113: +
! 114: +if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
! 115: + echo "$ac_t""yes" 1>&6
! 116: + :
! 117: +else
! 118: + echo "$ac_t""no" 1>&6
! 119: +echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
! 120: +echo "configure:5378: checking for socket in -lsocket" >&5
! 121: +ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
! 122: +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
! 123: + echo $ac_n "(cached) $ac_c" 1>&6
! 124: +else
! 125: + ac_save_LIBS="$LIBS"
! 126: +LIBS="-lsocket $LIBS"
! 127: +cat > conftest.$ac_ext <<EOF
! 128: +#line 5386 "configure"
! 129: +#include "confdefs.h"
! 130: +/* Override any gcc2 internal prototype to avoid an error. */
! 131: +/* We use char because int might match the return type of a gcc2
! 132: + builtin and then its argument prototype would still apply. */
! 133: +char socket();
! 134: +
! 135: +int main() {
! 136: +socket()
! 137: +; return 0; }
! 138: +EOF
! 139: +if { (eval echo configure:5397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! 140: + rm -rf conftest*
! 141: + eval "ac_cv_lib_$ac_lib_var=yes"
! 142: +else
! 143: + echo "configure: failed program was:" >&5
! 144: + cat conftest.$ac_ext >&5
! 145: + rm -rf conftest*
! 146: + eval "ac_cv_lib_$ac_lib_var=no"
! 147: +fi
! 148: +rm -f conftest*
! 149: +LIBS="$ac_save_LIBS"
! 150: +
! 151: +fi
! 152: +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
! 153: + echo "$ac_t""yes" 1>&6
! 154: + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
! 155: + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
! 156: + cat >> confdefs.h <<EOF
! 157: +#define $ac_tr_lib 1
! 158: +EOF
! 159: +
! 160: + LIBS="-lsocket $LIBS"
! 161: +
! 162: +else
! 163: + echo "$ac_t""no" 1>&6
! 164: +fi
! 165: +
! 166: +fi
! 167: +
! 168: +echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! 169: +echo "configure:5427: checking for gethostbyname" >&5
! 170: +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
! 171: + echo $ac_n "(cached) $ac_c" 1>&6
! 172: +else
! 173: + cat > conftest.$ac_ext <<EOF
! 174: +#line 5432 "configure"
! 175: +#include "confdefs.h"
! 176: +/* System header to define __stub macros and hopefully few prototypes,
! 177: + which can conflict with char gethostbyname(); below. */
! 178: +#include <assert.h>
! 179: +/* Override any gcc2 internal prototype to avoid an error. */
! 180: +/* We use char because int might match the return type of a gcc2
! 181: + builtin and then its argument prototype would still apply. */
! 182: +char gethostbyname();
! 183: +
! 184: +int main() {
! 185: +
! 186: +/* The GNU C library defines this for functions which it implements
! 187: + to always fail with ENOSYS. Some functions are actually named
! 188: + something starting with __ and the normal name is an alias. */
! 189: +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
! 190: +choke me
! 191: +#else
! 192: +gethostbyname();
! 193: +#endif
! 194: +
! 195: +; return 0; }
! 196: +EOF
! 197: +if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! 198: + rm -rf conftest*
! 199: + eval "ac_cv_func_gethostbyname=yes"
! 200: +else
! 201: + echo "configure: failed program was:" >&5
! 202: + cat conftest.$ac_ext >&5
! 203: + rm -rf conftest*
! 204: + eval "ac_cv_func_gethostbyname=no"
! 205: +fi
! 206: +rm -f conftest*
! 207: +fi
! 208: +
! 209: +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
! 210: + echo "$ac_t""yes" 1>&6
! 211: + :
! 212: +else
! 213: + echo "$ac_t""no" 1>&6
! 214: +echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! 215: +echo "configure:5473: checking for gethostbyname in -lnsl" >&5
! 216: +ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
! 217: +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
! 218: + echo $ac_n "(cached) $ac_c" 1>&6
! 219: +else
! 220: + ac_save_LIBS="$LIBS"
! 221: +LIBS="-lnsl $LIBS"
! 222: +cat > conftest.$ac_ext <<EOF
! 223: +#line 5481 "configure"
! 224: +#include "confdefs.h"
! 225: +/* Override any gcc2 internal prototype to avoid an error. */
! 226: +/* We use char because int might match the return type of a gcc2
! 227: + builtin and then its argument prototype would still apply. */
! 228: +char gethostbyname();
! 229: +
! 230: +int main() {
! 231: +gethostbyname()
! 232: +; return 0; }
! 233: +EOF
! 234: +if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! 235: + rm -rf conftest*
! 236: + eval "ac_cv_lib_$ac_lib_var=yes"
! 237: +else
! 238: + echo "configure: failed program was:" >&5
! 239: + cat conftest.$ac_ext >&5
! 240: + rm -rf conftest*
! 241: + eval "ac_cv_lib_$ac_lib_var=no"
! 242: +fi
! 243: +rm -f conftest*
! 244: +LIBS="$ac_save_LIBS"
! 245: +
! 246: +fi
! 247: +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
! 248: + echo "$ac_t""yes" 1>&6
! 249: + ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
! 250: + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
! 251: + cat >> confdefs.h <<EOF
! 252: +#define $ac_tr_lib 1
! 253: +EOF
! 254: +
! 255: + LIBS="-lnsl $LIBS"
! 256: +
! 257: +else
! 258: + echo "$ac_t""no" 1>&6
! 259: +fi
! 260: +
! 261: +fi
! 262:
! 263:
! 264: diff -ubBr configure.in.orig configure.in
! 265: --- configure.in.orig Mon Sep 15 16:09:22 2003
! 266: +++ configure.in Sat Mar 27 15:53:52 2004
! 267: @@ -533,4 +533,8 @@
! 268: AC_OUTPUT([Makefile docs/Makefile docs/latextut/Makefile], \
! 269: [test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h])
! 270:
! 271: +dnl for Solaris 2.x
! 272: +AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket,socket)])
! 273: +AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl,gethostbyname)])
! 274: +
! 275: dnl end configure.in
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to configure.diff CVS log ![[TXT]](/icons/cvsweb/text.gif){kind=icon}
![[DIR]](/icons/cvsweb/dir.gif){kind=icon}
Up to [local] / OpenXM / src / gnuplot