Przeglądaj źródła

* Removed more leftover configure stuff for tcl

svn: 606
Bryan Drewery 22 lat temu
rodzic
commit
8ac4089b1d
2 zmienionych plików z 2 dodań i 77 usunięć
  1. 0 6
      config.h.in
  2. 2 71
      configure

+ 0 - 6
config.h.in

@@ -10,9 +10,6 @@
 /* Define if running under cygwin */
 #undef CYGWIN_HACKS
 
-/* Define if running on sunos 4.0 *sigh* */
-#undef DLOPEN_1
-
 /* Defines the current pack version */
 #undef EGG_VERSION
 
@@ -29,9 +26,6 @@
    */
 #undef HAVE_DIRENT_H
 
-/* Define if we need dlopen (for module support) */
-#undef HAVE_DLOPEN
-
 /* Define to 1 if you have the `dprintf' function. */
 #undef HAVE_DPRINTF
 

+ 2 - 71
configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.3 .
+# From configure.ac Revision: 1.4 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -3538,7 +3538,6 @@ IRIX=no
 SUNOS=no
 HPUX=no
 EGG_CYGWIN=no
-NEED_DL=1
 
 echo "$as_me:$LINENO: checking system type" >&5
 echo $ECHO_N "checking system type... $ECHO_C" >&6
@@ -3563,7 +3562,6 @@ case "$egg_cv_var_system_type" in
   BSD/OS)
     case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
       2)
-        NEED_DL=0
       ;;
       *)
         CFLAGS="$CFLAGS -Wall"
@@ -3573,7 +3571,6 @@ case "$egg_cv_var_system_type" in
   CYGWI*)
     case "`echo $egg_cv_var_system_release | cut -c 1-3`" in
       1.*)
-        NEED_DL=0
 
 echo "$as_me:$LINENO: checking how to access the Win32 API" >&5
 echo $ECHO_N "checking how to access the Win32 API... $ECHO_C" >&6
@@ -3713,7 +3710,6 @@ echo "$as_me: WARNING: Make sure the directory Eggdrop is installed into is moun
         fi
       ;;
       *)
-        NEED_DL=0
         { echo "$as_me:$LINENO: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&5
 echo "$as_me: WARNING: Make sure the directory Eggdrop is installed into is mounted in binary mode." >&2;}
       ;;
@@ -3727,7 +3723,6 @@ _ACEOF
   ;;
   HP-UX)
     HPUX=yes
-    NEED_DL=0
 
 cat >>confdefs.h <<\_ACEOF
 #define HPUX_HACKS 1
@@ -3743,31 +3738,24 @@ _ACEOF
   dell)
     echo "$as_me:$LINENO: result: Dell SVR4" >&5
 echo "${ECHO_T}Dell SVR4" >&6
-    NEED_DL=0
   ;;
   IRIX)
     IRIX=yes
-    NEED_DL=0
   ;;
   Ultrix)
-    NEED_DL=0
     SHELL=/bin/sh5
   ;;
   SINIX*)
-    NEED_DL=0
   ;;
   BeOS)
-    NEED_DL=0
   ;;
   Linux)
     LINUX=yes
     CFLAGS="$CFLAGS -Wall"
   ;;
   Lynx)
-    NEED_DL=0
   ;;
   QNX)
-    NEED_DL=0
   ;;
   OSF1)
     case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
@@ -3792,7 +3780,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
       ;;
       *)
-        NEED_DL=0
       ;;
     esac
 
@@ -3809,10 +3796,6 @@ _ACEOF
       then
       # SunOS 4
       SUNOS=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define DLOPEN_1 1
-_ACEOF
     fi
   ;;
   *BSD)
@@ -3825,7 +3808,6 @@ echo $ECHO_N "checking if system is Mach based... $ECHO_C" >&6
     then
       echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-      NEED_DL=0
 
 cat >>confdefs.h <<\_ACEOF
 #define BORGCUBES 1
@@ -3839,7 +3821,6 @@ echo $ECHO_N "checking if system is QNX... $ECHO_C" >&6
       then
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-        NEED_DL=0
       else
         echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -3847,7 +3828,6 @@ echo "${ECHO_T}no" >&6
 echo "${ECHO_T}Something unknown!" >&6
         echo "$as_me:$LINENO: result: If you get dynamic modules to work, be sure to let the devel team know HOW :)" >&5
 echo "${ECHO_T}If you get dynamic modules to work, be sure to let the devel team know HOW :)" >&6
-        NEED_DL=0
       fi
     fi
   ;;
@@ -10831,8 +10811,7 @@ rm -f confcache
 
 
 
-
-for ac_func in clock dlopen dprintf fsync getdtablesize getrusage inet_aton isascii gethostbyname2
+for ac_func in clock dprintf fsync getdtablesize getrusage inet_aton isascii gethostbyname2
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -12360,54 +12339,6 @@ fi
 rm -f confcache
 # ---------- end of (what used to be) robey's Tcl thingies
 
-if test "$NEED_DL" = 1 && test "$ac_cv_func_dlopen" = "no"
-then
-  if test "$LINUX" = "yes"
-  then
-    cat << 'EOF' >&2
-configure: warning:
-
-  Since you are on a Linux system, this has a known problem...
-  I know a kludge for it,
-EOF
-
-    if test -r "/lib/libdl.so.1"
-    then
-      cat << 'EOF' >&2
-  and you seem to have it, so we'll do that...
-
-EOF
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
-      LIBS="/lib/libdl.so.1 $LIBS"
-    else
-      cat << 'EOF' >&2
-  which you DON'T seem to have... doh!
-  perhaps you may still have the stuff lying around somewhere
-  if you work out where it is, add it to your XLIBS= lines
-  and #define HAVE_DLOPEN in config.h
-
-  we'll proceed on anyway, but you probably won't be able
-  to 'make eggdrop' but you might be able to make the
-  static bot (I'll default your make to this version).
-
-EOF
-    fi
-  else
-    cat << 'EOF' >&2
-configure: warning:
-
-  You don't seem to have libdl anywhere I can find it, this will
-  prevent you from doing dynamic modules, I'll set your default
-  make to static linking.
-
-EOF
-  fi
-fi
-
-
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 NUMVER=`grep "int" $srcdir/src/main.c | $AWK '/egg_numver =/ {print $5}' |  sed -e 's/\;//g'`
 if ! test -f $srcdir/pack/pack.cfg; then