Check for Nick Faldo

diff --git a/configure b/configure
index 8919d3df1b4e622118052a306d3d2dd75168f6b1..d45f0839c74aca1d68139d95a8d7fa28ac7fe447 100755 (executable)
--- a/configure
+++ b/configure
@@ -1005,7 +1005,8 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-extra-fascism    Add extra gcc3-specific warning flags
+  --with-extra-fascism    add extra gcc3-specific warning flags
+  --with-faldo            make some use of Nick Faldo
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-pic              try to use only PIC/non-PIC objects default=use both
 
@@ -1796,6 +1797,13 @@ if test "${with_extra_fascism+set}" = set; then
   CFLAGS="$CFLAGS -g -ggdb -O2 -W -Wfloat-equal -Wbad-function-cast -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs"
 fi;
 
+
+# Check whether --with-faldo or --without-faldo was given.
+if test "${with_faldo+set}" = set; then
+  withval="$with_faldo"
+
+fi;
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4205,7 +4213,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4208 "configure"' > conftest.$ac_ext
+  echo '#line 4216 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4741,7 +4749,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6534,7 +6542,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6537 "configure"
+#line 6545 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6632,7 +6640,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6635 "configure"
+#line 6643 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8133,10 +8141,7 @@ echo "$as_me: error: No select() implementation found" >&2;}
 fi
 
 
-
-
-
-for ac_func in inet_aton socket strdup strstr
+for ac_func in inet_aton
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -8614,6 +8619,16 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then
 fi
 
 
+if test "$with_faldo" != "no"; then
+ echo $ECHO_N "checking for Nick Faldo $ECHO_C"
+ for bleh in 1 2 3; do
+  echo $ECHO_N ".\a"
+  sleep 1
+ done
+ echo "$as_me:$LINENO: result:  http://blitzed.org/advocacy/enjoy.jpg" >&5
+echo "${ECHO_T} http://blitzed.org/advocacy/enjoy.jpg" >&6
+fi
+
 ac_config_files="$ac_config_files Makefile src/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure

diff --git a/configure.in b/configure.in
index 2bd0790e079cf7c86e23fea9c65ce90c45ed6778..cb0511fc7e86d3dbfc380520ef4e0426e10a933a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,9 +8,13 @@ AM_MAINTAINER_MODE
 
 AC_ARG_WITH(extra-fascism,
     AC_HELP_STRING([--with-extra-fascism],
-    [Add extra gcc3-specific warning flags]),
+    [add extra gcc3-specific warning flags]),
     [CFLAGS="$CFLAGS -g -ggdb -O2 -W -Wfloat-equal -Wbad-function-cast -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs"])
 
+AC_ARG_WITH(faldo,
+    AC_HELP_STRING([--with-faldo],
+    [make some use of Nick Faldo]))
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -39,7 +43,7 @@ if test "$have_sys_poll_h" = "no"; then
  fi
 fi
 
-AC_CHECK_FUNCS(inet_aton socket strdup strstr)
+AC_CHECK_FUNCS(inet_aton)
 
 dnl Check if we can use gethostbyname2 for ipv6
 AC_CHECK_FUNCS(gethostbyname gethostbyname2)
@@ -51,6 +55,16 @@ dnl Solaris has to be weird doesn't it...
 AC_CHECK_LIB(socket, socket, AC_SUBST(LSOCKET, [-lsocket]))
 AC_CHECK_LIB(nsl, gethostbyname, AC_SUBST(LNSL, [-lnsl]))
 
+dnl teehee - taken from MRTG / Tobias Oetiker
+if test "$with_faldo" != "no"; then
+ echo $ECHO_N "checking for Nick Faldo $ECHO_C"
+ for bleh in 1 2 3; do
+  echo $ECHO_N ".\a"        
+  sleep 1
+ done
+ AC_MSG_RESULT([ http://blitzed.org/advocacy/enjoy.jpg])
+fi
+
 AC_OUTPUT(Makefile src/Makefile)
 
 echo "##############################################################################"

diff --git a/src/setup.h.in b/src/setup.h.in
index 679879565e3cfdca9150476e03b57213f841fcd2..aabac92df0d2f9010bee352f8e83dc7d24f678e2 100644 (file)
--- a/src/setup.h.in
+++ b/src/setup.h.in
@@ -24,27 +24,18 @@
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #undef HAVE_SYS_POLL_H