diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2007-07-10 01:11:48 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2007-07-10 01:11:48 +0000 |
| commit | ff679881597bc14cebdcb62369ded5c40bedf5af (patch) | |
| tree | 0b0be6b164e4bda8e79d336a691945cb7b727b02 | |
| parent | 98dc7f5ed84e047db8168510a4fc0610976ac039 (diff) | |
| download | nautilus-ff679881597bc14cebdcb62369ded5c40bedf5af.tar.gz | |
Remove AC_ISC_POSIX: It would have to be called after AC_PROG_CC, but
2007-07-10 Martin Wehner <martin.wehner@gmail.com>
* configure.in:
Remove AC_ISC_POSIX: It would have to be called after AC_PROG_CC,
but Interactive Unix is obsolete.
Remove checks for functions and headers we don't use anymore.
Remove check for jw as the SGML docs have been removed.
Remove configuration for removed gimphwrapbox.
Remove unused variables $CDDA_LIBS and $LIBJPEG.
svn path=/trunk/; revision=12989
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 24 |
2 files changed, 12 insertions, 22 deletions
@@ -1,5 +1,15 @@ 2007-07-10 Martin Wehner <martin.wehner@gmail.com> + * configure.in: + Remove AC_ISC_POSIX: It would have to be called after AC_PROG_CC, + but Interactive Unix is obsolete. + Remove checks for functions and headers we don't use anymore. + Remove check for jw as the SGML docs have been removed. + Remove configuration for removed gimphwrapbox. + Remove unused variables $CDDA_LIBS and $LIBJPEG. + +2007-07-10 Martin Wehner <martin.wehner@gmail.com> + * libnautilus-private/Makefile.am: * libnautilus-private/nautilus-cdrom-extensions.h: Remove unused file. diff --git a/configure.in b/configure.in index a392e8427..dbfaf9d94 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,6 @@ AC_SUBST(NAUTILUS_EXTENSION_VERSION_INFO, [nautilus_extension_current]:[nautilus AC_C_BIGENDIAN AC_C_CONST -AC_ISC_POSIX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -150,8 +149,7 @@ AC_SUBST(ORBIT_IDL) dnl ========================================================================== -AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo) -AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h fstab.h) +AC_CHECK_HEADERS(sys/mount.h sys/vfs.h) dnl ========================================================================== @@ -241,19 +239,6 @@ AC_CHECK_LIB(X11, XOpenDisplay, :, dnl ========================================================================== -dnl jw (for doc build) - -AC_PATH_PROG(JW,jw,no) -if test x$JW = xno; then - HAVE_JW="no" -else - HAVE_JW="yes" -fi -AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") -AC_SUBST(HAVE_JW) - -dnl ========================================================================== - AM_CONDITIONAL(HAVE_EXIF, false) dnl libexif checking @@ -384,11 +369,6 @@ fi dnl ========================================================================== -dnl gimphwrapbox -GIMPHWRAPBOX_MODULES="gtk+-2.0" -GIMPHWRAPBOX_CFLAGS="`$PKG_CONFIG --cflags $GIMPHWRAPBOX_MODULES`" -AC_SUBST(GIMPHWRAPBOX_CFLAGS) - dnl gsequence GSEQUENCE_MODULES="glib-2.0" GSEQUENCE_CFLAGS="`$PKG_CONFIG --cflags $GSEQUENCE_MODULES`" @@ -414,7 +394,7 @@ dnl core nautilus (must list bonobo-activation and libbonobo because idldir does CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES" CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS" AC_SUBST(CORE_CFLAGS) -CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" +CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" AC_SUBST(CORE_LIBS) CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" AC_SUBST(CORE_IDL_INCLUDES) |