remove references to noglobals stuff from build
authorconrad <conrad@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Fri, 13 Aug 2004 07:29:15 +0000 (07:29 +0000)
committerconrad <conrad@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Fri, 13 Aug 2004 07:29:15 +0000 (07:29 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@7555 0101bb08-14d6-0310-b084-bc0e0c8e3800

configure.ac
include/speex/Makefile.am
libspeex/Makefile.am

index d9880bf..fc87293 100644 (file)
@@ -90,12 +90,6 @@ AC_ARG_ENABLE(epic-48k, [  --enable-epic-48k       enable support for Epic 4.8 k
   AC_DEFINE([EPIC_48K], , [Enable support for Epic 4.8 kbps mode])
 fi])
 
-AC_ARG_ENABLE(global-pointers, [  --disable-global-pointers  disable writing to data segments (README.symbian)], noglobals="yes", noglobals="no")
-if test "$noglobals" = yes; then
-  AC_DEFINE([DISABLE_GLOBAL_POINTERS], , [Disable writing to data segments; see README.symbian])
-fi
-AM_CONDITIONAL(DISABLE_GLOBAL_POINTERS, [test "x$noglobals" = "xyes"])
-
 dnl Output the makefiles and version.h.
 
 AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
index ae08c8c..ae09cc8 100644 (file)
@@ -1,10 +1,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-if DISABLE_GLOBAL_POINTERS
-speex_noglobals = speex_noglobals.h
-endif
-
 pkginclude_HEADERS =  speex.h \
        speex_bits.h \
        speex_header.h \
@@ -12,6 +8,5 @@ pkginclude_HEADERS =  speex.h \
        speex_stereo.h \
        speex_preprocess.h \
        speex_jitter.h \
-       speex_echo.h \
-       $(speex_noglobals)
+       speex_echo.h
 
index f9a4fe7..0fa0d57 100644 (file)
@@ -8,12 +8,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libspeex.la
 
-if DISABLE_GLOBAL_POINTERS
-modes = modes_noglobals.c
-else
-modes = modes.c
-endif
-
 # Sources for compilation in the library
 libspeex_la_SOURCES = nb_celp.c \
        sb_celp.c \
@@ -27,7 +21,7 @@ libspeex_la_SOURCES = nb_celp.c \
        cb_search.c \
        filters.c \
        bits.c \
-       $(modes) \
+       modes.c \
        speex.c \
        vq.c \
        high_lsp_tables.c \