Skip to content

Commit

Permalink
In the big "host OS" switch, put the names in alphabetical order, and
Browse files Browse the repository at this point in the history
add cases for Irix and {OSF/1, Digital UNIX, Tru64 UNIX).

AIX appears to use the V7/BSD convention for man pages, not the SV
conventions.
  • Loading branch information
yuguy committed Oct 24, 2008
1 parent 54649cf commit e16bb01
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 33 deletions.
41 changes: 25 additions & 16 deletions configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.159 .
# From configure.in Revision: 1.160 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
Expand Down Expand Up @@ -8596,12 +8596,11 @@ _ACEOF
# We need "-lodm" and "-lcfg", as libpcap requires them on
# AIX.
DEPLIBS="-lodm -lcfg"
;;
#
# Assume System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
darwin*)
DYEXT="dylib"
V_CCOPT="$V_CCOPT -fno-common"
;;
hpux9*)
Expand Down Expand Up @@ -8650,6 +8649,26 @@ _ACEOF
MAN_MISC_INFO=5
;;
irix*)
#
# Use System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;
linux*)
V_CCOPT="$V_CCOPT -fPIC"
;;
osf*)
#
# Use System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;
sinix*)
{ echo "$as_me:$LINENO: checking if SINIX compiler defines sinix" >&5
echo $ECHO_N "checking if SINIX compiler defines sinix... $ECHO_C" >&6; }
Expand Down Expand Up @@ -8723,16 +8742,6 @@ _ACEOF
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;
darwin*)
DYEXT="dylib"
V_CCOPT="$V_CCOPT -fno-common"
;;
linux*)
V_CCOPT="$V_CCOPT -fPIC"
;;
esac
if test -n "$ac_tool_prefix"; then
Expand Down
43 changes: 26 additions & 17 deletions configure.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.159 2008-10-23 05:56:59 guy Exp $ (LBL)
dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.160 2008-10-24 07:29:34 guy Exp $ (LBL)
dnl
dnl Copyright (c) 1994, 1995, 1996, 1997
dnl The Regents of the University of California. All rights reserved.
dnl
dnl Process this file with autoconf to produce a configure script.
dnl

AC_REVISION($Revision: 1.159 $)
AC_REVISION($Revision: 1.160 $)
AC_PREREQ(2.50)
AC_INIT(pcap.c)

Expand Down Expand Up @@ -883,12 +883,11 @@ aix*)
# We need "-lodm" and "-lcfg", as libpcap requires them on
# AIX.
DEPLIBS="-lodm -lcfg"
;;

#
# Assume System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
darwin*)
DYEXT="dylib"
V_CCOPT="$V_CCOPT -fno-common"
;;

hpux9*)
Expand Down Expand Up @@ -935,6 +934,26 @@ hpux*)
MAN_MISC_INFO=5
;;

irix*)
#
# Use System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;

linux*)
V_CCOPT="$V_CCOPT -fPIC"
;;

osf*)
#
# Use System V conventions for man pages.
#
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;

sinix*)
AC_MSG_CHECKING(if SINIX compiler defines sinix)
AC_CACHE_VAL(ac_cv_cc_sinix_defined,
Expand All @@ -958,16 +977,6 @@ solaris*)
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
;;

darwin*)
DYEXT="dylib"
V_CCOPT="$V_CCOPT -fno-common"
;;

linux*)
V_CCOPT="$V_CCOPT -fPIC"
;;

esac

AC_PROG_RANLIB
Expand Down

0 comments on commit e16bb01

Please sign in to comment.