From 24802f6c45f69adf1e8000a96b7fe1a55f706a7c Mon Sep 17 00:00:00 2001
From: Michael Poole <mdpoole@troilus.org>
Date: Fri, 13 May 2005 02:03:33 +0000
Subject: [PATCH] Simplify CFLAGS handling in configure and expose crypt() on
 NetBSD

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1405 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---
 ChangeLog                | 10 +++++++
 configure.in             | 63 +---------------------------------------
 ircd/ircd_crypt_native.c |  3 +-
 3 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8757461..f02ed73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-12  Michael Poole <mdpoole@troilus.org>
+
+	* configure.in: Do not try to outsmart the default CFLAGS.
+	Simply add parameters explicitly requested by the user.
+
+	* configure: Regenerate.
+
+	* ircd/ircd_crypt_native.c: Use _XOPEN_SOURCE 600 (which is
+	used in os_generic.c) to get crypt() on NetBSD.
+
 2005-05-11  Kevin L. Mitchell  <klmitch@mit.edu>
 
 	* ircd/ircd.c: if debugging is enabled (both DEBUGMODE defined and
diff --git a/configure.in b/configure.in
index be0fe26..cbcc5fe 100644
--- a/configure.in
+++ b/configure.in
@@ -52,54 +52,6 @@ AC_PROG_CC
 
 dnl ANSIfy the C compiler whenever possible.
 AM_PROG_CC_STDC
-dnl Allow specification of optimization level.
-AC_ARG_WITH([optimization],
-    AS_HELP_STRING([--with-optimization=[-O2]], [Explicitly set the compiler optimization flags (default: -O3)]),
-    [unet_cv_optimization=$withval],
-    [unet_cv_optimization='-O3'])
-AC_CACHE_CHECK([optimization level], [unet_cv_optimization], [unet_cv_optimization='-O3'])
-if test "x$unet_cv_optimization" = "xno" ; then
-    unet_cv_optimization=""
-fi
-if test x"$CFLAGS" != x; then
-    CFLAGS=`echo "$CFLAGS" | sed -e s/-O2/$unet_cv_optimization/`
-fi
-dnl Notice the -g flag and deal accordingly
-if test x"$CFLAGS" != x; then
-    unet_old_cflags=$CFLAGS
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//g'`
-fi
-if test x"$CFLAGS" != x"$unet_old_cflags"; then
-    # If -g was already there, force symbols to be enabled
-    unet_cv_enable_symbols=yes
-fi
-dnl Notice the -pg flag and deal accordingly
-if test x"$CFLAGS" != x; then
-    unet_old_cflags=$CFLAGS
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-pg//g'`
-fi
-if test x"$CFLAGS" != x"$unet_old_cflags"; then
-    # If -pg was already there, force profiling to be enabled
-    unet_cv_enable_profile=yes
-fi
-dnl Notice the -Wall flag and deal accordingly
-if test x"$CFLAGS" != x; then
-    unet_old_cflags=$CFLAGS
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wall//g'`
-fi
-if test x"$CFLAGS" != x"$unet_old_cflags"; then
-    # If -Wall was already there, force warnings to be enabled
-    unet_cv_enable_warnings=yes
-fi
-dnl Notice the -pedantic flag and deal accordingly
-if test x"$CFLAGS" != x; then
-    unet_old_cflags=$CFLAGS
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-pedantic//g'`
-fi
-if test x"$CFLAGS" != x"$unet_old_cflags"; then
-    # If -pedantic was already there, force pedatic to be enabled
-    unet_cv_enable_pedantic=yes
-fi
 
 dnl Checks for libraries.
 
@@ -308,23 +260,10 @@ if test x"$unet_cv_enable_asserts" = xno; then
     AC_DEFINE([NDEBUG], 1, [Disable assertions])
 fi
 
-dnl Check for --enable-symbols
-AC_MSG_CHECKING([whether to enable debugging symbols])
-AC_ARG_ENABLE([symbols],
-[  --disable-symbols       Disable debugging symbols (remove -g from CFLAGS)],
-[unet_cv_enable_symbols=$enable_symbols],
-[AC_CACHE_VAL(unet_cv_enable_symbols,
-[unet_cv_enable_symbols=yes])])
-AC_MSG_RESULT([$unet_cv_enable_symbols])
-
-if test x"$unet_cv_enable_symbols" = xyes; then
-    CFLAGS="-g $CFLAGS"
-fi
-
 dnl Now check for --enable-profile
 AC_MSG_CHECKING([whether to enable profiling support (gprof)])
 AC_ARG_ENABLE([profile],
-[  --enable-profile        Enable profiling support (add -pg to CFLAGS)],
+[  --enable-profile        Enable profiling support (add -pg to CFLAGS and LDFLAGS)],
 [unet_cv_enable_profile=$enable_profile],
 [AC_CACHE_VAL(unet_cv_enable_profile,
 [unet_cv_enable_profile=no])])
diff --git a/ircd/ircd_crypt_native.c b/ircd/ircd_crypt_native.c
index f33a525..fe267c5 100644
--- a/ircd/ircd_crypt_native.c
+++ b/ircd/ircd_crypt_native.c
@@ -25,8 +25,7 @@
  * function (typically a DES encryption routine, but can be anything nowadays).
  * 
  */
-#define _XOPEN_SOURCE
-#define _XOPEN_VERSION 4
+#define _XOPEN_SOURCE 600
 
 #include "config.h"
 #include "ircd_crypt.h"
-- 
2.20.1