diff options
| author | Gerald Combs <gerald@wireshark.org> | 1998-09-20 00:21:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 1998-09-20 00:21:56 +0000 |
| commit | 7264d2060871c056844bf57160c902ebc267e303 (patch) | |
| tree | b856357e221722051b252b5fde9ec6882b174bd1 | |
| parent | f9599ff80fa76af39f867bd55173dec94f58f1e8 (diff) | |
* Refined LD_LIBRARY_PATH checks.
svn path=/trunk/; revision=18
| -rw-r--r-- | config.h | 24 | ||||
| -rw-r--r-- | configure.in | 23 |
2 files changed, 17 insertions, 30 deletions
diff --git a/config.h b/config.h deleted file mode 100644 index 08c87b037b..0000000000 --- a/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -#define PACKAGE "ethereal" - -#define VERSION "0.3.16" - -/* #undef HAVE_SOCKADDR_SA_LEN */ - -/* Define if you have the <netinet/in.h> header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define if you have the <sys/sockio.h> header file. */ -/* #undef HAVE_SYS_SOCKIO_H */ - -/* Define if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the pcap library (-lpcap). */ -#define HAVE_LIBPCAP 1 diff --git a/configure.in b/configure.in index b881a69958..8d8f4f5603 100644 --- a/configure.in +++ b/configure.in @@ -1,17 +1,28 @@ -# $Id: configure.in,v 1.3 1998/09/17 02:01:46 gerald Exp $ +# $Id: configure.in,v 1.4 1998/09/20 00:21:56 gerald Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(etypes.h) AM_INIT_AUTOMAKE(ethereal, 0.3.16) +dnl Check for CPU / vendor / OS +AC_CANONICAL_HOST + dnl Checks for programs. AC_PROG_CC -# If LD_LIBRARY_PATH is defined, add it as a link directory. -# This should help Solaris users. -if test x$LD_LIBRARY_PATH != x ; then - LIBS="$LIBS -R$LD_LIBRARY_PATH" -fi +# If we're running Solaris, and LD_LIBRARY_PATH is defined, add it as a +# link directory. +case "$host_os" in + solaris*) + AC_MSG_RESULT(You appear to be running Solaris. Checking for LD_LIBRARY_PATH...) + if test x$LD_LIBRARY_PATH != x -a ; then + LIBS="$LIBS -R$LD_LIBRARY_PATH" + AC_MSG_RESULT(Added LD_LIBRARY_PATH to run-time linker path) + else + AC_MSG_RESULT(You don't have LD_LIBRARY_PATH defined. This may cause trouble later on.) + fi + ;; +esac # GTK checks AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS", |